Merge pull request 'Update several: Euromat occurences, URL updates and FAQ' (#10) from willi-euromat into main

Reviewed-on: #10

README.md

@@ -1,6 +1,10 @@
-# CANDYMAT
+# KANDIMAT
 
-A Vue.js powered, progressive web voting application for upcoming internal elections of Bündnis90/Die Grünen. Candymat is hosted as a service of netzbegruenung e.V.
+A Vue.js powered, progressive web voting application for upcoming internal elections of Bündnis90/Die Grünen. Kandimat is hosted as a service of netzbegruenung e.V.
+
+## Issues
+
+..are tracked @ https://git.netzbegruenung.de/NB-Public/kandimat/issues
 
 ## Calculation Model
 

bin/admin-yml/index.js

@@ -22,7 +22,7 @@ const configTree = {
       meta: {
         name: 'euromat-theses',
         label: '[Euromat] Theses',
-        description: 'The theses selection pages for the EUROMAT.',
+        description: 'The theses selection pages for the KANDIMAT.',
         folder: 'src/app/euromat/content/theses'
       },
       fields: [
@@ -55,7 +55,7 @@ const configTree = {
       meta: {
         name: 'euromat-results',
         label: '[Euromat] Results',
-        description: 'The EUROMAT result page.',
+        description: 'The KANDIMAT result page.',
         folder: 'src/app/euromat/content/results'
       },
       fields: [

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "candymat",
+  "name": "kandimat",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "candymat",
+  "name": "kandimat",
   "version": "0.1.0",
   "private": true,
   "scripts": {

public/admin/config.yml

@@ -11,7 +11,7 @@ public_folder: /img/uploads
 collections:
   - name: euromat-theses
     label: '[Euromat] Theses'
-    description: The theses selection pages for the EUROMAT.
+    description: The theses selection pages for the KANDIMAT.
     folder: src/app/euromat/content/theses
     format: json
     create: true
@@ -90,7 +90,7 @@ collections:
         widget: string
   - name: euromat-results
     label: '[Euromat] Results'
-    description: The EUROMAT result page.
+    description: The KANDIMAT result page.
     folder: src/app/euromat/content/results
     format: json
     create: true

public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Candymat</title>
+    <title>Kandimat</title>
     <link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon_gruene_16x16.png">
     <!--[if IE]><link rel="shortcut icon" href="/img/favicon.ico"><![endif]-->
@@ -12,22 +12,22 @@
     <link rel="manifest" href="/manifest.json">
     <meta name="theme-color" content="#59ae2e">
     <!-- Open Graph -->
-    <meta property="og:url" content="https://www.candymat.info" />
-    <meta property="og:title" content="Candymat" />
+    <meta property="og:url" content="https://kandimat.netzbegruenung.verdigado.net" />
+    <meta property="og:title" content="Kandimat" />
     <meta property="og:locale" content="en_GB" />
     <meta property="og:locale:alternate" content="de_DE" />
     <meta property="og:locale:alternate" content="fr_FR" />
     <meta property="og:locale:alternate" content="cz_CZ" />
     <meta property="og:locale:alternate" content="si_SI" />
     <meta property="og:locale:alternate" content="dk_DK" />
-    <meta property="og:description" content="The Candymat is not a regular voting advice application. On the contrary, it is your digital tool navigating you through the policies and visions of the current Candidates. The goal of the Candymat is to support you to make an informed choice for the upcoming European elections!" />
-    <meta property="og:image" content="https://www.euromat.info/img/facebook.2.png" />
-    <meta property="og:image:secure_url" content="https://www.euromat.info/img/facebook.2.png" />
+    <meta property="og:description" content="The Kandimat is not a regular voting advice application. On the contrary, it is your digital tool navigating you through the policies and visions of the current Candidates. The goal of the Kandimat is to support you to make an informed choice for the upcoming European elections!" />
+    <meta property="og:image" content="https://blog.netzbegruenung.de/files/2013/10/netzbegruenung-logo-website.png" />
+    <meta property="og:image:secure_url" content="https://blog.netzbegruenung.de/files/2013/10/netzbegruenung-logo-website.png" />
     <meta property="fb:app_id" content="766231516835034" />
     <!-- Add to home screen for Safari on iOS -->
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-title" content="Candymat">
+    <meta name="apple-mobile-web-app-title" content="Kandimat">
     <link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png">
     <!-- Add to home screen for Windows -->
     <meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png">
@@ -51,7 +51,7 @@
     </script>
 
     <noscript>
-      <strong>We're sorry but Candymat doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but Kandimat doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
 
     <div id="app"></div>

public/manifest.json

@@ -1,7 +1,7 @@
 {
-  "name": "CANDYMAT",
-  "short_name": "candymat",
-  "description": "Der Candymat nicht einfach nur ein Wahlomat. Sondern Ihr digitaler Wahl-Freund, der Ihnen einen Eindruck von den politischen Positionen der Kandindaten vermittelt.",
+  "name": "KANDIMAT",
+  "short_name": "kandimat",
+  "description": "Der Kandimat nicht einfach nur ein Wahlomat. Sondern Ihr digitaler Wahl-Freund, der Ihnen einen Eindruck von den politischen Positionen der Kandindaten vermittelt.",
   "icons": [
     {
       "src": "/img/icons/gruenen_logo_200.png",

src/app/app.vue

@@ -3,7 +3,7 @@
     <header v-if="!isEmbedded" class="app-header">
       <router-link :to="{ path: `/${$i18n.locale}/` }">
         <img class="header-logo"
-          alt="EUROMAT Logo"
+          alt="KANDIMAT Logo"
           :src="euromatLogo"
           :width="logoSize"
           :height="logoSize / 2"
@@ -33,7 +33,7 @@
 
     data () {
       return {
-        euromatLogo: require('@/assets/candymat-logo.png'),
+        euromatLogo: require('@/assets/kandimat-logo.png'),
         logoSize: 220,
         languages: SUPPORTED_LOCALES.map(([locale, language]) => ({
           icon: require(`@/assets/svg/flag-${locale}.svg`),

src/app/euromat/graphqlQueries.js

@@ -38,7 +38,7 @@ export const apolloThesesCountQuery = gql`{
 export const apolloThesesCountUpdate = data => data.allQuestions.totalCount
 
 export const apolloPersonsForResultsQuery = gql`{
-  allPeople(condition: {role: CANDYMAT_CANDIDATE}) {
+  allPeople(condition: {role: KANDIMAT_CANDIDATE}) {
     nodes {
       id
       firstName

src/app/faq/content/de.json

@@ -13,8 +13,8 @@
       "answer": ""
     },
     {
-      "title": "Wie haben wir den EUROMAT entwickelt? ",
-      "answer": ""
+      "title": "Wie haben wir den KANDIMAT entwickelt? ",
+      "answer": "In dem wir den Euromat als am einfachsten anzupassende Version einer Software recherchiert und dnn wohl einfach losgelegt haben. Über mehrere Jahre. Den Quellcode findest du auf https://git.netzbegruenung.de/NB-Public/kandimat"
     }
   ]
 }