Merge branch 'main' into integrate-milestones-userland-with-backend

ssciwr · Nov 13, 2024 · d207bab · d207bab
2 parents 4b4a7e7 + 1496a3a
commit d207bab
Show file tree

Hide file tree

Showing 25 changed files with 2,765 additions and 1,189 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.2
+    rev: v0.7.3
     hooks:
       - id: ruff
         types_or: [python, pyi, jupyter]

diff --git a/frontend/package.json b/frontend/package.json
@@ -12,32 +12,32 @@
 		"openapi-ts": "openapi-ts"
 	},
 	"devDependencies": {
-		"@hey-api/openapi-ts": "0.53.5",
-		"@sveltejs/adapter-auto": "^3.3.0",
-		"@sveltejs/adapter-static": "^3.0.5",
-		"@sveltejs/kit": "^2.7.2",
+		"@hey-api/openapi-ts": "0.55.2",
+		"@sveltejs/adapter-static": "^3.0.6",
+		"@sveltejs/kit": "^2.8.0",
 		"@sveltejs/vite-plugin-svelte": "^4.0.0",
 		"@tailwindcss/typography": "^0.5.15",
 		"@testing-library/svelte": "^5.2.4",
 		"@types/eslint": "^9.6.1",
-		"@vitest/coverage-v8": "^2.1.3",
+		"@vitest/coverage-v8": "^2.1.4",
 		"autoprefixer": "^10.4.20",
 		"flowbite": "^2.5.2",
-		"flowbite-svelte": "^0.46.23",
-		"flowbite-svelte-icons": "2.0.0-next.16",
-		"globals": "^15.11.0",
+		"flowbite-svelte": "^0.47.3",
+		"flowbite-svelte-icons": "2.0.2",
+		"globals": "^15.12.0",
 		"jsdom": "^25.0.1",
-		"svelte": "^5.1.2",
-		"svelte-check": "^3.8.6",
+		"svelte": "^5.1.14",
+		"svelte-check": "^4.0.6",
 		"tailwindcss": "^3.4.14",
 		"typescript": "^5.6.3",
-		"typescript-eslint": "^8.11.0",
-		"vite": "^5.4.10",
-		"vitest": "^2.1.3"
+		"typescript-eslint": "^8.13.0",
+		"vite": "^5.4.11",
+		"vitest": "^2.1.4"
 	},
 	"type": "module",
 	"dependencies": {
-		"@hey-api/client-fetch": "0.4.0",
+		"@hey-api/client-fetch": "0.4.3",
+		"@unovis/ts": "1.5.0-beta.0",
 		"iso-639-1": "3.1.3",
 		"svelte-i18n": "^4.0.1"
 	}

diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
diff --git a/frontend/src/lib/client/schemas.gen.ts b/frontend/src/lib/client/schemas.gen.ts
@@ -422,23 +422,60 @@ export const MilestoneAdminSchema = {
                 '$ref': '#/components/schemas/MilestoneText'
             },
             type: 'object',
-            title: 'Text',
-            default: {}
+            title: 'Text'
         },
         images: {
             items: {
                 '$ref': '#/components/schemas/MilestoneImage'
             },
             type: 'array',
-            title: 'Images',
-            default: []
+            title: 'Images'
         }
     },
     type: 'object',
-    required: ['id', 'group_id', 'order', 'expected_age_months'],
+    required: ['id', 'group_id', 'order', 'expected_age_months', 'text', 'images'],
     title: 'MilestoneAdmin'
 } as const;
 
+export const MilestoneAgeScoreSchema = {
+    properties: {
+        age_months: {
+            type: 'integer',
+            title: 'Age Months'
+        },
+        avg_score: {
+            type: 'number',
+            title: 'Avg Score'
+        },
+        expected_score: {
+            type: 'number',
+            title: 'Expected Score'
+        }
+    },
+    type: 'object',
+    required: ['age_months', 'avg_score', 'expected_score'],
+    title: 'MilestoneAgeScore'
+} as const;
+
+export const MilestoneAgeScoresSchema = {
+    properties: {
+        scores: {
+            items: {
+                '$ref': '#/components/schemas/MilestoneAgeScore'
+            },
+            type: 'array',
+            title: 'Scores'
+        },
+        expected_age: {
+            type: 'integer',
+            title: 'Expected Age'
+        }
+    },
+    type: 'object',
+    required: ['scores', 'expected_age'],
+    title: 'MilestoneAgeScores'
+} as const;
+
 export const MilestoneAnswerPublicSchema = {
     properties: {
         milestone_id: {
@@ -498,20 +535,18 @@ export const MilestoneGroupAdminSchema = {
                 '$ref': '#/components/schemas/MilestoneGroupText'
             },
             type: 'object',
-            title: 'Text',
-            default: {}
+            title: 'Text'
         },
         milestones: {
             items: {
                 '$ref': '#/components/schemas/MilestoneAdmin'
             },
             type: 'array',
-            title: 'Milestones',
-            default: []
+            title: 'Milestones'
         }
     },
     type: 'object',
-    required: ['id', 'order'],
+    required: ['id', 'order', 'text', 'milestones'],
     title: 'MilestoneGroupAdmin'
 } as const;
 
@@ -526,8 +561,7 @@ export const MilestoneGroupPublicSchema = {
                 '$ref': '#/components/schemas/MilestoneGroupTextPublic'
             },
             type: 'object',
-            title: 'Text',
-            default: {}
+            title: 'Text'
         },
         milestones: {
             items: {
@@ -544,7 +578,7 @@ export const MilestoneGroupPublicSchema = {
         }
     },
     type: 'object',
-    required: ['id'],
+    required: ['id', 'text', 'milestones'],
     title: 'MilestoneGroupPublic'
 } as const;
 
@@ -675,20 +709,18 @@ export const MilestonePublicSchema = {
                 '$ref': '#/components/schemas/MilestoneTextPublic'
             },
             type: 'object',
-            title: 'Text',
-            default: {}
+            title: 'Text'
         },
         images: {
             items: {
                 '$ref': '#/components/schemas/MilestoneImagePublic'
             },
             type: 'array',
-            title: 'Images',
-            default: []
+            title: 'Images'
         }
     },
     type: 'object',
-    required: ['id', 'expected_age_months'],
+    required: ['id', 'expected_age_months', 'text', 'images'],
     title: 'MilestonePublic'
 } as const;