ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,370 Commits 117 Branches 1,511 Tags
Commit Graph

215 Commits

Author SHA1 Message Date
Moriz Wahl
a3178a91b4
refactor(webapp): store for categories (#8551) 
* after authentification, query the categories if active and store them

* get categories from store

* use category store to get categories

* get categories from store

* mock store to have access to categories

* to get rid of the active categories config variable in the frontend, the Category query returns an empty array when categories are not active

* remove CATEGORIES_ACTIVE from .env

* should return string to avoid warnings in console

* replace all env calls for categories active by getter from store

* use categoriesActive getter

* ignore order of returned categories

* mixin to get the category infos from the store, to ensure, that the quey has been called

* fix misspelling

---------

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2025-05-27 15:03:26 +02:00
Max
4e4eff8dc9
fix(webapp): fix layout break and hidden group name appearance (#8538) 
Fixes long comment overflow.
There is some underlying problem with flex box and overflows. A better solution could be to use a grid, but this was the fastest I would come up with.

Fixes hidden group name appearance
 2025-05-10 09:22:51 +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
sebastian2357
ff366a4075
fix(webapp): mobile optimization (#8516) 
* - optimized header
- added possibility of extra mobile logo

* - changed behavior of NotificationMenu link get directly open for mobile

* - moved notification links to the top of the menu

* - optimized chat view for mobile

* - added logo branding structure

* - added logo branding structure

* - fixed chat height

* - fixed paddings for internal pages

* Fix linting

* Fix linting

---------

Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2025-05-09 17:04:06 +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
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
Wolfgang Huß
a31274c793
refactor(webapp): refactor branding of post ribbons and chat etc. (#8395) 
* Refactor branding of post ribbons

* Refactor chat to be more brandable

* Refine avatar menu logout item to have danger color

* Change login menu item color to '$text-color-link'
 2025-04-17 17:48:59 +02: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
mahula
47d79544c6 adapt name and random faking to updates faker api 2024-04-29 08:18:00 +02:00
mahula
d8e47238bb adapt faker import in webapp to package update 2024-04-29 07:44:49 +02:00
mahula
73fac22148 linting according to updated linter 2024-03-10 22:49:46 +01:00
Tarun Samanta
8699d1049e
Update webapp/components/_new/generic/CounterIcon/CounterIcon.vue 
Applied v-if only to the span tag

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2023-09-26 20:37:53 +05:30
Tarun Samanta
d07fa4be0e
Update CounterIcon.vue 2023-09-26 02:39:47 +05:30
Tarun Samanta
76736b1d52 [Feature] Chat: Only show counter if unread messages exist 2023-09-25 23:28:06 +05:30
Wolfgang Huß
5ecf6a7fee Change cancel button in 'MySomethingList' from danger to green 2023-07-19 12:31:52 +02:00
Wolfgang Huß
29a05efadb Fix linting 2023-06-20 13:56:52 +02:00
elweyn
cb0f97238c Refactor code to computed methods. 
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2023-06-20 11:10:57 +02:00
Wolfgang Huß
53d3a921bf Force target '_blank' in registration 'terms and conditions', 'data privacy' links by 'PageParamsLink' 2023-06-14 13:20:56 +02:00
Wolfgang Huß
4c0469f61a Add tooltip to header avatar menu 
- Add 'showProfileNameTitle' to profile avatar.
 2023-03-23 07:51:19 +01:00
Wolfgang Huß
3f875525f2 Change shout icon 'bullhorn' to 'heart-o' 2023-03-09 18:41:34 +01:00
Moriz Wahl
6eb5ad25af get all components tests running 2023-02-15 11:12:19 +01:00
Moriz Wahl
4ce5bdd6fa get most components working 2023-02-15 10:23:34 +01:00
Moriz Wahl
a4fd558a88
Update webapp/components/_new/generic/BaseIcon/BaseIcon.vue 2023-02-03 20:18:53 +01:00
Moriz Wahl
b8228db9f3 Merge branch 'master' into map 2023-02-03 17:41:12 +01:00
Wolfgang Huß
11376facb1 Adjust globe position in header button 2023-01-31 18:54:39 +01:00
Wolfgang Huß
ab493e1a25 Adjust globe position in header button 2023-01-31 17:46:26 +01:00
Wolfgang Huß
8061b1d0fe Reduce size of map button a bit 2023-01-31 15:47:13 +01:00
Wolfgang Huß
e4d209526c Add different sizes to 'BaseIcon.vue' 2023-01-31 12:50:12 +01:00
Wolfgang Huß
c25a7377a8 Add CSS 'letter-spacing: $letter-spacing-large' to 'base-button' like in 'ds-button' 2023-01-29 12:58:39 +01:00
Wolfgang Huß
02598e5224 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist 2022-11-23 14:34:23 +01:00
Wolfgang Huß
bda0b3f088 Fix Cypress tests for the users social media 
- Refactor Cypress tests to make them more language independent.

Co-Authored-By: mahula <lenzmath@posteo.de>
 2022-11-23 14:22:45 +01:00
Wolfgang Huß
b20b797d60 Fix target property in 'PageParamsLink.vue' 2022-10-28 12:48:27 +02:00
Wolfgang Huß
00c10cc1a7 Refine footer links and donation link and fix their tests 2022-10-28 11:50:15 +02:00
ogerly
bad97a2fca fix lint 2022-10-27 08:50:37 +02:00
ogerly
1dfdc61220 footer links target dynamic 2022-10-27 08:48:58 +02:00
ogerly
31a4be9375 add target url dynamic 2022-10-27 08:24:20 +02:00
Wolfgang Huß
b9488d7d7a Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-10-25 13:33:11 +02:00
Susmit Mukherjee
917c20c7c7 Addressed issue #5427,Long words are being wrapped now 2022-10-23 22:14:18 +05:30
Moriz Wahl
88b5fb9b46 have i18n as option for search groups, fix test 2022-10-23 13:02:04 +02:00
Moriz Wahl
e27f9b00e6 remove location from group fragment, remove search type from search string on search page 2022-10-23 01:18:58 +02:00
Moriz Wahl
d1b05b7e02 add groups to search result page 2022-10-21 18:35:21 +02:00
Wolfgang Huß
a5c65faf15 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5137-refactor-social-media-and-mysomethinglist 
# Conflicts:
#	webapp/pages/settings/my-social-media.vue
 2022-10-04 10:08:29 +02:00
Wolfgang Huß
2aa85d7b05 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5344-add-group-members-management 
# Conflicts:
#	backend/src/db/graphql/groups.js
#	backend/src/schema/resolvers/groups.js
#	webapp/components/Group/GroupCard.vue
#	webapp/components/Group/GroupForm.vue
#	webapp/components/Group/GroupTeaser.vue
#	webapp/graphql/groups.js
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/group/edit/_id.vue
 2022-09-23 15:04:49 +02:00
Wolfgang Huß
a20d66b1bc Fix type validation error in BaseButton 2022-09-21 08:01:47 +02:00
Wolfgang Huß
2e0e485bbd Fix multiple use of 'disabled' property in BaseButton component in code base by implementing it. 2022-09-19 06:56:40 +02:00
ogerly
41955c5f56 add gruopMenu 2022-09-13 20:40:40 +02:00
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
Wolfgang Huß
5f43a51c6a Rename prop 'user' of 'profile-avatar' to 'profile' 2022-08-29 18:39:51 +02:00
Wolfgang Huß
615ee2991a Rename Component from 'UserAvatar' as 'user-avatar' to 'ProfileAvatar' as 'profile-avatar' 2022-08-29 18:21:50 +02:00
Wolfgang Huß
077a63aca7 Rename class 'user-avatar' to 'profile-avatar' 2022-08-29 18:09:51 +02:00