41 Commits

Author SHA1 Message Date
Wolfgang Huß
2eca3fbfec
🧘🏼 [Simulation] brand reformer.network – v4 (#8506)
* Fix favicon and icon

* - fixed menu item colors
- fixed footer item colors

* - fixed input focus

* - fixed slug color
- fixed primary button hover color

* - fixed chat colors

* - fixed editor button colors

* Add logo-r-circle.svg

* Add new settings in logos.js and logos.ts

* Brand 'categories.*' files

* Add brand categories to locales

* Add 'categories.*' SVGs

* Move categories SVGs to folder 'webapp/assets/_new/icons/svgs'

* Change paths to icon name

* Remove gender language

* Remove '.svg' from icon names and replace underscores by dashes

---------

Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
2025-05-12 10:50:11 +02:00
Wolfgang Huß
5084620a2d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step 2025-05-12 10:47:25 +02: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
Wolfgang Huß
5a0d170a2a
🧘🏼 [Simulation] brand reformer.network – v3 (#8456)
* Set login to landing page

* Fix _branding.scss

* Remove test code

* Fix login branding

* Fix branding
2025-05-08 09:53:02 +02:00
Wolfgang Huß
c6923893ba Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into brand-reformer-network-first-step
# Conflicts:
#	webapp/constants/links.js
#	webapp/locales/de.json
#	webapp/locales/en.json
2025-05-08 09:39:34 +02: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
Wolfgang Huß
569485bc4c
🧘🏼 [Simulation] Brand reformer network first step – v2, Login etc. Branding (#8448)
* Refine locals of some internal pages headlines

* Create page 'legacy information'

* Move filter button into menu

* Refine page 'legacy information'

* Create internal page 'code-of-conduct.html'

* Refine internal page 'code-of-conduct.html'

* Refine page 'legacy information'

* Create internal page 'imprint.html'

* Create internal page 'faq.html'

* Create internal page 'support.html'

* Refine internal page 'faq.html'

* Refine internal page 'imprint.html'

* Move parts of internal page 'data-privacy.html' to 'terms-and-conditions.html'

* Refine internal page 'data-privacy.html'

* Fix tool tip text

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

* Rename title of organization footer item

- Remove donation page from footer

* Change 'Reformer.Network' to 'Reformer.network'

* Create internal page 'organization.html'

* Refine internal pages

* Translate internal pages

* Change brandings $secondary-color from 'rgb(244, 142, 0)' to 'rgb(239, 123, 0)'

* Change branding $color-primary-active from 'rgb(95, 97, 92)' to 'rgb(135, 135, 135)'

* Move commented font commands in '_branding.scss'

* Set $color-tertiary-light and ribbon colors in '_branding.scss'

* Refactor branding of post ribbons

* Refactor Logos

* Change branding $secondary-color from 'rgb(239, 123, 0)' to 'rgb(239, 124, 0)'

* Refactor colors after the designer suggestions - first step

* Change diverse collorings

- Change border color
- Change plus button
- Change hashtag color
- Change footer link hover
- Change number count color
- Change input border color

* Add font Inter

* Use font Inter

* Make font branding work

* Hover effect for user teaser

* 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

* Add link hover to all internal pages

* Set font family to Inter

- Cleanup

* Set background, color, and font weight of user avatar

* Make login, registration, password-reset layout brandable

- Rename some variables related to this

* Set background images for Login etc.

* Set layout for Login etc. to be 'blank'

* Add login etc. background images

* - first fix for login, registration and password-reset

* - fixed background (including jumping)

* - removing quote block by css
- adding text block by css

* - set font weight

* - added approach also for registration page

* removed registration hack

---------

Co-authored-by: Maximilian Harz <maxharz@gmail.com>
Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2025-04-29 10:21:14 +02:00
Wolfgang Huß
b8141c2e6e
🧘🏼 [Simulation] Brand reformer network first step – v2 (#8384)
* Refine locals of some internal pages headlines

* Create page 'legacy information'

* Move filter button into menu

* Refine page 'legacy information'

* Create internal page 'code-of-conduct.html'

* Refine internal page 'code-of-conduct.html'

* Refine page 'legacy information'

* Create internal page 'imprint.html'

* Create internal page 'faq.html'

* Create internal page 'support.html'

* Refine internal page 'faq.html'

* Refine internal page 'imprint.html'

* Move parts of internal page 'data-privacy.html' to 'terms-and-conditions.html'

* Refine internal page 'data-privacy.html'

* Fix tool tip text

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

* Rename title of organization footer item

- Remove donation page from footer

* Change 'Reformer.Network' to 'Reformer.network'

* Create internal page 'organization.html'

* Refine internal pages

* Translate internal pages

* Change brandings $secondary-color from 'rgb(244, 142, 0)' to 'rgb(239, 123, 0)'

* Change branding $color-primary-active from 'rgb(95, 97, 92)' to 'rgb(135, 135, 135)'

* Move commented font commands in '_branding.scss'

* Set $color-tertiary-light and ribbon colors in '_branding.scss'

* Refactor branding of post ribbons

* Refactor Logos

* Change branding $secondary-color from 'rgb(239, 123, 0)' to 'rgb(239, 124, 0)'

* Refactor colors after the designer suggestions - first step

* Change diverse collorings

- Change border color
- Change plus button
- Change hashtag color
- Change footer link hover
- Change number count color
- Change input border color

* Add font Inter

* Use font Inter

* Make font branding work

* Hover effect for user teaser

* 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

* Add link hover to all internal pages

* Set font family to Inter

- Cleanup

* Set background, color, and font weight of user avatar

---------

Co-authored-by: Maximilian Harz <maxharz@gmail.com>
2025-04-29 10:08:38 +02:00
Wolfgang Huß
949dffc528 Adjust footer color and font weight 2024-11-04 16:06:36 +01:00
Wolfgang Huß
1814dd7b4a Adjust colors, extended, second step 2024-10-24 11:47:14 +02:00
Wolfgang Huß
e35c222368 Switch $color-secondary with $color-tertiary 2024-10-24 11:46:04 +02:00
Wolfgang Huß
9af0bf150e Adjust colors, extended, first step 2024-10-24 10:45:12 +02:00
Wolfgang Huß
883957b7b2 Set colors for chat, fourth step 2024-10-22 23:28:14 +02:00
Wolfgang Huß
72d91d0314 Set colors for chat, third step 2024-10-22 22:09:31 +02:00
Wolfgang Huß
4e4bd3b356 Set colors for chat, second step 2024-10-22 21:50:24 +02:00
Wolfgang Huß
942adc09c6 Set first config and branding 2024-10-22 21:38:23 +02:00
Markus
02566a6e93 fixed hardcoded z-index of overlay, filter and add-btn 2023-05-02 15:49:26 +02:00
Wolfgang Huß
a1fa905f40 Revert "Set Yunite rebranding"
This reverts commit 2635907ac71320b64a33121c412267662d5e9eb9.

# Conflicts:
#	webapp/assets/styles/imports/_branding.scss
2023-03-01 12:47:47 +01:00
Wolfgang Huß
a4a25eb5cf Replace explicit color #6e8b87 in branding by $color-primary 2023-03-01 07:57:07 +01:00
Wolfgang Huß
e719ae23c9 Adjust ds-chips background color on group teaser and group profile 2023-03-01 07:55:50 +01:00
Wolfgang Huß
7278adb09d Set primary and secondary color correctly for Yunite incl. donation bar and toast 2023-02-28 20:51:21 +01:00
Wolfgang Huß
58fd233e70 Make branding color setting possible or better for donation bar and toaster 2023-02-28 20:49:50 +01:00
Wolfgang Huß
2635907ac7 Set Yunite rebranding 2023-02-28 19:42:12 +01:00
ogerly
0293fec7e7 step1 refactor rebranding 2022-09-22 16:51:48 +02:00
ogerly
58e48cfe77 rebrand in config for scss and styleguide 2022-09-21 12:09:35 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +02:00
ogerly
8b62b624ac refactor header menu, add svg logos 2022-09-20 10:19:02 +02:00
ogerly
afb5c719dc add color from yunite in branding 2022-08-10 09:52:59 +02:00
ogerly
85fd02a30f remove grey from sccs branding 2022-08-10 08:05:54 +02:00
ogerly
968dcc7276 add yunite logo and branding scss file 2022-08-09 13:24:31 +02:00
Alina Beck
f564126e13 fix disabled content styles 2020-02-20 00:32:18 +01:00
Alina Beck
278868133f use base-card on user profile 2020-02-11 18:31:14 +01:00
Alina Beck
4e6ec6eba7 move dropdown-arrow class to main.scss 2019-12-19 08:40:04 +05:30
Alina Beck
4e6572a042 replace ds-icon with base-icon 2019-11-19 12:26:07 +03:00
Robert Schäfer
649c51c705
Merge pull request #1452 from Human-Connection/separate-text-at-words
Use hyphens to separate words properly
2019-09-03 18:12:02 +02:00
Alina Beck
f34ff188eb disable scrolling behind popover 2019-09-03 11:44:22 +01:00
Alina Beck
0fd0cdbe34 separate post title and content with hyphens 2019-09-02 16:46:41 +01:00
Robert Schäfer
4b09284011 Merge remote-tracking branch 'origin_https/master' into 984-minimum-size-of-body 2019-07-09 22:52:58 +02:00
senderfm
91f9aacb79 full ads width use with small devices 2019-07-03 08:26:15 +02:00
Matt Rider
6e420d68d1 Improved UI
- add buefy for slider and checkboxes
- update/translate text
- add warning
- transition
2019-06-07 10:16:55 -03:00
Robert Schäfer
c91a61af89 Merging webapp to master 2019-03-20 21:06:17 +01:00