Skip to content
Merged

2.2.0 #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
c5489eb
build(deps): bump @types/jsonwebtoken from 9.0.7 to 9.0.8
dependabot[bot] Feb 6, 2025
cb960c7
Merge branch 'development' into dependabot/npm_and_yarn/types/jsonweb…
axelrindle Feb 6, 2025
efa49ec
build(deps-dev): bump husky from 8.0.3 to 9.1.7
dependabot[bot] Mar 9, 2025
08cea86
build(deps): bump koa from 2.15.3 to 2.16.0
dependabot[bot] Mar 10, 2025
dc4092b
Merge branch 'development' into dependabot/npm_and_yarn/koa-2.16.0
danielswiatek Mar 21, 2025
ac06272
Merge pull request #262 from codeanker/dependabot/npm_and_yarn/koa-2.…
axelrindle Mar 21, 2025
dbe70ab
Merge pull request #205 from codeanker/dependabot/npm_and_yarn/types/…
danielswiatek Mar 21, 2025
57cdfa8
Merge pull request #222 from codeanker/dependabot/npm_and_yarn/husky-…
danielswiatek Mar 21, 2025
33753b4
Add new components and update layout for registration flow
lhauenstein Mar 22, 2025
5a01cf8
Fix JWT signing to ensure correct type casting in oauthLogin function
lhauenstein Mar 22, 2025
b358352
Add vue-sonner for notifications and implement registration modal wit…
lhauenstein Mar 22, 2025
89484de
build mail sender from hostname
axelrindle Mar 22, 2025
17b531c
fix formatting
axelrindle Mar 22, 2025
3fec2c1
allow one gliederung per event
axelrindle Mar 22, 2025
22f6ffa
Replace favicon.ico with favicon.webp and update logo handling in reg…
lhauenstein Mar 22, 2025
350cd33
Add Dilly logo to sidebar and update input field labels in login view
lhauenstein Mar 22, 2025
e8a4970
Refactor AnmeldungLayout to remove PublicLayout and simplify structure
lhauenstein Mar 22, 2025
9b31db0
Add small Dilly logo and update sidebar to use dynamic logo source
lhauenstein Mar 22, 2025
e535fe1
Refactor AccountList.vue to improve layout and update no-data message…
lhauenstein Mar 22, 2025
d0fdbc8
simplify routers
axelrindle Mar 22, 2025
fbe460d
fix expiresIn type
axelrindle Mar 22, 2025
d2f7ac7
Refactor FormAccountGeneral.vue to enhance account deletion section w…
lhauenstein Mar 22, 2025
bb9f46a
Update navigation after account deletion to redirect to 'Verwaltung A…
lhauenstein Mar 22, 2025
e74a574
Merge pull request #273 from codeanker/fix/kleinigkeiten
danielswiatek Mar 23, 2025
cc76365
Add trailer_temp.webm video asset to project
lhauenstein Mar 23, 2025
e0f60a9
Fix positioning of DarkModeSwitch in Login.vue for improved layout
lhauenstein Mar 23, 2025
a2b9bb8
Enhance dark mode support across various components and layouts for i…
lhauenstein Mar 23, 2025
136aa77
drop unique constraint for crew conditions
axelrindle Mar 23, 2025
80f0299
allow multiple gliederungen for crew
axelrindle Mar 23, 2025
158ac4e
fix procedure structure
axelrindle Mar 23, 2025
0c81135
Merge pull request #276 from codeanker/fix/gliederung-unique
danielswiatek Mar 25, 2025
a9793c2
fix duration type in config
axelrindle Mar 29, 2025
dd01b40
Merge branch 'development' of https://github.com/codeanker/brahmsee.d…
axelrindle Mar 29, 2025
c2bd6d3
remove unnecessary cast
axelrindle Mar 29, 2025
11226e8
feature: display photo status in export
axelrindle Mar 30, 2025
ed734c1
remove lodash-es
axelrindle Mar 30, 2025
c26585b
add gap between cards
axelrindle Mar 30, 2025
d9b2ab0
map type name
axelrindle Mar 30, 2025
c276a82
add small tab change delay
axelrindle Mar 30, 2025
7ca58aa
configurable tab persistence
axelrindle Mar 30, 2025
0a0204c
Merge pull request #284 from codeanker/fix/config-type
danielswiatek Mar 30, 2025
9c41969
Merge branch 'development' into feature/gh-279-foto-im-export
axelrindle Mar 30, 2025
4efe411
Merge branch 'development' into feature/login-refactor-teilnehmer-create
axelrindle Mar 30, 2025
770b72f
add endpoint to download all photos
axelrindle Mar 30, 2025
3e036ee
update lockfile
axelrindle Mar 30, 2025
f9df16e
Merge branch 'development' into feature/kleinigkeiten
axelrindle Mar 30, 2025
5b576d4
build(deps-dev): bump vitest from 0.34.6 to 3.1.1
dependabot[bot] Mar 31, 2025
710bb18
fix: enforce maximum amount of registrations
axelrindle Apr 1, 2025
6105d47
Merge pull request #293 from codeanker/fix/gh-292-enforce-max-anmeldu…
danielswiatek Apr 1, 2025
44005d5
Merge pull request #289 from codeanker/dependabot/npm_and_yarn/vitest…
danielswiatek Apr 1, 2025
ec7ee3a
make breadcrumbs always hold a link
axelrindle Apr 4, 2025
a5dbc45
always show stats
axelrindle Apr 4, 2025
93bd505
text updates
axelrindle Apr 4, 2025
d062795
enable debugging
axelrindle Apr 4, 2025
98ce60f
chore: update README.md
axelrindle Apr 5, 2025
657dea7
Merge pull request #285 from codeanker/feature/gh-279-foto-im-export
axelrindle Apr 5, 2025
77950ca
Merge branch 'development' into feature/login-refactor-teilnehmer-create
axelrindle Apr 5, 2025
2302ab5
better key infos
axelrindle Apr 7, 2025
592be53
rework unterveranstaltung description purpose
axelrindle Apr 7, 2025
1a78909
add component
axelrindle Apr 7, 2025
c9ed3cd
better breadcrumbs
axelrindle Apr 7, 2025
7a699d1
Merge pull request #287 from codeanker/feature/kleinigkeiten
axelrindle Apr 7, 2025
b332743
Merge branch 'development' into feature/foto-download
axelrindle Apr 7, 2025
9ccdfce
display card on veranstaltung detail
axelrindle Apr 7, 2025
32d3f4d
Merge pull request #286 from codeanker/feature/foto-download
axelrindle Apr 7, 2025
2c79bb8
update vitest
axelrindle Apr 12, 2025
eba92c1
update format type
axelrindle Apr 12, 2025
acdbd89
feat: custom registration links
axelrindle Apr 12, 2025
3d68171
chore: reuse panels
axelrindle Apr 14, 2025
45c156b
remove Ausschreibungen from sidebar
axelrindle Apr 14, 2025
f42a8d2
fix: update imprint and make it public again
axelrindle Apr 19, 2025
ef421da
fix: protect worksheet with password
axelrindle Apr 19, 2025
1f29e28
fix: update participant export (#278)
axelrindle Apr 19, 2025
b9f1a6d
refactor: make internal title optional
axelrindle Apr 19, 2025
fb05ba6
chore: use github issue forms
axelrindle Apr 19, 2025
eb94123
Merge branch 'development' into feature/login-refactor-teilnehmer-create
axelrindle Apr 19, 2025
da9a5c6
fix: conflicts
axelrindle Apr 19, 2025
260679b
fix: typos
axelrindle Apr 19, 2025
835d6d7
fix: use "some" restriction to prevent unauthorized data access
axelrindle Apr 19, 2025
112f56f
feat: activate user accounts instantly
axelrindle Apr 19, 2025
3822bce
fix: use Button component
axelrindle Apr 19, 2025
2b517fc
fix: export ModalApi again
axelrindle Apr 19, 2025
562c5e5
fix: type errors
axelrindle Apr 19, 2025
28b6043
Merge pull request #272 from codeanker/feature/login-refactor-teilneh…
axelrindle Apr 19, 2025
d09a520
fix loading layout
axelrindle Apr 22, 2025
a9ab72d
fix loading animation in button
axelrindle Apr 22, 2025
4a38519
update trailer video
axelrindle Apr 22, 2025
eb6438f
don't use lfs
axelrindle Apr 23, 2025
9c2caeb
fix: modal z-index
axelrindle Apr 23, 2025
1aa98a5
Update package.json
danielswiatek Apr 25, 2025
f84e048
Merge pull request #298 from codeanker/danielswiatek-patch-1
danielswiatek Apr 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Fehlerbericht
description: |
Nutze dieses Formular, um einen Fehler zu melden.
Du kannst es auch benutzen, wenn die ein Verhalten komisch oder ungewollt vorkommt.
type: Bug
title: "[Bug] {kurzbeschreibung}"
labels:
- "state:open"
body:
- type: input
id: kurzbeschreibung
attributes:
label: Kurzbeschreibung
description: |
Eine kurze Beschreibung des Fehlers.
Halte es so kurz wie möglich.
- type: textarea
id: beschreibung
attributes:
label: Beschreibung
description: |
Eine detaillierte Beschreibung des Fehlers.
Erkläre, was du gemacht hast, was du erwartet hast und was tatsächlich passiert ist.
40 changes: 0 additions & 40 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Feature Request
description: |
Nutze dieses Formular, um eine neue Funktion zu beantragen.
Du kannst es auch benutzen, wenn du eine Idee hast,
wie wir das System verbessern können.
type: Feature
title: "[Feature] {kurzbeschreibung}"
labels:
- "state:open"
body:
- type: input
id: kurzbeschreibung
attributes:
label: Kurzbeschreibung
description: |
Eine kurze Beschreibung der Funktion.
Halte es so kurz wie möglich.
- type: textarea
id: beschreibung
attributes:
label: Beschreibung
description: |
Eine detaillierte Beschreibung der Funktion.
Erkläre, was du dir wünschst und warum es wichtig ist.
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

31 changes: 31 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
// Verwendet IntelliSense zum Ermitteln möglicher Attribute.
// Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
// Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Debug Frontend",
"request": "launch",
"type": "chrome",
"url": "https://localhost:8080",
"webRoot": "${workspaceFolder}/apps/frontend/src",
"pathMapping": {
"/@fs/workspaces/brahmsee.digital": "${workspaceFolder}"
},
"runtimeArgs": [
"--ignore-certificate-errors",
"--auto-open-devtools-for-tabs"
]
},
{
"type": "node",
"request": "attach",
"name": "Attach to API",
"restart": true,
"address": "localhost",
"port": 9229,
"localRoot": "${workspaceFolder}/apps/api/src",
},
]
}
22 changes: 11 additions & 11 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"problemMatcher": [],
"presentation": {
"reveal": "always",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
},
Expand All @@ -25,7 +25,7 @@
"problemMatcher": [],
"presentation": {
"reveal": "always",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
},
Expand All @@ -42,7 +42,7 @@
"problemMatcher": [],
"presentation": {
"reveal": "silent",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
},
Expand All @@ -59,7 +59,7 @@
"problemMatcher": [],
"presentation": {
"reveal": "always",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
},
Expand All @@ -76,7 +76,7 @@
"problemMatcher": [],
"presentation": {
"reveal": "always",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
},
Expand Down Expand Up @@ -119,7 +119,7 @@
"presentation": {
"reveal": "silent",
"revealProblems": "onProblem",
"panel": "new",
"panel": "shared",
"close": true
}
},
Expand All @@ -134,7 +134,7 @@
"presentation": {
"reveal": "always",
"revealProblems": "onProblem",
"panel": "new",
"panel": "shared",
"close": false
}
},
Expand All @@ -151,7 +151,7 @@
},
"presentation": {
"reveal": "always",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
}
Expand All @@ -169,7 +169,7 @@
},
"presentation": {
"reveal": "always",
"panel": "new",
"panel": "shared",
"group": "start",
"close": false
}
Expand All @@ -187,7 +187,7 @@
"presentation": {
"reveal": "always",
"revealProblems": "onProblem",
"panel": "new",
"panel": "shared",
"close": true
}
},
Expand All @@ -205,7 +205,7 @@
"presentation": {
"reveal": "always",
"revealProblems": "onProblem",
"panel": "new",
"panel": "shared",
"close": true
}
}
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Am besten wird das Projekt in einem Devcontainer gestartet. Dazu wird nur Docker
Über den Eintrag "Clone Repository in Container Volume" kann das Projekt heruntergeladen und geöffnet werden.
Das Projekt wird dann automatisch eingerichtet und kann wenn das Abgeschlossen ist auch gestartet werden.


