From ab662db0e4e29acd1496856c16989053415f7ca1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 6 Sep 2022 18:46:47 +0200
Subject: [PATCH 01/22] empty array as input only clears all saved categories

---
 backend/src/schema/resolvers/users.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 23a39a2a1..12f00ffb6 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -286,6 +286,10 @@ export default {
           { id },
         )
       })
+
+      // frontend gives [] when all categories are selected (default)
+      if (activeCategories.length === 0) return true
+
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const saveCategorySettingsResponse = await transaction.run(
           `

From 523d290ff8d63186d8f4368bea7224d83637a789 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 6 Sep 2022 18:50:05 +0200
Subject: [PATCH 02/22] add save icon

---
 webapp/assets/_new/icons/svgs/save.svg | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 webapp/assets/_new/icons/svgs/save.svg

diff --git a/webapp/assets/_new/icons/svgs/save.svg b/webapp/assets/_new/icons/svgs/save.svg
new file mode 100644
index 000000000..31c1d8459
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/save.svg
@@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>save</title>
+<path d="M5 5h17.406l0.313 0.281 4 4 0.281 0.313v17.406h-22v-22zM7 7v18h2v-9h14v9h2v-14.563l-3-3v5.563h-12v-6h-3zM12 7v4h8v-4h-2v2h-2v-2h-4zM11 18v7h10v-7h-10z"></path>
+</svg>

From d4c338e04efbd1d62a166371bf74cef557bdfd43 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 6 Sep 2022 18:50:33 +0200
Subject: [PATCH 03/22] add save categories mutation

---
 webapp/graphql/SaveCategories.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 webapp/graphql/SaveCategories.js

diff --git a/webapp/graphql/SaveCategories.js b/webapp/graphql/SaveCategories.js
new file mode 100644
index 000000000..6154dacbc
--- /dev/null
+++ b/webapp/graphql/SaveCategories.js
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export default () => {
+  return gql`
+    mutation($activeCategories: [String]) {
+      saveCategorySettings(activeCategories: $activeCategories)
+    }
+  `
+}

From d45ad17b4324907ef02a4330f496f28e0ea35834 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 6 Sep 2022 18:51:20 +0200
Subject: [PATCH 04/22] add save button to category filters

---
 .../components/FilterMenu/CategoriesFilter.vue   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue
index 47e4bcc10..6ed37d4b3 100644
--- a/webapp/components/FilterMenu/CategoriesFilter.vue
+++ b/webapp/components/FilterMenu/CategoriesFilter.vue
@@ -7,6 +7,8 @@
         icon="check"
         @click="resetCategories"
       />
+      <hr />
+      <labeled-button filled :label="$t('actions.save')" icon="save" @click="saveCategories" />
     </template>
     <template #filter-list>
       <li v-for="category in categories" :key="category.id" class="item">
@@ -24,6 +26,7 @@
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import CategoryQuery from '~/graphql/CategoryQuery.js'
+import SaveCategories from '~/graphql/SaveCategories.js'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -47,6 +50,19 @@ export default {
       resetCategories: 'posts/RESET_CATEGORIES',
       toggleCategory: 'posts/TOGGLE_CATEGORY',
     }),
+    saveCategories() {
+      this.$apollo
+        .mutate({
+          mutation: SaveCategories(),
+          variables: { activeCategories: this.filteredCategoryIds },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('filter-menu.save.success'))
+        })
+        .catch(() => {
+          this.$toast.error(this.$t('filter-menu.save.error'))
+        })
+    },
   },
   apollo: {
     Category: {

From dcdef615c1f299bc9bd4f24f7be07d6de15ad49a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 6 Sep 2022 18:51:55 +0200
Subject: [PATCH 05/22] add locales for saving categories

---
 webapp/locales/de.json | 6 +++++-
 webapp/locales/en.json | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b17e47d08..0a21f0a4d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -363,7 +363,11 @@
         "label": "Älteste zuerst"
       }
     },
-    "order-by": "Sortieren nach ..."
+    "order-by": "Sortieren nach ...",
+    "save": {
+      "error": "Themen konnten nicht gespeichert werden",
+      "success": "Themen gespeichert!"
+    }
   },
   "followButton": {
     "follow": "Folgen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8587d9da5..22fa73593 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -363,7 +363,11 @@
         "label": "Oldest first"
       }
     },
-    "order-by": "Order by ..."
+    "order-by": "Order by ...",
+    "save": {
+      "error": "Failed saving topic settings",
+      "success": "Topics saved!"
+    }
   },
   "followButton": {
     "follow": "Follow",

From 3213bd3ee469afaa39b3ce98ddd2dc292871bf15 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 6 Sep 2022 19:17:06 +0200
Subject: [PATCH 06/22] test save categories

---
 .../FilterMenu/CategoriesFilter.spec.js       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/webapp/components/FilterMenu/CategoriesFilter.spec.js b/webapp/components/FilterMenu/CategoriesFilter.spec.js
index ef0f2ad90..813f7b33c 100644
--- a/webapp/components/FilterMenu/CategoriesFilter.spec.js
+++ b/webapp/components/FilterMenu/CategoriesFilter.spec.js
@@ -15,8 +15,19 @@ describe('CategoriesFilter.vue', () => {
     'posts/filteredCategoryIds': jest.fn(() => []),
   }
 
+  const apolloMutationMock = jest.fn().mockResolvedValue({
+    data: { saveCategorySettings: true },
+  })
+
   const mocks = {
     $t: jest.fn((string) => string),
+    $apollo: {
+      mutate: apolloMutationMock,
+    },
+    $toast: {
+      success: jest.fn(),
+      error: jest.fn(),
+    },
   }
 
   const Wrapper = () => {
@@ -76,5 +87,14 @@ describe('CategoriesFilter.vue', () => {
         expect(mutations['posts/RESET_CATEGORIES']).toHaveBeenCalledTimes(1)
       })
     })
+
+    describe('save categories', () => {
+      it('calls the API', async () => {
+        wrapper = await Wrapper()
+        const saveButton = wrapper.findAll('.categories-filter .sidebar .base-button').at(1)
+        saveButton.trigger('click')
+        expect(apolloMutationMock).toBeCalled()
+      })
+    })
   })
 })

From 341e3862074ec1f16789dc43961938047eb9e850 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 13:37:48 +0200
Subject: [PATCH 07/22] linting

---
 webapp/graphql/SaveCategories.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/graphql/SaveCategories.js b/webapp/graphql/SaveCategories.js
index 6154dacbc..d6db34b8a 100644
--- a/webapp/graphql/SaveCategories.js
+++ b/webapp/graphql/SaveCategories.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default () => {
   return gql`
-    mutation($activeCategories: [String]) {
+    mutation ($activeCategories: [String]) {
       saveCategorySettings(activeCategories: $activeCategories)
     }
   `

From d05919fddb212988fa3c0e463530f702d27ad7e6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 14:08:03 +0200
Subject: [PATCH 08/22] add active categories to current user query

---
 webapp/graphql/User.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index f16323073..053cb022f 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -285,6 +285,7 @@ export const currentUserQuery = gql`
         id
         url
       }
+      activeCategories
     }
   }
 `

From 18e15be24d503791740af93ee1a05f7471759ecf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 14:09:24 +0200
Subject: [PATCH 09/22] active categories is array of string (ids of
 categories), current user query resolves with active categories

---
 backend/src/schema/resolvers/user_management.js | 5 +++--
 backend/src/schema/types/type/User.gql          | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index beb2cddb3..9eea67108 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -20,8 +20,9 @@ export default {
         const result = await transaction.run(
           `
             MATCH (user:User {id: $id})
-            WITH user, [(user)<-[:OWNED_BY]-(medium:SocialMedia) | properties(medium) ] as media
-            RETURN user {.*, socialMedia: media } as user
+            MATCH (category:Category) WHERE NOT ((user)-[:NOT_INTERESTED_IN]->(category))
+            WITH user, [(user)<-[:OWNED_BY]-(medium:SocialMedia) | properties(medium) ] as media, category
+            RETURN user {.*, socialMedia: media, activeCategories: collect(category.id) } as user
           `,
           { id: user.id },
         )
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index d2ac79037..c3fcf932b 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -115,11 +115,11 @@ type User {
 
   emotions: [EMOTED]
 
-  activeCategories: [Category] @cypher(
+  activeCategories: [String] @cypher(
   statement: """
   MATCH (category:Category)
   WHERE NOT ((this)-[:NOT_INTERESTED_IN]->(category))
-  RETURN category
+  RETURN collect(category.id)
   """
   )
 }

From bcaeee44faa4752f09db5bd24ab26e4bbc36661f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 14:12:53 +0200
Subject: [PATCH 10/22] adopt active categories as array of ids

---
 backend/src/schema/resolvers/users.spec.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 7116d2201..d8fce3b29 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -602,9 +602,7 @@ describe('save category settings', () => {
     const userQuery = gql`
       query ($id: ID) {
         User(id: $id) {
-          activeCategories {
-            id
-          }
+          activeCategories
         }
       }
     `
@@ -631,11 +629,7 @@ describe('save category settings', () => {
               data: {
                 User: [
                   {
-                    activeCategories: expect.arrayContaining([
-                      { id: 'cat1' },
-                      { id: 'cat3' },
-                      { id: 'cat5' },
-                    ]),
+                    activeCategories: expect.arrayContaining(['cat1', 'cat3', 'cat5']),
                   },
                 ],
               },
@@ -678,11 +672,11 @@ describe('save category settings', () => {
                 User: [
                   {
                     activeCategories: expect.arrayContaining([
-                      { id: 'cat10' },
-                      { id: 'cat11' },
-                      { id: 'cat12' },
-                      { id: 'cat8' },
-                      { id: 'cat9' },
+                      'cat10',
+                      'cat11',
+                      'cat12',
+                      'cat8',
+                      'cat9',
                     ]),
                   },
                 ],

From 860949dc6a3f6cc57c8bd83c9fb49bf34c1c9d8d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 15:00:04 +0200
Subject: [PATCH 11/22] test current user query for active categories

---
 .../src/schema/resolvers/user_management.js   |  2 +-
 .../schema/resolvers/user_management.spec.js  | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index 9eea67108..71517dd05 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -20,7 +20,7 @@ export default {
         const result = await transaction.run(
           `
             MATCH (user:User {id: $id})
