Merge branch 'main' into feature/legal_feedback

MinBZK · Oct 7, 2024 · e129106 · e129106
2 parents 1e53c51 + 44a76aa
commit e129106
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 98 deletions.
diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
@@ -16,9 +16,15 @@ jobs:
         with:
           node-version: 20
           registry-url: https://registry.npmjs.org/
+
+
+      - name: Change version number from release
+        run: |
+          sed -i 's|"version": .*$|"version": ${{ github.event.release.tag_name }}|g' frontend/package.json
+
       - run: npm install --prefix frontend
       - run: npm run build --prefix frontend
       - run: npm run prepub --prefix frontend
-      - run: npm publish ./frontend/dist --access=public --tag "${{ github.event.release.tag_name }}"
+      - run: npm publish ./frontend/dist --access=public
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPMJS_ACCESS_TOKEN}}
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.6.7
+    rev: v0.6.8
     hooks:
       - id: ruff
       - id: ruff-format

diff --git a/decision-tree.yaml b/decision-tree.yaml
@@ -517,7 +517,7 @@ questions:
     answers:
       - answer: Ja
         labels:
-          - "aanbieder + gebruiksverantwoordelijke"
+          - "aanbieder"
         redirects:
           - nextConclusionId: "14.0.1"
             if: '"AI-systeem" in labels && "hoog-risico AI" in labels && "transparantieverplichtingen" in labels'

diff --git a/frontend/index.html b/frontend/index.html
@@ -9,6 +9,13 @@
 </head>
 
 <body>
+  <div class="rvo-header__logo-wrapper">
+    <div class="rvo-logo rvo-header__logo-img">
+      <div class="rvo-logo__emblem">
+        <img src="@nl-rvo/assets/images/emblem.svg">
+      </div>
+    </div>
+  </div>
   <div id="app"></div>
   <script type="module" src="/src/main.ts"></script>
 </body>

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -17,16 +17,16 @@
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
     "@nl-rvo/assets": "1.0.0-alpha.360",
-    "@nl-rvo/component-library-css": "1.1.0",
-    "@nl-rvo/design-tokens": "1.0.0-alpha.407",
+    "@nl-rvo/component-library-css": "1.2.0",
+    "@nl-rvo/design-tokens": "1.2.0",
     "@types/jexl": "^2.3.4",
     "fp-ts": "^2.16.9",
     "io-ts": "^2.2.21",
     "jexl": "^2.3.0",
     "js-yaml": "^4.1.0",
-    "pinia": "^2.2.0",
+    "pinia": "^2.2.4",
     "vite-plugin-css-injected-by-js": "^3.5.2",
-    "vue": "^3.5.10"
+    "vue": "^3.5.11"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.10.4",

diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
@@ -11,12 +11,8 @@ const emit = defineEmits(['reset-event'])
 
 <template>
   <header class="header">
-    <div class="rvo-header__logo-wrapper">
-      <div class="rvo-logo rvo-header__logo-img">
-        <div class="rvo-logo__emblem">
-          <img src="@nl-rvo/assets/images/emblem.svg">
-        </div>
-      </div>
+    <div id="header_logo">
+      <!-- Place holder div for logo based on who implements the decision tree -->
     </div>
     <div class="rvo-layout-column rvo-layout-gap--2xl">
       <div class="rvo-topnav__background rvo-topnav__background--horizontal-rule">