1489 Commits

Author SHA1 Message Date
Max
d09f1a95f9
fix(webapp): fix badge focus (#8452)
* Verification badge is never a button

* Fix focus style of badges, removing weird outline

Instead of outline, increase size, like when hovered.
2025-04-28 17:59:35 +00:00
Wolfgang Huß
48c7bd0033
refactor(webapp): make login, registration, password-reset layout brandable (#8440)
* Make login, registration, password-reset layout brandable

- Rename some variables related to this

* Remove experimental code

* add lodash types

* fix build

fix type

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2025-04-28 16:58:35 +00:00
Max
fffaebcbca
Replace edit link by pencil button (#8453)
We show now a round button with pencil icon to edit the badges.
2025-04-28 14:39:54 +00:00
Wolfgang Huß
a5ee90a95d
fix(webapp): refine little things (#8382)
* Refine locals of some internal pages headlines

* Fix tool tip text

* Fix 'email' -> 'e-mail'

* Syncronize 'metadata.ts' with webapp

* Refine e-mail notifications

* Adjust notification settings buttons

* Refine third party setting

* Fix post teaser counter icon tooltips translations

* Refine e-mail notifications

* Refine third party setting

* notification spec snapshot

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2025-04-28 13:32:23 +00:00
Max
ba0cc147e7
fix(webapp): fix admin badges settings (#8438)
* Remove proxy from nuxt.config, instead add proxy filter

* Show message when there are no badges
2025-04-26 17:25:27 +00:00
sebastian2357
2fd138697f
feat(webapp): badges UI (#8426)
- New badge UI, including editor.
- Adds config to enable/disable badges.

---------

Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
Co-authored-by: Maximilian Harz <maxharz@gmail.com>
2025-04-25 16:55:46 +00:00
Max
c090db3866
feat(webapp): badges admin settings (#8401)
Adds a link to badges settings in the user table, where admins can set the available badges.
2025-04-22 17:28:51 +00:00
8cf405c549
feat(backend): badges (#8391)
* delete all old badges

* reward/unrewardBadge

* verification Badges

* name all badged accordingly

* more tests, lint

* seed badges

* profileBadge mechanic

* badgesUnusedCount

* seed profileBadges set

* configure profile badge count

* insert badges db:data:badges:default

* seed commands to seed default badges and allow to seed branding data

* copy data migrations when building docker

* typo

* correct data:branding command & document it

* test new functionality

* Update backend/src/db/seed/badges.ts

Co-authored-by: Max <maxharz@gmail.com>

* Update backend/src/db/seed/badges.ts

Co-authored-by: Max <maxharz@gmail.com>

* Update backend/src/db/seed/badges.ts

Co-authored-by: Max <maxharz@gmail.com>

* naming coventions

* final naming fix

lint

fix build

fix badge type in test

renamed badge_ to trophy_

lint fixes

small renameing

fixes

fix users spec

fix webapp queries

fix display

* expose badge description

---------

Co-authored-by: Max <maxharz@gmail.com>
2025-04-17 23:08:54 +00:00
Max
fb12a139bc
fix(webapp): better settings ux (#8347)
* Scroll to notification settings when opened (for mobile)

* scroll to settings content when clicking on menu entry

* Scroll to settings content on mobile and fix weird loading state

* Add fail-safety

* Fix linting
2025-04-14 17:56:29 +00:00
Max
caeff070b7
feat(webapp): add mute/unumute group to menu (#8335)
* basics to notify a user when a followed user posted

* do not notify following user on posts in groups

* followig user wrote post notification

* notify regular group members when a new post is posted in the group

* mute and unmute groups

* clean database at end

* locale for post in group notification

* post in group notification triggers correctly

* email settings for post in group

* Add mute/unumute group to menu (WIP)

* Add mute group functionality (WIP)

* Add locales; use mute/unmute mutations, cleanup tests

* Overhaul group content menu test

* Rename isMuted to isMutedByMe and add it to group query

* Add German and English locales

* Add spanish translations

* Add missing translation keys (with null values)

* Remove console statement

* Add snapshot

* Replace mount by render

* Mock Math.random(), add tests for mute/unmute

* Use container instead of baseElement for snapshots

* fix group slug tests

* undo wrong variable naming

* rename parameter to groupId of mute/unmute group mutation

* rename parameter to groupId of mute/unmute group mutation

* only non pending members have access to the comtext menu

---------

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2025-04-11 23:10:42 +00:00
Max
1b07b06ca7
feat(webapp): notification settings frontend (#8320)
Implements detailed settings for email notifications.

Issues
relates 🚀 [Feature] Drei neue Interaktions-Benachrichtigungen #8280
2025-04-09 13:21:38 +00:00
Max
1e6a74b8ce
feat(frontend): observe posts (#8293)
* After creating the post, the author of it automatically observes it to get notifications when there are interactions

* a user that comments a post, automatically observes that post to get notifications when there are more interactions on that post

* mutation that switches the state of the obeservation of a post on and off

* remove duplicate code

* fix unit tests

* add metric observed users count to posts

* change naming

* Add follow post entry to post menu

* Add FollowButton (WIP), show unfollow in menu when already followed

* Follow/unfollow post => observe

* Update slashed bell

* Add requests to observe/unobserve posts

* Add ObserveButton functionality

* Rename isObservedByMe

* Add observingUsersCount; simplify ObserveButton and menu entries

* Fix locales

* Add snapshot test for ObserveButton (WIP)

* Remove empty routes push

* Add test for ObserveButton

* Add test for ContentMenu, improve ObserveButton test

* Remove unneeded fields from PostQuery

---------

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2025-04-04 11:54:43 +00:00
Wolfgang Huß
b9207853c5 Fix notification page has unbranded button by changing ds-button to base-button 2024-10-23 13:36:18 +02:00
Markus
9c4d4944af Merge branch 'master' into 6976-optimize-post-teaser-date 2024-02-01 15:49:57 +01:00
Markus
d70fd979fb fixed event info layout 2024-02-01 11:57:13 +01:00
Wolfgang Huß
86b55bc2ae Fix wrong content menu position on group profile page by change class name from 'page-name-group-id-slug' to 'group-profile' 2024-01-26 12:25:32 +01:00
mahula
852e97b166 adapt linting of current frontend to new eslint-plugin-vue rules 2023-12-11 17:15:10 +01:00
mahula
6d53fb97ff
Merge branch 'master' into replace-deprecated-jest-method 2023-10-31 19:31:58 +01:00
mahula
57b6b81a5f linting 2023-10-31 11:24:27 +01:00
mahula
7480f2c523 replace deprecated jest methods in webapp unit tests 2023-10-31 11:10:38 +01:00
Wolfgang Huß
34ac7b97bd Make filter menu visible if categories are inactive 2023-10-30 15:57:30 +01:00
Javier López
be604cc945 fix:[6687] update the groups link in map 2023-08-20 23:48:14 +02:00
Hannes Heine
7f06d71f6a
Merge branch 'master' into 6443-refactor-create-post-page 2023-07-26 10:53:04 +02:00
Wolfgang Huß
883d7d89ab Fix linting 2023-07-20 12:04:37 +02:00
Wolfgang Huß
dee77df5f6 Cleanup 2023-07-20 12:02:24 +02:00
elweyn
13da3ba3f4 Add returned properties to the CreateRoom mutation, add emit to change the roomID. 2023-07-20 11:35:06 +02:00
Wolfgang Huß
858e3fdee8 Rename 'addRoom' to 'toggleUserSearch' in chat component 2023-07-20 10:40:04 +02:00
Markus
18f932f1b6 [refactor] fixed wrong title on edit post page 2023-07-20 10:15:39 +02:00
Hannes Heine
b881daef91
Merge branch 'master' into 6592-chat-component-+-button-open-search 2023-07-20 10:11:41 +02:00
Markus
a8f32cad75 Merge branch 'master' into 6443-refactor-create-post-page 2023-07-19 22:01:47 +02:00
Wolfgang Huß
4192612293 Fix linting 2023-07-19 17:51:05 +02:00
Wolfgang Huß
3d9a9cd5a0 Create the chat room on user search in chats function 2023-07-19 17:47:56 +02:00
Wolfgang Huß
26282c67b7 Make user search in chats function – second step 2023-07-19 16:41:23 +02:00
Wolfgang Huß
ffe51a0743 Separate 'ds-select' of 'AddGroupMember' into separate component 'SelectUserSearch' 2023-07-19 15:48:05 +02:00
Wolfgang Huß
a114b8a12c Give the chat plus button a function and show hide the user search 2023-07-19 14:07:10 +02:00
Markus
85e68795a3 [fix] all group related pages are now under one route, so link highlighting works 2023-07-19 10:09:04 +02:00
Wolfgang Huß
9157e14ded Change small chat partner on click the chat button on different user profile 2023-07-18 18:21:05 +02:00
Wolfgang Huß
c7deefa563 Close small chat if one changes to the chat room page 2023-07-18 17:33:45 +02:00
Wolfgang Huß
cc4cb8af46 Rename tag 'chat-module' to 'chat' 2023-07-18 14:41:10 +02:00
Wolfgang Huß
785a027989 Close mini chat on visit chat room page 2023-07-18 14:17:40 +02:00
Wolfgang Huß
53a320fb9d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6545-add-headline-to-chat-page
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
2023-07-14 11:40:24 +02:00
Markus
9662e729aa Merge branch 'master' into 6443-refactor-create-post-page 2023-07-13 18:50:04 +02:00
Markus
caa7e8e1fb [refactor] updated ui of creat post page 2023-07-13 18:47:36 +02:00
Wolfgang Huß
751c8b60a6 Add headline to chat page 2023-07-13 12:02:53 +02:00
Wolfgang Huß
20d7e0690e
Merge branch 'master' into 6436-show-the-event-on-the-map 2023-07-13 10:49:30 +02:00
Wolfgang Huß
34bb207e8e Change store commits into 'mapMutations' on user profile 2023-07-13 09:30:19 +02:00
Wolfgang Huß
40774b0498 Put user name in the tooltip of the chat button on the user profile 2023-07-13 08:59:51 +02:00
Wolfgang Huß
a07a8b35e0
Update webapp/pages/profile/_id/_slug.vue
Co-authored-by: Alexander Friedland <fridolin@tutanota.com>
2023-07-13 08:49:08 +02:00
Wolfgang Huß
2a44b18aa6 Fix icon and set texts on chat button on user profile 2023-07-12 16:11:58 +02:00
Wolfgang Huß
a5cb81ceac Change group marker from blue to red on map 2023-07-12 11:24:12 +02:00