Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .changeset/stale-geese-show.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@quassel/frontend": patch
"@quassel/backend": patch
"@quassel/utils": patch
"@quassel/ui": patch
---

Upgrade dependencies
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm
FROM mcr.microsoft.com/devcontainers/typescript-node:2-22-bookworm

RUN apt update
RUN apt install -y postgresql-common
RUN YES=yes /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh
RUN apt install -y postgresql-client-17
RUN su node -c "npm install -g pnpm@10.8.1"
RUN su node -c "npm install -g pnpm@10.14.0"
46 changes: 23 additions & 23 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,45 +29,45 @@
},
"dependencies": {
"@fastify/secure-session": "^8.2.0",
"@fastify/static": "^8.1.1",
"@mikro-orm/cli": "^6.4.13",
"@mikro-orm/core": "^6.4.13",
"@mikro-orm/migrations": "^6.4.13",
"@fastify/static": "^8.2.0",
"@mikro-orm/cli": "^6.4.16",
"@mikro-orm/core": "^6.4.16",
"@mikro-orm/migrations": "^6.4.16",
"@mikro-orm/nestjs": "^6.1.1",
"@mikro-orm/postgresql": "^6.4.13",
"@mikro-orm/reflection": "^6.4.13",
"@mikro-orm/seeder": "^6.4.13",
"@nestjs/common": "^11.0.20",
"@mikro-orm/postgresql": "^6.4.16",
"@mikro-orm/reflection": "^6.4.16",
"@mikro-orm/seeder": "^6.4.16",
"@nestjs/common": "^11.1.6",
"@nestjs/config": "^4.0.2",
"@nestjs/core": "^11.0.20",
"@nestjs/platform-fastify": "^11.0.20",
"@nestjs/swagger": "^11.1.4",
"@nestjs/core": "^11.1.6",
"@nestjs/platform-fastify": "^11.1.6",
"@nestjs/swagger": "^11.2.0",
"@nestjs/terminus": "^11.0.0",
"@quassel/utils": "workspace:*",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.1",
"csv-stringify": "^6.5.2",
"class-validator": "^0.14.2",
"csv-stringify": "^6.6.0",
"date-fns": "^4.1.0",
"fastify": "5.3.0",
"fastify": "5.5.0",
"hash-wasm": "^4.12.0",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.2"
},
"devDependencies": {
"@nestjs/cli": "^11.0.6",
"@nestjs/schematics": "^11.0.5",
"@nestjs/testing": "^11.0.20",
"@types/jest": "^29.5.14",
"@types/node": "^22.14.1",
"@nestjs/cli": "^11.0.10",
"@nestjs/schematics": "^11.0.7",
"@nestjs/testing": "^11.1.6",
"@types/jest": "^30.0.0",
"@types/node": "^24.2.1",
"@types/supertest": "^6.0.3",
"jest": "^29.7.0",
"jest": "^30.0.5",
"source-map-support": "^0.5.21",
"supertest": "^7.1.0",
"ts-jest": "^29.3.2",
"supertest": "^7.1.4",
"ts-jest": "^29.4.1",
"ts-loader": "^9.5.2",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.8.3"
"typescript": "^5.9.2"
},
"jest": {
"moduleFileExtensions": [
Expand Down
5 changes: 3 additions & 2 deletions apps/backend/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ async function bootstrap() {
app.enableShutdownHooks();
app.useGlobalPipes(new ValidationPipe());
app.useGlobalInterceptors(new ClassSerializerInterceptor(app.get(Reflector)));

await app.register(fastifySecureSession, {
// TODO: Remove `as any` when type definitions of "@fastify/secure-session" package are fixed
/* eslint-disable @typescript-eslint/no-explicit-any */
await app.register(fastifySecureSession as any, {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ausnahme für Fehler einfügen, damit die CI durchläuft

expiry: configService.get("session.expiry"),
cookieName: configService.get("session.cookieName"),
secret: configService.get("session.secret"),
Expand Down
48 changes: 24 additions & 24 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,40 @@
"generate:icons": "pwa-asset-generator ./public/logo.svg ./public --type png --opaque false --favicon --maskable --manifest ./manifest.json --index ./index.html"
},
"dependencies": {
"@fullcalendar/core": "^6.1.17",
"@fullcalendar/interaction": "^6.1.17",
"@fullcalendar/react": "^6.1.17",
"@fullcalendar/timegrid": "^6.1.17",
"@nanostores/i18n": "^1.0.0",
"@nanostores/persistent": "^1.0.0",
"@fullcalendar/core": "^6.1.19",
"@fullcalendar/interaction": "^6.1.19",
"@fullcalendar/react": "^6.1.19",
"@fullcalendar/timegrid": "^6.1.19",
"@nanostores/i18n": "^1.2.2",
"@nanostores/persistent": "^1.1.0",
"@nanostores/react": "^1.0.0",
"@quassel/ui": "workspace:*",
"@quassel/utils": "workspace:*",
"@tanstack/react-query": "^5.74.4",
"@tanstack/react-router": "^1.116.0",
"@tanstack/react-query": "^5.85.0",
"@tanstack/react-router": "^1.131.8",
"nanostores": "^1.0.1",
"openapi-fetch": "0.13.5",
"openapi-react-query": "0.3.1",
"react": "^19.1.0",
"react-dom": "^19.1.0"
"openapi-fetch": "0.14.0",
"openapi-react-query": "0.5.0",
"react": "^19.1.1",
"react-dom": "^19.1.1"
},
"devDependencies": {
"@anolilab/unplugin-favicons": "^1.0.5",
"@sinclair/typebox": "^0.34.33",
"@tanstack/router-devtools": "^1.116.0",
"@tanstack/router-plugin": "^1.116.1",
"@testing-library/jest-dom": "^6.6.3",
"@sinclair/typebox": "^0.34.38",
"@tanstack/router-devtools": "^1.131.8",
"@tanstack/router-plugin": "^1.131.8",
"@testing-library/jest-dom": "^6.6.4",
"@testing-library/react": "^16.3.0",
"@types/react": "^19.1.2",
"@types/react-dom": "^19.1.2",
"@vitejs/plugin-react": "^4.4.1",
"@vitest/coverage-v8": "3.1.1",
"@types/react": "^19.1.10",
"@types/react-dom": "^19.1.7",
"@vitejs/plugin-react": "^5.0.0",
"@vitest/coverage-v8": "3.2.4",
"favicons": "^7.2.0",
"jsdom": "^26.1.0",
"openapi-typescript": "^7.6.1",
"openapi-typescript": "^7.9.1",
"openapi-typescript-helpers": "^0.0.15",
"typescript": "^5.8.3",
"vite": "^6.3.2",
"vitest": "^3.1.1"
"typescript": "^5.9.2",
"vite": "^7.1.2",
"vitest": "^3.2.4"
}
}
15 changes: 10 additions & 5 deletions apps/frontend/src/components/questionnaire/PeriodForm.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Button, Flex, InputError, MonthPicker, Stack, TextInput, useForm } from "@quassel/ui";
import { formatDate } from "@quassel/utils";
import { formatDate, getStartOf, isSame } from "@quassel/utils";
import { i18n } from "../../stores/i18n";
import { useStore } from "@nanostores/react";
import { useEffect } from "react";
import { params } from "@nanostores/i18n";

export type PeriodFormValues = {
title: string;
range: [Date | null, Date | null];
range: [string | null, string | null];
};

type PeriodFormProps = {
Expand All @@ -32,7 +32,7 @@ export function PeriodForm({ onSave, actionLabel, period }: PeriodFormProps) {
},
validate: {
range([start]) {
if (period?.range[0] && +period.range[0] !== +start!) {
if (period?.range[0] && !isSame("day", new Date(period.range[0]), new Date(start!))) {
return t.validationStartDate;
}
},
Expand All @@ -41,14 +41,19 @@ export function PeriodForm({ onSave, actionLabel, period }: PeriodFormProps) {
const [newStart, newEnd] = newValues.range ?? [];
const [prevStart, prevEnd] = prevValues.range ?? [];
if ((!prevStart || !prevEnd) && newStart && newEnd) {
f.setFieldValue("title", t.defaultTitle({ start: formatDate(newStart, "M/YY"), end: formatDate(newEnd, "M/YY") }));
f.setFieldValue("title", t.defaultTitle({ start: formatDate(new Date(newStart), "M/YY"), end: formatDate(new Date(newEnd), "M/YY") }));
}
},
});

useEffect(() => {
if (period) {
f.setValues(period);
const [start, end] = period.range;

f.setValues({
...period,
range: [start, end ? getStartOf("day", new Date(end)).toISOString() : null],
});
}
}, [period]);

Expand Down
Loading