## Starten

Find all Tasks in CMD/CTRL-SHIFT-P -> `Tasks: Run Tasks`
Expand Down
4 changes: 4 additions & 0 deletions apps/api/config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,9 @@
"imprint": "PUBLIC_LEGAL_IMPRINT",
"privacy": "PUBLIC_LEGAL_PRIVACY"
}
},

"export": {
"sheetPassword": "EXPORT_SHEET_PASSWORD"
}
}
4 changes: 4 additions & 0 deletions apps/api/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@
"imprint": "https://localhost:8080",
"privacy": "https://localhost:8080"
}
},

"export": {
"sheetPassword": "brahmsee.digital"
}
}
11 changes: 6 additions & 5 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "npx prisma migrate deploy && tsx src/server.ts",
"dev": "tsx watch --clear-screen=false --env-file .env src/server.ts",
"dev": "tsx watch --inspect --clear-screen=false --env-file .env src/server.ts",
"createAccount": "tsx src/scripts/createAccount.ts",
"initMeilisearch": "tsx src/scripts/initMeilisearch.ts",
"cli": "tsx src/cli/index.ts",
Expand Down Expand Up @@ -40,6 +40,7 @@
"@prisma/extension-accelerate": "^1.1.0",
"@sendgrid/mail": "^8.1.0",
"@trpc/server": "catalog:",
"archiver": "^7.0.1",
"axios": "^1.7.7",
"config": "^3.3.9",
"dayjs": "^1.11.10",
Expand All @@ -48,15 +49,14 @@
"grant": "^5.4.22",
"handlebars": "^4.7.8",
"jsonwebtoken": "^9.0.2",
"koa": "^2.14.2",
"koa": "^2.16.0",
"koa-body": "^6.0.1",
"koa-helmet": "^7.0.2",
"koa-router": "^13.0.1",
"koa-session": "^6.4.0",
"koa-static": "^5.0.0",
"lodash-es": "^4.17.21",
"meilisearch": "^0.37.0",
"mime-types": "^2.1.35",
"mime": "^4.0.6",
"mjml": "^4.15.3",
"prom-client": "^15.0.0",
"superjson": "catalog:",
Expand All @@ -69,9 +69,10 @@
"@codeanker/eslint-config": "workspace:*",
"@codeanker/typescript-config": "workspace:*",
"@inquirer/prompts": "^7.1.0",
"@types/archiver": "^6.0.3",
"@types/config": "^3.3.3",
"@types/http-status-codes": "^1.2.0",
"@types/jsonwebtoken": "^9.0.5",
"@types/jsonwebtoken": "^9.0.8",
"@types/koa": "^2.14.0",
"@types/koa-bodyparser": "^4.3.12",
"@types/koa-router": "^7.4.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*
Warnings:

