Merge branch 'main' into feature/test_multiple_answers

MinBZK · Nov 11, 2024 · 92692ff · 92692ff
2 parents 35ffd9a + fc566a0
commit 92692ff
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 81 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
       - id: check-toml
       - id: detect-private-key
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.0
+    rev: v0.7.2
     hooks:
       - id: ruff
       - id: ruff-format

diff --git a/frontend/index.html b/frontend/index.html
@@ -1,23 +1,18 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="node_modules/@nl-rvo/assets/images/favicon/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Beslisboom</title>
+  </head>
 
-<head>
-  <meta charset="UTF-8">
-  <link rel="icon" href="/favicon.ico">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Beslisboom</title>
-</head>
-
-<body>
-  <div class="rvo-header__logo-wrapper">
+  <body>
+    <div class="rvo-header__logo-wrapper">
       <a href="#" class="rvo-header__logo-link rvo-link rvo-link--no-underline">
         <div class="rvo-logo rvo-header__logo-img">
           <div class="rvo-logo__emblem">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 -12 44 88"
-              role="img"
-            >
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -12 44 88" role="img">
               <title>Logo Rijksoverheid</title>
               <rect
                 x="0"
@@ -35,8 +30,7 @@
         </div>
       </a>
     </div>
-  <div id="app"></div>
-  <script type="module" src="/src/main.ts"></script>
-</body>
-
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
 </html>
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -24,28 +24,28 @@
     "io-ts": "^2.2.21",
     "jexl": "^2.3.0",
     "js-yaml": "^4.1.0",
-    "pinia": "^2.2.4",
+    "pinia": "^2.2.6",
     "vite-plugin-css-injected-by-js": "^3.5.2",
     "vue": "^3.5.12"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.10.4",
     "@tsconfig/node20": "^20.1.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.7.7",
+    "@types/node": "^22.8.7",
     "@vitejs/plugin-vue": "^5.1.4",
-    "@vue/eslint-config-prettier": "^10.0.0",
+    "@vue/eslint-config-prettier": "^10.1.0",
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/tsconfig": "^0.5.1",
     "autoprefixer": "^10.4.20",
     "eslint": "^8.57.1",
-    "eslint-plugin-vue": "^9.29.1",
+    "eslint-plugin-vue": "^9.30.0",
     "npm-run-all2": "^6.2.3",
     "postcss": "^8.4.47",
     "prettier": "^3.3.3",
     "tailwindcss": "^3.4.14",
     "typescript": "~5.6.3",
-    "vite": "^5.4.9",
-    "vue-tsc": "^2.1.6"
+    "vite": "^5.4.10",
+    "vue-tsc": "^2.1.10"
   }
 }
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -8,5 +8,5 @@ import '@nl-rvo/design-tokens/dist/index.css'
 </script>
 
 <template>
-  <BeslisboomForm class="rvo-theme"/>
+  <BeslisboomForm class="rvo-theme" />
 </template>
diff --git a/frontend/src/components/HelpWanted.vue b/frontend/src/components/HelpWanted.vue
@@ -0,0 +1,23 @@
+<template>
+  <div>
+    <details class="rvo-expandable-text">
+      <summary class="rvo-expandable-text__summary">
+    <span
+      class="utrecht-icon rvo-icon rvo-icon-info rvo-icon--md rvo-icon--hemelblauw"
+      role="img"
+      aria-label="Info"
+    ></span>
+        Hulp nodig?
+      </summary>
+      <div class="rvo-expandable-text__details"
+           style="width: 55%">Je hebt aangegeven dat je hulp nodig hebt.
+        Voor advies kun je een e-mail sturen naar
+        <a class="rvo-link" href="mailto:[email protected]">
+          [email protected]
+        </a> of op de pleio-omgeving <a class="rvo-link" target="_blank" href="https://algoritmes.pleio.nl">
+          https://algoritmes.pleio.nl</a></div>
+    </details>
+  </div>
+</template>
+<script setup lang="ts">
+</script>
diff --git a/frontend/src/components/Question.vue b/frontend/src/components/Question.vue
@@ -3,6 +3,7 @@ import BetaversionLabel from '@/components/betaversion-label.vue'
 import Sources from '@/components/Sources.vue'
 import { Answer } from '@/models/DecisionTree'
 import SubResult from '@/components/SubResult.vue'
+import HelpWanted from '@/components/HelpWanted.vue'
 
 interface Props {
   id: string
@@ -34,6 +35,7 @@ defineEmits(['answered', 'back'])
           <span v-html="question"></span>
           <slot />
         </p>
+        <HelpWanted style="margin-top: -2%; margin-bottom: 5%"/>
       </div>
       <div>
         <!-- Controleer of er meer dan 2 antwoorden zijn -->