Merge a5fc918 into d82f896

uzh-bf · Nov 8, 2024 · 9bbc01e · 9bbc01e
2 parents d82f896 + a5fc918
commit 9bbc01e
Show file tree

Hide file tree

Showing 17 changed files with 255 additions and 236 deletions.
diff --git a/apps/auth/package.json b/apps/auth/package.json
@@ -8,7 +8,7 @@
     "@klicker-uzh/prisma": "workspace:*",
     "@klicker-uzh/shared-components": "workspace:*",
     "@next-auth/prisma-adapter": "1.0.7",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "axios": "1.7.7",
     "bcryptjs": "2.4.3",
     "js-cookie": "3.0.5",

diff --git a/apps/backend-docker/package.json b/apps/backend-docker/package.json
@@ -56,7 +56,7 @@
     "@types/passport": "^1.0.16",
     "@types/passport-jwt": "^4.0.1",
     "@types/ws": "^8.5.12",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "axios": "~1.7.7",
     "cross-env": "~7.0.3",
     "dotenv": "~16.4.5",

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -21,7 +21,7 @@
     "@gabrielcsapo/docusaurus-plugin-matomo": "~0.1.2",
     "@mdx-js/react": "~3.0.1",
     "@tailwindcss/typography": "~0.5.15",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "autoprefixer": "~10.4.20",
     "cross-env": "~7.0.3",
     "nodemon": "~3.1.7",

diff --git a/apps/frontend-control/package.json b/apps/frontend-control/package.json
@@ -17,7 +17,7 @@
     "@klicker-uzh/prisma": "workspace:*",
     "@klicker-uzh/shared-components": "workspace:*",
     "@socialgouv/matomo-next": "1.9.1",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "body-parser": "1.20.3",
     "cross-env": "7.0.3",
     "dayjs": "1.11.13",

diff --git a/apps/frontend-manage/package.json b/apps/frontend-manage/package.json
@@ -21,7 +21,7 @@
     "@socialgouv/matomo-next": "1.9.1",
     "@tanstack/react-table": "8.20.5",
     "@uidotdev/usehooks": "2.4.1",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "d3": "7.9.0",
     "dayjs": "1.11.13",
     "deepmerge": "4.3.1",