- A unique constraint covering the columns `[veranstaltungId,gliederungId]` on the table `Unterveranstaltung` will be added. If there are existing duplicate values, this will fail.

*/
-- CreateIndex
CREATE UNIQUE INDEX "Unterveranstaltung_veranstaltungId_gliederungId_key" ON "Unterveranstaltung"("veranstaltungId", "gliederungId");
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- DropIndex
DROP INDEX "Unterveranstaltung_veranstaltungId_gliederungId_key";
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
Warnings:

- The primary key for the `_AnmeldungToMahlzeit` table will be changed. If it partially fails, the table could be left without primary key constraint.
- The primary key for the `_FaqToUnterveranstaltung` table will be changed. If it partially fails, the table could be left without primary key constraint.
- A unique constraint covering the columns `[A,B]` on the table `_AnmeldungToMahlzeit` will be added. If there are existing duplicate values, this will fail.
- A unique constraint covering the columns `[A,B]` on the table `_FaqToUnterveranstaltung` will be added. If there are existing duplicate values, this will fail.

*/
-- AlterTable
ALTER TABLE "_AnmeldungToMahlzeit" DROP CONSTRAINT "_AnmeldungToMahlzeit_AB_pkey";

-- AlterTable
ALTER TABLE "_FaqToUnterveranstaltung" DROP CONSTRAINT "_FaqToUnterveranstaltung_AB_pkey";

