Skip to content

Commit 74fe070

Browse files
committed
Merge remote-tracking branch 'origin/main' into 16-implement-gap-detection-logic
2 parents 413c9f6 + c93f72c commit 74fe070

File tree

6 files changed

+80
-73
lines changed

6 files changed

+80
-73
lines changed

.github/workflows/ci-checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
run: pnpm coverage
4444

4545
- name: Upload coverage reports to Codecov
46-
uses: codecov/codecov-action@v5.1.1
46+
uses: codecov/codecov-action@v5
4747
with:
4848
token: ${{ secrets.CODECOV_TOKEN }}

apps/backend/db/seeds/DatabaseSeeder.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ export class DatabaseSeeder extends Seeder {
5858
];
5959

6060
const carers: CarerCreationDto[] = [
61-
{ name: "Mutter, Mother" },
62-
{ name: "Vater, Father" },
63-
{ name: "Grossmutter, Grandmother" },
64-
{ name: "Grossvater, Grandfather" },
65-
{ name: "Schwester, Sister" },
66-
{ name: "Bruder, Brother" },
67-
{ name: "Tante, Aunt" },
68-
{ name: "Onkel, Uncle" },
69-
{ name: "KiTa, Day care centre" },
70-
{ name: "Spielgruppe, Playgroup" },
71-
{ name: "Turnen, Gymnastics" },
72-
{ name: "Kindergarten, Kindergarten" },
73-
{ name: "Hort, After-school care" },
74-
{ name: "Kinderbetreuung, Nanny / Babysitter" },
75-
{ name: "Nachbar, Neighbour" },
61+
{ name: "Mutter, Mother", color: "#BF0D3E" },
62+
{ name: "Vater, Father", color: "#0028A5" },
63+
{ name: "Grossmutter, Grandmother", color: "#F3537F" },
64+
{ name: "Grossvater, Grandfather", color: "#3062FF" },
65+
{ name: "Schwester, Sister", color: "#FBC6D4" },
66+
{ name: "Bruder, Brother", color: "#BACBFF" },
67+
{ name: "Tante, Aunt", color: "#8F0A2E" },
68+
{ name: "Onkel, Uncle", color: "#001E7C" },
69+
{ name: "KiTa, Day care centre", color: "#FFF4DA" },
70+
{ name: "Spielgruppe, Playgroup", color: "#ECF6D6" },
71+
{ name: "Turnen, Gymnastics", color: "#FFE9B5" },
72+
{ name: "Kindergarten, Kindergarten", color: "#DBEDAD" },
73+
{ name: "Hort, After-school care", color: "#FFDE8F" },
74+
{ name: "Kinderbetreuung, Nanny / Babysitter", color: "#FEB799" },
75+
{ name: "Nachbar, Neighbour", color: "#FC4C02" },
7676
];
7777

7878
const languages: LanguageCreationDto[] = [

apps/frontend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
"@nanostores/react": "^0.8.4",
2626
"@quassel/ui": "workspace:*",
2727
"@tanstack/react-query": "^5.62.8",
28-
"@tanstack/react-router": "^1.91.2",
28+
"@tanstack/react-router": "^1.91.3",
2929
"nanostores": "^0.11.3",
3030
"openapi-fetch": "0.13.3",
3131
"openapi-react-query": "0.2.8",
3232
"react": "^18.3.1",
3333
"react-dom": "^18.3.1"
3434
},
3535
"devDependencies": {
36-
"@tanstack/router-devtools": "^1.91.2",
36+
"@tanstack/router-devtools": "^1.91.3",
3737
"@tanstack/router-plugin": "^1.91.1",
3838
"@testing-library/jest-dom": "^6.6.3",
3939
"@testing-library/react": "^16.1.0",
@@ -45,7 +45,7 @@
4545
"openapi-typescript": "^7.4.4",
4646
"openapi-typescript-helpers": "^0.0.15",
4747
"typescript": "^5.7.2",
48-
"vite": "^6.0.3",
48+
"vite": "^6.0.4",
4949
"vitest": "^2.1.8"
5050
}
5151
}

libs/ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"@types/react-dom": "^18.3.5",
4444
"@vitejs/plugin-react": "^4.3.4",
4545
"typescript": "^5.7.2",
46-
"vite": "^6.0.3",
47-
"vite-plugin-dts": "^4.3.0",
46+
"vite": "^6.0.4",
47+
"vite-plugin-dts": "^4.4.0",
4848
"vite-plugin-svgr": "^4.3.0"
4949
}
5050
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"eslint-plugin-react": "^7.37.2",
3030
"eslint-plugin-react-hooks": "5.1.0",
3131
"eslint-plugin-react-refresh": "^0.4.16",
32-
"globals": "^15.13.0",
32+
"globals": "^15.14.0",
3333
"nx": "^20.2.2",
3434
"typescript-eslint": "^8.18.1"
3535
},

0 commit comments

Comments
 (0)