From 94b2c314de10d4d18c420bc3d6bb359efb7d8968 Mon Sep 17 00:00:00 2001 From: uhkfc Date: Fri, 5 Jul 2024 21:45:21 +0200 Subject: [PATCH 1/2] fix route param types --- web/src/routes/admin/(resources)/curriculums/[id]/+page.ts | 2 +- web/src/routes/admin/(resources)/rooms/[id]/+page.ts | 2 +- web/src/routes/admin/(resources)/studentGroups/[id]/+page.ts | 2 +- web/src/routes/admin/(resources)/students/[id]/+page.ts | 2 +- web/src/routes/admin/(resources)/subjects/[id]/+page.ts | 2 +- web/src/routes/admin/(resources)/tags/[id]/+page.ts | 2 +- web/src/routes/admin/(resources)/teachers/[id]/+page.ts | 2 +- web/src/routes/admin/constraints/[id]/+page.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/src/routes/admin/(resources)/curriculums/[id]/+page.ts b/web/src/routes/admin/(resources)/curriculums/[id]/+page.ts index 8f89c8993..46b8a634e 100644 --- a/web/src/routes/admin/(resources)/curriculums/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/curriculums/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/(resources)/rooms/[id]/+page.ts b/web/src/routes/admin/(resources)/rooms/[id]/+page.ts index f61d3855a..d30260bf7 100644 --- a/web/src/routes/admin/(resources)/rooms/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/rooms/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/(resources)/studentGroups/[id]/+page.ts b/web/src/routes/admin/(resources)/studentGroups/[id]/+page.ts index 4f79d6cbc..5e56bf6b8 100644 --- a/web/src/routes/admin/(resources)/studentGroups/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/studentGroups/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/(resources)/students/[id]/+page.ts b/web/src/routes/admin/(resources)/students/[id]/+page.ts index 2fe731db0..5a5b00099 100644 --- a/web/src/routes/admin/(resources)/students/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/students/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/(resources)/subjects/[id]/+page.ts b/web/src/routes/admin/(resources)/subjects/[id]/+page.ts index 4f9eaeb3a..88ee0f6f7 100644 --- a/web/src/routes/admin/(resources)/subjects/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/subjects/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/(resources)/tags/[id]/+page.ts b/web/src/routes/admin/(resources)/tags/[id]/+page.ts index 27ddde194..54602d462 100644 --- a/web/src/routes/admin/(resources)/tags/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/tags/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/(resources)/teachers/[id]/+page.ts b/web/src/routes/admin/(resources)/teachers/[id]/+page.ts index 81ff965e5..c55abdd45 100644 --- a/web/src/routes/admin/(resources)/teachers/[id]/+page.ts +++ b/web/src/routes/admin/(resources)/teachers/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { diff --git a/web/src/routes/admin/constraints/[id]/+page.ts b/web/src/routes/admin/constraints/[id]/+page.ts index 2a5f6f51e..6ab5233fd 100644 --- a/web/src/routes/admin/constraints/[id]/+page.ts +++ b/web/src/routes/admin/constraints/[id]/+page.ts @@ -1,4 +1,4 @@ -import type { PageLoad } from '../$types'; +import type { PageLoad } from './$types'; export const load = (({ params }) => { return { From 4b3583ff93a8dbc7f442046487cfef8feba18a79 Mon Sep 17 00:00:00 2001 From: uhkfc Date: Fri, 5 Jul 2024 21:45:45 +0200 Subject: [PATCH 2/2] enable tsc checks --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8fd3794f..9664de1f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,9 +41,9 @@ jobs: run: npm run check:svelte if: ${{ !cancelled() }} - # - name: Run tsc - # run: npm run check:typescript - # if: ${{ !cancelled() }} + - name: Run tsc + run: npm run check:typescript + if: ${{ !cancelled() }} # - name: Run unit tests & coverage # run: npm run test:cov