-            MATCH (category:Category) WHERE NOT ((user)-[:NOT_INTERESTED_IN]->(category))
+            OPTIONAL MATCH (category:Category) WHERE NOT ((user)-[:NOT_INTERESTED_IN]->(category))
             WITH user, [(user)<-[:OWNED_BY]-(medium:SocialMedia) | properties(medium) ] as media, category
             RETURN user {.*, socialMedia: media, activeCategories: collect(category.id) } as user
           `,
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 264cf2752..4e0cfaa14 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -6,6 +6,7 @@ import { createTestClient } from 'apollo-server-testing'
 import createServer, { context } from '../../server'
 import encode from '../../jwt/encode'
 import { getNeode } from '../../db/neo4j'
+import { categories } from '../../constants/categories'
 
 const neode = getNeode()
 let query, mutate, variables, req, user
@@ -118,6 +119,7 @@ describe('currentUser', () => {
         }
         email
         role
+        activeCategories
       }
     }
   `
@@ -172,6 +174,49 @@ describe('currentUser', () => {
         }
         await respondsWith(expected)
       })
+
+      describe('with categories in DB', () => {
+        beforeEach(async () => {
+          await Promise.all(
+            categories.map(async ({ icon, name }, index) => {
+              await Factory.build('category', {
+                id: `cat${index + 1}`,
+                slug: name,
+                name,
+                icon,
+              })
+            }),
+          )
+        })
+
+        it('returns all categories', async () => {
+          const result = await query({ query: currentUserQuery, variables })
+          expect(result.data.currentUser.activeCategories).toHaveLength(categories.length)
+        })
+
+        describe('with categories saved for current user', () => {
+          const saveCategorySettings = gql`
+            mutation ($activeCategories: [String]) {
+              saveCategorySettings(activeCategories: $activeCategories)
+            }
+          `
+          beforeEach(async () => {
+            await mutate({
+              mutation: saveCategorySettings,
+              variables: { activeCategories: ['cat1', 'cat3', 'cat5', 'cat7'] },
+            })
+          })
+
+          it('returns only the saved active categories', async () => {
+            const result = await query({ query: currentUserQuery, variables })
+            expect(result.data.currentUser.activeCategories).toHaveLength(4)
+            expect(result.data.currentUser.activeCategories).toContain('cat1')
+            expect(result.data.currentUser.activeCategories).toContain('cat3')
+            expect(result.data.currentUser.activeCategories).toContain('cat5')
+            expect(result.data.currentUser.activeCategories).toContain('cat7')
+          })
+        })
+      })
     })
   })
 })

From 5596cd11e90408fac712b8de54bbcb3dc6a195d8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 15:13:14 +0200
Subject: [PATCH 12/22] test saving active categories

---
 webapp/store/auth.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 4ef63e3ea..0147b97ac 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -3,6 +3,7 @@ import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { currentUserQuery } from '~/graphql/User'
 import Cookie from 'universal-cookie'
 import metadata from '~/constants/metadata'
+import { mutations as postMutations } from './posts.js'
 
 const cookies = new Cookie()
 