-- CreateTable
CREATE TABLE "AnmeldungLink" (
"id" SERIAL NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"comment" TEXT,
"accessToken" UUID NOT NULL,
"unterveranstaltungId" INTEGER NOT NULL,
"createdById" INTEGER NOT NULL,
"anmeldungId" INTEGER,

CONSTRAINT "AnmeldungLink_pkey" PRIMARY KEY ("id")
);

-- CreateIndex
CREATE UNIQUE INDEX "AnmeldungLink_anmeldungId_key" ON "AnmeldungLink"("anmeldungId");

-- CreateIndex
CREATE UNIQUE INDEX "_AnmeldungToMahlzeit_AB_unique" ON "_AnmeldungToMahlzeit"("A", "B");

-- CreateIndex
CREATE UNIQUE INDEX "_FaqToUnterveranstaltung_AB_unique" ON "_FaqToUnterveranstaltung"("A", "B");

-- AddForeignKey
ALTER TABLE "AnmeldungLink" ADD CONSTRAINT "AnmeldungLink_unterveranstaltungId_fkey" FOREIGN KEY ("unterveranstaltungId") REFERENCES "Unterveranstaltung"("id") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "AnmeldungLink" ADD CONSTRAINT "AnmeldungLink_createdById_fkey" FOREIGN KEY ("createdById") REFERENCES "Account"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "AnmeldungLink" ADD CONSTRAINT "AnmeldungLink_anmeldungId_fkey" FOREIGN KEY ("anmeldungId") REFERENCES "Anmeldung"("id") ON DELETE SET NULL ON UPDATE CASCADE;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "AnmeldungLink" ADD COLUMN "usedAt" TIMESTAMP(3);
2 changes: 1 addition & 1 deletion apps/api/prisma/migrations/migration_lock.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Please do not edit this file manually
# It should be added in your version-control system (e.g., Git)
# It should be added in your version-control system (i.e. Git)
provider = "postgresql"
1 change: 1 addition & 0 deletions apps/api/prisma/schema/Account.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ model Account {
passwordResetToken String? @unique
activities Activity[]
Anmeldung Anmeldung[]
AnmeldungLink AnmeldungLink[]
}
Loading
Loading