Merge branch 'feature/vuejs'

.eslintrc.js

@@ -1,27 +1,30 @@
+/* eslint-env node */
 module.exports = {
   root: true,
   overrides: [
     {
-      files: ['src/ts/**/*.ts', 'tools/**/*.ts'],
-
+      files: ['src/ts/**/*.ts', 'tools/**/*.ts', 'src/**/*.vue'],
       env: {
         es6: true,
       },
-      parser: '@typescript-eslint/parser',
+      parser: 'vue-eslint-parser',
       parserOptions: {
-        ecmaVersion: 2021,
+        parser: '@typescript-eslint/parser',
+        ecmaVersion: 2022,
         sourceType: 'module',
         ecmaFeatures: {},
         project: 'tsconfig.json',
       },
-      plugins: ['@typescript-eslint/eslint-plugin'],
       extends: [
+        'plugin:vue/vue3-essential',
         'eslint:recommended',
         'airbnb-base',
         'airbnb-typescript/base',
         'plugin:compat/recommended',
         'plugin:@typescript-eslint/recommended',
         'plugin:@typescript-eslint/recommended-requiring-type-checking',
+        '@vue/eslint-config-typescript',
+        '@vue/eslint-config-prettier/skip-formatting',
         'prettier',
       ],
       rules: {

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .parcel-cache/
 dist-dev/
+local/

config/general.yaml

@@ -1,2 +1,11 @@
 general:
-  backgroundImage: config/assets/background.webp
+  assetBaseDir: config/assets
+  primaryLanguage: de
+  secondaryLanguage: en
+  scoreLabels:
+    circularity:
+      en: Circularity
+      de: Kreislauf
+    happiness:
+      en: Happiness
+      de: Zufriedenheit

config/interaction.yaml

@@ -1,172 +1,113 @@
 interaction:
-  slotActivationDelay: 1
-  slotDeactivationDelay: 1
+  actionCardDelayMs: 1000
+  eventCardMinDelayMs: 10000
+  eventCardMaxDelayMs: 20000
+  eventCardMinDurationMs: 30000
+  eventCardMaxDurationMs: 60000
+  assets:
+    markerSlotActive:
+      url: slots/marker-slot-active_x-121_y-121.webp
+    markerSlotInactive:
+      url: slots/marker-slot-inactive_x-121_y-121.webp
   slotGroups:
     - id: technology
       type: action-card
       slots:
-        - {
-            id: technology-1,
-            x: 0,
-            y: 0,
-            angle: 0,
-            card: { x: 0, y: 0, angle: 0 },
-          }
-        - {
-            id: technology-2,
-            x: 0,
-            y: 0,
-            angle: 0,
-            card: { x: 0, y: 0, angle: 0 },
-          }
-        - {
-            id: technology-3,
-            x: 0,
-            y: 0,
-            angle: 0,
-            card: { x: 0, y: 0, angle: 0 },
-          }
+        - markerSlot: { id: technology-ms-1, x: 131, y: 744, angle: 90 }
+          cardSlot: { id: technology-cs-1, x: 470, y: 644, angle: 90 }
+        - markerSlot: { id: technology-ms-2, x: 131, y: 1000, angle: 90 }
+          cardSlot: { id: technology-cs-2, x: 470, y: 900, angle: 90 }
+        - markerSlot: { id: technology-ms-3, x: 131, y: 1256, angle: 90 }
+          cardSlot: { id: technology-cs-3, x: 470, y: 1156, angle: 90 }
       cards:
-        - id: technology-card-1
-          url: technology-card-1.png
-          title:
-            en: 'T-Tech-en-1'
-            de: 'T-Tech-de-1'
-          description:
-            en: 'D-Tech-en-1'
-            de: 'D-Tech-de-1'
-        - id: technology-card-2
-          url: technology-card-2.png
-          title:
-            en: 'T-Tech-en-2'
-            de: 'T-Tech-de-2'
-          description:
-            en: 'D-Tech-en-2'
-            de: 'D-Tech-de-2'
-        - id: technology-card-3
-          url: technology-card-3.png
-          title:
-            en: 'T-Tech-en-3'
-            de: 'T-Tech-de-3'
-          description:
-            en: 'D-Tech-en-3'
-            de: 'D-Tech-de-3'
-        - id: technology-card-4
-          url: technology-card-4.png
-          title:
-            en: 'T-Tech-en-4'
-            de: 'T-Tech-de-4'
-          description:
-            en: 'D-Tech-en-4'
-            de: 'D-Tech-de-4'
+        - parameterTransformId: (T) Triple Diamantglas
+          url: cards/technology/triple-diamond-glass.webp
+        - parameterTransformId: (T) KI-Automatisierung
+          url: cards/technology/ai-automation.webp
+        - parameterTransformId: (T) Modular smartphone
+          url: cards/technology/modular-smartphone.webp
+        - parameterTransformId: (T) Planed Obsol
+          url: cards/technology/planned-obsolescence.webp
+        - parameterTransformId: (T) Software Upgrade
+          url: cards/technology/software-upgrade.webp
     - id: policy
       type: action-card
       slots:
-        - { id: policy-1, x: 0, y: 0, angle: 0, card: { x: 0, y: 0, angle: 0 } }
-        - { id: policy-2, x: 0, y: 0, angle: 0, card: { x: 0, y: 0, angle: 0 } }
-        - { id: policy-3, x: 0, y: 0, angle: 0, card: { x: 0, y: 0, angle: 0 } }
+        - markerSlot: { id: policy-ms-1, x: 1415, y: 2029, angle: 0 }
+          cardSlot: { id: policy-cs-1, x: 1315, y: 1690, angle: 0 }
+        - markerSlot: { id: policy-ms-2, x: 1671, y: 2029, angle: 0 }
+          cardSlot: { id: policy-cs-2, x: 1571, y: 1690, angle: 0 }
+        - markerSlot: { id: policy-ms-3, x: 1927, y: 2029, angle: 0 }
+          cardSlot: { id: policy-cs-3, x: 1827, y: 1690, angle: 0 }
       cards:
-        - id: policy-card-1
-          url: policy-card-1.png
-          title:
-            en: 'T-Pol-en-1'
-            de: 'T-Pol-de-1'
-          description:
-            en: 'D-Pol-en-1'
-            de: 'D-Pol-de-1'
-        - id: policy-card-2
-          url: policy-card-2.png
-          title:
-            en: 'T-Pol-en-2'
-            de: 'T-Pol-de-2'
-          description:
-            en: 'D-Pol-en-2'
-            de: 'D-Pol-de-2'
-        - id: policy-card-3
-          url: policy-card-3.png
-          title:
-            en: 'T-Pol-en-3'
-            de: 'T-Pol-de-3'
-          description:
-            en: 'D-Pol-en-3'
-            de: 'D-Pol-de-3'
-        - id: policy-card-4
-          url: policy-card-4.png
-          title:
-            en: 'T-Pol-en-4'
-            de: 'T-Pol-de-4'
-          description:
-            en: 'D-Pol-en-4'
-            de: 'D-Pol-de-4'
+        - parameterTransformId: (P) Schul-Repair-Café
+          url: cards/policy/school-repair-cafe.webp
+        - parameterTransformId: (P) Extreme Öko-Steuer
+          url: cards/policy/extreme-eco-tax.webp
+        - parameterTransformId: (P) Handy-Abo
+          url: cards/policy/handy-abo.webp
+        - parameterTransformId: (P) Recycle-Prämie
+          url: cards/policy/recycle-bonus.webp
+        - parameterTransformId: (P) Wartungsvertrag
+          url: cards/policy/wartungsvertrag.webp
+        - parameterTransformId: (P) Jugendschutz
+          url: cards/policy/youth-protection.webp
+        - parameterTransformId: (P) Ein-Telefon-Gesetz
+          url: cards/policy/one-phone-law.webp
+        - parameterTransformId: (P) BYOD
+          url: cards/policy/byod.webp
+        - parameterTransformId: (P) Handy Detox Day
+          url: cards/policy/handy-detox-day.webp
     - id: event
       type: event-card
-      slots:
-        - { id: event, x: 0, y: 0, angle: 0, card: { x: 0, y: 0, angle: 0 } }
+      markerSlot: { id: event-ms-1, x: 2298, y: 190, angle: 180 }
+      cardSlots:
+        - { id: event-cs-1, x: 1633, y: 318, angle: 180 }
+        - { id: event-cs-2, x: 1891, y: 318, angle: 180 }
+        - { id: event-cs-3, x: 2147, y: 318, angle: 180 }
       cards:
-        - id: event-card-1
-          url: event-card-1.png
-          title:
-            en: 'T-Ev-en-1'
-            de: 'T-Ev-de-1'
-          description:
-            en: 'D-Ev-en-1'
-            de: 'D-Ev-de-1'
-        - id: event-card-2
-          url: event-card-2.png
-          title:
-            en: 'T-Ev-en-2'
-            de: 'T-Ev-de-2'
-          description:
-            en: 'D-Ev-en-2'
-            de: 'D-Ev-de-2'
-        - id: event-card-3
-          url: event-card-3.png
-          title:
-            en: 'T-Ev-en-3'
-            de: 'T-Ev-de-3'
-          description:
-            en: 'D-Ev-en-3'
-            de: 'D-Ev-de-3'
-        - id: event-card-4
-          url: event-card-4.png
-          title:
-            en: 'T-Ev-en-4'
-            de: 'T-Ev-de-4'
-          description:
-            en: 'D-Ev-en-4'
-            de: 'D-Ev-de-4'
+        - parameterTransformId: (E) Weltweite Chip-Krise
+          url: cards/event/global-chip-crisis.webp
+        - parameterTransformId: (E) Neues Ananas Phone
+          url: cards/event/new-pineapple-phone.webp
+        - parameterTransformId: (E) Sicherheitslücke
+          url: cards/event/security-gap.webp
+        - parameterTransformId: (E) Transport Streik
+          url: cards/event/transportstreik.webp
+        - parameterTransformId: (E) Deponie Streik
+          url: cards/event/landfill-strike.webp
     - id: reduce
       type: basic
       slots:
-        - { id: reduce-1, x: 0, y: 0, angle: 0 }
-        - { id: reduce-2, x: 0, y: 0, angle: 0 }
-        - { id: reduce-3, x: 0, y: 0, angle: 0 }
+        - { id: reduce-ms-1, x: 1604, y: 1217, angle: 0 }
+        - { id: reduce-ms-2, x: 1859, y: 1229, angle: 0 }
+        - { id: reduce-ms-2, x: 2111, y: 1240, angle: 0 }
       parameterTransformIds: [reduce, reduce, reduce]
     - id: reuse
       type: basic
       slots:
-        - { id: reuse-1, x: 0, y: 0, angle: 0 }
-        - { id: reuse-2, x: 0, y: 0, angle: 0 }
-        - { id: reuse-3, x: 0, y: 0, angle: 0 }
+        - { id: reuse-ms-1, x: 3494, y: 866, angle: -90 }
+        - { id: reuse-ms-2, x: 3503, y: 1118, angle: -90 }
+        - { id: reuse-ms-3, x: 3513, y: 1373, angle: -90 }
       parameterTransformIds: [reuse, reuse, reuse]
     - id: repair
       type: basic
       slots:
-        - { id: repair-1, x: 0, y: 0, angle: 0 }
-        - { id: repair-2, x: 0, y: 0, angle: 0 }
-        - { id: repair-3, x: 0, y: 0, angle: 0 }
+        - { id: repair-ms-1, x: 1390, y: 927, angle: 180 }
+        - { id: repair-ms-2, x: 1634, y: 855, angle: 180 }
+        - { id: repair-ms-3, x: 1878, y: 783, angle: 180 }
       parameterTransformIds: [repair, repair, repair]
     - id: refurbish
       type: basic
       slots:
-        - { id: refurbish-1, x: 0, y: 0, angle: 0 }
-        - { id: refurbish-2, x: 0, y: 0, angle: 0 }
-        - { id: refurbish-3, x: 0, y: 0, angle: 0 }
+        - { id: refurbish-ms-1, x: 2959, y: 1981, angle: 0 }
+        - { id: refurbish-ms-2, x: 3194, y: 1879, angle: 0 }
+        - { id: refurbish-ms-3, x: 3424, y: 1778, angle: 0 }
       parameterTransformIds: [refurbish, refurbish, refurbish]
     - id: recycle
       type: basic
       slots:
-        - { id: recycle-1, x: 0, y: 0, angle: 0 }
-        - { id: recycle-2, x: 0, y: 0, angle: 0 }
-        - { id: recycle-3, x: 0, y: 0, angle: 0 }
+        - { id: recycle-ms-1, x: 465, y: 423, angle: 180 }
+        - { id: recycle-ms-2, x: 693, y: 306, angle: 180 }
+        - { id: recycle-ms-3, x: 916, y: 190, angle: 180 }
       parameterTransformIds: [recycle, recycle, recycle]

config/layers.yaml

@@ -0,0 +1,10 @@
+layers:
+  - url: background_static_x0_y0.webp
+    condition: 'true'
+  - modelVisualization
+  - url: government_static_x794_y1705.webp
+    condition: 'true'
+  - url: reduce_cellphone_x1647_y1346.webp
+    condition: 'true'
+  - url: reduce_walkingman_x1471_y1347.webp
+    condition: 'true'

config/model.yaml

@@ -14,23 +14,23 @@ model:
     supplyOfRepairedPhones: 0
   initialParameters:
     abandonExcessRate: 0.5
-    abandonRate: 0.1
+    abandonRate: 0.5
     acquireRate: 1
-    breakRate: 0.1
+    breakRate: 0.3
     capacityAdjustmentRate: 0.1
-    disposeIncentive: 0.5
-    disposeRate: 0.5
+    disposeIncentive: 0.8
+    disposeRate: 0.8
     landfillIncentive: 0.5
-    landfillRate: 1
+    landfillRate: 0.8
     naturalResourcesIncentive: 0.5
     newPhoneProductionRate: 0.5
     newlyProducedPhoneIncentive: 0.82
     numberOfUsers: 1000000
     phonesPerUserGoal: 1
-    recycleRate: 1
-    recyclingIncentive: 0.89
-    refurbishmentIncentive: 0.5
-    refurbishmentRate: 1
-    repairIncentive: 0.5
-    repairRate: 1
-    reuseIncentive: 0.86
+    recycleRate: 0.2
+    recyclingIncentive: 0.2
+    refurbishmentIncentive: 0.2
+    refurbishmentRate: 0.2
+    repairIncentive: 0.2
+    repairRate: 0.2
+    reuseIncentive: 0.2