diff --git a/apps/frontend-manage/src/components/sessions/creation/groupActivity/GroupActivityWizard.tsx b/apps/frontend-manage/src/components/sessions/creation/groupActivity/GroupActivityWizard.tsx
@@ -81,7 +81,7 @@ function GroupActivityWizard({
     undefined
   )
   const [activeStep, setActiveStep] = useState(0)
-  const [stepValidity, setStepValidity] = useState(
+  const [stepValidity, setStepValidity] = useState<boolean[]>(
     Array(4).fill(!!initialValues)
   )
   const formRef = useRef<FormikProps<GroupActivityFormValues>>(null)
@@ -219,20 +219,24 @@ function GroupActivityWizard({
     {
       title: t('shared.generic.information'),
       tooltip: t('manage.sessionForms.groupActivityInformation'),
+      completed: stepValidity[0],
     },
     {
       title: t('shared.generic.description'),
       tooltip: t('manage.sessionForms.groupActivityDescription'),
+      completed: stepValidity[1],
     },
     {
       title: t('shared.generic.settings'),
       tooltip: t('manage.sessionForms.groupActivitySettings'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[2],
     },
     {
       title: t('shared.generic.questions'),
       tooltip: t('manage.sessionForms.groupActivityQuestions'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[3],
     },
   ]
 

diff --git a/apps/frontend-manage/src/components/sessions/creation/liveQuiz/LiveSessionWizard.tsx b/apps/frontend-manage/src/components/sessions/creation/liveQuiz/LiveSessionWizard.tsx
@@ -73,7 +73,7 @@ function LiveSessionWizard({
   const [isWizardCompleted, setIsWizardCompleted] = useState(false)
   const [errorToastOpen, setErrorToastOpen] = useState(false)
   const [activeStep, setActiveStep] = useState(0)
-  const [stepValidity, setStepValidity] = useState(
+  const [stepValidity, setStepValidity] = useState<boolean[]>(
     Array(4).fill(!!initialValues)
   )
   const formRef = useRef<FormikProps<LiveSessionFormValues>>(null)
@@ -158,21 +158,25 @@ function LiveSessionWizard({
     {
       title: t('shared.generic.information'),
       tooltip: t('manage.sessionForms.liveQuizInformation'),
+      completed: stepValidity[0],
     },
     {
       title: t('shared.generic.description'),
       tooltip: t('manage.sessionForms.liveQuizDescription'),
       tooltipDisabled: t('manage.sessionForms.liveQuizDescription'),
+      completed: stepValidity[1],
     },
     {
       title: t('shared.generic.settings'),
       tooltip: t('manage.sessionForms.liveQuizSettings'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[2],
     },
     {
       title: t('manage.sessionForms.liveQuizBlocks'),
       tooltip: t('manage.sessionForms.liveQuizDragDrop'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[3],
     },
   ]
 

diff --git a/apps/frontend-manage/src/components/sessions/creation/microLearning/MicroLearningWizard.tsx b/apps/frontend-manage/src/components/sessions/creation/microLearning/MicroLearningWizard.tsx
@@ -79,7 +79,7 @@ function MicroLearningWizard({
     undefined
   )
   const [activeStep, setActiveStep] = useState(0)
-  const [stepValidity, setStepValidity] = useState(
+  const [stepValidity, setStepValidity] = useState<boolean[]>(
     Array(4).fill(!!initialValues)
   )
   const formRef = useRef<FormikProps<MicroLearningFormValues>>(null)
@@ -191,21 +191,25 @@ function MicroLearningWizard({
     {
       title: t('shared.generic.information'),
       tooltip: t('manage.sessionForms.microLearningInformation'),
+      completed: stepValidity[0],
     },
     {
       title: t('shared.generic.description'),
       tooltip: t('manage.sessionForms.microlearningDescription'),
       tooltipDisabled: t('manage.sessionForms.microlearningDescription'),
+      completed: stepValidity[1],
     },
     {
       title: t('shared.generic.settings'),
       tooltip: t('manage.sessionForms.microlearningSettings'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[2],
     },
     {
       title: t('shared.generic.questions'),
       tooltip: t('manage.sessionForms.microlearningQuestions'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[3],
     },
   ]
 

diff --git a/apps/frontend-manage/src/components/sessions/creation/practiceQuiz/PracticeQuizWizard.tsx b/apps/frontend-manage/src/components/sessions/creation/practiceQuiz/PracticeQuizWizard.tsx
@@ -92,7 +92,7 @@ function PracticeQuizWizard({
   const [isWizardCompleted, setIsWizardCompleted] = useState(false)
 
   const [activeStep, setActiveStep] = useState(0)
-  const [stepValidity, setStepValidity] = useState(
+  const [stepValidity, setStepValidity] = useState<boolean[]>(
     Array(4).fill(!!initialValues)
   )
   const formRef = useRef<FormikProps<PracticeQuizFormValues>>(null)
@@ -197,20 +197,24 @@ function PracticeQuizWizard({
     {
       title: t('shared.generic.information'),
       tooltip: t('manage.sessionForms.practiceQuizInformation'),
+      completed: stepValidity[0],
     },
     {
       title: t('shared.generic.description'),
       tooltip: t('manage.sessionForms.practiceQuizDescription'),
+      completed: stepValidity[1],
     },
     {
       title: t('shared.generic.settings'),
       tooltip: t('manage.sessionForms.practiceQuizSettings'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[2],
     },
     {
       title: t('shared.generic.questions'),
       tooltip: t('manage.sessionForms.practiceQuizContent'),
       tooltipDisabled: t('manage.sessionForms.checkValues'),
+      completed: stepValidity[3],
     },
   ]
 

diff --git a/apps/frontend-pwa/package.json b/apps/frontend-pwa/package.json
@@ -27,7 +27,7 @@
     "@radix-ui/react-tabs": "1.1.1",
     "@socialgouv/matomo-next": "1.9.1",
     "@uidotdev/usehooks": "2.4.1",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "body-parser": "1.20.3",
     "dayjs": "1.11.13",
     "deepmerge": "4.3.1",

diff --git a/apps/func-incoming-responses/package.json b/apps/func-incoming-responses/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.7",
     "@types/node": "^20.16.1",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "azure-functions-core-tools": "~4.0.6280",
     "cross-env": "~7.0.3",
     "dotenv": "~16.4.5",

diff --git a/apps/func-response-processor/package.json b/apps/func-response-processor/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.7",
     "@types/node": "^20.16.1",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "azure-functions-core-tools": "~4.0.6280",
     "cross-env": "~7.0.3",
     "dotenv": "~16.4.5",

diff --git a/apps/office-addin/package.json b/apps/office-addin/package.json
@@ -3,7 +3,7 @@
   "version": "3.3.0-alpha.7",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "core-js": "3.30.2",
     "es6-promise": "4.2.8",
     "formik": "2.4.6",

diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -40,7 +40,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "next": "^15.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
@@ -35,7 +35,7 @@
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@klicker-uzh/graphql": "workspace:*",
     "@klicker-uzh/markdown": "workspace:*",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "dayjs": "^1.11.13",
     "formik": "^2.4.6",
     "js-cookie": "^3.0.5",

diff --git a/packages/transactional/package.json b/packages/transactional/package.json
@@ -8,7 +8,7 @@
     "@react-email/components": "~0.0.25",
     "@types/node": "^20.16.1",
     "@types/react": "^18.3.11",
-    "@uzh-bf/design-system": "3.0.0-alpha.32",
+    "@uzh-bf/design-system": "3.0.0-alpha.34",
     "react": "~18.3.1",
     "react-email": "~3.0.1",
     "tsx": "~4.19.1",