16316 Commits

Author SHA1 Message Date
Wolfgang Huß
b471a8f92b
fix(backend): fix user profile and group links in e-mails (#8512)
* Add e-mail .env settings

* Fix user profile and group links

* fix snapshots

---------

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
b3.5.3-1153
2025-05-09 11:51:21 +00:00
2278a9e311
fix(backend): fix registration with invite code (#8513)
* fix registration with invite code

* save one db call

* fix
b3.5.3-1152
2025-05-09 11:20:56 +00:00
ac79452ce6
fix locales errors (german) (#8510) b3.5.3-1151 2025-05-09 12:19:00 +02:00
989d5ff781
fix(backend): invite codes - hotfix 1 (#8508)
* hotfix invite codes

* fix tests & ensure correct behaviour
b3.5.3-1150
2025-05-08 22:57:55 +00:00
Moriz Wahl
fbec8288b2
refactor(backend): category seed (#8505)
* define ids and slugs in categories, check for existing ids, only seed the new ids

* seed categories respecting existing categories

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
b3.5.3-1149
2025-05-08 20:27:41 +00:00
3f4d648562
feat(backend): group invite codes (#8499)
* 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
b3.5.3-1148
2025-05-08 19:18:40 +00:00
Wolfgang Huß
e3864b1f9d
feat(webapp): change german to du and dich (#8507)
* Change 'Du' -> 'du'

* Change 'Dich' -> 'dich'

* Change backend e-mails 'Dich' -> 'dich'

* Change backend e-mails 'Du' -> 'du'

* Fix e-mail snapshots

* Revert "Auxiliary commit to revert individual files from eea84f60ba9c17d48a735632709a66452f0494e9"

This reverts commit d80994c3b8bff311422cb44aab1275c31286595a.

* Change backend e-mails 'Du' -> 'du', 'Dich' -> 'dich'

* Change webapp 'Dein<x>' -> 'dein<x>'

* Change backend 'Dein<x>' -> 'dein<x>'
b3.5.3-1147
2025-05-08 18:48:26 +02:00
Moriz Wahl
20d14f3a2f
chore(release): v3.5.3 (#8503)
* Release v3.5.3
b3.5.3-1146 3.5.3
2025-05-07 18:44:44 +00:00
Moriz Wahl
50bc62428e
fix(backend): correct email from (#8501) b3.5.2-1145 2025-05-07 19:42:39 +02:00
Robert Schäfer
290a176407
refactor(backend): types for global config (#8485)
* refactor(backend): types for global config

I saw merge conflicts in these files for #8463 so let's get some parts of this PR into `master` already.

I believe this fixes a small bug. They guard clause didn't ensure that all of REDIS_ configurations were set.

* remove old email mechanism

* refactor(backend: react to @ulfgebhardt's review

See: https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8485#pullrequestreview-2813528327

* build(backend): optional commit

@ulfgebhardt this is how I tested the configurations. We don't need to include this commit but I wouldn't expect to send out real emails from a `docker-compose` setup.

---------

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
b3.5.2-1144
2025-05-07 15:57:35 +02:00
32026dacfc
fix warning in workflow for lower case as (#8494) b3.5.2-1143 2025-05-06 22:46:51 +00:00
5d348c2eaf
v3.5.2 (#8498) b3.5.2-1142 3.5.2 2025-05-06 11:44:58 +00:00
2b63df1930
fix emails2 (#8497) b3.5.1-1141 2025-05-06 11:18:34 +00:00
4960f2800b
v3.5.1 (#8496) b3.5.1-1140 3.5.1 2025-05-06 10:30:40 +00:00
5c5550092e
fix emails in production (#8493) b3.5.0-1139 2025-05-06 09:52:24 +00:00
b280b1f3f0
v3.5.0 (#8492) b3.5.0-1138 3.5.0 2025-05-06 05:28:51 +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>
b3.4.0-1137
2025-05-05 23:54:13 +00:00
Moriz Wahl
65f764f6d9
feat(backend): signup email localized (#8459)
* localized registration email

* localized email verification email

* localized reset password email
b3.4.0-1136
2025-05-05 20:44:14 +02:00
63dd215297
lint json (#8472)
revert providers path
b3.4.0-1135
2025-05-05 14:35:13 +02:00
mahula
30080a44c2
refactor(other): cypress: simplify cucumber preprocessor imports and some linting (#8489)
* cypress: a little linting

* cypress: import badeball preprocessor globally

* cypress: reintroduce accidentally removed semicolons

* cypress: set new e2e support file in config

* Revert "cypress: import badeball preprocessor globally"

This reverts commit 55fde3de2f9c355fe25bf9b49485b6bf64ca01cf.

* Revert "cypress: set new e2e support file in config"

This reverts commit 525cb5cf3766e402dadfd17f48e5b0f6c6ba1f9b.

* cypress: change preprocessor import to correct method in step definition file

* cypress: change preprocessor import to correct method in step definition files
b3.4.0-1134
2025-05-04 22:00:36 +02:00
b54e9773f4
fix backend node23 (#8488) b3.4.0-1133 2025-05-04 14:46:29 +02:00
mahula
5d5a5b17b8
refactor(workflow): parallelize e2e preparation (#8481)
* e2e preparation: separate image buildings

* e2e preparation: fix job naming

* e2e preparation: set required jobs in cleanup job

* e2e preparation: set restore keys

* e2e preparation: reduce cleanup job dependencies

* e2e preparation: remove primary cache key pattern

* Revert "e2e preparation: remove primary cache key pattern"

This reverts commit 9df95de90083cc296f38ae87b127f76ac4e59295.

* e2e preparation: split cache restore steps

* e2e preparation: set concrete archive paths

* e2e preparation: remove redundant step id

* e2e preparation: fix typo

* e2e preparation: fix typo

* e2e preparation: move env copying to cypress preaparation job

* e2e preparation: update cache cleaning job

* e2e preparation: refactor job and step naming

* e2e preparation: add repo checkout step to cache cleanup job

* e2e preparation: correct docker compose step

* e2e preparation: correct backend env copying

* e2e preparation: correct cypress cache restore key
b3.4.0-1132
2025-05-04 12:53:34 +02:00
Robert Schäfer
fac818a3e4
refactor(backend): types for context + slug (#8486)
Also these changes saw merge conflicts in #8463 so let's get them merged already.

Co-authored-by: mahula <lenzmath@posteo.de>
b3.4.0-1131
2025-05-04 07:44:31 +08:00
Moriz Wahl
e4ae0dfe50
feat(backend): emails for notifications (#8435)
* email templates with pug for all possible notification emails

* more information in emails

* Individual email subjects to all notification emails

---------

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Co-authored-by: mahula <lenzmath@posteo.de>
b3.4.0-1130
2025-05-03 21:11:44 +02:00
4f05b852af
remove some dependabot groups & no alpine version to allow update (#8475)
Co-authored-by: mahula <lenzmath@posteo.de>
b3.4.0-1129
2025-05-03 11:51:22 +00:00
dependabot[bot]
43f4fd130e
build(deps-dev): bump the babel group with 3 updates (#8478)
Bumps the babel group with 3 updates: [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core), [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) and [@babel/register](https://github.com/babel/babel/tree/HEAD/packages/babel-register).


Updates `@babel/core` from 7.26.10 to 7.27.1
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.27.1/packages/babel-core)

Updates `@babel/preset-env` from 7.26.9 to 7.27.1
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.27.1/packages/babel-preset-env)

Updates `@babel/register` from 7.25.9 to 7.27.1
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.27.1/packages/babel-register)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-version: 7.27.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: babel
- dependency-name: "@babel/preset-env"
  dependency-version: 7.27.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: babel
- dependency-name: "@babel/register"
  dependency-version: 7.27.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: babel
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b3.4.0-1128
2025-05-03 11:08:28 +00:00
dependabot[bot]
83b7e09bb6
build(deps-dev): bump @types/node from 22.15.2 to 22.15.3 in /backend (#8479)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.15.2 to 22.15.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 22.15.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b3.4.0-1127
2025-05-03 10:19:46 +00:00
c69cef47a1
refactor(backend): refactor context (#8434)
* type for neo4j and neode

* fix build

* remove flakyness

* wait for neode to install schema

* remove flakyness

* explain why we wait for a non-promise

* refactor context

missing change

missing change

* adjust test setup

proper cleanup after test

* lint fixes

* fix failing test to use new context
b3.4.0-1126
2025-05-03 09:43:08 +00:00
dependabot[bot]
913cc2f06d
build(deps): bump amannn/action-semantic-pull-request (#8480)
Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 04501d43b574e4c1d23c629ffe4dcec27acfdeff to 335288255954904a41ddda8947c8f2c844b8bfeb.
- [Release notes](https://github.com/amannn/action-semantic-pull-request/releases)
- [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/main/CHANGELOG.md)
- [Commits](04501d43b5...3352882559)

---
updated-dependencies:
- dependency-name: amannn/action-semantic-pull-request
  dependency-version: 335288255954904a41ddda8947c8f2c844b8bfeb
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b3.4.0-1125
2025-05-03 09:44:29 +02:00
dependabot[bot]
fb09076f0f
build(deps-dev): bump eslint-plugin-prettier in /webapp (#8332)
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 5.2.3 to 5.2.6.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v5.2.3...v5.2.6)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-version: 5.2.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b3.4.0-1124
2025-05-03 03:00:59 +02:00
68edc47f65
remove all helpers on src/helpers (#8469)
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
b3.4.0-1123
2025-05-02 13:57:37 +00:00
edce234745
move models into database folder (#8471)
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
b3.4.0-1122
2025-05-02 11:34:43 +00:00
a38d24a803
also lint cjs files (#8467)
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
b3.4.0-1121
2025-05-02 10:39:10 +00:00
1536a32b3a
refactor(backend): refactor badges (#8465)
* new badge descriptions

* new user verification color

* new svgs for elevated roles

---------

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
b3.4.0-1120
2025-05-02 09:59:18 +00:00
839ffb29ee
refactor(backend): move resolvers into graphql folder (#8470)
* move resolvers into graphql folder

* lint fixes
b3.4.0-1119
2025-05-02 07:47:39 +00:00
5e24f51cf7
refactor(webapp): remove unused packages (#8468)
* remove unused packages

* fix lint
b3.4.0-1118
2025-05-02 07:21:26 +00:00
a3dffb3cb5
refactor(backend): remove unused packages (#8466)
* remove unused packages

* remove more unused packages

* remove unused files
b3.4.0-1117
2025-05-02 08:54:03 +02:00
e709c4ba06
fix(backend): fix backend dev and dev:debug command (#8439)
* fix backend dev and dev:debug command

* fix dev:debug command
b3.4.0-1116
2025-05-01 09:07:17 +00:00
f8864a779c
move distanceToMe onto Location (#8464) b3.4.0-1115 2025-05-01 10:33:53 +02:00
21f343b8cf
feat(backend): distanceToMe (#8462)
* 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
b3.4.0-1114
2025-04-30 18:12:20 +00:00
sebastian2357
c855554825
fix(webapp): fixed padding for mobile in basic layout (#8455)
* - fixed padding for mobile in basic layout

* Select .layout-blank class only

---------

Co-authored-by: Sebastian Stein <sebastian@codepassion.de>
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
b3.4.0-1113
2025-04-30 16:28:01 +00:00
Wolfgang Huß
2f67b8cba1
Fix ocelot.social link for imprint and donation (#8461) b3.4.0-1112 2025-04-30 13:28:07 +00:00
9afedcf922
v3.4.0 (#8454) b3.4.0-1111 3.4.0 2025-04-28 20:56:20 +02:00
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.
b3.3.0-1110
2025-04-28 17:59:35 +00:00
9d5396988a
feat(backend): branding middlewares (#8429)
* allow the rbanding to provide middlewares

lint fix

fix config

* whitelist instead o blacklist when to exclude middlewares

fix config whitelisting

* fix lint
b3.3.0-1109
2025-04-28 17:27:01 +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>
b3.3.0-1108
2025-04-28 16:58:35 +00:00
d7d8a242cd
fix(backend): fixes for branding (#8449)
* copy from branding folder to backend public folder

provide default branding/public folder

* copy public folder correctly

* copy files again for providers.json

* copy more public folders

* more copy

* revert change

* fix naming of called script when using db:data:branding

* prod command for branding data

* close database connection

* lint fixes

* increase test timeout again
b3.3.0-1107
2025-04-28 18:17:18 +02:00
Max
fffaebcbca
Replace edit link by pencil button (#8453)
We show now a round button with pencil icon to edit the badges.
b3.3.0-1106
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>
b3.3.0-1105
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
b3.3.0-1104
2025-04-26 17:25:27 +00:00