82 Commits

Author SHA1 Message Date
18ae2a04ab
update user, write all values, query verification Badge (#8593) 2025-05-25 14:48:24 +00:00
Max
ce1844e521
feat(webapp): several group and personal invitation links (#8504)
* invite codes refactor

typo

* lint fixes

* remove duplicate initeCodes on User

* fix typo

* clean permissionMiddleware

* dummy permissions

* separate validateInviteCode call

* permissions group & user

* test validateInviteCode + adjustments

* more validateInviteCode fixes

* missing test

* generatePersonalInviteCode

* generateGroupInviteCode

* old tests

* lint fixes

* more lint fixes

* fix validateInviteCode

* fix redeemInviteCode, fix signup

* fix all tests

* fix lint

* uniform types in config

* test & fix invalidateInviteCode

* cleanup test

* fix & test redeemInviteCode

* permissions

* fix Group->inviteCodes

* more cleanup

* improve tests

* fix code generation

* cleanup

* order inviteCodes result on User and Group

* lint

* test max invite codes + fix

* better description of collision

* tests: properly define group ids

* reused old group query

* reuse old Groupmembers query

* remove duplicate skip

* update comment

* fix uniqueInviteCode

* fix test

* fix lint

* Get invite codes

* Show invitation data in registration

* Add invitation list to menu (WIP)

* Add mutations, add CreateInvitation, some fixes

* Improve style, fix long comments

* Lock scrolling when popover is open, but prevent layout change

* small fixes

* instant updates

* Introduce config for link limit; add texts, layout changes

* Validate comment length

* Improve layout

* Add message to copied link

* Add invite link section to group settings

* Handle hidden groups

* Add menu entry for group invite links

* Fix locale

* hotfix invite codes

* Add copy messages

* More styling (WIP)

* Design update

* Don't forget user state

* Localize placeholder

* Add locale

* Instant updates for group invites

* fix registration with invite code

* Fix text overflow

* Fix instant updates

* Overhaul styles, add locales, add heading

* Add test and snapshot for CreateInvitation

* Improve accessability; add invitation test

* Add tests for InvitationList

* Fix locales

* Round plus button

* Fix tests

* Fix tests

* fix locales

* fix linting

* Don't show name of hidden group in invite message

* Add more tests

* Update webapp/locales/de.json

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>

* Update webapp/locales/de.json

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2025-05-10 08:25:03 +00:00
Max
33274e5b9a
feat(webapp): user teaser popover (#8450)
* calculate distance between current user and queried user

* fix query for unset location

* use database to calculate distance

* rename distance to distance to me, 100% calculation done in DB

* distanceToMe tests

* lint fixes

* remove comments

* Show user teaser popover with badges, Desktop

* Refactor UserTeaser and add mobile popover support

* Avoid click propagation (WIP)

* Prevent event propagation

* Adjust alignment and font sizes

* More spacing for statistics

* Add distance, simplify user link

* Refactor location info into own component

* Add tests for UserTeaserPopup

* Refactor and test LocationInfo

* Query distanceToMe, rename distance to distanceToMe

* Update test

* Improve tests for UserTeaser, WIP

* Fix tests

* DistanceToMe on User instead of Location

* Revert "DistanceToMe on User instead of Location"

This reverts commit 96c9db00a44cd120e47bfe9534d3e066a194744c.

* Fix notifications

* Refactor UserTeaser and fix location info

* Fix group member crash

* Show 0 distance

* Fit in popover on small screens

* Allow access to profile on desktop

* Revert backend changes

* Load user teaser popover data only when needed

* Fix type mismatch

* Refactor for clarity and accessibility

* Litte refactorings and improvements

* Fix popover test

* Adapt and fix tests

* Fix tests and bugs

* Add placeholder

* cypress: adapt user teaser locator to changes

* Remove delays and scrolling

* Disable popovers in notification list and fix layout

* Remove flickering

* Make overlay catch all pointer events on touch devices

* Re-add attribute for E2E test

* Fix test, return to mouseover

* fix snapshot

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
Co-authored-by: mahula <lenzmath@posteo.de>
2025-05-05 23:54:13 +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
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
1b8b356432
notification subscription 2023-07-20 13:41:59 +02:00
Moriz Wahl
c9135d321d fix notification added subscription 2023-06-21 14:31:16 +02:00
Moriz Wahl
033630e8e3 add group type for mark notifications as read 2023-03-16 16:55:30 +01:00
Moriz Wahl
ab58c569d0 related user for group notifications 2023-03-15 17:49:52 +01:00
Moriz Wahl
10c02c251e group notifications in notification dropdown 2023-03-15 16:23:45 +01:00
Moriz Wahl
bdc1cb33da Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-08 16:50:02 +01:00
Wolfgang Huß
654bf0f64e Add 'about' to 'mapUserQuery' 2023-01-25 17:24:55 +01:00
Wolfgang Huß
36239bc762 Show all users with locations on map 2023-01-12 11:25:58 +01:00
Wolfgang Huß
e8d21147ae Split 'locationAndBadgesFragment' into 'locationFragment' and 'badgesFragment' 2023-01-12 10:53:43 +01:00
Wolfgang Huß
04810ca500 Move the admins user query GQL to the appropriate file 2023-01-12 10:50:44 +01:00
Wolfgang Huß
13f2451e02 Change default GQL 'UserQuery' to named 'profileUserQuery' 2023-01-12 10:12:32 +01:00
Wolfgang Huß
9790eb1f88 Make 'followedByCount' and 'followingCount' in 'User' query imperative 2023-01-11 16:17:34 +01:00
Wolfgang Huß
dd80dc764c Fix unused parameters naming 2022-11-16 14:13:32 +01:00
Wolfgang Huß
b398eabf47 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read
# Conflicts:
#	webapp/locales/it.json
2022-11-16 11:45:19 +01:00
ogerly
a8cf6acd93 add slug user to group member 2022-10-18 13:38:05 +02:00
Wolfgang Huß
0048486a78 Refactor to save location in db by 'UpdateUser', 'CreateGroup', and 'UpdateGroup' resolvers
- Refactor, add, and refine tests of location for 'CreateGroup' and 'UpdateGroup' resolvers.
2022-09-17 20:55:43 +02:00
Moriz Wahl
d05919fddb add active categories to current user query 2022-09-07 14:08:03 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
Wolfgang Huß
7ae5593f82 Implement user notifications settings 2021-09-22 14:05:10 +02:00
Wolfgang Huß
a94d7188be Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read-test 2020-11-12 15:37:38 +01:00
Ademílson F. Tonato
0bffede021 feat: add mutation for new functionality (mark-all-as-read)
- Add mutation for markAllAsRead (notifications)
- Add method to the schema that returns a list of all notifications
- Add permissions rules to invoke this method (isAuthenticated)

See #2660
2020-10-24 11:29:09 +01:00
Moriz Wahl
f9518619fe id for author added 2020-10-14 16:35:47 +02:00
Moriz Wahl
8e527a83f1 post categories added for data export 2020-10-14 00:14:56 +02:00
Moriz Wahl
f0354c337f Export of user data as XML 2020-09-29 15:54:21 +02:00
Moriz Wahl
0e678a5559 basic json download of user data 2020-09-29 13:35:47 +02:00
ogerly
1c1a0030f7 fix: i have taken over and implemented the proposals from tirrok 2020-08-04 13:08:11 +02:00
ogerly
b2326c710e git pull conflicts fixed 2020-04-29 10:10:14 +02:00
ogerly
7e5a7f5d42 bug: deleteUser on old status, currentUserCounts are retrieved additionally, admin cannot delete himself via his user settings 2020-04-29 10:04:54 +02:00
ogerly
8a2d238f96 fix: #3498 Checkboxes missing on delete user account page 2020-04-26 13:11:32 +02:00
Raphael Beer
e6361c9b74
Refactor: move following/followedBy updating to page component 2020-03-28 05:57:48 +01:00
Raphael Beer
984f69a738
Chore: lint 2020-03-25 12:51:36 +01:00
Raphael Beer
f339ed2c7f
Add: button to load all remaining connections 2020-03-25 12:51:35 +01:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043)
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
2020-03-16 15:32:19 +01:00
roschaefer
7d9cbb3ce9 perf(neo4j): Improve currentUser read performance 2020-03-04 13:32:30 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2020-02-10 16:25:00 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
2020-01-23 19:18:12 +01:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00