Skip to content
Merged

2.6.0 #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b3a7195
build(deps): bump typescript-eslint from 8.18.2 to 8.27.0
dependabot[bot] Mar 20, 2025
fc0f28d
Merge branch 'development' into dependabot/npm_and_yarn/typescript-es…
danielswiatek Mar 21, 2025
c4baa45
programm wip
axelrindle Mar 23, 2025
e18adb4
Merge branch 'development' into feature/programm
axelrindle Mar 30, 2025
ea8faeb
build(deps-dev): bump vite from 6.1.0 to 6.2.4
dependabot[bot] Mar 31, 2025
4b6aff9
Merge branch 'development' into dependabot/npm_and_yarn/vite-6.2.4
danielswiatek Apr 1, 2025
0ecbcb6
group program in frontend
axelrindle Apr 5, 2025
5aff8cb
program create form
axelrindle Apr 7, 2025
ad6fa09
build(deps): bump axios from 1.7.9 to 1.8.2
dependabot[bot] Apr 7, 2025
1d144ad
Merge branch 'development' of https://github.com/codeanker/brahmsee.d…
axelrindle Apr 19, 2025
765ce39
build(deps): bump koa from 2.16.0 to 2.16.1
dependabot[bot] Apr 19, 2025
ab87bf0
delete old views
axelrindle Apr 22, 2025
afc7ae3
add program seeder
axelrindle Apr 22, 2025
e1cdcf4
update
axelrindle Apr 22, 2025
4ec204c
public program view
axelrindle Apr 22, 2025
f9a2118
build(deps): bump axios from 1.7.9 to 1.9.0
dependabot[bot] Apr 25, 2025
03c5995
Merge branch 'development' into feature/programm
danielswiatek Apr 29, 2025
e37579f
Merge branch 'development' into feature/programm
danielswiatek May 2, 2025
ec9e749
refactor: allow photo upload after closing date
axelrindle May 2, 2025
b35684e
refactor: update layout and improve responsiveness in PublicFooter, S…
lhauenstein May 10, 2025
e7e0895
feat: add publicReadToken to Veranstaltung model and update related s…
lhauenstein May 10, 2025
5e2a26e
fix: ensure proper handling of null values and improve keyInfos displ…
lhauenstein May 10, 2025
84b8a54
fix: protect program list route
axelrindle May 10, 2025
9e20203
fix: add default column value
axelrindle May 10, 2025
fcda464
Merge branch 'development' into feature/programm
danielswiatek May 10, 2025
28fe741
refactor: enhance tab components with full-width property and remove …
danielswiatek May 10, 2025
2316e79
style: enhance BasicDatepicker styles with SCSS variables for improve…
danielswiatek May 10, 2025
1a37be5
feat: add BETA badge to Programmpunkte section for clarity on feature…
danielswiatek May 10, 2025
4ee41b8
Merge branch 'dependabot/npm_and_yarn/axios-1.8.2' into development
danielswiatek May 10, 2025
7c7a665
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/vite-6.2…
danielswiatek May 10, 2025
208aff7
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/axios-1.…
danielswiatek May 10, 2025
622751b
Merge pull request #308 from codeanker/refactor/allow-photoupload-aft…
danielswiatek May 10, 2025
3e0cce3
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/typescri…
danielswiatek May 10, 2025
970e90a
Merge pull request #294 from codeanker/dependabot/npm_and_yarn/koa-2.…
danielswiatek May 10, 2025
e5c42ea
remove unused Anmeldung components and routes
danielswiatek May 10, 2025
bf593ee
add Unterveranstaltung selection to anmeldungLinkListProcedure and in…
danielswiatek May 10, 2025
a70535d
add kreditinstitute
danielswiatek May 10, 2025
52cc0eb
refactor veranstaltungVerpflegung to use unterveranstaltungen and sim…
danielswiatek May 19, 2025
7d97442
bump version to 2.6.0 in package.json
danielswiatek May 19, 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
4 changes: 2 additions & 2 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"@sendgrid/mail": "^8.1.0",
"@trpc/server": "catalog:",
"archiver": "^7.0.1",
"axios": "^1.7.7",
"axios": "^1.9.0",
"config": "^3.3.9",
"dayjs": "^1.11.10",
"dot-prop": "^9.0.0",
"fast-csv": "^5.0.1",
"grant": "^5.4.22",
"handlebars": "^4.7.8",
"jsonwebtoken": "^9.0.2",
"koa": "^2.16.0",
"koa": "^2.16.1",
"koa-body": "^6.0.1",
"koa-helmet": "^7.0.2",
"koa-router": "^13.0.1",
Expand Down
16 changes: 16 additions & 0 deletions apps/api/prisma/migrations/20250323092444_programm/migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-- CreateTable
CREATE TABLE "ProgrammPunkt" (
"id" SERIAL NOT NULL,
"name" TEXT NOT NULL,
"description" TEXT,
"startingAt" TIMESTAMP(3) NOT NULL,
"endingAt" TIMESTAMP(3) NOT NULL,
"location" TEXT NOT NULL,
"responsible" TEXT NOT NULL,
"veranstaltungId" INTEGER NOT NULL,

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

-- AddForeignKey
ALTER TABLE "ProgrammPunkt" ADD CONSTRAINT "ProgrammPunkt_veranstaltungId_fkey" FOREIGN KEY ("veranstaltungId") REFERENCES "Veranstaltung"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
Warnings:

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

*/
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";

-- AlterTable
ALTER TABLE "Veranstaltung" ADD COLUMN "publicReadToken" TEXT DEFAULT uuid_generate_v4();

-- CreateIndex
CREATE UNIQUE INDEX "Veranstaltung_publicReadToken_key" ON "Veranstaltung"("publicReadToken");
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
-- AlterTable
ALTER TABLE "Veranstaltung" ALTER COLUMN "publicReadToken" DROP DEFAULT;

-- CreateTable
CREATE TABLE "Kreditinstitute" (
"id" SERIAL NOT NULL,
"name" TEXT NOT NULL,
"shortName" TEXT NOT NULL,
"blz" INTEGER NOT NULL,
"bic" TEXT NOT NULL,
"pan" TEXT NOT NULL,

CONSTRAINT "Kreditinstitute_pkey" PRIMARY KEY ("id")
);
8 changes: 8 additions & 0 deletions apps/api/prisma/schema/Kreditinstitute.prisma
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
model Kreditinstitute {
id Int @id @default(autoincrement())
name String
shortName String
blz Int
bic String
pan String
}
12 changes: 12 additions & 0 deletions apps/api/prisma/schema/ProgrammPunkt.prisma
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
model ProgrammPunkt {
id Int @id @default(autoincrement())
name String
description String?
startingAt DateTime
endingAt DateTime
location String
responsible String

veranstaltungId Int
veranstaltung Veranstaltung @relation(fields: [veranstaltungId], references: [id])
}
2 changes: 2 additions & 0 deletions apps/api/prisma/schema/Veranstaltung.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ model Veranstaltung {
hostnameId Int?
hostname Hostname? @relation(fields: [hostnameId], references: [id])
customFields CustomField[]
programmPunkte ProgrammPunkt[]
publicReadToken String? @unique @default(cuid())
}
13 changes: 11 additions & 2 deletions apps/api/prisma/seeders/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,25 @@ import createAccount from './account.js'
import createAnmeldung from './anmeldungen.js'
import importGliederungen from './gliederungen.js'
import createVeranstaltung from './veranstaltung.js'
import createProgramm from './programm.js'
import importKreditinstitute from './kreditinstitute.js'

export type Seeder = (prisma: PrismaClient) => Promise<void>

const seeders: Seeder[] = (() => {
// in produktion nur Gliederungen importieren
if (isProduction() || process.env.DISABLE_SEEDER === '1') {
return [importGliederungen]
return [importGliederungen, importKreditinstitute]
}

return [importGliederungen, createAccount, createVeranstaltung, createAnmeldung]
return [
importGliederungen,
importKreditinstitute,
createAccount,
createVeranstaltung,
createAnmeldung,
createProgramm,
]
})()

const prisma = new PrismaClient()
Expand Down
Loading
Loading