@@ -16,6 +17,9 @@ export const state = () => {
 
 export const mutations = {
   SET_USER(state, user) {
+    if (user.activeCategories) {
+      console.log(user.activeCategories)
+    }
     state.user = user || null
   },
   SET_TOKEN(state, token) {

From a65e306b85ebac8b705a79b430fd87698c4170a8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 16:04:09 +0200
Subject: [PATCH 13/22] all categories saved returns empty array

---
 backend/src/schema/resolvers/user_management.js   | 15 ++++++++++-----
 .../src/schema/resolvers/user_management.spec.js  |  9 ++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index 71517dd05..d88eafdae 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -21,16 +21,21 @@ export default {
           `
             MATCH (user:User {id: $id})
             OPTIONAL MATCH (category:Category) WHERE NOT ((user)-[:NOT_INTERESTED_IN]->(category))
-            WITH user, [(user)<-[:OWNED_BY]-(medium:SocialMedia) | properties(medium) ] as media, category
-            RETURN user {.*, socialMedia: media, activeCategories: collect(category.id) } as user
+            OPTIONAL MATCH (cats:Category)
+            WITH user, [(user)<-[:OWNED_BY]-(medium:SocialMedia) | properties(medium) ] AS media, category, toString(COUNT(cats)) AS categoryCount
+            RETURN user {.*, socialMedia: media, activeCategories: collect(category.id) } AS user, categoryCount
           `,
           { id: user.id },
         )
-        log(result)
-        return result.records.map((record) => record.get('user'))
+        const [categoryCount] = result.records.map((record) => record.get('categoryCount'))
+        const [currentUser] = result.records.map((record) => record.get('user'))
+        // frontend expects empty array when all categories are selected
+        if (currentUser.activeCategories.length === parseInt(categoryCount))
+          currentUser.activeCategories = []
+        return currentUser
       })
       try {
-        const [currentUser] = await currentUserTransactionPromise
+        const currentUser = await currentUserTransactionPromise
         return currentUser
       } finally {
         session.close()
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 4e0cfaa14..e7f2f3ed1 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -189,9 +189,12 @@ describe('currentUser', () => {
           )
         })
 
-        it('returns all categories', async () => {
-          const result = await query({ query: currentUserQuery, variables })
-          expect(result.data.currentUser.activeCategories).toHaveLength(categories.length)
+        it('returns empty array for all categories', async () => {
+          await respondsWith({
+            data: {
+              currentUser: expect.objectContaining({ activeCategories: [] }),
+            },
+          })
         })
 
         describe('with categories saved for current user', () => {

From b323d0f5806f8afc52688cbfa8aee43d89d4bba1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 20:19:10 +0200
Subject: [PATCH 14/22] set category filter as stored in db after login

---
 webapp/components/LoginForm/LoginForm.vue | 17 +++++++++++++++++
 webapp/store/auth.js                      |  4 ----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index 0d85ca33a..ce2f3338b 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -58,6 +58,7 @@ import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParams
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
 import ShowPassword from '../ShowPassword/ShowPassword.vue'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   components: {
@@ -84,12 +85,28 @@ export default {
     iconName() {
       return this.showPassword ? 'eye-slash' : 'eye'
     },
+    ...mapGetters({
+      currentUser: 'auth/user',
+    }),
   },
   methods: {
+    ...mapMutations({
+      toggleCategory: 'posts/TOGGLE_CATEGORY',
+      resetCategories: 'posts/RESET_CATEGORIES',
+    }),
     async onSubmit() {
       const { email, password } = this.form
       try {
         await this.$store.dispatch('auth/login', { email, password })
+        if (this.currentUser && this.currentUser.activeCategories) {
+          if (this.currentUser.activeCategories.length > 0) {
+            this.currentUser.activeCategories.forEach((categoryId) => {
+              this.toggleCategory(categoryId)
+            })
+          } else {
+            this.resetCategories()
+          }
+        }
         this.$toast.success(this.$t('login.success'))
         this.$emit('success')
       } catch (err) {
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 0147b97ac..4ef63e3ea 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -3,7 +3,6 @@ import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { currentUserQuery } from '~/graphql/User'
 import Cookie from 'universal-cookie'
 import metadata from '~/constants/metadata'
-import { mutations as postMutations } from './posts.js'
 
 const cookies = new Cookie()
 
@@ -17,9 +16,6 @@ export const state = () => {
 
 export const mutations = {
   SET_USER(state, user) {
-    if (user.activeCategories) {
-      console.log(user.activeCategories)
-    }
     state.user = user || null
   },
   SET_TOKEN(state, token) {

From 754251258dd29c0e0522f1ae13e5d14b30c99dee Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 7 Sep 2022 21:50:37 +0200
Subject: [PATCH 15/22] test setting of saved categories

---
 webapp/components/LoginForm/LoginForm.spec.js | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/webapp/components/LoginForm/LoginForm.spec.js b/webapp/components/LoginForm/LoginForm.spec.js
index 430fdbe21..4dfdea50a 100644
--- a/webapp/components/LoginForm/LoginForm.spec.js
+++ b/webapp/components/LoginForm/LoginForm.spec.js
@@ -12,6 +12,8 @@ config.stubs['nuxt-link'] = '<span><slot /></span>'
 config.stubs['locale-switch'] = '<span><slot /></span>'
 config.stubs['client-only'] = '<span><slot /></span>'
 
+const authUserMock = jest.fn().mockReturnValue({ activeCategories: [] })
+
 describe('LoginForm', () => {
   let mocks
   let propsData
@@ -26,10 +28,15 @@ describe('LoginForm', () => {
       storeMocks = {
         getters: {
           'auth/pending': () => false,
+          'auth/user': authUserMock,
         },
         actions: {
           'auth/login': jest.fn(),
         },
+        mutations: {
+          'posts/TOGGLE_CATEGORY': jest.fn(),
+          'posts/RESET_CATEGORIES': jest.fn(),
+        },
       }
       const store = new Vuex.Store(storeMocks)
       mocks = {
@@ -43,20 +50,46 @@ describe('LoginForm', () => {
     }
 
     describe('fill in email and password and submit', () => {
-      const fillIn = (wrapper, opts = {}) => {
+      const fillIn = async (wrapper, opts = {}) => {
         const { email = 'email@example.org', password = '1234' } = opts
         wrapper.find('input[name="email"]').setValue(email)
         wrapper.find('input[name="password"]').setValue(password)
-        wrapper.find('form').trigger('submit')
+        await wrapper.find('form').trigger('submit')
       }
 
-      it('dispatches login with form data', () => {
-        fillIn(Wrapper())
+      it('dispatches login with form data', async () => {
+        await fillIn(Wrapper())
         expect(storeMocks.actions['auth/login']).toHaveBeenCalledWith(expect.any(Object), {
           email: 'email@example.org',
           password: '1234',
         })
       })
+
+      describe('setting saved categories', () => {
+        beforeEach(() => {
+          jest.clearAllMocks()
+        })
+
+        describe('no categories saved', () => {
+          it('resets the categories', async () => {
+            await fillIn(Wrapper())
+            expect(storeMocks.actions['auth/login']).toBeCalled()
+            expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toBeCalled()
+          })
+        })
+
+        describe('categories saved', () => {
+          it('sets the categories', async () => {
+            authUserMock.mockReturnValue({ activeCategories: ['cat1', 'cat9', 'cat12'] })
+            await fillIn(Wrapper())
+            expect(storeMocks.actions['auth/login']).toBeCalled()
+            expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledTimes(3)
+            expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat1')
+            expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat9')
+            expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat12')
+          })
+        })
+      })
     })
 
     describe('Visibility of password', () => {

From cc5fcb6704f44f9ade66d927cebf55948498277e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 8 Sep 2022 15:17:05 +0200
Subject: [PATCH 16/22] Update webapp/locales/de.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 0a21f0a4d..bc0b720c8 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -365,7 +365,7 @@
     },
     "order-by": "Sortieren nach ...",
     "save": {
-      "error": "Themen konnten nicht gespeichert werden",
+      "error": "Themen konnten nicht gespeichert werden!",
       "success": "Themen gespeichert!"
     }
   },

From 2c4f45ad70f13e7019e9472e390169953d458112 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 8 Sep 2022 15:17:12 +0200
Subject: [PATCH 17/22] Update webapp/locales/en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 22fa73593..b3555378f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -365,7 +365,7 @@
     },
     "order-by": "Order by ...",
     "save": {
-      "error": "Failed saving topic settings",
+      "error": "Failed saving topic settings!",
       "success": "Topics saved!"
     }
   },

From 60627ffcf25018ea2367af0574035435cee303c0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 8 Sep 2022 15:34:29 +0200
Subject: [PATCH 18/22] ensure that selected categories are resteted before
 toggling them to set saved categories

---
 webapp/components/LoginForm/LoginForm.spec.js | 4 ++--
 webapp/components/LoginForm/LoginForm.vue     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/webapp/components/LoginForm/LoginForm.spec.js b/webapp/components/LoginForm/LoginForm.spec.js
index 4dfdea50a..10fc2c622 100644
--- a/webapp/components/LoginForm/LoginForm.spec.js
+++ b/webapp/components/LoginForm/LoginForm.spec.js
@@ -73,8 +73,8 @@ describe('LoginForm', () => {
         describe('no categories saved', () => {
           it('resets the categories', async () => {
             await fillIn(Wrapper())
-            expect(storeMocks.actions['auth/login']).toBeCalled()
             expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toBeCalled()
+            expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).not.toBeCalled()
           })
         })
 
@@ -82,7 +82,7 @@ describe('LoginForm', () => {
           it('sets the categories', async () => {
             authUserMock.mockReturnValue({ activeCategories: ['cat1', 'cat9', 'cat12'] })
             await fillIn(Wrapper())
-            expect(storeMocks.actions['auth/login']).toBeCalled()
+            expect(storeMocks.mutations['posts/RESET_CATEGORIES']).toBeCalled()
             expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledTimes(3)
             expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat1')
             expect(storeMocks.mutations['posts/TOGGLE_CATEGORY']).toBeCalledWith({}, 'cat9')
diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index ce2f3338b..59a6d7a24 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -99,12 +99,11 @@ export default {
       try {
         await this.$store.dispatch('auth/login', { email, password })
         if (this.currentUser && this.currentUser.activeCategories) {
+          this.resetCategories()
           if (this.currentUser.activeCategories.length > 0) {
             this.currentUser.activeCategories.forEach((categoryId) => {
               this.toggleCategory(categoryId)
             })
-          } else {
-            this.resetCategories()
           }
         }
         this.$toast.success(this.$t('login.success'))

From bb0d6329e7e36ea03671318ea8dd128a6d5a5a7a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 8 Sep 2022 16:25:18 +0200
Subject: [PATCH 19/22] add new yunite icons

---
 webapp/assets/_new/icons/svgs/culture.svg     | 20 ++++++++++
 webapp/assets/_new/icons/svgs/energy.svg      | 14 +++++++
 webapp/assets/_new/icons/svgs/finance.svg     | 13 +++++++
 webapp/assets/_new/icons/svgs/health.svg      |  7 ++++
 webapp/assets/_new/icons/svgs/media.svg       |  7 ++++
 .../assets/_new/icons/svgs/miscellaneous.svg  | 13 +++++++
 webapp/assets/_new/icons/svgs/mobility.svg    | 11 ++++++
 webapp/assets/_new/icons/svgs/movement.svg    | 39 +++++++++----------
 webapp/assets/_new/icons/svgs/nature.svg      | 18 +++++++++
 webapp/assets/_new/icons/svgs/networking.svg  | 22 +++++++++++
 webapp/assets/_new/icons/svgs/peace.svg       |  8 ++++
 webapp/assets/_new/icons/svgs/politics.svg    | 12 ++++++
 webapp/assets/_new/icons/svgs/psyche.svg      |  8 ++++
 webapp/assets/_new/icons/svgs/science.svg     | 25 ++++++++++++
 .../assets/_new/icons/svgs/spirituality.svg   | 13 +++++++
 15 files changed, 210 insertions(+), 20 deletions(-)
 create mode 100644 webapp/assets/_new/icons/svgs/culture.svg
 create mode 100644 webapp/assets/_new/icons/svgs/energy.svg
 create mode 100644 webapp/assets/_new/icons/svgs/finance.svg
 create mode 100644 webapp/assets/_new/icons/svgs/health.svg
 create mode 100644 webapp/assets/_new/icons/svgs/media.svg
 create mode 100644 webapp/assets/_new/icons/svgs/miscellaneous.svg
 create mode 100644 webapp/assets/_new/icons/svgs/mobility.svg
 create mode 100644 webapp/assets/_new/icons/svgs/nature.svg
 create mode 100644 webapp/assets/_new/icons/svgs/networking.svg
 create mode 100644 webapp/assets/_new/icons/svgs/peace.svg
 create mode 100644 webapp/assets/_new/icons/svgs/politics.svg
 create mode 100644 webapp/assets/_new/icons/svgs/psyche.svg
 create mode 100644 webapp/assets/_new/icons/svgs/science.svg
 create mode 100644 webapp/assets/_new/icons/svgs/spirituality.svg

diff --git a/webapp/assets/_new/icons/svgs/culture.svg b/webapp/assets/_new/icons/svgs/culture.svg
new file mode 100644
index 000000000..d63e38cb4
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/culture.svg
@@ -0,0 +1,20 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M5.9,25.1c-0.3,0.3-0.3,0.8,0,1.1s0.8,0.3,1.1,0c1.7-1.7,4.5-1.7,6.3,0c0.1,0.1,0.3,0.2,0.5,0.2s0.4-0.1,0.5-0.2
+		c0.3-0.3,0.3-0.8,0-1.1C12,22.8,8.2,22.8,5.9,25.1z"/>
+	<path d="M24.4,8.7c0.7-0.7,2-0.7,2.7,0C27.2,8.9,27.4,9,27.6,9c0.2,0,0.4-0.1,0.5-0.2c0.3-0.3,0.3-0.8,0-1.1
+		c-1.3-1.3-3.5-1.3-4.8,0C23,8,23,8.5,23.3,8.7C23.6,9,24.1,9,24.4,8.7z"/>
+	<path d="M16.4,7.7c-0.3,0.3-0.3,0.8,0,1.1c0.3,0.3,0.8,0.3,1.1,0c0.7-0.7,1.9-0.7,2.7,0C20.3,8.9,20.5,9,20.7,9s0.4-0.1,0.5-0.2
+		c0.3-0.3,0.3-0.8,0-1.1C19.9,6.4,17.7,6.4,16.4,7.7z"/>
+	<path d="M31.4,0.8c-0.2-0.1-0.5-0.2-0.7-0.1c-2,0.8-5.1,1.2-8.4,1.2s-6.4-0.4-8.4-1.2c-0.2-0.1-0.5-0.1-0.7,0.1
+		c-0.2,0.1-0.3,0.4-0.3,0.6v9.9c-1,0.1-1.9,0.1-3,0.1c-3.3,0-6.4-0.4-8.4-1.2c-0.2-0.1-0.5-0.1-0.7,0.1c-0.2,0.1-0.3,0.4-0.3,0.6
+		l0,11.5c0,5.2,4.2,9.4,9.4,9.4s9.4-4.2,9.4-9.4V22c0.7,0.3,1.6,0.4,3,0.4c5.2,0,9.4-4.2,9.4-9.4V1.4C31.7,1.2,31.6,0.9,31.4,0.8z
+		 M9.9,30.4c-4.4,0-7.9-3.6-7.9-7.9V12c2.1,0.6,4.9,1,7.9,1c2.7,0,5.2-0.3,7.3-0.8l0.5-0.1c0,1.6,0,2.9,0,4c0,1.3,0,2.4,0.1,3.2v3.2
+		C17.8,26.8,14.2,30.4,9.9,30.4z M30.2,13c0,4.4-3.6,7.9-7.9,7.9c-2.1,0-2.8,0-3-1.7v-2.8c0.9,0.5,1.9,0.8,3,0.8
+		c1.6,0,3.1-0.6,4.2-1.7c0.3-0.3,0.3-0.8,0-1.1s-0.8-0.3-1.1,0c-0.8,0.8-2,1.3-3.1,1.3c-1.1,0-2.1-0.4-3-1.2v-3.6
+		c0-0.2-0.1-0.5-0.3-0.6c-0.2-0.1-0.5-0.2-0.7-0.1c-0.4,0.2-0.9,0.3-1.4,0.4l-2.5,0.4V2.5c2.1,0.6,4.9,1,7.9,1c3,0,5.8-0.3,7.9-1V13
+		z"/>
+	<path d="M10.9,17.7c-0.3,0.3-0.3,0.8,0,1.1s0.8,0.3,1.1,0c0.7-0.7,2-0.7,2.7,0c0.1,0.1,0.3,0.2,0.5,0.2s0.4-0.1,0.5-0.2
+		c0.3-0.3,0.3-0.8,0-1.1C14.4,16.4,12.2,16.4,10.9,17.7z"/>
+	<path d="M7.7,18.7C7.9,18.9,8.1,19,8.3,19s0.4-0.1,0.5-0.2c0.3-0.3,0.3-0.8,0-1.1c-1.3-1.3-3.5-1.3-4.8,0c-0.3,0.3-0.3,0.8,0,1.1
+		s0.8,0.3,1.1,0C5.8,18,7,18,7.7,18.7z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/energy.svg b/webapp/assets/_new/icons/svgs/energy.svg
new file mode 100644
index 000000000..5035a5586
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/energy.svg
@@ -0,0 +1,14 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32">
+<path d="M27.6,19.7L26.8,19c-3-2.8-4.8-4.4-5.2-4.6c-0.9-0.6-2.9-0.5-3.6-0.4c-0.2-0.5-0.5-0.9-0.9-1.2V2.2
+	c0-1-0.7-1.6-1.3-1.6c-0.6-0.1-1.4,0.4-1.6,1.4c-0.1,0.5-0.3,1.4-0.5,2.4c-0.6,2.9-1,5-1,5.4c-0.1,1.1,1.1,2.8,1.5,3.3
+	c-0.3,0.4-0.5,0.9-0.5,1.4c0,0,0,0,0,0.1c-0.9,0.6-7.3,5-8.7,6c-0.8,0.6-0.9,1.4-0.6,2c0.2,0.4,0.7,0.7,1.2,0.7
+	c0.3,0,0.5-0.1,0.8-0.2c1.5-0.6,6.7-2.9,7.4-3.2c0.2-0.1,0.4-0.3,0.6-0.5l-1.3,11c0,1,2.3,1,2.8,1s2.8,0,2.8-1.1l-1.4-13.5
+	c1.8,1.1,7.2,4.4,8.6,5.2c0.3,0.2,0.7,0.3,0.9,0.3c0.5,0,0.9-0.2,1.1-0.5C28.5,21.4,28.5,20.5,27.6,19.7z M14.8,14.6
+	c0-0.8,0.6-1.2,1.2-1.2c0.6,0,1.2,0.6,1.2,1.2c0,0.8-0.6,1.2-1.2,1.2C15.2,15.8,14.8,15.2,14.8,14.6z M14.8,4.7c0.2-1,0.4-2,0.5-2.5
+	c0.1-0.5,0.3-0.7,0.5-0.6c0.2,0,0.4,0.2,0.4,0.6v10.2c-0.1,0-0.1,0-0.2,0c-0.3,0-0.6,0.1-0.9,0.2c-0.6-0.8-1.4-2-1.3-2.7
+	C13.8,9.5,14.4,6.5,14.8,4.7z M13.5,19.1c-0.6,0.3-5.8,2.6-7.3,3.2c-0.4,0.2-0.7,0.1-0.8-0.1c-0.1-0.2,0-0.4,0.3-0.7
+	c1.3-0.9,6.9-4.8,8.4-5.8c0.2,0.3,0.5,0.6,0.8,0.8C14.6,17.4,13.9,18.8,13.5,19.1z M16,30.4c-0.6,0-1.4-0.1-1.8-0.2l1.6-13.4
+	c0,0,0.1,0,0.1,0c0.1,0,0.3,0,0.4,0l1.4,13.4C17.4,30.3,16.6,30.4,16,30.4z M27.3,21.3c-0.1,0.1-0.4,0.2-0.7,0
+	c-1.5-0.9-7.2-4.4-8.8-5.3c0.2-0.3,0.3-0.6,0.4-0.9c1-0.1,2.5-0.1,3,0.3c0.4,0.2,3.6,3.2,5,4.5l0.8,0.7
+	C27.3,20.8,27.4,21.1,27.3,21.3z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/finance.svg b/webapp/assets/_new/icons/svgs/finance.svg
new file mode 100644
index 000000000..74081bc6a
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/finance.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32">
+	<rect x="8.1" y="13.3" width="1.5" height="1.9"/>
+	<path d="M31.9,17.9L31.9,17.9l0-0.6c-0.2-5.5-4.1-10.3-9.5-11.6c-0.2,0-0.8-0.2-0.8-0.2c-3.1-0.6-6.3-0.5-9.5,0.1
+		c-0.3,0.1-0.6,0.1-0.9,0.2C10.6,5.7,10,5.4,9.7,5.4L9.5,5.3C8.7,5,7.6,4.6,6.8,5.1C6,5.7,6,6.7,6.2,7.3l0.3,1.2
+		C5.1,9.7,4,11.2,3.3,12.8c-0.4,0.8-0.8,0.8-1.2,0.8c-0.1,0-0.2,0-0.3,0H0l0,5.5l0.6,0.1c0,0,1.1,0.2,1.6,1C2.5,20.7,2.7,21,3,22.3
+		c1.1,3.4,3.6,5.3,4.6,5.9l0,3.9H12l2.6-3.4h6.1l1.7,3.4h4.9v-4.6l0.4-0.4c2.5-2.2,3.9-5.2,4.1-8.5l0-0.4
+		C31.9,18.1,31.9,18,31.9,17.9z M26.7,25.9l-0.9,0.9v3.8h-2.5l-1.7-3.4h-7.7l-2.6,3.4H9.1l0-3.2l-0.4-0.2c0,0-3.1-1.7-4.2-5.3
+		c-0.4-1.4-0.6-1.8-1-2.3c-0.5-0.9-1.4-1.3-2-1.5v-2.8l0.6,0c0.5,0,1.8,0,2.6-1.7c0.5-1.2,1.3-2.3,2.2-3.3c0.8-0.8,1.3-1,1.1-1.5
+		l0,0L7.6,7c-0.1-0.2-0.1-0.5,0-0.6c0.2-0.1,1,0.1,1.4,0.3l0.3,0.1c0.3,0.1,0.9,0.4,1.7,0.6l0.2,0.1l0.3-0.1c0.3-0.1,0.7-0.2,1-0.2
+		c3-0.6,5.9-0.6,8.9-0.1c0,0,0.6,0.1,0.8,0.1c4.7,1.1,8.2,5.3,8.4,10.1l0,0.8c-0.1,1.3-1.2,2.4-2.5,2.4c-1,0-1.9-0.9-1.9-2
+		c0-0.8,0.6-1.4,1.4-1.4v-1.5c-1.6,0-2.9,1.3-2.9,2.9c0,1.9,1.5,3.5,3.4,3.5c0.7,0,1.3-0.2,1.8-0.5C29.1,23.2,28.1,24.7,26.7,25.9z"
+		/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/health.svg b/webapp/assets/_new/icons/svgs/health.svg
new file mode 100644
index 000000000..acf50d7c1
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/health.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M26.1,20.7c-2.9,5.1-9.3,8.8-10.8,9.6c-2.1-1.1-13.7-7.8-13.7-16.1c0-3.6,2.8-6.5,6.5-6.5c2.6,0,4.9,1.5,5.9,3.9l0.7,1.7
+		l0.7-1.7c1-2.4,3.3-3.9,5.9-3.9c3.6,0,6.5,2.8,6.5,6.5V15h1.5v-0.8c0-4.5-3.5-8-8-8c-2.7,0-5.2,1.3-6.6,3.5
+		c-1.4-2.2-3.9-3.5-6.6-3.5c-4.5,0-8,3.5-8,8c0,10,14.3,17.3,14.9,17.6l0.3,0.2l0.3-0.2c0.3-0.2,8.3-4.2,11.8-10.4l0.4-0.7L26.5,20
+		L26.1,20.7z"/>
+	<polygon points="22.9,17 19.5,21.2 17,14.5 11.6,19.9 12.6,20.9 16.4,17.2 19,24.2 23.6,18.5 31.9,18.5 31.9,17 	"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/media.svg b/webapp/assets/_new/icons/svgs/media.svg
new file mode 100644
index 000000000..d63c98610
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/media.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M31.7,29.2L29.8,23V7.1c0-1.1-1-2.1-2.1-2.1H4.8c-1.1,0-2.1,1-2.1,2.1V23l-2,6.1c-0.2,0.6-0.1,1.3,0.2,1.9
+		c0.4,0.6,1,0.9,1.7,0.9h27.1c0.7,0,1.3-0.3,1.7-0.9C31.8,30.4,31.9,29.7,31.7,29.2z M4.2,7.1c0-0.3,0.3-0.6,0.6-0.6h22.8
+		c0.3,0,0.6,0.3,0.6,0.6v15.3h-24V7.1z M30.2,30.2c-0.1,0.1-0.2,0.2-0.5,0.2H2.6c-0.3,0-0.4-0.2-0.5-0.2C2.1,30,2,29.8,2.1,29.6
+		L4,23.9h24.4l1.8,5.8C30.4,29.8,30.3,30,30.2,30.2z"/>
+	<rect x="13.5" y="27.8" width="5.6" height="1.5"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/miscellaneous.svg b/webapp/assets/_new/icons/svgs/miscellaneous.svg
new file mode 100644
index 000000000..07f8dbe3f
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/miscellaneous.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M7.5,4.9c0.1-0.1,0.2-0.2,0.3-0.2l0.7-0.6l-1-1.4L6.8,3.1C6.7,3.3,6.6,3.4,6.5,3.5L5.8,4.1l1,1.3L7.5,4.9z"/>
+	<path d="M31.5,19.2c0.2-1,0.3-2.1,0.3-3.2c0-8.6-7-15.8-15.8-15.8c-1.7,0-3.3,0.2-5,0.8l-0.8,0.2l0.6,1.6l0.8-0.2
+		c1.5-0.5,3-0.7,4.5-0.7c3.6,0,6.9,1.4,9.4,3.7C22.7,6,21.3,7.3,21,9.7c-0.2,1.3,0.6,2.4,1.4,3.3c0.3,0.5,1,1.3,0.9,1.5
+		c0,0.2-0.2,0.3-0.6,0.6c-0.8,0.6-2,1.3-1.7,3.6c0.2,1.6,0.9,2.8,2.2,3.1c0.2,0.1,0.6,0.1,0.8,0.1c1,0,2.1-0.6,2.9-1.5
+		c0.8-1,0.8-1,2-0.5c0.2,0.1,0.4,0.2,0.6,0.3c-1.8,5.7-7.1,9.8-13.4,9.8c-1.7,0-3.4-0.3-4.9-0.9l-0.1-0.1c-0.7-1.8,1-4.3,2.9-5.9
+		c2.1-1.8,2.9-4.6,2.1-7.1c-0.5-1.2-1.4-2.1-2.7-2.3C12,13.5,10.6,14,9.7,15c-1,1.3-1.8,2-3,2c-1.3-0.1-3.3-2-4.3-3.1l-0.2-0.3
+		c0.4-2.1,1.2-4,2.4-5.7L5,7.2l-1.4-1L3.1,6.8c-1.8,2.8-2.9,5.9-2.9,9.2c0,8.6,7.1,15.8,15.9,15.8c7.3,0,13.5-5.1,15.2-11.9
+		L31.5,19.2L31.5,19.2z M2,16.1c0,0,0-0.1,0-0.1c1.1,1.1,2.9,2.6,4.5,2.6c2.1,0.1,3.3-1.3,4.5-2.5c0.5-0.6,1.3-0.8,2.1-0.7
+		c0.3,0.1,1,0.3,1.3,1.2c0.6,1.8,0,4-1.5,5.3c-0.9,0.9-3.7,3.6-3.5,6.5C5,26,2,21.3,2,16.1z M29.6,18.4c-1.7-0.9-2.7-1-4.1,0.9
+		c-0.6,0.7-1.3,1-1.8,0.9s-0.8-0.7-0.9-1.6c-0.1-1.3,0.3-1.5,0.9-2c0.5-0.3,1-0.7,1.3-1.5c0.3-1.2-0.5-2.2-1.2-3.1
+		c-0.5-0.7-1.2-1.5-1-2.1c0.1-1,0.3-2.6,4.3-2.7c1.9,2.4,3.1,5.5,3.1,8.8c0,0.8-0.1,1.6-0.2,2.4C29.8,18.4,29.7,18.4,29.6,18.4z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/mobility.svg b/webapp/assets/_new/icons/svgs/mobility.svg
new file mode 100644
index 000000000..9e36ec21e
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/mobility.svg
@@ -0,0 +1,11 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="32px" height="32px" viewBox="0 0 32 32">
+<path d="M31.8,20c0-6.8-5.6-9.1-8.2-9.1h-3.2c-0.3-1.6-1.7-2.9-3.5-2.9h-2.2v1.1h-3.4v1.5h3.4v2.1h-3.4v1.5h3.4v0.9h2.2
+	c1.7,0,3.1-1.2,3.4-2.7h3.3c1.3,0,6.7,1.3,6.7,7.6c0,6.9-7.2,7.2-7.2,7.2h-0.8h-0.1V28c0,1.3-1.1,2.4-2.5,2.4
+	c-1.4,0-2.5-1.1-2.5-2.4v-0.8H8.6V28c0,1.3-1.1,2.4-2.4,2.4c-1.5,0-2.4-1.2-2.4-2.4v-0.8H1.8v-2.6c0-0.1,0-0.8,0.5-1
+	c0.5-0.1,1.3-0.4,2.2-0.7c0.5-0.2,1.1-0.4,1.2-0.4c0.4,0,0.8-0.3,1.4-1l0.1-0.1c0.1-0.1,0.5-0.7,0.9-1.1c0.8-0.9,1-1.2,1.1-1.4
+	c0.1-0.1,0.5-0.4,1-0.4h8.6c0.6,0,0.8,0.2,1,0.4c0.4,0.5,1.9,2.5,1.9,2.5l1.2-0.9c0,0-1.5-2-1.9-2.5c-0.5-0.7-1.2-1-2.2-1h-8.6
+	c-1,0-2,0.6-2.2,1.1c-0.1,0.1-0.6,0.8-1,1.2c-0.5,0.6-0.8,1-0.9,1.2c-0.2,0.2-0.5,0.4-0.6,0.6c-0.2,0-0.5,0.2-1.5,0.5
+	c-0.7,0.3-1.6,0.6-2,0.7c-1,0.3-1.7,1.2-1.7,2.4v4.1h2.2c0.3,1.8,1.9,3.2,3.8,3.2c1.9,0,3.5-1.4,3.9-3.2h5.7
+	c0.3,1.8,1.9,3.2,3.9,3.2c1.9,0,3.5-1.4,3.9-3.2C26.2,28.5,31.8,26.6,31.8,20z M16.9,13.6h-0.8V9.6h0.8c1.1,0,2.1,0.9,2.1,2
+	S18,13.6,16.9,13.6z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/movement.svg b/webapp/assets/_new/icons/svgs/movement.svg
index ac5cd9cc0..81052875d 100644
--- a/webapp/assets/_new/icons/svgs/movement.svg
+++ b/webapp/assets/_new/icons/svgs/movement.svg
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24.3px" viewBox="0 0 24 24.3" style="enable-background:new 0 0 24 24.3;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#333333;}
-</style>
-<g>
-	<circle class="st0" cx="17.1" cy="2.9" r="2.9"/>
-	<path class="st0" d="M23.5,5.6L23.5,5.6c-0.6-0.5-1.4-0.5-2,0.1l-2.7,3l-2.2-1.4c0.1,0.3,0.1,0.6,0.1,0.9c0,0.6-0.2,1.1-0.5,1.6
-		L16,10.2l1.5,1c0.4,0.3,0.9,0.4,1.4,0.4c0.1,0,0.2,0,0.4,0c0.6-0.1,1.2-0.4,1.6-0.9l2.7-3.1C24.2,7,24.1,6.1,23.5,5.6z"/>
-	<path class="st0" d="M6.5,17c-0.3-0.2-0.5-0.5-0.7-0.8c0,0,0,0,0,0L4.6,19l-4,2.7C0,22.1-0.2,23,0.2,23.6l0,0
-		c0.4,0.6,1.3,0.8,1.9,0.4l4.7-3.2l1.4-3.3l-0.7-0.1C7.2,17.4,6.8,17.2,6.5,17z"/>
-	<path class="st0" d="M16.3,15.1l-4.4-0.5l3.5-4.7l0.3-0.4C16,9,16.2,8.6,16.2,8.2c0-0.7-0.4-1.4-1-1.7c-0.1,0-0.1-0.1-0.2-0.1
-		l-1.8-0.7L9.4,4.4C9.1,4.3,8.8,4.3,8.5,4.3c-0.3,0-0.5,0-0.8,0.1c-0.5,0.2-1,0.5-1.3,0.9L3.7,8.5C3.2,9.1,3.3,10,3.9,10.5l0,0
-		c0.3,0.2,0.6,0.3,0.9,0.3c0.4,0,0.8-0.2,1.1-0.5L8.6,7L11.4,8l-4.8,6.5l0,0c-0.1,0.1-0.1,0.3-0.2,0.4c-0.2,0.8,0.4,1.7,1.3,1.8
-		l0.9,0.1l6.9,0.9l-1.7,2.7c-0.4,0.7-0.2,1.5,0.5,1.9h0c0.2,0.1,0.5,0.2,0.7,0.2c0.5,0,0.9-0.2,1.2-0.7l2-3.2
-		c0.4-0.7,0.5-1.6,0.1-2.3C17.8,15.7,17.1,15.2,16.3,15.1z"/>
-</g>
-</svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M16,9.9c-2.7,0-4.8-2.2-4.8-4.8s2.2-4.8,4.8-4.8c2.7,0,4.8,2.2,4.8,4.8S18.6,9.9,16,9.9z M16,1.8c-1.8,0-3.3,1.5-3.3,3.3
+		s1.5,3.3,3.3,3.3c1.8,0,3.3-1.5,3.3-3.3S17.8,1.8,16,1.8z"/>
+	<path d="M19.6,32c-3.3,0-5.4-0.1-6-0.3c-2.6-1.1-2.6-2.5-2.4-3.1c0.5-2,4.1-3.1,8.7-2.6l0.3,0c0.4,0,0.8,0.3,0.8,0.8
+		s-0.3,0.8-0.8,0.8h-0.3c-4.7-0.4-7,0.8-7.1,1.5c-0.1,0.3,0.4,0.9,1.5,1.4c0.8,0.3,7.5,0.2,10.1,0.2c0.7,0,1.3,0,1.7,0
+		c0.6,0,1.3-0.5,1.3-1.3c0-1.6-2-3.1-3.6-4.2c-0.5-0.3-0.9-0.7-1.3-1c-0.2-0.2-0.4-0.4-0.7-0.6c-0.9-0.8-1.9-1.5-2-2.5
+		c-0.1-0.5,0-1.1,0.2-1.8c0.2-0.6,0.3-1.2,0.3-2c0-0.4,0.3-0.7,0.6-0.7c0.4-0.1,0.7,0.1,0.8,0.5c0.9,2.3,1.4,2.7,2.7,3.9
+		c0.6,0.5,1.3,1.1,2.4,2.1c0.5,0.5,1.2,0.5,1.6,0c0.2-0.2,0.3-0.5,0.3-0.8s-0.1-0.5-0.3-0.8l-2.9-2.8c-1.3-1.2-1.9-2.8-2.5-4
+		c-0.7-1.7-1.1-2.5-2.1-2.5h-9c-0.9,0-1.3,0.7-2.1,2.5c-0.5,1.2-1.2,2.8-2.5,4l-2.9,2.8c-0.2,0.2-0.3,0.5-0.3,0.8
+		c0,0.3,0.1,0.5,0.3,0.8c0.5,0.5,1.2,0.5,1.6,0c0.5-0.5,1-1,1.6-1.5c1.6-1.3,3.2-2.7,3.5-4.4c0.1-0.4,0.4-0.6,0.8-0.6
+		c0.4,0,0.7,0.4,0.7,0.7c0,0.8,0.2,1.4,0.3,2c0.2,0.6,0.3,1.3,0.2,1.9c-0.2,0.9-1.2,1.7-2.1,2.5c-0.2,0.2-0.4,0.3-0.5,0.5
+		c-0.4,0.3-0.8,0.7-1.3,1c-1.6,1.2-3.6,2.7-3.6,4.2c0,0.6,0.5,1.3,1.3,1.3h4c0.4,0,0.8,0.3,0.8,0.8S11.3,32,10.9,32h-4
+		c-1.5,0-2.8-1.3-2.8-2.8c0-2.4,2.3-4.1,4.2-5.5c0.4-0.3,0.9-0.6,1.2-0.9c0.2-0.1,0.3-0.3,0.5-0.5c0.7-0.6,1.5-1.3,1.6-1.7
+		c0.1-0.2,0-0.6-0.1-1c-0.8,1.1-1.9,2-2.9,2.9c-0.6,0.5-1.1,0.9-1.5,1.4c-1.1,1.1-2.7,1.1-3.7,0c-0.5-0.5-0.8-1.2-0.8-1.8
+		s0.3-1.3,0.8-1.8l2.9-2.8c1.1-1,1.6-2.3,2.1-3.5c0.7-1.7,1.4-3.4,3.5-3.4h9c2,0,2.7,1.7,3.5,3.4c0.5,1.2,1.1,2.5,2.1,3.5l2.9,2.8
+		c0.5,0.5,0.8,1.2,0.8,1.8s-0.3,1.3-0.8,1.8c-1.1,1.1-2.7,1-3.7,0c-1-0.9-1.7-1.5-2.3-2c-0.9-0.8-1.5-1.3-2.1-2.3
+		c-0.1,0.4-0.2,0.8-0.2,1c0.1,0.5,0.9,1.1,1.5,1.6c0.2,0.2,0.5,0.4,0.7,0.6c0.3,0.3,0.8,0.6,1.2,0.9c1.9,1.4,4.2,3.1,4.2,5.5
+		c0,1.5-1.3,2.8-2.8,2.8c-0.3,0-0.9,0-1.7,0C22.5,32,20.9,32,19.6,32z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/nature.svg b/webapp/assets/_new/icons/svgs/nature.svg
new file mode 100644
index 000000000..d40250af4
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/nature.svg
@@ -0,0 +1,18 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M31,20.4c-0.4-0.3-1-0.5-1.6-0.5l-0.2-0.4c-0.5-1.4-2.1-1.6-3.6-1.1c-0.2,0.1-0.6,0.3-1,0.6c-0.7-0.8-2-0.9-3.2-0.5
+		c-0.5,0.2-1.8,0.9-2.5,1.3c-2.6-0.5-5.8-1.1-6.5-1.2c-2-0.2-3.3-0.2-4.9,0.3c-0.6,0.2-5.2,2.3-6.1,2.7L0.9,22l0.6,1.4l0.7-0.3
+		c2.5-1.2,5.5-2.5,5.9-2.6c1.4-0.4,2.4-0.4,4.3-0.2c0.9,0.1,8.1,1.5,9.4,1.8c0.9,0.2,0.9,0.7,0.9,0.8c0,0.3-0.1,0.4-0.1,0.4
+		s0,0-0.1,0h-8.6v1.5h2l0.5,0.3c0.1,0,1.4,0.9,2.4,1.3c1,0.4,2,0.4,2.7-0.2c2.6-1.7,6.7-4.4,7-4.6c0.6-0.4,1.4-0.4,1.6-0.2
+		c0.1,0.1,0.2,0.2,0.2,0.3s-0.1,0.2-0.2,0.3c-2.8,2-10.3,7.5-11.2,8c-1.2,0.7-2.8,0.3-3.6,0.1c-1.2-0.4-7.1-2.5-7.6-2.7
+		c-0.7-0.2-2.4-0.6-3.9,0C2.7,28,1,29,0.9,29l-0.7,0.3l0.7,1.3l0.7-0.3c0,0,1.7-0.9,2.8-1.4c0.9-0.4,2.2-0.2,2.6,0
+		c0.5,0.2,6.4,2.3,7.7,2.7c0.5,0.1,1.3,0.3,2.2,0.3c0.8,0,1.7-0.2,2.5-0.3c1.1-0.6,10.9-7.8,11.3-8.1c0.5-0.4,0.8-0.9,0.8-1.5
+		S31.5,20.8,31,20.4z M22,20c0,0,0.7-0.2,1.2-0.1c-0.4,0.3-0.8,0.5-1.1,0.7c0,0,0,0,0,0c-0.2-0.1-0.5-0.1-0.9-0.2
+		C21.6,20.2,21.9,20.1,22,20z M19.3,25.2c-0.2-0.1-0.4-0.2-0.6-0.3h2.1c-0.1,0.1-0.2,0.2-0.3,0.2C20.3,25.3,19.9,25.5,19.3,25.2z
+		 M24.2,22.7c0-0.5-0.2-0.9-0.5-1.2c1.2-0.7,2.4-1.5,2.7-1.6c0,0,1.4-0.4,1.7,0.3l0,0.1c-0.2,0.1-0.3,0.1-0.5,0.2
+		C27.5,20.5,25.8,21.6,24.2,22.7z"/>
+	<path d="M15.9,16c3,0,4.5-1.3,5.3-2.3c1.3,1.4,1.5,3,1.5,3.1l0.1,0.7l1.6-0.1l-0.1-0.7c-0.1-0.1-0.3-2.5-2.5-4.4
+		c0.4-1.6,0.1-3.5-1-4.9c-2.2-2.7-5.4-2.9-8.6-2.8c-2.9,0-4.6,0-6.4-0.9L4.9,3.2L4.7,4.2C4.3,6.3,5.2,9,7.1,11.5
+		C9.4,14.4,12.7,16,15.9,16z M12.3,6.1c3-0.1,5.7,0,7.4,2.2c0.7,0.8,1,2,0.8,3c-2-1.1-4-1.6-5.6-2.1c-1.2-0.3-2.3-0.6-2.7-1
+		l-0.6-0.5l-1,1.1l0.6,0.5c0.7,0.6,1.9,0.9,3.4,1.3c1.6,0.4,3.6,1,5.5,2.1c-0.7,1.2-2.1,1.8-4.1,1.8c-2.8,0-5.6-1.4-7.6-4
+		C7,8.9,6.2,7,6.2,5.5C8,6.1,9.7,6.1,12.3,6.1z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/networking.svg b/webapp/assets/_new/icons/svgs/networking.svg
new file mode 100644
index 000000000..b8d35da69
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/networking.svg
@@ -0,0 +1,22 @@
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+<path d="M31.6,16c-0.6-6.4-1.9-6.4-2.4-6.4c-0.4,0-0.8,0.1-1.1,0.4c-0.8,0.8-0.8,2.5-0.8,4.2c0,0.5,0,1.2,0,1.7h-0.1
+	C26,15.5,25.1,17,24.5,18c-0.1,0.2-0.2,0.4-0.3,0.5c-0.8,0.9-1.2,1.2-2.2,2c-0.4,0.4-1,0.6-1.5,0.9c-0.6,0.3-1.2,0.6-1.8,1.1
+	c-2.3,1.9-1.8,4.1-1.4,6.1c0.2,0.8,0.3,1.5,0.3,2.3v0.8h1.5v-0.8c0-0.9-0.2-1.7-0.4-2.6c-0.4-2.1-0.6-3.4,0.9-4.6
+	c0.4-0.4,1-0.6,1.5-0.9c0.6-0.3,1.2-0.6,1.8-1.1c1-0.8,1.5-1.2,2.4-2.2c0.1-0.1,0.3-0.4,0.4-0.7c0.2-0.3,0.7-1.2,1-1.4
+	c0.3,0.2,0.4,1.3,0.3,1.7c-0.3,1-1.1,1.9-1.9,2.8c-0.7,0.8-1.4,1.6-1.8,2.5L23,25l1.3,0.7l0.3-0.7c0.4-0.7,1-1.4,1.6-2.2
+	c0.9-1,1.8-2.1,2.2-3.3c0.2-0.5,0.2-1.4-0.1-2.2c0.4-0.5,0.4-1.4,0.4-3c0-0.8,0-2.5,0.3-3c0.3,0.5,0.7,1.8,1,4.9
+	c0.2,2,0.2,4.8-1.2,7.1c-0.5,0.9-1.3,1.7-2,2.4c-1.3,1.4-2.7,2.9-3,5.2l-0.1,0.7l1.5,0.2l0.1-0.7c0.2-1.7,1.4-3,2.6-4.3
+	c0.8-0.8,1.5-1.7,2.2-2.7C31.9,21.4,31.9,18.2,31.6,16z"/>
+<path d="M26.3,7.2c0-2.9-2.4-5.2-5.2-5.2c-2.4,0-3.9,1.4-4.5,2c-0.6-0.6-2.1-2-4.5-2C9.3,2,6.9,4.3,6.9,7.1c0,1,0.5,1.9,1,2.4
+	c0.4,0.6,0.8,1,0.8,1l7.4,7.5l0.6,0.6l7.9-7.9C24.6,10.7,26.3,9.2,26.3,7.2z M16.6,16.7l-7-7c0,0-0.4-0.3-0.7-0.8
+	C8.6,8.4,8.3,7.7,8.3,7.2c0-2.1,1.7-3.8,3.8-3.8c2,0,3.9,2,3.9,2L16.6,6l0.5-0.6c0,0,1.9-2,4-2s3.8,1.7,3.8,3.8
+	c0,1.1-1.3,2.5-1.3,2.5L16.6,16.7z"/>
+<path d="M13.4,22.6c-0.6-0.4-1.2-0.8-1.8-1.1c-0.6-0.3-1.1-0.6-1.5-0.9c-1-0.8-1.4-1.2-2.2-2c-0.1-0.1-0.2-0.3-0.3-0.5
+	c-0.6-1-1.5-2.5-2.7-2.1c-0.1,0-0.1,0.1-0.2,0.1c0-0.5,0-1.2,0-1.7c0-1.8,0-3.5-0.8-4.2c-0.3-0.3-0.7-0.4-1-0.4
+	c-0.5,0-1.8,0-2.4,6.4c-0.3,2.2-0.2,5.4,1.4,8.1c0.6,1,1.4,1.9,2.2,2.7c1.3,1.3,2.4,2.6,2.7,4.3L6.9,32l1.5-0.2L8.1,31
+	c-0.3-2.2-1.7-3.7-3.1-5.1c-0.7-0.8-1.5-1.6-2-2.5c-1.4-2.3-1.4-5.2-1.2-7.1c0.3-3.1,0.8-4.5,1-4.9c0.3,0.5,0.3,2.2,0.3,3
+	c0,1.7,0,2.6,0.5,3.1c-0.2,0.8-0.2,1.7-0.1,2.1C4,20.9,4.9,22,5.8,23c0.6,0.7,1.3,1.4,1.6,2.2l0.3,0.7L9,25.2l-0.3-0.7
+	c-0.5-0.9-1.2-1.7-1.8-2.5c-0.8-0.9-1.6-1.8-1.9-2.8c-0.1-0.4,0-1.5,0.3-1.7c0.3,0.2,0.8,1.1,1,1.4s0.3,0.6,0.5,0.7
+	c0.8,0.9,1.4,1.4,2.4,2.2c0.6,0.4,1.2,0.8,1.8,1.1c0.6,0.3,1.1,0.6,1.5,0.9c1.5,1.3,1.3,2.6,0.9,4.6C13.1,29.3,13,30.1,13,31v0.8
+	h1.5V31c0-0.7,0.2-1.5,0.3-2.3C15.2,26.8,15.7,24.5,13.4,22.6z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/peace.svg b/webapp/assets/_new/icons/svgs/peace.svg
new file mode 100644
index 000000000..408601cae
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/peace.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="32px" height="32px">
+<path d="M27.3,5c-1.5-1.5-3.1-2.6-5-3.4c-2-0.8-4-1.2-6.2-1.2c-2.1,0-4.2,0.4-6.2,1.2C8,2.4,6.3,3.5,4.9,5c-1.5,1.5-2.6,3.1-3.4,5
+	c-0.8,2-1.2,4-1.2,6.2c0,2.1,0.4,4.2,1.2,6.2c0.8,1.9,1.9,3.6,3.4,5c1.5,1.5,3.1,2.6,5,3.4c2,0.8,4,1.2,6.2,1.2
+	c2.1,0,4.2-0.4,6.2-1.2c1.9-0.8,3.6-1.9,5-3.4c1.5-1.5,2.6-3.1,3.4-5c0.8-2,1.2-4,1.2-6.2c0-2.1-0.4-4.2-1.2-6.2
+	C29.8,8.1,28.7,6.4,27.3,5z M15.1,2.4v13.4L5.4,25c-2-2.4-3.2-5.5-3.2-8.8C2.2,8.9,7.9,2.9,15.1,2.4z M6.8,26.4l8.3-7.9V30
+	C11.9,29.7,9,28.4,6.8,26.4z M17.1,30V18.5l8.3,7.9C23.1,28.4,20.2,29.7,17.1,30z M26.7,25l-9.7-9.2V2.4c7.2,0.5,12.8,6.5,12.8,13.8
+	C29.9,19.5,28.7,22.6,26.7,25z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/politics.svg b/webapp/assets/_new/icons/svgs/politics.svg
new file mode 100644
index 000000000..35322097d
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/politics.svg
@@ -0,0 +1,12 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M19.3,15.4c0.3,0.2,0.9,0.5,1.1,0.8c0.5,0.6,0.6,1.2,0.6,1.3l0.8,3.1l1.4-0.4l-0.8-3c0-0.1-0.2-0.9-0.9-1.8
+		c-0.5-0.6-1.5-1.1-1.6-1.2l-8.5-4.7l-0.7,1.3L19.3,15.4z"/>
+	<path d="M7.4,19.1c0.4,2.2,2.5,4.1,3.4,4.8l0.9-1.2c-1.7-1.4-2.8-2.9-2.9-4.2l0-0.4l-2.3-1.3L11,7.8c0.1-0.2,0.1-0.4,0-0.6
+		c-0.1-0.2-0.2-0.3-0.4-0.4L6.5,4.9L5.9,6.3l3.4,1.6L4.4,17.9l-3.4-1.6l-0.6,1.4l4.1,1.9c0.1,0,0.2,0.1,0.3,0.1
+		c0.3,0,0.5-0.2,0.7-0.4l0.5-1L7.4,19.1z"/>
+	<path d="M28.9,30.5l-2.8-10.1l-5.6,1.5l-1.1-4c-0.1-0.4-0.5-0.6-0.9-0.5c-0.4,0.1-0.6,0.5-0.5,0.9l2.1,7.6c0.2,0.7-0.2,1.4-1,1.6
+		c-0.3,0.1-0.7,0-0.9-0.1c-0.3-0.2-0.5-0.4-0.6-0.8l-1.4-5c-0.1-0.3-0.4-0.5-0.7-0.6c-0.1,0-2.4,0-3.8-3.5c-0.2-0.4-0.6-0.6-1-0.4
+		c-0.4,0.2-0.6,0.6-0.4,1c1.4,3.4,3.6,4.2,4.6,4.4l0.2,0.9l-6.8,1.9l1.2,4.4l1.4-0.4l-0.8-2.9l5.3-1.5l0.6,2.1
+		c0.2,0.7,0.7,1.3,1.3,1.7c0.4,0.2,0.9,0.4,1.3,0.4c0.3,0,0.5,0,0.8-0.1c1.5-0.4,2.3-1.9,1.9-3.4L21,23.4l4.1-1.1l2.2,8.2h-20V32
+		h24.5v-1.5H28.9z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/psyche.svg b/webapp/assets/_new/icons/svgs/psyche.svg
new file mode 100644
index 000000000..8c285d5ca
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/psyche.svg
@@ -0,0 +1,8 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+<path class="st0" d="M30.8,12C30.5,7.4,27.9,3.5,24,1.8c-2-0.9-4.3-1.4-6.4-1.4v0.1c0,0,0,0,0,0V0.4c-2,0-3.9,0.4-5.7,1.2
+	c-1.8,0.8-3.4,2-4.7,3.6c0,0,0,0,0,0c-0.1,0.1-2.6,3.3-2.5,8.5l-3.4,6.3C1,20.7,1,21.4,1.4,22c0.3,0.6,1,0.9,1.6,0.9h1.9v2.8
+	c0,1.7,1.4,3.1,3.1,3.1h2.8v1.7c0,0.7,0,1.3,0,1.3l1.4,0v-4.3h-4c-1,0-1.9-0.8-1.9-1.9v-4H3.2c-0.5,0-0.8-0.5-0.6-1L6.2,14
+	c-0.2-5,2.2-8,2.2-8c1.2-1.4,2.6-2.5,4.2-3.2c1.5-0.6,3.2-1,4.8-1c2,0,4,0.4,5.9,1.3c3.7,1.6,5.7,5.3,6,9.2c0.1,2.1-0.3,4.3-1.1,6.2
+	c-0.4,1-0.9,1.9-1.5,2.8c-0.3,0.5-1.8,1.9-1.8,2.4c0,0,0,6,0,6.8l0,1.3c0.2,0,1.5,0,1.5,0s0-0.8,0-1.3c0,0,0-5.4,0-6.6
+	c0.2-0.3,0.6-0.7,0.9-1c0.4-0.4,0.6-0.7,0.8-0.9c0.7-1,1.2-2,1.6-3.1C30.5,16.6,30.9,14.3,30.8,12z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/science.svg b/webapp/assets/_new/icons/svgs/science.svg
new file mode 100644
index 000000000..9d3211223
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/science.svg
@@ -0,0 +1,25 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M28.4,16.1c1-1.7,1.9-3.3,2.5-4.9c1.5-4,1.3-7.3-0.6-9.2C27.5-0.8,22,0.1,16.1,3.7C10.3,0.1,4.7-0.8,2,1.9
+		c-2.8,2.8-1.9,8.3,1.8,14.1c-3.3,5.3-4.4,10.4-2.5,13.4C1.5,29.7,1.7,30,2,30.2c1.1,1.1,2.6,1.6,4.4,1.6c1.4,0,3-0.3,4.8-1
+		c1.6-0.6,3.2-1.4,4.9-2.5c2.6,1.6,5.1,2.7,7.4,3.2c0,0,0.1,0,0.1,0c0.3,0.1,0.7,0.1,1,0.2c0.1,0,0.1,0,0.2,0c0.4,0,0.7,0.1,1,0.1
+		c0,0,0,0,0,0c0,0,0,0,0,0c0.3,0,0.5,0,0.8-0.1c0.2,0,0.4,0,0.5,0c0.3,0,0.6-0.1,0.9-0.2c0.1,0,0.2,0,0.3-0.1
+		c0.3-0.1,0.5-0.2,0.8-0.4c0.1,0,0.2-0.1,0.3-0.1c0.3-0.2,0.6-0.4,0.9-0.7c1.9-1.9,2.1-5.2,0.6-9.2C30.3,19.4,29.5,17.7,28.4,16.1z
+		 M29.5,21.5c1.3,3.4,1.1,6.2-0.3,7.6c-0.2,0.2-0.4,0.3-0.6,0.5c-0.2,0.1-0.4,0.2-0.6,0.3c0,0-0.1,0-0.1,0.1
+		c-0.3,0.1-0.5,0.2-0.8,0.2c0,0,0,0,0,0c-0.3,0.1-0.6,0.1-0.9,0.1c0,0,0,0,0,0c-0.3,0-0.6,0-0.8,0c-0.1,0-0.1,0-0.2,0
+		c-0.2,0-0.5-0.1-0.7-0.1c-0.2,0-0.3,0-0.5-0.1c-0.1,0-0.3-0.1-0.4-0.1c-0.3-0.1-0.6-0.1-0.9-0.2c0,0-0.1,0-0.1,0
+		c-1.5-0.5-3.2-1.3-4.9-2.3c1.9-1.3,3.7-2.8,5.4-4.6c1.7-1.7,3.3-3.6,4.6-5.5C28.3,18.8,29,20.2,29.5,21.5z M5.6,16.1
+		c1.3-1.9,2.9-3.9,4.7-5.8c1.9-1.9,3.8-3.5,5.8-4.7c0,0,0,0,0.1,0c0.1,0.1,0.2,0.2,0.4,0.2c0.4,0.3,0.8,0.6,1.2,0.8c0,0,0,0,0.1,0.1
+		c0.4,0.3,0.8,0.6,1.2,1c0.1,0.1,0.2,0.2,0.4,0.3c0.3,0.3,0.6,0.5,0.9,0.8c0.1,0.1,0.2,0.2,0.4,0.3c0.4,0.4,0.8,0.8,1.2,1.2
+		c1.8,1.8,3.5,3.8,4.8,5.8c-1.3,2-2.9,3.9-4.8,5.8c-1.8,1.8-3.8,3.4-5.8,4.8c-1.9-1.3-3.9-2.9-5.8-4.8C8.5,20,6.9,18,5.6,16.1z
+		 M25.8,1.8c1.4,0,2.6,0.4,3.4,1.2c1.4,1.4,1.5,4.2,0.3,7.6c-0.5,1.3-1.2,2.7-2,4c-1.3-1.9-2.8-3.7-4.6-5.5
+		c-1.8-1.8-3.6-3.3-5.4-4.6C20.6,2.8,23.5,1.8,25.8,1.8z M3,3c0.2-0.2,0.4-0.4,0.7-0.5C3.8,2.4,3.9,2.4,4,2.3
+		c0.1-0.1,0.3-0.1,0.4-0.2C4.6,2.1,4.8,2,4.9,2c0.1,0,0.3-0.1,0.4-0.1c0.2,0,0.4,0,0.5,0c0.1,0,0.3,0,0.4,0c0.3,0,0.6,0,1,0.1
+		c0.1,0,0.1,0,0.2,0C7.8,1.9,8.1,2,8.4,2c0.1,0,0.2,0,0.3,0.1c0.3,0.1,0.7,0.2,1,0.3c0,0,0.1,0,0.1,0c0.4,0.1,0.8,0.3,1.2,0.4
+		c0.1,0,0.2,0.1,0.3,0.1c0.3,0.1,0.6,0.3,0.9,0.4c0.1,0,0.2,0.1,0.3,0.1c0.4,0.2,0.8,0.4,1.1,0.6c0,0,0.1,0,0.1,0
+		c0.4,0.2,0.7,0.4,1.1,0.6c-1.8,1.3-3.7,2.8-5.4,4.6C7.5,11,6,12.8,4.7,14.7C1.8,9.7,0.9,5.1,3,3z M10.7,29.4
+		c-3.4,1.3-6.2,1.1-7.6-0.3C0.9,27,1.8,22.4,4.7,17.5c1.3,1.8,2.8,3.7,4.6,5.4c0.4,0.4,0.9,0.8,1.3,1.2c0.1,0.1,0.2,0.2,0.3,0.3
+		c0.4,0.3,0.8,0.7,1.1,1c0.1,0.1,0.1,0.1,0.2,0.2c0.8,0.7,1.7,1.3,2.5,1.9C13.4,28.3,12,28.9,10.7,29.4z"/>
+	<path d="M19.4,19.3c1.8-1.8,1.8-4.8,0-6.6c-1.8-1.8-4.8-1.8-6.6,0c-1.8,1.8-1.8,4.8,0,6.6c0.9,0.9,2.1,1.4,3.3,1.4
+		C17.3,20.7,18.5,20.3,19.4,19.3z M13.9,13.8c0.6-0.6,1.4-0.9,2.2-0.9s1.6,0.3,2.2,0.9c1.2,1.2,1.2,3.2,0,4.4s-3.2,1.2-4.4,0
+		S12.7,15.1,13.9,13.8z"/>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/spirituality.svg b/webapp/assets/_new/icons/svgs/spirituality.svg
new file mode 100644
index 000000000..0c2757071
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/spirituality.svg
@@ -0,0 +1,13 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32px" height="32px" viewBox="0 0 32 32">
+	<path d="M15.9,18.6c-1.4,0-2.7-0.5-3.7-1.5c-1.4-1.4-1.9-3.3-1.4-5.2c0.5-1.8,1.9-3.2,3.7-3.7c1.9-0.5,3.8,0,5.2,1.4
+	c1.3,1.3,1.9,3.3,1.4,5.2c-0.5,1.8-1.9,3.2-3.7,3.7c0,0,0,0,0,0C16.9,18.5,16.4,18.6,15.9,18.6z M17.2,17.7L17.2,17.7
+	L17.2,17.7z M15.9,9.5c-0.3,0-0.7,0-1,0.1c-1.2,0.3-2.3,1.4-2.6,2.6c-0.4,1.4,0,2.7,1,3.7s2.4,1.3,3.7,1
+	c1.2-0.3,2.3-1.4,2.6-2.6c0.4-1.4,0-2.7-1-3.7C17.9,9.9,16.9,9.5,15.9,9.5z"/>
+	<path d="M27.8,32H4v-2.2c0-5.5,4.4-9.9,9.9-9.9h4c5.5,0,9.9,4.4,9.9,9.9V32z M5.5,30.5h20.8v-0.7c0-4.6-3.8-8.4-8.4-8.4h-4
+	c-4.6,0-8.4,3.8-8.4,8.4V30.5z"/>
+	<rect x="15.6" y="0.5" width="1.5" height="4.3"/>
+	<rect x="23.6" y="7.2" transform="matrix(0.8679 -0.4968 0.4968 0.8679 -0.5339 13.83)" width="4.3" height="1.5"/>
+	<rect x="5.9" y="5.9" transform="matrix(0.4969 -0.8678 0.8678 0.4969 -3.6304 9.7958)" width="1.5" height="4.3"/>
+	<rect x="9.4" y="1.8" transform="matrix(0.8207 -0.5714 0.5714 0.8207 -0.4488 6.4807)" width="1.5" height="4.3"/>
+	<rect x="20.1" y="3.2" transform="matrix(0.5712 -0.8208 0.8208 0.5712 6.3227 19.9037)" width="4.3" height="1.5"/>
+</svg>

From 3508b372247970cb1f02c815f44bf9c04760b246 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 8 Sep 2022 16:28:45 +0200
Subject: [PATCH 20/22] load new icons for categories

---
 backend/src/constants/categories.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/src/constants/categories.js b/backend/src/constants/categories.js
index 146131453..358afb852 100644
--- a/backend/src/constants/categories.js
+++ b/backend/src/constants/categories.js
@@ -1,6 +1,6 @@
 export const categories = [
   {
-    icon: 'users',
+    icon: 'networking',
     name: 'networking',
     description: 'Kooperation, Aktionsbündnisse, Solidarität, Hilfe',
   },
@@ -10,12 +10,12 @@ export const categories = [
     description: 'Bauen, Lebensgemeinschaften, Tiny Houses, Gemüsegarten',
   },
   {
-    icon: 'lightbulb',
+    icon: 'enrgy',
     name: 'energy',
     description: 'Öl, Gas, Kohle, Wind, Wasserkraft, Biogas, Atomenergie, ...',
   },
   {
-    icon: 'smile',
+    icon: 'psyche',
     name: 'psyche',
     description: 'Seele, Gefühle, Glück',
   },
@@ -30,7 +30,7 @@ export const categories = [
     description: 'Menschenrechte, Gesetze, Verordnungen',
   },
   {
-    icon: 'money',
+    icon: 'finance',
     name: 'finance',
     description: 'Geld, Finanzsystem, Alternativwährungen, ...',
   },
@@ -40,7 +40,7 @@ export const categories = [
     description: 'Familie, Pädagogik, Schule, Prägung',
   },
   {
-    icon: 'suitcase',
+    icon: 'mobility',
     name: 'mobility',
     description: 'Reise, Verkehr, Elektromobilität',
   },
@@ -50,48 +50,48 @@ export const categories = [
     description: 'Handel, Konsum, Marketing, Lebensmittel, Lieferketten, ...',
   },
   {
-    icon: 'angellist',
+    icon: 'peace',
     name: 'peace',
     description: 'Krieg, Militär, soziale Verteidigung, Waffen, Cyberattacken',
   },
   {
-    icon: 'university',
+    icon: 'politics',
     name: 'politics',
     description: 'Demokratie, Mitbestimmung, Wahlen, Korruption, Parteien',
   },
   {
-    icon: 'tree',
+    icon: 'nature',
     name: 'nature',
     description: 'Tiere, Pflanzen, Landwirtschaft, Ökologie, Artenvielfalt',
   },
   {
-    icon: 'graduation-cap',
+    icon: 'science',
     name: 'science',
     description: 'Bildung, Hochschule, Publikationen, ...',
   },
   {
-    icon: 'medkit',
+    icon: 'health',
     name: 'health',
     description: 'Medizin, Ernährung, WHO, Impfungen, Schadstoffe, ...',
   },
   {
-    icon: 'desktop',
+    icon: 'media',
     name: 'it-and-media',
     description:
       'Nachrichten, Manipulation, Datenschutz, Überwachung, Datenkraken, AI, Software, Apps',
   },
   {
-    icon: 'heart-o',
+    icon: 'spirituality',
     name: 'spirituality',
     description: 'Religion, Werte, Ethik',
   },
   {
-    icon: 'music',
+    icon: 'culture',
     name: 'culture',
     description: 'Kunst, Theater, Musik, Fotografie, Film',
   },
   {
-    icon: 'ellipsis-h',
+    icon: 'miscellaneous',
     name: 'miscellaneous',
     description: '',
   },

From 8e561711d0328cb4dc6d347bdab8c1a6d63650af Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 8 Sep 2022 16:37:41 +0200
Subject: [PATCH 21/22] fix typo

---
 backend/src/constants/categories.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/constants/categories.js b/backend/src/constants/categories.js
index 358afb852..3676fed0b 100644
--- a/backend/src/constants/categories.js
+++ b/backend/src/constants/categories.js
@@ -10,7 +10,7 @@ export const categories = [
     description: 'Bauen, Lebensgemeinschaften, Tiny Houses, Gemüsegarten',
   },
   {
-    icon: 'enrgy',
+    icon: 'energy',
     name: 'energy',
     description: 'Öl, Gas, Kohle, Wind, Wasserkraft, Biogas, Atomenergie, ...',
   },

From 5b1643208b15eb8e02ee147c533df110f3351b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 10 Sep 2022 12:36:49 +0200
Subject: [PATCH 22/22] Upgrade neode from v^0.4.7 to v^0.4.8 in backend and
 main folder

---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 package.json         | 2 +-
 yarn.lock            | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 62db1cf0f..f6299ee48 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -103,7 +103,7 @@
     "mustache": "^4.2.0",
     "neo4j-driver": "^4.0.2",
     "neo4j-graphql-js": "^2.11.5",
-    "neode": "^0.4.7",
+    "neode": "^0.4.8",
     "node-fetch": "~2.6.1",
     "nodemailer": "^6.4.4",
     "nodemailer-html-to-text": "^3.2.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 18f65abee..48c05947e 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -7574,10 +7574,10 @@ neo4j-graphql-js@^2.11.5:
     lodash "^4.17.15"
     neo4j-driver "^4.0.1"
 
-neode@^0.4.7:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.7.tgz#033007b57a2ee167e9ee5537493086db08d005eb"
-  integrity sha512-YXlc187JRpeKCBcUIkY6nimXXG+Tvlopfe71/FPno2THrwmYt5mm0RPHZ+mXF2O1Xg6zvjKvOpCpDz2vHBfroQ==
+neode@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.8.tgz#0889b4fc7f1bf0b470b01fa5b8870373b5d47ad6"
+  integrity sha512-pb91NfCOg4Fj5o+98H+S2XYC+ByQfbdhwcc1UVuzuUQ0Ezzj+jWz8NmKWU8ZfCH6l4plk71yDAPd2eTwpt+Xvg==
   dependencies:
     "@hapi/joi" "^15.1.1"
     dotenv "^4.0.0"
diff --git a/package.json b/package.json
index a36063f04..d7463adac 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "jsonwebtoken": "^8.5.1",
     "mock-socket": "^9.0.3",
     "neo4j-driver": "^4.3.4",
-    "neode": "^0.4.7",
+    "neode": "^0.4.8",
     "npm-run-all": "^4.1.5",
     "rosie": "^2.1.0",
     "slug": "^6.0.0"
diff --git a/yarn.lock b/yarn.lock
index 7b1c5eb79..6103f10a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4481,10 +4481,10 @@ neo4j-driver@^4.2.2, neo4j-driver@^4.3.4:
     neo4j-driver-core "^4.3.4"
     rxjs "^6.6.3"
 
-neode@^0.4.7:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.7.tgz#033007b57a2ee167e9ee5537493086db08d005eb"
-  integrity sha512-YXlc187JRpeKCBcUIkY6nimXXG+Tvlopfe71/FPno2THrwmYt5mm0RPHZ+mXF2O1Xg6zvjKvOpCpDz2vHBfroQ==
+neode@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.8.tgz#0889b4fc7f1bf0b470b01fa5b8870373b5d47ad6"
+  integrity sha512-pb91NfCOg4Fj5o+98H+S2XYC+ByQfbdhwcc1UVuzuUQ0Ezzj+jWz8NmKWU8ZfCH6l4plk71yDAPd2eTwpt+Xvg==
   dependencies:
     "@hapi/joi" "^15.1.1"
     dotenv "^4.0.0"