From 751c8b60a66d6615abd03816f6c809236f0b55c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 13 Jul 2023 12:02:53 +0200
Subject: [PATCH 001/181] Add headline to chat page

---
 webapp/locales/de.json | 3 +++
 webapp/locales/en.json | 3 +++
 webapp/pages/chat.vue  | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a9a8e9ed4..450f5b3a0 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -78,6 +78,9 @@
     }
   },
   "chat": {
+    "page": {
+      "headline": "Chat"
+    },
     "userProfileButton": {
       "label": "Chat",
       "tooltip": "Chatte mit „{name}“"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9af3e11af..bfb8b34c2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -78,6 +78,9 @@
     }
   },
   "chat": {
+    "page": {
+      "headline": "Chat"
+    },
     "userProfileButton": {
       "label": "Chat",
       "tooltip": "Chat with “{name}”"
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 61192ea49..b23a6e8dc 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,5 +1,8 @@
 <template>
-  <chat />
+  <div>
+    <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
+    <chat />
+  </div>
 </template>
 
 <script>

From 24c6884b9afe1d902b4aeb4d7983cf22d391ca3b Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 14:38:28 +0200
Subject: [PATCH 002/181] [feature] changed usertag in chat messages to
 user-slug

---
 webapp/components/Chat/Chat.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..d27824fa8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,6 +164,12 @@ export default {
     },
 
     async sendMessage(message) {
+      //check for usersTag and change userid to username
+      message.usersTag.forEach(userTag =>{
+        let needle = `<usertag>${userTag.id}</usertag>`
+        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle,replacement)
+      })
       try {
         await this.$apollo.mutate({
           mutation: createMessageMutation(),

From 08b78aad7c55d66cab3ec23d98b32eb710dc58d0 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 14:45:44 +0200
Subject: [PATCH 003/181] fixed linting

---
 webapp/components/Chat/Chat.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d27824fa8..6ed548ab0 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,11 +164,11 @@ export default {
     },
 
     async sendMessage(message) {
-      //check for usersTag and change userid to username
-      message.usersTag.forEach(userTag =>{
-        let needle = `<usertag>${userTag.id}</usertag>`
-        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
-        message.content = message.content.replaceAll(needle,replacement)
+      // check for usersTag and change userid to username
+      message.usersTag.forEach((userTag) => {
+        const needle = `<usertag>${userTag.id}</usertag>`
+        const replacement = `<usertag>@${userTag.name.replaceAll(' ', '-').toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle, replacement)
       })
       try {
         await this.$apollo.mutate({

From caa7e8e1fb74bc38325d436069241d02bc446b70 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 18:47:36 +0200
Subject: [PATCH 004/181] [refactor] updated ui of creat post page

---
 .../ContributionForm/ContributionForm.vue     | 357 +++++++++---------
 webapp/locales/de.json                        |   4 +-
 webapp/locales/en.json                        |   4 +-
 webapp/pages/post/create.vue                  | 106 +++---
 4 files changed, 244 insertions(+), 227 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 0067dab72..6d42eed61 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -1,190 +1,203 @@
 <template>
-  <ds-form
-    class="contribution-form"
-    ref="contributionForm"
-    v-model="formData"
-    :schema="formSchema"
-    @submit="submit"
-  >
-    <template #default="{ errors }">
-      <base-card>
-        <template #heroImage>
-          <img
-            v-if="formData.image"
-            :src="formData.image | proxyApiUrl"
-            :class="['image', formData.imageBlurred && '--blur-image']"
+  <div>
+    <div>
+      <h1 v-if="!createEvent" class="title">
+        {{ $t('post.createNewPost.title') }}
+      </h1>
+      <h1 v-else class="title">
+        {{ $t('post.createNewEvent.title') }}
+      </h1>
+    </div>
+    <ds-form
+      class="contribution-form"
+      ref="contributionForm"
+      v-model="formData"
+      :schema="formSchema"
+      @submit="submit"
+    >
+      <template #default="{ errors }">
+        <base-card>
+          <template #heroImage>
+            <img
+              v-if="formData.image"
+              :src="formData.image | proxyApiUrl"
+              :class="['image', formData.imageBlurred && '--blur-image']"
+            />
+            <image-uploader
+              :hasImage="!!formData.image"
+              :class="[formData.imageBlurred && '--blur-image']"
+              @addHeroImage="addHeroImage"
+              @addImageAspectRatio="addImageAspectRatio"
+              @addImageType="addImageType"
+            />
+          </template>
+          <div v-if="formData.image" class="blur-toggle">
+            <label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label>
+            <input type="checkbox" id="blur-img" v-model="formData.imageBlurred" />
+            <page-params-link class="link" :pageParams="links.FAQ">
+              {{ $t('contribution.inappropriatePicture') }}
+              <base-icon name="question-circle" />
+            </page-params-link>
+          </div>
+          <ds-space margin-top="base" />
+          <ds-input
+            model="title"
+            :placeholder="$t('contribution.title')"
+            name="title"
+            autofocus
+            size="large"
           />
-          <image-uploader
-            :hasImage="!!formData.image"
-            :class="[formData.imageBlurred && '--blur-image']"
-            @addHeroImage="addHeroImage"
-            @addImageAspectRatio="addImageAspectRatio"
-            @addImageType="addImageType"
+          <ds-chip size="base" :color="errors && errors.title && 'danger'">
+            {{ formData.title.length }}/{{ formSchema.title.max }}
+            <base-icon v-if="errors && errors.title" name="warning" />
+          </ds-chip>
+          <editor
+            :users="users"
+            :value="formData.content"
+            :hashtags="hashtags"
+            @input="updateEditorContent"
           />
-        </template>
-        <div v-if="formData.image" class="blur-toggle">
-          <label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label>
-          <input type="checkbox" id="blur-img" v-model="formData.imageBlurred" />
-          <page-params-link class="link" :pageParams="links.FAQ">
-            {{ $t('contribution.inappropriatePicture') }}
-            <base-icon name="question-circle" />
-          </page-params-link>
-        </div>
-        <ds-space margin-top="base" />
-        <ds-input
-          model="title"
-          :placeholder="$t('contribution.title')"
-          name="title"
-          autofocus
-          size="large"
-        />
-        <ds-chip size="base" :color="errors && errors.title && 'danger'">
-          {{ formData.title.length }}/{{ formSchema.title.max }}
-          <base-icon v-if="errors && errors.title" name="warning" />
-        </ds-chip>
-        <editor
-          :users="users"
-          :value="formData.content"
-          :hashtags="hashtags"
-          @input="updateEditorContent"
-        />
-        <ds-chip size="base" :color="errors && errors.content && 'danger'">
-          {{ contentLength }}
-          <base-icon v-if="errors && errors.content" name="warning" />
-        </ds-chip>
+          <ds-chip size="base" :color="errors && errors.content && 'danger'">
+            {{ contentLength }}
+            <base-icon v-if="errors && errors.content" name="warning" />
+          </ds-chip>
+
+          <!-- Eventdata -->
+          <div v-if="createEvent" class="eventDatas">
+            <hr />
+            <ds-space margin-top="x-small" />
+            <ds-grid>
+              <ds-grid-item class="event-grid-item">
+                <!-- <label>Beginn</label> -->
+                <div class="event-grid-item-z-helper">
+                  <date-picker
+                    name="eventStart"
+                    v-model="formData.eventStart"
+                    type="datetime"
+                    value-type="format"
+                    :minute-step="15"
+                    Xformat="DD-MM-YYYY HH:mm"
+                    class="event-grid-item-z-helper"
+                    :placeholder="$t('post.viewEvent.eventStart')"
+                    :disabled-date="notBeforeToday"
+                    :disabled-time="notBeforeNow"
+                    :show-second="false"
+                    @change="changeEventStart($event)"
+                  ></date-picker>
+                </div>
+                <div
+                  v-if="errors && errors.eventStart"
+                  class="chipbox event-grid-item-margin-helper"
+                >
+                  <ds-chip size="base" :color="errors && errors.eventStart && 'danger'">
+                    <base-icon name="warning" />
+                  </ds-chip>
+                </div>
+              </ds-grid-item>
+              <ds-grid-item class="event-grid-item">
+                <!-- <label>Ende (optional)</label> -->
 
-        <!-- Eventdata -->
-        <div v-if="createEvent" class="eventDatas">
-          <hr />
-          <ds-space margin-top="x-small" />
-          <ds-grid>
-            <ds-grid-item class="event-grid-item">
-              <!-- <label>Beginn</label> -->
-              <div class="event-grid-item-z-helper">
                 <date-picker
-                  name="eventStart"
-                  v-model="formData.eventStart"
+                  v-model="formData.eventEnd"
+                  name="eventEnd"
                   type="datetime"
                   value-type="format"
                   :minute-step="15"
+                  :seconds-step="0"
                   Xformat="DD-MM-YYYY HH:mm"
-                  class="event-grid-item-z-helper"
-                  :placeholder="$t('post.viewEvent.eventStart')"
-                  :disabled-date="notBeforeToday"
-                  :disabled-time="notBeforeNow"
+                  :placeholder="$t('post.viewEvent.eventEnd')"
+                  class="event-grid-item-font-helper"
+                  :disabled-date="notBeforeEventDay"
+                  :disabled-time="notBeforeEvent"
                   :show-second="false"
-                  @change="changeEventStart($event)"
+                  @change="changeEventEnd($event)"
                 ></date-picker>
-              </div>
-              <div v-if="errors && errors.eventStart" class="chipbox event-grid-item-margin-helper">
-                <ds-chip size="base" :color="errors && errors.eventStart && 'danger'">
-                  <base-icon name="warning" />
-                </ds-chip>
-              </div>
-            </ds-grid-item>
-            <ds-grid-item class="event-grid-item">
-              <!-- <label>Ende (optional)</label> -->
+              </ds-grid-item>
+            </ds-grid>
+            <ds-grid class="event-location-grid">
+              <ds-grid-item class="event-grid-item">
+                <ds-input
+                  model="eventVenue"
+                  name="eventVenue"
+                  :placeholder="$t('post.viewEvent.eventVenue')"
+                />
+                <div class="chipbox">
+                  <ds-chip size="base" :color="errors && errors.eventVenue && 'danger'">
+                    {{ formData.eventVenue.length }}/{{ formSchema.eventVenue.max }}
+                    <base-icon v-if="errors && errors.eventVenue" name="warning" />
+                  </ds-chip>
+                </div>
+              </ds-grid-item>
+              <ds-grid-item v-if="showEventLocationName" class="event-grid-item">
+                <ds-input
+                  model="eventLocationName"
+                  name="eventLocationName"
+                  :placeholder="$t('post.viewEvent.eventLocationName')"
+                />
+                <div class="chipbox">
+                  <ds-chip size="base" :color="errors && errors.eventLocationName && 'danger'">
+                    {{ formData.eventLocationName.length }}/{{ formSchema.eventLocationName.max }}
+                    <base-icon v-if="errors && errors.eventLocationName" name="warning" />
+                  </ds-chip>
+                </div>
+              </ds-grid-item>
+            </ds-grid>
 
-              <date-picker
-                v-model="formData.eventEnd"
-                name="eventEnd"
-                type="datetime"
-                value-type="format"
-                :minute-step="15"
-                :seconds-step="0"
-                Xformat="DD-MM-YYYY HH:mm"
-                :placeholder="$t('post.viewEvent.eventEnd')"
+            <div>
+              <input
+                type="checkbox"
+                v-model="formData.eventIsOnline"
+                model="eventIsOnline"
+                name="eventIsOnline"
                 class="event-grid-item-font-helper"
-                :disabled-date="notBeforeEventDay"
-                :disabled-time="notBeforeEvent"
-                :show-second="false"
-                @change="changeEventEnd($event)"
-              ></date-picker>
-            </ds-grid-item>
-          </ds-grid>
-          <ds-grid class="event-location-grid">
-            <ds-grid-item class="event-grid-item">
-              <ds-input
-                model="eventVenue"
-                name="eventVenue"
-                :placeholder="$t('post.viewEvent.eventVenue')"
+                @change="changeEventIsOnline($event)"
               />
-              <div class="chipbox">
-                <ds-chip size="base" :color="errors && errors.eventVenue && 'danger'">
-                  {{ formData.eventVenue.length }}/{{ formSchema.eventVenue.max }}
-                  <base-icon v-if="errors && errors.eventVenue" name="warning" />
-                </ds-chip>
-              </div>
-            </ds-grid-item>
-            <ds-grid-item v-if="showEventLocationName" class="event-grid-item">
-              <ds-input
-                model="eventLocationName"
-                name="eventLocationName"
-                :placeholder="$t('post.viewEvent.eventLocationName')"
-              />
-              <div class="chipbox">
-                <ds-chip size="base" :color="errors && errors.eventLocationName && 'danger'">
-                  {{ formData.eventLocationName.length }}/{{ formSchema.eventLocationName.max }}
-                  <base-icon v-if="errors && errors.eventLocationName" name="warning" />
-                </ds-chip>
-              </div>
-            </ds-grid-item>
-          </ds-grid>
-
-          <div>
-            <input
-              type="checkbox"
-              v-model="formData.eventIsOnline"
-              model="eventIsOnline"
-              name="eventIsOnline"
-              class="event-grid-item-font-helper"
-              @change="changeEventIsOnline($event)"
-            />
-            {{ $t('post.viewEvent.eventIsOnline') }}
+              {{ $t('post.viewEvent.eventIsOnline') }}
+            </div>
           </div>
-        </div>
-        <ds-space margin-top="x-small" />
-        <categories-select
-          v-if="categoriesActive"
-          model="categoryIds"
-          :existingCategoryIds="formData.categoryIds"
-        />
-        <ds-chip
-          v-if="categoriesActive"
-          size="base"
-          :color="errors && errors.categoryIds && 'danger'"
-        >
-          {{ formData.categoryIds.length }} / 3
-          <base-icon v-if="errors && errors.categoryIds" name="warning" />
-        </ds-chip>
-        <ds-flex class="buttons-footer" gutter="xxx-small">
-          <ds-flex-item width="3.5" class="buttons-footer-helper">
-            <!-- eslint-disable vue/no-v-text-v-html-on-component -->
-            <!-- TODO => remove v-html! only text ! no html! security first! -->
-            <ds-text
-              v-if="showGroupHint"
-              v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
-            />
-            <!-- eslint-enable vue/no-v-text-v-html-on-component -->
-          </ds-flex-item>
-          <ds-flex-item width="0.15" />
-          <ds-flex-item class="action-buttons-group" width="2">
-            <base-button
-              data-test="cancel-button"
-              :disabled="loading"
-              @click="$router.back()"
-              danger
-            >
-              {{ $t('actions.cancel') }}
-            </base-button>
-            <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>
-              {{ $t('actions.save') }}
-            </base-button>
-          </ds-flex-item>
-        </ds-flex>
-      </base-card>
-    </template>
-  </ds-form>
+          <ds-space margin-top="x-small" />
+          <categories-select
+            v-if="categoriesActive"
+            model="categoryIds"
+            :existingCategoryIds="formData.categoryIds"
+          />
+          <ds-chip
+            v-if="categoriesActive"
+            size="base"
+            :color="errors && errors.categoryIds && 'danger'"
+          >
+            {{ formData.categoryIds.length }} / 3
+            <base-icon v-if="errors && errors.categoryIds" name="warning" />
+          </ds-chip>
+          <ds-flex class="buttons-footer" gutter="xxx-small">
+            <ds-flex-item width="3.5" class="buttons-footer-helper">
+              <!-- eslint-disable vue/no-v-text-v-html-on-component -->
+              <!-- TODO => remove v-html! only text ! no html! security first! -->
+              <ds-text
+                v-if="showGroupHint"
+                v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
+              />
+              <!-- eslint-enable vue/no-v-text-v-html-on-component -->
+            </ds-flex-item>
+            <ds-flex-item width="0.15" />
+            <ds-flex-item class="action-buttons-group" width="2">
+              <base-button
+                data-test="cancel-button"
+                :disabled="loading"
+                @click="$router.back()"
+                danger
+              >
+                {{ $t('actions.cancel') }}
+              </base-button>
+              <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>
+                {{ $t('actions.save') }}
+              </base-button>
+            </ds-flex-item>
+          </ds-flex>
+        </base-card>
+      </template>
+    </ds-form>
+  </div>
 </template>
 <script>
 import gql from 'graphql-tag'
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a9a8e9ed4..744955c63 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -731,13 +731,13 @@
       "forGroup": {
         "title": "Für die Gruppe „{name}“"
       },
-      "title": "Erstelle ein neues Event"
+      "title": "Erstelle eine Veranstaltung"
     },
     "createNewPost": {
       "forGroup": {
         "title": "Für die Gruppe „{name}“"
       },
-      "title": "Erstelle einen neuen Beitrag"
+      "title": "Erstelle einen Beitrag"
     },
     "edited": "bearbeitet",
     "editPost": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9af3e11af..a4a3d57ca 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -731,13 +731,13 @@
       "forGroup": {
         "title": "For The Group “{name}”"
       },
-      "title": "Create A New Event"
+      "title": "Create an Event"
     },
     "createNewPost": {
       "forGroup": {
         "title": "For The Group “{name}”"
       },
-      "title": "Create A New Article"
+      "title": "Create an Article"
     },
     "edited": "edited",
     "editPost": {
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index cc4fb828a..5fff07f19 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -1,55 +1,23 @@
 <template>
   <div>
-    <ds-flex :width="{ base: '100%' }">
-      <ds-flex-item :width="{ base: '100%' }">
-        <ds-flex gutter="base" :width="{ base: '100%', sm: 1 }">
-          <ds-flex-item>
-            <ds-card class="create-form-btn" :primary="!createEvent" centered>
-              <div>
-                <ds-button
-                  v-if="!createEvent"
-                  ghost
-                  fullwidth
-                  size="x-large"
-                  class="inactive-tab-button"
-                >
-                  {{ $t('post.createNewPost.title') }}
-                </ds-button>
-                <ds-button v-else ghost fullwidth size="x-large" @click="switchPostType()">
-                  {{ $t('post.createNewPost.title') }}
-                </ds-button>
-              </div>
-            </ds-card>
-          </ds-flex-item>
-          <ds-flex-item>
-            <ds-card class="create-form-btn" :primary="!!createEvent" centered>
-              <div>
-                <ds-button
-                  ghost
-                  fullwidth
-                  size="x-large"
-                  v-if="createEvent"
-                  hover
-                  class="inactive-tab-button"
-                >
-                  {{ $t('post.createNewEvent.title') }}
-                </ds-button>
-                <ds-button ghost fullwidth size="x-large" v-else @click="switchPostType()">
-                  {{ $t('post.createNewEvent.title') }}
-                </ds-button>
-              </div>
-            </ds-card>
-          </ds-flex-item>
-        </ds-flex>
-        <div v-if="group" class="group-create-title">
-          {{ $t('post.createNewPost.forGroup.title', { name: group.name }) }}
-        </div>
+    <ds-flex gutter="small">
+      <ds-flex-item :width="{ base: '100%', md: '200px' }">
+        <ds-menu class="post-type-menu" :routes="routes">
+          <ds-menu-item
+            @click.prevent="switchPostType($event, item)"
+            slot="menuitem"
+            slot-scope="item"
+            :route="item.route"
+            class="post-type-menu-item"
+          >
+            {{ item.route.name }}
+          </ds-menu-item>
+        </ds-menu>
       </ds-flex-item>
-    </ds-flex>
-
-    <ds-flex :width="{ base: '100%' }" gutter="base">
-      <ds-flex-item :width="{ base: '100%' }">
-        <contribution-form :group="group" :createEvent="createEvent" />
+      <ds-flex-item :width="{ base: '100%', md: 1 }">
+        <transition name="slide-up" appear>
+          <contribution-form :group="group" :createEvent="createEvent" />
+        </transition>
       </ds-flex-item>
     </ds-flex>
   </div>
@@ -74,6 +42,20 @@ export default {
     group() {
       return this.Group && this.Group[0] ? this.Group[0] : null
     },
+    routes() {
+      return [
+        {
+          name: this.$t('post.name'),
+          path: `/post/create`,
+          type: 'post',
+        },
+        {
+          name: this.$t('post.event'),
+          path: `/`,
+          type: 'event',
+        },
+      ]
+    },
   },
   apollo: {
     Group: {
@@ -97,8 +79,18 @@ export default {
     },
   },
   methods: {
-    switchPostType() {
-      this.createEvent = !this.createEvent
+    switchPostType(event, route) {
+      if (route.route.type.toLowerCase() === 'event') {
+        this.createEvent = true
+      } else {
+        this.createEvent = false
+      }
+      // hacky way to set active element
+      const menuItems = document.querySelectorAll('.post-type-menu-item')
+      menuItems.forEach((menuItem) => {
+        menuItem.firstChild.classList.remove('router-link-exact-active', 'router-link-active')
+      })
+      event.target.classList.add('router-link-exact-active')
     },
   },
 }
@@ -120,4 +112,16 @@ export default {
 .create-form-btn .ds-button-ghost:hover {
   background-color: transparent;
 }
+
+.menu-item-active {
+  color: $color-primary;
+  border-left: 2px solid $color-primary;
+  background-color: #faf9fa;
+}
+
+@media screen and (min-width: 768px) {
+  .post-type-menu {
+    margin-top: 39px;
+  }
+}
 </style>

From 032bca1b64a68fe3080bdcaf0aa51878ae87a6f5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 13 Jul 2023 19:09:17 +0200
Subject: [PATCH 005/181] add last message at, use cypher statements for
 roomName and avatar

---
 backend/src/graphql/rooms.ts                  |  1 +
 backend/src/schema/resolvers/messages.spec.ts | 17 ++++++++++++++++-
 backend/src/schema/resolvers/messages.ts      |  1 +
 backend/src/schema/resolvers/rooms.spec.ts    |  3 +++
 backend/src/schema/resolvers/rooms.ts         |  6 +-----
 backend/src/schema/types/type/Room.gql        |  6 ++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 109bf1d55..c42da6166 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -18,6 +18,7 @@ export const roomQuery = () => {
         id
         roomId
         roomName
+        lastMessageAt
         users {
           _id
           id
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 0deccb4e9..bc16c1ef2 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
 import { getNeode, getDriver } from '../../db/neo4j'
-import { createRoomMutation } from '../../graphql/rooms'
+import { createRoomMutation, roomQuery } from '../../graphql/rooms'
 import { createMessageMutation, messageQuery, markMessagesAsSeen } from '../../graphql/messages'
 import createServer from '../../server'
 
@@ -129,6 +129,21 @@ describe('Message', () => {
               },
             })
           })
+
+          describe('room is updated as well', () => {
+            it('has last message at set', async () => {
+              await expect(query({ query: roomQuery() })).resolves.toMatchObject({
+                errors: undefined,
+                data: {
+                  Room: [
+                    expect.objectContaining({
+                      lastMessageAt: expect.any(String),
+                    }),
+                  ],
+                },
+              })
+            })
+          })
         })
 
         describe('user does not chat in room', () => {
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 45de0b4a4..266758128 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -68,6 +68,7 @@ export default {
             distributed: false,
             seen: false
           })-[:INSIDE]->(room)
+          SET room.lastMessageAt = toString(datetime())
           RETURN message { .* }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 03c3d4456..d247c42b4 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -21,6 +21,9 @@ beforeAll(async () => {
         driver,
         neode,
         user: authenticatedUser,
+        cypherParams: {
+          currentUserId: authenticatedUser ? authenticatedUser.id : null,
+        },
       }
     },
   })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d5015a03b..c8077211a 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -12,11 +12,6 @@ export default {
       if (resolved) {
         resolved.forEach((room) => {
           if (room.users) {
-            // buggy, you must query the username for this to function correctly
-            room.roomName = room.users.filter((user) => user.id !== context.user.id)[0].name
-            room.avatar =
-              room.users.filter((user) => user.id !== context.user.id)[0].avatar?.url ||
-              'default-avatar'
             room.users.forEach((user) => {
               user._id = user.id
             })
@@ -68,6 +63,7 @@ export default {
   },
   Room: {
     ...Resolver('Room', {
+      undefinedToNull: ['lastMessageAt'],
       hasMany: {
         users: '<-[:CHATS_IN]-(related:User)',
       },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ce6556f6..eb5ed02e5 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -13,8 +13,10 @@ type Room {
   users: [User]! @relation(name: "CHATS_IN", direction: "IN")
 
   roomId: String! @cypher(statement: "RETURN this.id")
-  roomName: String! ## @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user[0].name")
-  avatar: String! ## @cypher match not own user in users array
+  roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
+  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+
+  lastMessageAt: String
 }
 
 type Mutation {

From d73fd0cbb75d7080f3c55612e727e62e78b6ef8e Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 22:35:48 +0200
Subject: [PATCH 006/181] [bug] chat language is now reactive

---
 webapp/components/Chat/Chat.vue | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 8aeb4e7de..855f1e14b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -114,20 +114,6 @@ export default {
           text: 'This is the action',
         },
       ],
-      textMessages: {
-        ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
-        ROOM_EMPTY: this.$t('chat.roomEmpty'),
-        NEW_MESSAGES: this.$t('chat.newMessages'),
-        MESSAGE_DELETED: this.$t('chat.messageDeleted'),
-        MESSAGES_EMPTY: this.$t('chat.messagesEmpty'),
-        CONVERSATION_STARTED: this.$t('chat.conversationStarted'),
-        TYPE_MESSAGE: this.$t('chat.typeMessage'),
-        SEARCH: this.$t('chat.search'),
-        IS_ONLINE: this.$t('chat.isOnline'),
-        LAST_SEEN: this.$t('chat.lastSeen'),
-        IS_TYPING: this.$t('chat.isTyping'),
-        CANCEL_SELECT_MESSAGE: this.$t('chat.cancelSelectMessage'),
-      },
       roomActions: [
         /*
         {
@@ -177,6 +163,22 @@ export default {
       // return this.theme === 'light' ? chatStyle.STYLE.light : chatStyle.STYLE.dark
       return chatStyle.STYLE.light
     },
+    textMessages() {
+      return{
+        ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
+        ROOM_EMPTY: this.$t('chat.roomEmpty'),
+        NEW_MESSAGES: this.$t('chat.newMessages'),
+        MESSAGE_DELETED: this.$t('chat.messageDeleted'),
+        MESSAGES_EMPTY: this.$t('chat.messagesEmpty'),
+        CONVERSATION_STARTED: this.$t('chat.conversationStarted'),
+        TYPE_MESSAGE: this.$t('chat.typeMessage'),
+        SEARCH: this.$t('chat.search'),
+        IS_ONLINE: this.$t('chat.isOnline'),
+        LAST_SEEN: this.$t('chat.lastSeen'),
+        IS_TYPING: this.$t('chat.isTyping'),
+        CANCEL_SELECT_MESSAGE: this.$t('chat.cancelSelectMessage'),
+      }
+    }
   },
   methods: {
     fetchMessages({ room, options = {} }) {

From d496aef0a42abb9fdd17a7c8ac95c2653c0172b8 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 22:56:38 +0200
Subject: [PATCH 007/181] fixed linting

---
 webapp/components/Chat/Chat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 855f1e14b..eb7d7124a 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,7 +164,7 @@ export default {
       return chatStyle.STYLE.light
     },
     textMessages() {
-      return{
+      return {
         ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
         ROOM_EMPTY: this.$t('chat.roomEmpty'),
         NEW_MESSAGES: this.$t('chat.newMessages'),
@@ -178,7 +178,7 @@ export default {
         IS_TYPING: this.$t('chat.isTyping'),
         CANCEL_SELECT_MESSAGE: this.$t('chat.cancelSelectMessage'),
       }
-    }
+    },
   },
   methods: {
     fetchMessages({ room, options = {} }) {

From 5376e171bd50494700ffa5452a447e72557c6a61 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 09:11:32 +0200
Subject: [PATCH 008/181] trying last message prop in room

---
 backend/src/schema/resolvers/messages.spec.ts | 6 +++++-
 backend/src/schema/types/type/Room.gql        | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index bc16c1ef2..bad78a240 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -131,13 +131,17 @@ describe('Message', () => {
           })
 
           describe('room is updated as well', () => {
-            it('has last message at set', async () => {
+            it('has last message set', async () => {
               await expect(query({ query: roomQuery() })).resolves.toMatchObject({
                 errors: undefined,
                 data: {
                   Room: [
                     expect.objectContaining({
                       lastMessageAt: expect.any(String),
+                      lastMessage: expect.objectContaining({
+                        id: expect.any(String),
+                        content: 'Some nice message to other chatting user',
+                      })
                     }),
                   ],
                 },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index eb5ed02e5..3f8a22e70 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -17,6 +17,8 @@ type Room {
   avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
 
   lastMessageAt: String
+
+  lastMessage: Message @cypher(statement: "MATCH (this)<-[:INSIDE]-(message:Message) RETURN message ORDER BY message.createdAt DESC LIMIT 1")
 }
 
 type Mutation {

From f9da7622538d0d73a974ad91b999eba26da8d357 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 10:42:20 +0200
Subject: [PATCH 009/181] implemented chat seed

---
 backend/src/db/seed.ts | 86 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index a717ff7a6..425c9e28c 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -11,6 +11,8 @@ import {
   changeGroupMemberRoleMutation,
 } from '../graphql/groups'
 import { createPostMutation } from '../graphql/posts'
+import { createRoomMutation } from '../graphql/rooms'
+import { createMessageMutation } from '../graphql/messages'
 import { createCommentMutation } from '../graphql/comments'
 import { categories } from '../constants/categories'
 
@@ -1553,6 +1555,90 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     )
 
     await Factory.build('donations')
+
+    // Chat
+    authenticatedUser = await huey.toJson()
+    const { data: roomHueyPeter } = await mutate({
+      mutation: createRoomMutation(),
+      variables: {
+        userId: (await peterLustig.toJson()).id,
+      },
+    })
+
+    for (let i = 0; i < 30; i++) {
+      authenticatedUser = await huey.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyPeter?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+      authenticatedUser = await peterLustig.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyPeter?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+    }
+
+    authenticatedUser = await huey.toJson()
+    const { data: roomHueyJenny } = await mutate({
+      mutation: createRoomMutation(),
+      variables: {
+        userId: (await jennyRostock.toJson()).id,
+      },
+    })
+    for (let i = 0; i < 10000; i++) {
+      authenticatedUser = await huey.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyJenny?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+      authenticatedUser = await jennyRostock.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyJenny?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+    }
+
+    for (const user of additionalUsers) {
+      authenticatedUser = await jennyRostock.toJson()
+      const { data: room } = await mutate({
+        mutation: createRoomMutation(),
+        variables: {
+          userId: (await user.toJson()).id,
+        },
+      })
+
+      for (let i = 0; i < 30; i++) {
+        authenticatedUser = await jennyRostock.toJson()
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: room?.CreateRoom.id,
+            content: faker.lorem.sentence(),
+          },
+        })
+        authenticatedUser = await user.toJson()
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: room?.CreateRoom.id,
+            content: faker.lorem.sentence(),
+          },
+        })
+      }
+    }
+
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     await driver.close()

From eae7b53adf79de8e87ee1fa1acf050de9e36b540 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 10:56:02 +0200
Subject: [PATCH 010/181] reduce message count to 1000 instead of 10000 to
 reduce seed time

---
 backend/src/db/seed.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index 425c9e28c..cf3f43ee9 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -1591,7 +1591,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         userId: (await jennyRostock.toJson()).id,
       },
     })
-    for (let i = 0; i < 10000; i++) {
+    for (let i = 0; i < 1000; i++) {
       authenticatedUser = await huey.toJson()
       await mutate({
         mutation: createMessageMutation(),

From 55b3bc999a57588e90ba90fba71052b83d919e3e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 10:59:38 +0200
Subject: [PATCH 011/181] use a prime for seeding to allow testing of the
 pagination

---
 backend/src/db/seed.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index cf3f43ee9..7286683dd 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -1619,7 +1619,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         },
       })
 
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 29; i++) {
         authenticatedUser = await jennyRostock.toJson()
         await mutate({
           mutation: createMessageMutation(),

From 54cf5b37a5f353de187a95b7b608791c5ffdfd30 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 11:09:04 +0200
Subject: [PATCH 012/181] order by indexId instead of createdAt

---
 backend/src/graphql/messages.ts           | 2 +-
 backend/src/schema/types/type/Message.gql | 3 +--
 webapp/graphql/Messages.js                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index ca5ffb952..26eb32750 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -17,7 +17,7 @@ export const createMessageMutation = () => {
 export const messageQuery = () => {
   return gql`
     query ($roomId: ID!, $first: Int, $offset: Int) {
-      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: indexId_desc) {
         _id
         id
         indexId
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 671c5523a..764181dd9 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -3,8 +3,7 @@
 # }
 
 enum _MessageOrdering {
-  createdAt_asc
-  createdAt_desc
+  indexId_desc
 }
 
 type Message {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..bede62d01 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -3,7 +3,7 @@ import gql from 'graphql-tag'
 export const messageQuery = () => {
   return gql`
     query ($roomId: ID!, $first: Int, $offset: Int) {
-      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: indexId_desc) {
         _id
         id
         indexId

From 1d92b40f506d1999858cef5448726c02de35ee7d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 11:52:51 +0200
Subject: [PATCH 013/181] lastMessage in room working

---
 backend/src/graphql/rooms.ts                  | 12 ++++++++++
 backend/src/middleware/chatMiddleware.ts      | 22 +++++++++++++++++++
 backend/src/middleware/index.ts               |  3 +++
 backend/src/schema/resolvers/messages.spec.ts | 16 ++++++++++++--
 backend/src/schema/resolvers/rooms.ts         | 12 +---------
 backend/src/schema/types/type/Room.gql        |  6 ++++-
 6 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 backend/src/middleware/chatMiddleware.ts

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index c42da6166..28626071c 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -19,6 +19,18 @@ export const roomQuery = () => {
         roomId
         roomName
         lastMessageAt
+        lastMessage {
+          _id
+          id
+          content
+          senderId
+          username
+          avatar
+          date
+          saved
+          distributed
+          seen
+        }
         users {
           _id
           id
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
new file mode 100644
index 000000000..38b299450
--- /dev/null
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -0,0 +1,22 @@
+const roomProperties = async (resolve, root, args, context, info) => {
+  const resolved = await resolve(root, args, context, info)
+  if (resolved) {
+    resolved.forEach((room) => {
+      if (room.users) {
+        room.users.forEach((user) => {
+          user._id = user.id
+        })
+      }
+      if (room.lastMessage) {
+        room.lastMessage._id = room.lastMessage.id
+      }
+    })
+  }
+  return resolved
+}
+
+export default {
+  Query: {
+    Room: roomProperties,
+  },
+}
diff --git a/backend/src/middleware/index.ts b/backend/src/middleware/index.ts
index 813bbe9a7..08c872db7 100644
--- a/backend/src/middleware/index.ts
+++ b/backend/src/middleware/index.ts
@@ -14,6 +14,7 @@ import login from './login/loginMiddleware'
 import sentry from './sentryMiddleware'
 import languages from './languages/languages'
 import userInteractions from './userInteractions'
+import chatMiddleware from './chatMiddleware'
 
 export default (schema) => {
   const middlewares = {
@@ -31,6 +32,7 @@ export default (schema) => {
     orderBy,
     languages,
     userInteractions,
+    chatMiddleware,
   }
 
   let order = [
@@ -49,6 +51,7 @@ export default (schema) => {
     'softDelete',
     'includedFields',
     'orderBy',
+    'chatMiddleware',
   ]
 
   // add permisions middleware at the first position (unless we're seeding)
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index bad78a240..ecdf90873 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -22,6 +22,9 @@ beforeAll(async () => {
         driver,
         neode,
         user: authenticatedUser,
+        cypherParams: {
+          currentUserId: authenticatedUser ? authenticatedUser.id : null,
+        },
       }
     },
   })
@@ -132,16 +135,25 @@ describe('Message', () => {
 
           describe('room is updated as well', () => {
             it('has last message set', async () => {
-              await expect(query({ query: roomQuery() })).resolves.toMatchObject({
+              const result = await query({ query: roomQuery() })
+              await expect(result).toMatchObject({
                 errors: undefined,
                 data: {
                   Room: [
                     expect.objectContaining({
                       lastMessageAt: expect.any(String),
                       lastMessage: expect.objectContaining({
+                        _id: result.data.Room[0].lastMessage.id,
                         id: expect.any(String),
                         content: 'Some nice message to other chatting user',
-                      })
+                        senderId: 'chatting-user',
+                        username: 'Chatting User',
+                        avatar: expect.any(String),
+                        date: expect.any(String),
+                        saved: true,
+                        distributed: false,
+                        seen: false,
+                      }),
                     }),
                   ],
                 },
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index c8077211a..d1e14aaba 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -8,17 +8,7 @@ export default {
       params.filter.users_some = {
         id: context.user.id,
       }
-      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
-      if (resolved) {
-        resolved.forEach((room) => {
-          if (room.users) {
-            room.users.forEach((user) => {
-              user._id = user.id
-            })
-          }
-        })
-      }
-      return resolved
+      return neo4jgraphql(object, params, context, resolveInfo)
     },
   },
   Mutation: {
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 3f8a22e70..2cf51014e 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -18,7 +18,11 @@ type Room {
 
   lastMessageAt: String
 
-  lastMessage: Message @cypher(statement: "MATCH (this)<-[:INSIDE]-(message:Message) RETURN message ORDER BY message.createdAt DESC LIMIT 1")
+  lastMessage: Message @cypher(statement: """
+    MATCH (this)<-[:INSIDE]-(message:Message)
+    WITH message ORDER BY message.createdAt DESC LIMIT 1
+    RETURN message
+  """)
 }
 
 type Mutation {

From 2fe93892a1c1a52ae224e04c1fbb391b15c0bc4a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:21:40 +0200
Subject: [PATCH 014/181] full room object for create room mutation

---
 backend/src/graphql/rooms.ts               | 10 +++++++
 backend/src/middleware/chatMiddleware.ts   | 33 +++++++++++++++-------
 backend/src/schema/resolvers/rooms.spec.ts | 19 +++++++++++++
 backend/src/schema/resolvers/rooms.ts      |  8 +++++-
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 28626071c..e48ffe943 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -6,6 +6,16 @@ export const createRoomMutation = () => {
       CreateRoom(userId: $userId) {
         id
         roomId
+        roomName
+        lastMessageAt
+        users {
+          _id
+          id
+          name
+          avatar {
+            url
+          }
+        }
       }
     }
   `
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index 38b299450..5b0e4d7e2 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -1,16 +1,26 @@
+import { isArray } from 'lodash'
+
+const setRoomProps = (room) => {
+  if (room.users) {
+    room.users.forEach((user) => {
+      user._id = user.id
+    })
+  }
+  if (room.lastMessage) {
+    room.lastMessage._id = room.lastMessage.id
+  }
+}
+
 const roomProperties = async (resolve, root, args, context, info) => {
   const resolved = await resolve(root, args, context, info)
   if (resolved) {
-    resolved.forEach((room) => {
-      if (room.users) {
-        room.users.forEach((user) => {
-          user._id = user.id
-        })
-      }
-      if (room.lastMessage) {
-        room.lastMessage._id = room.lastMessage.id
-      }
-    })
+    if (isArray(resolved)) {
+      resolved.forEach((room) => {
+        setRoomProps(room)
+      })
+    } else {
+      setRoomProps(resolved)
+    }
   }
   return resolved
 }
@@ -19,4 +29,7 @@ export default {
   Query: {
     Room: roomProperties,
   },
+  Mutation: {
+    CreateRoom: roomProperties,
+  },
 }
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index d247c42b4..daed6815e 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -125,6 +125,25 @@ describe('Room', () => {
               CreateRoom: {
                 id: expect.any(String),
                 roomId: result.data.CreateRoom.id,
+                roomName: 'Other Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _id: 'chatting-user',
+                    id: 'chatting-user',
+                    name: 'Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                  {
+                    _id: 'other-chatting-user',
+                    id: 'other-chatting-user',
+                    name: 'Other Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                ]),
               },
             },
           })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d1e14aaba..885688643 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -29,7 +29,13 @@ export default {
           ON CREATE SET
             room.createdAt = toString(datetime()),
             room.id = apoc.create.uuid()
-          RETURN room { .* }
+          WITH room, user, currentUser,
+          user.name AS roomName
+          RETURN room {
+            .*,
+            users: [properties(currentUser), properties(user)],
+            roomName: roomName
+          }
         `
         const createRommTxResponse = await transaction.run(createRoomCypher, {
           userId,

From 1fd67aa581c58cf4f17f26811cc8280ee94026ff Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:34:12 +0200
Subject: [PATCH 015/181] add unreadCount property

---
 backend/src/graphql/rooms.ts               | 2 ++
 backend/src/schema/resolvers/rooms.spec.ts | 2 ++
 backend/src/schema/resolvers/rooms.ts      | 3 ++-
 backend/src/schema/types/type/Room.gql     | 7 +++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index e48ffe943..554c346dc 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -8,6 +8,7 @@ export const createRoomMutation = () => {
         roomId
         roomName
         lastMessageAt
+        unreadCount
         users {
           _id
           id
@@ -29,6 +30,7 @@ export const roomQuery = () => {
         roomId
         roomName
         lastMessageAt
+        unreadCount
         lastMessage {
           _id
           id
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index daed6815e..0ff8669fb 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -126,6 +126,7 @@ describe('Room', () => {
                 id: expect.any(String),
                 roomId: result.data.CreateRoom.id,
                 roomName: 'Other Chatting User',
+                unreadCount: 0,
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -241,6 +242,7 @@ describe('Room', () => {
                   id: expect.any(String),
                   roomId: result.data.Room[0].id,
                   roomName: 'Chatting User',
+                  unreadCount: 0,
                   users: expect.arrayContaining([
                     {
                       _id: 'chatting-user',
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 885688643..f87f89f2e 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -34,7 +34,8 @@ export default {
           RETURN room {
             .*,
             users: [properties(currentUser), properties(user)],
-            roomName: roomName
+            roomName: roomName,
+            unreadCount: toString(0)
           }
         `
         const createRommTxResponse = await transaction.run(createRoomCypher, {
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2cf51014e..a1ff56e34 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -23,6 +23,13 @@ type Room {
     WITH message ORDER BY message.createdAt DESC LIMIT 1
     RETURN message
   """)
+
+  unreadCount: Int @cypher(statement: """
+    MATCH (this)<-[:INSIDE]-(message:Message)<-[:CREATED]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+      AND NOT message.seen 
+    RETURN count(message)
+  """)
 }
 
 type Mutation {

From b9b9fea1ddedaf48771b6ca43ddd72dfbb3dcb14 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:38:46 +0200
Subject: [PATCH 016/181] test unread count

---
 backend/src/schema/resolvers/messages.spec.ts | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index ecdf90873..9a9e84c1e 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -142,6 +142,7 @@ describe('Message', () => {
                   Room: [
                     expect.objectContaining({
                       lastMessageAt: expect.any(String),
+                      unreadCount: 0,
                       lastMessage: expect.objectContaining({
                         _id: result.data.Room[0].lastMessage.id,
                         id: expect.any(String),
@@ -160,6 +161,35 @@ describe('Message', () => {
               })
             })
           })
+
+          describe('unread count for other user', () => {
+            it('has unread count = 1', async () => {
+              authenticatedUser = await otherChattingUser.toJson()
+              await expect(query({ query: roomQuery() })).resolves.toMatchObject({
+                errors: undefined,
+                data: {
+                  Room: [
+                    expect.objectContaining({
+                      lastMessageAt: expect.any(String),
+                      unreadCount: 1,
+                      lastMessage: expect.objectContaining({
+                        _id: expect.any(String),
+                        id: expect.any(String),
+                        content: 'Some nice message to other chatting user',
+                        senderId: 'chatting-user',
+                        username: 'Chatting User',
+                        avatar: expect.any(String),
+                        date: expect.any(String),
+                        saved: true,
+                        distributed: false,
+                        seen: false,
+                      }),
+                    }),
+                  ],
+                },
+              })
+            })
+          })
         })
 
         describe('user does not chat in room', () => {

From 4310b3fa48d9c2f36df5e992d2f973458cf68fb4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:51:54 +0200
Subject: [PATCH 017/181] create message mutation returns full message object

---
 backend/src/graphql/messages.ts               |  4 ++++
 backend/src/middleware/chatMiddleware.ts      | 22 +++++++++++++++++++
 backend/src/schema/resolvers/messages.spec.ts |  4 ++++
 backend/src/schema/resolvers/messages.ts      | 15 +++++++------
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index 34c7d559b..e042fc600 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -6,6 +6,10 @@ export const createMessageMutation = () => {
       CreateMessage(roomId: $roomId, content: $content) {
         id
         content
+        senderId
+        username
+        avatar
+        date
         saved
         distributed
         seen
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index 5b0e4d7e2..c28d6a70d 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -11,6 +11,13 @@ const setRoomProps = (room) => {
   }
 }
 
+const setMessageProps = (message, context) => {
+  message._id = message.id
+  if (message.senderId !== context.user.id) {
+    message.distributed = true
+  }
+}
+
 const roomProperties = async (resolve, root, args, context, info) => {
   const resolved = await resolve(root, args, context, info)
   if (resolved) {
@@ -25,9 +32,24 @@ const roomProperties = async (resolve, root, args, context, info) => {
   return resolved
 }
 
+const messageProperties = async (resolve, root, args, context, info) => {
+  const resolved = await resolve(root, args, context, info)
+  if (resolved) {
+    if (isArray(resolved)) {
+      resolved.forEach((message) => {
+        setMessageProps(message, context)
+      })
+    } else {
+      setMessageProps(resolved, context)
+    }
+  }
+  return resolved
+}
+
 export default {
   Query: {
     Room: roomProperties,
+    Message: messageProperties,
   },
   Mutation: {
     CreateRoom: roomProperties,
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 9a9e84c1e..68b84ad69 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -125,6 +125,10 @@ describe('Message', () => {
                 CreateMessage: {
                   id: expect.any(String),
                   content: 'Some nice message to other chatting user',
+                  senderId: 'chatting-user',
+                  username: 'Chatting User',
+                  avatar: expect.any(String),
+                  date: expect.any(String),
                   saved: true,
                   distributed: false,
                   seen: false,
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 266758128..fa80a7b3f 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -40,12 +40,6 @@ export default {
           }
           // send subscription to author to updated the messages
         }
-        resolved.forEach((message) => {
-          message._id = message.id
-          if (message.senderId !== context.user.id) {
-            message.distributed = true
-          }
-        })
       }
       return resolved
     },
@@ -60,6 +54,7 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
+          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -69,7 +64,13 @@ export default {
             seen: false
           })-[:INSIDE]->(room)
           SET room.lastMessageAt = toString(datetime())
-          RETURN message { .* }
+          RETURN message {
+            .*,
+            senderId: currentUser.id,
+            username: currentUser.name,
+            avatar: image.url,
+            date: message.createdAt
+          }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,

From 138b8517373aec69b4ec37659dd694cea95c0334 Mon Sep 17 00:00:00 2001
From: entermex <max@infinity.labs.ooo>
Date: Fri, 14 Jul 2023 13:05:07 +0200
Subject: [PATCH 018/181] Change color red to green on cancel buttons of post
 and comments

---
 webapp/components/CommentForm/CommentForm.vue           | 1 -
 webapp/components/ContributionForm/ContributionForm.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index 5f6a2420d..6d9b59de6 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -8,7 +8,6 @@
             :disabled="disabled && !update"
             @click="handleCancel"
             data-test="cancel-button"
-            danger
           >
             {{ $t('actions.cancel') }}
           </base-button>
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 0067dab72..261c1d28d 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -173,7 +173,6 @@
               data-test="cancel-button"
               :disabled="loading"
               @click="$router.back()"
-              danger
             >
               {{ $t('actions.cancel') }}
             </base-button>

From f4567b14ff838a5f78e2f132d471d8ce4aa7da0a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 13:25:57 +0200
Subject: [PATCH 019/181] feat(backend): unread rooms query

---
 backend/src/schema/resolvers/rooms.ts  | 21 +++++++++++++++++++++
 backend/src/schema/types/type/Room.gql |  1 +
 2 files changed, 22 insertions(+)

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d5015a03b..3eda1440c 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -25,6 +25,27 @@ export default {
       }
       return resolved
     },
+    UnreadRooms: async (object, params, context, resolveInfo) => {
+      const {
+        user: { id: currentUserId },
+      } = context
+      const session = context.driver.session()
+      const readTxResultPromise = session.readTransaction(async (transaction) => {
+        const unreadRoomsCypher = `
+          MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(user:User)
+          WHERE NOT message.seen AND NOT user.id = $currentUserId
+          RETURN toString(COUNT(room)) AS count
+        `
+        const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { currentUserId })
+        return unreadRoomsTxResponse.records.map((record) => record.get('count'))
+      })
+      try {
+        const count = await readTxResultPromise
+        return count
+      } finally {
+        session.close()
+      }
+    },
   },
   Mutation: {
     CreateRoom: async (_parent, params, context, _resolveInfo) => {
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ce6556f6..55984fb5f 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -25,4 +25,5 @@ type Mutation {
 
 type Query {
   Room: [Room]
+  UnreadRooms: Int
 }

From 09be4d3442e227bb7722cfc5fe0b4a3d9445a44c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 14:40:38 +0200
Subject: [PATCH 020/181] test unread rooms query

---
 backend/src/graphql/rooms.ts                  |   8 ++
 .../src/middleware/permissionsMiddleware.ts   |   1 +
 backend/src/schema/resolvers/rooms.spec.ts    | 120 +++++++++++++++++-
 backend/src/schema/resolvers/rooms.ts         |   6 +-
 4 files changed, 128 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 109bf1d55..cb511c4eb 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -30,3 +30,11 @@ export const roomQuery = () => {
     }
   `
 }
+
+export const unreadRoomsQuery = () => {
+  return gql`
+    query {
+      UnreadRooms
+    }
+  `
+}
diff --git a/backend/src/middleware/permissionsMiddleware.ts b/backend/src/middleware/permissionsMiddleware.ts
index c07098a3c..f87f4b079 100644
--- a/backend/src/middleware/permissionsMiddleware.ts
+++ b/backend/src/middleware/permissionsMiddleware.ts
@@ -408,6 +408,7 @@ export default shield(
       getInviteCode: isAuthenticated, // and inviteRegistration
       Room: isAuthenticated,
       Message: isAuthenticated,
+      UnreadRooms: isAuthenticated,
     },
     Mutation: {
       '*': deny,
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 03c3d4456..6a8cb47de 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -1,7 +1,8 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
 import { getNeode, getDriver } from '../../db/neo4j'
-import { createRoomMutation, roomQuery } from '../../graphql/rooms'
+import { createRoomMutation, roomQuery, unreadRoomsQuery } from '../../graphql/rooms'
+import { createMessageMutation } from '../../graphql/messages'
 import createServer from '../../server'
 
 const driver = getDriver()
@@ -29,11 +30,13 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  await cleanDatabase()
+  // await cleanDatabase()
   driver.close()
 })
 
 describe('Room', () => {
+  let roomId: string
+
   beforeAll(async () => {
     ;[chattingUser, otherChattingUser, notChattingUser] = await Promise.all([
       Factory.build('user', {
@@ -68,8 +71,6 @@ describe('Room', () => {
     })
 
     describe('authenticated', () => {
-      let roomId: string
-
       beforeAll(async () => {
         authenticatedUser = await chattingUser.toJson()
       })
@@ -260,4 +261,115 @@ describe('Room', () => {
       })
     })
   })
+
+  describe('unread rooms query', () => {
+    describe('unauthenticated', () => {
+      it('throws authorization error', async () => {
+        authenticatedUser = null
+        await expect(
+          query({
+            query: unreadRoomsQuery(),
+          }),
+        ).resolves.toMatchObject({
+          errors: [{ message: 'Not Authorized!' }],
+        })
+      })
+    })
+
+    describe('authenticated', () => {
+      let otherRoomId: string
+
+      beforeAll(async () => {
+        authenticatedUser = await chattingUser.toJson()
+        const result = await mutate({
+          mutation: createRoomMutation(),
+          variables: {
+            userId: 'not-chatting-user',
+          },
+        })
+        otherRoomId = result.data.CreateRoom.roomId
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: otherRoomId,
+            content: 'Message to not chatting user',
+          },
+        })
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId,
+            content: '1st message to other chatting user',
+          },
+        })
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId,
+            content: '2nd message to other chatting user',
+          },
+        })
+        authenticatedUser = await otherChattingUser.toJson()
+        const result2 = await mutate({
+          mutation: createRoomMutation(),
+          variables: {
+            userId: 'not-chatting-user',
+          },
+        })
+        otherRoomId = result2.data.CreateRoom.roomId
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: otherRoomId,
+            content: 'Other message to not chatting user',
+          },
+        })
+      })
+
+      describe('as chatting user', () => {
+        it('has 0 unread rooms', async () => {
+          authenticatedUser = await chattingUser.toJson()
+          await expect(
+            query({
+              query: unreadRoomsQuery(),
+            }),
+          ).resolves.toMatchObject({
+            data: {
+              UnreadRooms: 0,
+            },
+          })
+        })
+      })
+
+      describe('as other chatting user', () => {
+        it('has 1 unread rooms', async () => {
+          authenticatedUser = await otherChattingUser.toJson()
+          await expect(
+            query({
+              query: unreadRoomsQuery(),
+            }),
+          ).resolves.toMatchObject({
+            data: {
+              UnreadRooms: 1,
+            },
+          })
+        })
+      })
+
+      describe('as not chatting user', () => {
+        it('has 2 unread rooms', async () => {
+          authenticatedUser = await notChattingUser.toJson()
+          await expect(
+            query({
+              query: unreadRoomsQuery(),
+            }),
+          ).resolves.toMatchObject({
+            data: {
+              UnreadRooms: 2,
+            },
+          })
+        })
+      })
+    })
+  })
 })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 3eda1440c..084a75eb0 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -33,11 +33,11 @@ export default {
       const readTxResultPromise = session.readTransaction(async (transaction) => {
         const unreadRoomsCypher = `
           MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(user:User)
-          WHERE NOT message.seen AND NOT user.id = $currentUserId
-          RETURN toString(COUNT(room)) AS count
+          WHERE NOT user.id = $currentUserId AND NOT message.seen
+          RETURN toString(COUNT(DISTINCT room)) AS count
         `
         const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { currentUserId })
-        return unreadRoomsTxResponse.records.map((record) => record.get('count'))
+        return unreadRoomsTxResponse.records.map((record) => record.get('count'))[0]
       })
       try {
         const count = await readTxResultPromise

From d7746e5904a44460404fa5ebf6d554ef42d17882 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 14:44:41 +0200
Subject: [PATCH 021/181] clean db after all

---
 backend/src/schema/resolvers/rooms.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 6a8cb47de..8c46794c7 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -30,7 +30,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  // await cleanDatabase()
+  await cleanDatabase()
   driver.close()
 })
 

From c46d0064fcd33b175fa71e95aab747bef587aa04 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 14:50:43 +0200
Subject: [PATCH 022/181] unread rooms query in chat notification

---
 .../ChatNotificationMenu.vue                   | 18 +++++++++++++++++-
 webapp/graphql/Rooms.js                        |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index fcd93ee48..016410216 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -8,18 +8,34 @@
         placement: 'bottom-start',
       }"
     >
-      <counter-icon icon="chat-bubble" :count="1" danger />
+      <counter-icon icon="chat-bubble" :count="count" danger />
     </base-button>
   </nuxt-link>
 </template>
 
 <script>
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
+import { unreadRoomsQuery } from '~/graphql/Rooms'
 
 export default {
   name: 'ChatNotificationMenu',
   components: {
     CounterIcon,
   },
+  data() {
+    return {
+      count: 0,
+    }
+  },
+  apollo: {
+    UnreadRooms: {
+      query() {
+        return unreadRoomsQuery()
+      },
+      update({ UnreadRooms }) {
+        this.count = UnreadRooms
+      },
+    },
+  },
 }
 </script>
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e28702f77..c659ba85c 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -27,3 +27,11 @@ export const createRoom = () => gql`
     }
   }
 `
+
+export const unreadRoomsQuery = () => {
+  return gql`
+    query {
+      UnreadRooms
+    }
+  `
+}

From db594650f9308e8c3bdd5e396c087598ae932d82 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 18:53:56 +0200
Subject: [PATCH 023/181] feat(webapp): mark messages as seen

---
 webapp/components/Chat/Chat.vue | 71 +++++++++++++++++++--------------
 webapp/graphql/Messages.js      |  8 ++++
 2 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..8c4aaff69 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation } from '~/graphql/Messages'
+import { messageQuery, createMessageMutation, markMessagesAsSeen } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters } from 'vuex'
 
@@ -83,30 +83,30 @@ export default {
           title: 'Just a dummy item',
         },
         /* {
-          name: 'inviteUser',
-          title: 'Invite User',
-        },
-        {
-          name: 'removeUser',
-          title: 'Remove User',
-        },
-        {
-          name: 'deleteRoom',
-          title: 'Delete Room',
-        },
-        */
+            name: 'inviteUser',
+            title: 'Invite User',
+            },
+            {
+            name: 'removeUser',
+            title: 'Remove User',
+            },
+            {
+            name: 'deleteRoom',
+            title: 'Delete Room',
+            },
+          */
       ],
       messageActions: [
         /*
-        {
-          name: 'addMessageToFavorite',
-          title: 'Add To Favorite',
-        },
-        {
-          name: 'shareMessage',
-          title: 'Share Message',
-        },
-        */
+            {
+            name: 'addMessageToFavorite',
+            title: 'Add To Favorite',
+            },
+            {
+            name: 'shareMessage',
+            title: 'Share Message',
+            },
+          */
       ],
       templatesText: [
         {
@@ -134,14 +134,14 @@ export default {
       },
       roomActions: [
         /*
-        {
-          name: 'archiveRoom',
-          title: 'Archive Room',
-        },
-        { name: 'inviteUser', title: 'Invite User' },
-        { name: 'removeUser', title: 'Remove User' },
-        { name: 'deleteRoom', title: 'Delete Room' },
-        */
+            {
+            name: 'archiveRoom',
+            title: 'Archive Room',
+            },
+            { name: 'inviteUser', title: 'Invite User' },
+            { name: 'removeUser', title: 'Remove User' },
+            { name: 'deleteRoom', title: 'Delete Room' },
+          */
       ],
       rooms: [],
       messages: [],
@@ -208,8 +208,19 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
+        const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
+        if (newMsgIds.length) {
+          this.$apollo.mutate({
+            mutation: markMessagesAsSeen(),
+            variables: {
+              messageIds: newMsgIds,
+            },
+          })
+        }
+
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
+          m.seen = true
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..134b00de0 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -27,3 +27,11 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const markMessagesAsSeen = () => {
+  return gql`
+    mutation ($messageIds: [String!]) {
+      MarkMessagesAsSeen(messageIds: $messageIds)
+    }
+  `
+}

From f05a0bc5448bbd55116283d928b82d1381955412 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:38:19 +0200
Subject: [PATCH 024/181] frontend paginate rooms

---
 webapp/components/Chat/Chat.vue | 108 +++++++++++++++++---------------
 webapp/graphql/Rooms.js         |   4 +-
 2 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..437f8bcf1 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -13,13 +13,15 @@
         :messages-loaded="messagesLoaded"
         :rooms="JSON.stringify(rooms)"
         :room-actions="JSON.stringify(roomActions)"
-        :rooms-loaded="true"
+        :rooms-loaded="roomsLoaded"
+        :loading-rooms="loadingRooms"
         show-files="false"
         show-audio="false"
         :styles="JSON.stringify(computedChatStyle)"
         :show-footer="true"
         @send-message="sendMessage($event.detail[0])"
         @fetch-messages="fetchMessages($event.detail[0])"
+        @fetch-more-rooms="fetchRooms"
         :responsive-breakpoint="responsiveBreakpoint"
         :single-room="singleRoom"
         show-reaction-emojis="false"
@@ -143,17 +145,20 @@ export default {
         { name: 'deleteRoom', title: 'Delete Room' },
         */
       ],
-      rooms: [],
-      messages: [],
-      messagesLoaded: true,
+      
       showDemoOptions: true,
       responsiveBreakpoint: 600,
+      rooms: [],
+      roomsLoaded: false,
+      roomPage: 0,
+      roomPageSize: 10, // TODO pagination is a problem with single rooms - cant use
       singleRoom: !!this.singleRoomId || false,
+      selectedRoom: null,
+      loadingRooms: true,
+      messagesLoaded: false,
       messagePage: 0,
       messagePageSize: 20,
-      roomPage: 0,
-      roomPageSize: 999, // TODO pagination is a problem with single rooms - cant use
-      selectedRoom: null,
+      messages: [],
     }
   },
   mounted() {
@@ -165,8 +170,8 @@ export default {
             userId: this.singleRoomId,
           },
         })
-        .then(() => {
-          this.$apollo.queries.Rooms.refetch()
+        .then(({data: { CreateRoom }}) => {
+          this.fetchRooms({room: CreateRoom})
         })
         .catch((error) => {
           this.$toast.error(error)
@@ -174,6 +179,8 @@ export default {
         .finally(() => {
           // this.loading = false
         })
+    } else {
+      this.fetchRooms()
     }
   },
   computed: {
@@ -181,12 +188,52 @@ export default {
       currentUser: 'auth/user',
     }),
     computedChatStyle() {
-      // TODO light/dark theme still needed?
-      // return this.theme === 'light' ? chatStyle.STYLE.light : chatStyle.STYLE.dark
       return chatStyle.STYLE.light
     },
   },
   methods: {
+    async fetchRooms({ room } = {}){
+      console.log(room)
+      this.roomsLoaded = false
+      const offset = this.roomPage * this.roomPageSize
+      try {
+        const {
+          data: { Room },
+        } = await this.$apollo.query({
+          query: roomQuery(),
+          variables: {
+            id: room?.id,
+            first: this.roomPageSize,
+            offset,
+          },
+          fetchPolicy: 'no-cache',
+        })
+
+        console.log(Room)
+        const rooms = []
+        const newRooms = Room.map((r) => {
+          return {
+            ...r,
+            users: r.users.map((u) => {
+              return { ...u, username: u.name, avatar: u.avatar?.url }
+            }),
+          }
+        })
+
+        this.rooms = [...this.rooms, ...newRooms]
+
+        if (Room.length < this.roomPageSize) {
+          this.roomsLoaded = true
+        }
+        this.roomPage += 1
+      } catch (error) {
+        this.rooms = []
+        this.$toast.error(error.message)
+      }
+      // must be set false after initial rooms are loaded and never changed again
+      this.loadingRooms = false
+    },
+
     async fetchMessages({ room, options = {} }) {
       if (this.selectedRoom !== room.id) {
         this.messages = []
@@ -251,45 +298,6 @@ export default {
       return fullname.match(/\b\w/g).join('').substring(0, 3).toUpperCase()
     },
   },
-  apollo: {
-    Rooms: {
-      query() {
-        return roomQuery()
-      },
-      variables() {
-        return {
-          first: this.roomPageSize,
-          offset: this.roomPage * this.roomPageSize,
-        }
-      },
-      update({ Room }) {
-        if (!Room) {
-          this.rooms = []
-          return
-        }
-
-        // Backend result needs mapping of the following values
-        // room[i].users[j].name -> room[i].users[j].username
-        // room[i].users[j].avatar.url -> room[i].users[j].avatar
-        // also filter rooms for the single room
-        this.rooms = Room.map((r) => {
-          return {
-            ...r,
-            users: r.users.map((u) => {
-              return { ...u, username: u.name, avatar: u.avatar?.url }
-            }),
-          }
-        }).filter((r) =>
-          this.singleRoom ? r.users.filter((u) => u.id === this.singleRoomId).length > 0 : true,
-        )
-      },
-      error(error) {
-        this.rooms = []
-        this.$toast.error(error.message)
-      },
-      fetchPolicy: 'no-cache',
-    },
-  },
 }
 </script>
 <style lang="scss">
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e28702f77..38fd5e3b1 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
 
 export const roomQuery = () => gql`
-  query Room($first: Int, $offset: Int) {
-    Room(first: $first, offset: $offset) {
+  query Room($first: Int, $offset: Int, $id: ID) {
+    Room(first: $first, offset: $offset, id: $id) {
       id
       roomId
       roomName

From 5f4a973e2a56b8f81e7fb3b1da0eebd481d10c13 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:38:35 +0200
Subject: [PATCH 025/181] backend allow room filter by id for single rooms

---
 backend/src/graphql/rooms.ts           | 4 ++--
 backend/src/schema/types/type/Room.gql | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 109bf1d55..001c5cdc3 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -13,8 +13,8 @@ export const createRoomMutation = () => {
 
 export const roomQuery = () => {
   return gql`
-    query {
-      Room {
+    query Room($first: Int, $offset: Int, $id: ID) {
+      Room(first: $first, offset: $offset, id: $id) {
         id
         roomId
         roomName
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ce6556f6..1d056770b 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -24,5 +24,5 @@ type Mutation {
 }
 
 type Query {
-  Room: [Room]
+  Room(id: ID): [Room]
 }

From 851dd2e3e609eec3711ba76660b814cfb6630ea9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:40:18 +0200
Subject: [PATCH 026/181] lint fixes

---
 webapp/components/Chat/Chat.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 437f8bcf1..f2e0f7c3d 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -145,7 +145,7 @@ export default {
         { name: 'deleteRoom', title: 'Delete Room' },
         */
       ],
-      
+
       showDemoOptions: true,
       responsiveBreakpoint: 600,
       rooms: [],
@@ -170,8 +170,8 @@ export default {
             userId: this.singleRoomId,
           },
         })
-        .then(({data: { CreateRoom }}) => {
-          this.fetchRooms({room: CreateRoom})
+        .then(({ data: { CreateRoom } }) => {
+          this.fetchRooms({ room: CreateRoom })
         })
         .catch((error) => {
           this.$toast.error(error)
@@ -192,8 +192,7 @@ export default {
     },
   },
   methods: {
-    async fetchRooms({ room } = {}){
-      console.log(room)
+    async fetchRooms({ room } = {}) {
       this.roomsLoaded = false
       const offset = this.roomPage * this.roomPageSize
       try {
@@ -209,8 +208,6 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        console.log(Room)
-        const rooms = []
         const newRooms = Room.map((r) => {
           return {
             ...r,

From 0cb45cd8f63c526b2e0977603c25d6efb3a44a9e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:42:10 +0200
Subject: [PATCH 027/181] removed refetch message method

---
 webapp/components/Chat/Chat.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index f2e0f7c3d..7d258c2d0 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -268,13 +268,6 @@ export default {
       }
     },
 
-    refetchMessage(roomId) {
-      this.fetchMessages({
-        room: this.rooms.find((r) => r.roomId === roomId),
-        options: { refetch: true },
-      })
-    },
-
     async sendMessage(message) {
       try {
         await this.$apollo.mutate({
@@ -287,7 +280,10 @@ export default {
       } catch (error) {
         this.$toast.error(error.message)
       }
-      this.refetchMessage(message.roomId)
+      this.fetchMessages({
+        room: this.rooms.find((r) => r.roomId === roomId),
+        options: { refetch: true },
+      })
     },
 
     getInitialsName(fullname) {

From ab91413bf30aa7db32e3aee82e15b4be77a5bc9d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:43:08 +0200
Subject: [PATCH 028/181] typo

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 7d258c2d0..96bdef518 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -281,7 +281,7 @@ export default {
         this.$toast.error(error.message)
       }
       this.fetchMessages({
-        room: this.rooms.find((r) => r.roomId === roomId),
+        room: this.rooms.find((r) => r.roomId === message.roomId),
         options: { refetch: true },
       })
     },

From 66cd66d71a833eac20d94fcebd35ba88fe6b0e38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:03:53 +0200
Subject: [PATCH 029/181] test room pagination and singleRoom query

---
 backend/src/schema/resolvers/rooms.spec.ts | 182 +++++++++++++++++++++
 1 file changed, 182 insertions(+)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 03c3d4456..a527d1b8b 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -48,6 +48,14 @@ describe('Room', () => {
         id: 'not-chatting-user',
         name: 'Not Chatting User',
       }),
+      Factory.build('user', {
+        id: 'second-chatting-user',
+        name: 'Second Chatting User',
+      }),
+      Factory.build('user', {
+        id: 'third-chatting-user',
+        name: 'Third Chatting User',
+      }),
     ])
   })
 
@@ -260,4 +268,178 @@ describe('Room', () => {
       })
     })
   })
+
+  describe('query several rooms', () => {
+    beforeAll(async () => {
+      authenticatedUser = await chattingUser.toJson()
+      await mutate({
+        mutation: createRoomMutation(),
+        variables: {
+          userId: 'second-chatting-user',
+        },
+      })
+      await mutate({
+        mutation: createRoomMutation(),
+        variables: {
+          userId: 'third-chatting-user',
+        },
+      })
+    })
+
+    it('returns the rooms paginated', async () => {
+      expect(await query({ query: roomQuery(), variables: { first: 2, offset: 0 } })).toMatchObject(
+        {
+          errors: undefined,
+          data: {
+            Room: [
+              {
+                id: expect.any(String),
+                roomId: expect.any(String),
+                roomName: 'Other Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _id: 'chatting-user',
+                    id: 'chatting-user',
+                    name: 'Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                  {
+                    _id: 'other-chatting-user',
+                    id: 'other-chatting-user',
+                    name: 'Other Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                ]),
+              },
+              {
+                id: expect.any(String),
+                roomId: expect.any(String),
+                roomName: 'Second Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _id: 'chatting-user',
+                    id: 'chatting-user',
+                    name: 'Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                  {
+                    _id: 'second-chatting-user',
+                    id: 'second-chatting-user',
+                    name: 'Second Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                ]),
+              },
+            ],
+          },
+        },
+      )
+      expect(await query({ query: roomQuery(), variables: { first: 2, offset: 2 } })).toMatchObject(
+        {
+          errors: undefined,
+          data: {
+            Room: [
+              {
+                id: expect.any(String),
+                roomId: expect.any(String),
+                roomName: 'Third Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _id: 'chatting-user',
+                    id: 'chatting-user',
+                    name: 'Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                  {
+                    _id: 'third-chatting-user',
+                    id: 'third-chatting-user',
+                    name: 'Third Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                ]),
+              },
+            ],
+          },
+        },
+      )
+    })
+  })
+
+  describe('query single room', () => {
+    let result: any = null
+    beforeAll(async () => {
+      authenticatedUser = await chattingUser.toJson()
+      result = await query({ query: roomQuery() })
+    })
+    describe('as chatter of room', () => {
+      it('returns the room', async () => {
+        expect(
+          await query({
+            query: roomQuery(),
+            variables: { first: 2, offset: 0, id: result.data.Room[0].id },
+          }),
+        ).toMatchObject({
+          errors: undefined,
+          data: {
+            Room: [
+              {
+                id: result.data.Room[0].id,
+                roomId: result.data.Room[0].id,
+                roomName: 'Other Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _id: 'chatting-user',
+                    id: 'chatting-user',
+                    name: 'Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                  {
+                    _id: 'other-chatting-user',
+                    id: 'other-chatting-user',
+                    name: 'Other Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                ]),
+              },
+            ],
+          },
+        })
+      })
+      describe('as not chatter of room', () => {
+        beforeAll(async () => {
+          authenticatedUser = await notChattingUser.toJson()
+        })
+        it('returns no room', async () => {
+          authenticatedUser = await notChattingUser.toJson()
+          expect(
+            await query({
+              query: roomQuery(),
+              variables: { first: 2, offset: 0, id: result.data.Room[0].id },
+            }),
+          ).toMatchObject({
+            errors: undefined,
+            data: {
+              Room: [],
+            },
+          })
+        })
+      })
+    })
+  })
 })

From 2d3483dc1be4e5565f61c5e920a87477739e60a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:35:26 +0200
Subject: [PATCH 030/181] query additional data for messages

---
 webapp/graphql/Messages.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..1d7917bfc 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -7,11 +7,17 @@ export const messageQuery = () => {
         _id
         id
         indexId
-        senderId
         content
+        senderId
         author {
           id
         }
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
       }
     }
   `

From 775a3ddb7282fea07cc32aba9af7c33e0aa2518a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:35:44 +0200
Subject: [PATCH 031/181] strip datetime down to date in message

---
 webapp/components/Chat/Chat.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..daab051de 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -210,6 +210,7 @@ export default {
 
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
+          m.date = new Date(m.date).toDateString()
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)

From 661c2f1b71c0ad8308068331248fee998c9f2316 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:51:33 +0200
Subject: [PATCH 032/181] implement room order

---
 backend/src/graphql/rooms.ts           |  2 +-
 backend/src/schema/types/type/Room.gql | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 001c5cdc3..2977a3dde 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -14,7 +14,7 @@ export const createRoomMutation = () => {
 export const roomQuery = () => {
   return gql`
     query Room($first: Int, $offset: Int, $id: ID) {
-      Room(first: $first, offset: $offset, id: $id) {
+      Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
         id
         roomId
         roomName
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 1d056770b..82acd9e05 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -5,6 +5,11 @@
 #   users_some: _UserFilter
 # }
 
+# TODO change this to last message date
+enum _RoomOrdering {
+  createdAt_desc
+}
+
 type Room {
   id: ID!
   createdAt: String
@@ -24,5 +29,8 @@ type Mutation {
 }
 
 type Query {
-  Room(id: ID): [Room]
+  Room(
+    id: ID
+    orderBy: [_RoomOrdering]
+  ): [Room]
 }

From 1e7f579378ab22cd4ea008b78287322c8917676b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:51:43 +0200
Subject: [PATCH 033/181] adjust tests

---
 backend/src/schema/resolvers/rooms.spec.ts | 28 +++++++++++-----------
 webapp/graphql/Rooms.js                    |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index a527d1b8b..0978fd600 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -295,7 +295,7 @@ describe('Room', () => {
               {
                 id: expect.any(String),
                 roomId: expect.any(String),
-                roomName: 'Other Chatting User',
+                roomName: 'Third Chatting User',
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -306,9 +306,9 @@ describe('Room', () => {
                     },
                   },
                   {
-                    _id: 'other-chatting-user',
-                    id: 'other-chatting-user',
-                    name: 'Other Chatting User',
+                    _id: 'third-chatting-user',
+                    id: 'third-chatting-user',
+                    name: 'Third Chatting User',
                     avatar: {
                       url: expect.any(String),
                     },
@@ -350,7 +350,7 @@ describe('Room', () => {
               {
                 id: expect.any(String),
                 roomId: expect.any(String),
-                roomName: 'Third Chatting User',
+                roomName: 'Other Chatting User',
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -361,9 +361,9 @@ describe('Room', () => {
                     },
                   },
                   {
-                    _id: 'third-chatting-user',
-                    id: 'third-chatting-user',
-                    name: 'Third Chatting User',
+                    _id: 'other-chatting-user',
+                    id: 'other-chatting-user',
+                    name: 'Other Chatting User',
                     avatar: {
                       url: expect.any(String),
                     },
@@ -395,9 +395,9 @@ describe('Room', () => {
           data: {
             Room: [
               {
-                id: result.data.Room[0].id,
-                roomId: result.data.Room[0].id,
-                roomName: 'Other Chatting User',
+                id: expect.any(String),
+                roomId: expect.any(String),
+                roomName: 'Third Chatting User',
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -408,9 +408,9 @@ describe('Room', () => {
                     },
                   },
                   {
-                    _id: 'other-chatting-user',
-                    id: 'other-chatting-user',
-                    name: 'Other Chatting User',
+                    _id: 'third-chatting-user',
+                    id: 'third-chatting-user',
+                    name: 'Third Chatting User',
                     avatar: {
                       url: expect.any(String),
                     },
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 38fd5e3b1..a746d34f9 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
       id
       roomId
       roomName

From 5dfdcc9bc2e77cde65d9c2f0ef4970ed5b07c952 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 15 Jul 2023 19:00:46 +0200
Subject: [PATCH 034/181] fix(webapp): show room header images.

---
 webapp/components/Chat/Chat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..6cacd7090 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -188,10 +188,10 @@ export default {
   },
   methods: {
     async fetchMessages({ room, options = {} }) {
-      if (this.selectedRoom !== room.id) {
+      if (this.selectedRoom?.id !== room.id) {
         this.messages = []
         this.messagePage = 0
-        this.selectedRoom = room.id
+        this.selectedRoom = room
       }
       this.messagesLoaded = options.refetch ? this.messagesLoaded : false
       const offset = (options.refetch ? 0 : this.messagePage) * this.messagePageSize

From 5ca1e9e648f5d34b8127234455522a4dac9ac144 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:35:20 +0200
Subject: [PATCH 035/181] add docker image building step to e2e test workflow

---
 .github/workflows/test-e2e.yml | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 74ebd1c43..87fdb2bf0 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -2,8 +2,46 @@ name: ocelot.social end-to-end test CI
 on: push
 
 jobs:
+  docker_preparation:
+    name: Fullstack test preparation
+    runs-on: ubuntu-latest
+    outputs:
+      pr-number: ${{ steps.pr.outputs.number }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
+
+      - name: Build docker images
+        run: |
+          mkdir /tmp/images
+          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
+          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
+
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+      
+      - name: Cache docker images
+        id: cache
+        uses: actions/cache/save@v3.3.1
+        with:
+          path: |
+            /tmp/images/
+          key: e2e-preparation-cache-pr${{ steps.pr.outputs.number }}
+
   fullstack_tests:
     name: Fullstack tests
+    if: success()
+    needs: docker_preparation
     runs-on: ubuntu-latest
     env:
       jobs: 8

From 690021fcb6eb3f575470e15d969267b3a5d7d9ad Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:39:57 +0200
Subject: [PATCH 036/181] move cypress requirement installation to preparation
 step

---
 .github/workflows/test-e2e.yml | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 87fdb2bf0..9d4a7d1a5 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -26,6 +26,15 @@ jobs:
           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
           docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
 
+      - name: Install cypress requirements
+        run: |
+          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          cd backend
+          yarn install
+          yarn build
+          cd ..
+          yarn install
+
       - name: Get pr number
         id: pr
         uses: 8BitJonny/gh-get-current-pr@2.2.0
@@ -35,6 +44,9 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
           key: e2e-preparation-cache-pr${{ steps.pr.outputs.number }}
 
@@ -50,29 +62,9 @@ jobs:
         # run copies of the current job in parallel
         job: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: webapp | copy env file
-        run: cp webapp/.env.template webapp/.env
-
-      - name: backend | copy env file
-        run: cp backend/.env.template backend/.env
-
       - name: boot up test system | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
 
-      - name: Full stack tests | prepare
-        run: |
-          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
-          chmod +x /opt/cucumber-json-formatter
-          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
-          cd backend
-          yarn install
-          yarn build
-          cd ..
-          yarn install
-
       - name: Full stack tests | run tests
         id: e2e-tests
         run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )

From 9ba873648e04203a518b4cb1efdd47f259ab9662 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:42:58 +0200
Subject: [PATCH 037/181] add cache restoring in e2e test step

---
 .github/workflows/test-e2e.yml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9d4a7d1a5..426b2450c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -62,8 +62,27 @@ jobs:
         # run copies of the current job in parallel
         job: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
-      - name: boot up test system | docker-compose
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+      - name: Restore cache
+        uses: actions/cache/restore@v3.3.1
+        id: cache
+        with:
+          path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
+            /tmp/images/
+          key: e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}
+          fail-on-cache-miss: true
+
+      - name: Boot up test system | docker-compose
+        run: |
+          chmod +x /opt/cucumber-json-formatter
+          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+          docker load < /tmp/images/neo4j.tar
+          docker load < /tmp/images/backend.tar
+          docker load < /tmp/images/webapp.tar
+          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+          sleep 90s
 
       - name: Full stack tests | run tests
         id: e2e-tests

From 545eb04d6cb60a7bccf9423e82890c0b78fb3849 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:43:54 +0200
Subject: [PATCH 038/181] adapt step namings

---
 .github/workflows/test-e2e.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 426b2450c..9235d9f27 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -94,12 +94,12 @@ jobs:
           cd cypress/
           node create-cucumber-html-report.js
   
-      - name: End-to-end tests | if tests failed, get pr number
+      - name: Full stack tests | if tests failed, get pr number
         id: pr
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: 8BitJonny/gh-get-current-pr@2.2.0
 
-      - name: End-to-end tests | if tests failed, upload report
+      - name: Full stack tests | if tests failed, upload report
         id: e2e-report
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: actions/upload-artifact@v3

From fe8d4a4cfa3d477c78f9188682405ea1eefa498a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:46:01 +0200
Subject: [PATCH 039/181] reuse pr number from preparation step in e2e test
 step

---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9235d9f27..e68f2992f 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -104,6 +104,6 @@ jobs:
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: actions/upload-artifact@v3
         with:
-          name: ocelot-e2e-test-report-pr${{ steps.pr.outputs.number }}
+          name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 

From 6ab1d24c36bbfb6c574f9f873b0f1800dad40471 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:47:49 +0200
Subject: [PATCH 040/181] remove pr number step fpm e2e test job

---
 .github/workflows/test-e2e.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index e68f2992f..2e6986722 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -93,11 +93,6 @@ jobs:
         run: |
           cd cypress/
           node create-cucumber-html-report.js
-  
-      - name: Full stack tests | if tests failed, get pr number
-        id: pr
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
 
       - name: Full stack tests | if tests failed, upload report
         id: e2e-report
@@ -107,3 +102,16 @@ jobs:
           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 
+  cleanup:
+    name: Cleanup
+    if: always()
+    needs: [docker_preparation, fullstack_tests]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file

From b6fe28e1c4fcbadedc7b8d5f64f17a5714e222f6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 10:29:32 +0200
Subject: [PATCH 041/181] fix test, test pagination properly

---
 backend/src/schema/resolvers/rooms.spec.ts | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 17277ab13..c4c46f00d 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -399,7 +399,7 @@ describe('Room', () => {
     })
 
     it('returns the rooms paginated', async () => {
-      expect(await query({ query: roomQuery(), variables: { first: 2, offset: 0 } })).toMatchObject(
+      expect(await query({ query: roomQuery(), variables: { first: 3, offset: 0 } })).toMatchObject(
         {
           errors: undefined,
           data: {
@@ -450,11 +450,34 @@ describe('Room', () => {
                   },
                 ]),
               },
+              {
+                id: expect.any(String),
+                roomId: expect.any(String),
+                roomName: 'Not Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _id: 'chatting-user',
+                    id: 'chatting-user',
+                    name: 'Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                  {
+                    _id: 'not-chatting-user',
+                    id: 'not-chatting-user',
+                    name: 'Not Chatting User',
+                    avatar: {
+                      url: expect.any(String),
+                    },
+                  },
+                ]),
+              },
             ],
           },
         },
       )
-      expect(await query({ query: roomQuery(), variables: { first: 2, offset: 2 } })).toMatchObject(
+      expect(await query({ query: roomQuery(), variables: { first: 3, offset: 3 } })).toMatchObject(
         {
           errors: undefined,
           data: {

From d75566a8ce3733efd709271d8f775e36eb51dbbe Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 10:30:12 +0200
Subject: [PATCH 042/181] sender user

---
 backend/src/schema/resolvers/rooms.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 084a75eb0..cbf5bcd63 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -32,8 +32,8 @@ export default {
       const session = context.driver.session()
       const readTxResultPromise = session.readTransaction(async (transaction) => {
         const unreadRoomsCypher = `
-          MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(user:User)
-          WHERE NOT user.id = $currentUserId AND NOT message.seen
+          MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
+          WHERE NOT sender.id = $currentUserId AND NOT message.seen
           RETURN toString(COUNT(DISTINCT room)) AS count
         `
         const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { currentUserId })

From 8e3402a7efb55a57796f3e28ad50f792c1e0b2e5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 11:33:59 +0200
Subject: [PATCH 043/181] Update backend/src/schema/types/type/Room.gql

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index a1ff56e34..c9c72e931 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -20,7 +20,7 @@ type Room {
 
   lastMessage: Message @cypher(statement: """
     MATCH (this)<-[:INSIDE]-(message:Message)
-    WITH message ORDER BY message.createdAt DESC LIMIT 1
+    WITH message ORDER BY message.indexId DESC LIMIT 1
     RETURN message
   """)
 

From 9c052ea1cdc0997b842ffede2a86fb1d474ba57c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 11:38:06 +0200
Subject: [PATCH 044/181] start with chat notifications

---
 backend/src/schema/resolvers/messages.ts      | 18 +++++++++++++++++-
 backend/src/schema/types/type/Message.gql     |  4 ++++
 backend/src/server.ts                         |  1 +
 .../ChatNotificationMenu.vue                  | 19 +++++++++++++++++++
 .../NotificationMenu/NotificationMenu.vue     |  1 +
 webapp/graphql/Messages.js                    | 13 +++++++++++++
 6 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index a9937aac4..b0defe760 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,7 +1,19 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
+import { withFilter } from 'graphql-subscriptions'
+import { pubsub, CHAT_MESSAGE_ADDED } from '../../server'
 
 export default {
+  Subscription: {
+    chatMessageAdded: {
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
+        (payload, variables) => {
+          return payload.chatMessageAdded.senderId !== variables.userId
+        },
+      ),
+    },
+  },
   Query: {
     Message: async (object, params, context, resolveInfo) => {
       const { roomId } = params
@@ -72,7 +84,7 @@ export default {
             distributed: false,
             seen: false
           })-[:INSIDE]->(room)
-          RETURN message { .* }
+          RETURN message { .*, room: properties(room), senderId: currentUser.id }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,
@@ -82,6 +94,10 @@ export default {
         const [message] = await createMessageTxResponse.records.map((record) =>
           record.get('message'),
         )
+
+        // send subscriptions
+        await pubsub.publish(CHAT_MESSAGE_ADDED, { chatMessageAdded: message })
+
         return message
       })
       try {
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 671c5523a..e15a27d91 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -45,3 +45,7 @@ type Query {
     orderBy: [_MessageOrdering]
   ): [Message]
 }
+
+type Subscription {
+  chatMessageAdded(userId: ID!): Message
+}
diff --git a/backend/src/server.ts b/backend/src/server.ts
index b4d63c007..8192e44bc 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -14,6 +14,7 @@ import bodyParser from 'body-parser'
 import { graphqlUploadExpress } from 'graphql-upload'
 
 export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
+export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
 const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG
 let prodPubsub, devPubsub
 const options = {
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 016410216..34368a787 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -14,8 +14,10 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import { unreadRoomsQuery } from '~/graphql/Rooms'
+import { chatMessageAdded } from '~/graphql/Messages'
 
 export default {
   name: 'ChatNotificationMenu',
@@ -27,6 +29,11 @@ export default {
       count: 0,
     }
   },
+  computed: {
+    ...mapGetters({
+      user: 'auth/user',
+    }),
+  },
   apollo: {
     UnreadRooms: {
       query() {
@@ -35,6 +42,18 @@ export default {
       update({ UnreadRooms }) {
         this.count = UnreadRooms
       },
+      subscribeToMore: {
+        document: chatMessageAdded(),
+        variables() {
+          return {
+            userId: this.user.id,
+          }
+        },
+        updateQuery: (previousResult, { subscriptionData }) => {
+          // TODO emit chat reload
+          return { UnreadRooms: previousResult.UnreadRooms + 1}
+        },
+      },
     },
   },
 }
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 72f539a42..9e94e07d7 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -146,6 +146,7 @@ export default {
           const {
             data: { notificationAdded: newNotification },
           } = subscriptionData
+
           return {
             notifications: unionBy(
               [newNotification],
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..408a4aabb 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -27,3 +27,16 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const chatMessageAdded = () => {
+  return gql`
+    subscription chatMessageAdded($userId: ID!) {
+      chatMessageAdded(userId: $userId) {
+        id
+        room {
+          id
+        }
+      }
+    }
+  `
+}

From 882435e54c28af8ef1f609a846c2829014e5658e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 11:40:07 +0200
Subject: [PATCH 045/181] lint fix

---
 backend/src/schema/resolvers/rooms.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index c4c46f00d..690572e43 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -374,7 +374,7 @@ describe('Room', () => {
           ).resolves.toMatchObject({
             data: {
               UnreadRooms: 2,
-            }
+            },
           })
         })
       })

From 4afd688fbecc17bb8de63d1a392de0ef2c07e54e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 11:50:59 +0200
Subject: [PATCH 046/181] count unread messages on create room

---
 backend/src/schema/resolvers/rooms.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index f87f89f2e..b0ff6925e 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -29,13 +29,16 @@ export default {
           ON CREATE SET
             room.createdAt = toString(datetime()),
             room.id = apoc.create.uuid()
-          WITH room, user, currentUser,
+          WITH room, user, currentUser
+          OPTIONAL MATCH (room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
+          WHERE NOT sender.id = $currentUserId AND NOT message.seen
+          WITH room, user, currentUser, message,
           user.name AS roomName
           RETURN room {
             .*,
             users: [properties(currentUser), properties(user)],
             roomName: roomName,
-            unreadCount: toString(0)
+            unreadCount: toString(COUNT(DISTINCT message))
           }
         `
         const createRommTxResponse = await transaction.run(createRoomCypher, {

From edaf72b674027f61f685b80ec598e0d0eac8fbc7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 11:56:58 +0200
Subject: [PATCH 047/181] add room query pagination

---
 backend/src/graphql/rooms.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 554c346dc..2c724b1c8 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -24,8 +24,8 @@ export const createRoomMutation = () => {
 
 export const roomQuery = () => {
   return gql`
-    query {
-      Room {
+    query Room($first: Int, $offset: Int, $id: ID) {
+      Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
         id
         roomId
         roomName

From 3e60ab6854957e6085163c7b4eed219077813e3e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 12:41:06 +0200
Subject: [PATCH 048/181] room count subscription

---
 backend/src/schema/resolvers/messages.ts      | 20 +++++++------------
 backend/src/schema/resolvers/rooms.ts         | 13 ++++++++++++
 backend/src/schema/types/type/Message.gql     |  4 ----
 backend/src/schema/types/type/Room.gql        |  4 ++++
 backend/src/server.ts                         |  3 ++-
 .../ChatNotificationMenu.vue                  |  8 +++-----
 webapp/graphql/Messages.js                    | 13 ------------
 webapp/graphql/Rooms.js                       |  8 ++++++++
 8 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index b0defe760..49756d4d1 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,19 +1,9 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
-import { withFilter } from 'graphql-subscriptions'
-import { pubsub, CHAT_MESSAGE_ADDED } from '../../server'
+import RoomResolver from './rooms'
+import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 
 export default {
-  Subscription: {
-    chatMessageAdded: {
-      subscribe: withFilter(
-        () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
-        (payload, variables) => {
-          return payload.chatMessageAdded.senderId !== variables.userId
-        },
-      ),
-    },
-  },
   Query: {
     Message: async (object, params, context, resolveInfo) => {
       const { roomId } = params
@@ -91,12 +81,16 @@ export default {
           roomId,
           content,
         })
+
         const [message] = await createMessageTxResponse.records.map((record) =>
           record.get('message'),
         )
 
+        // TODO change user in context - mark message as seen
+        const roomCountUpdated = await RoomResolver.Query.UnreadRooms(null, null, context, null)
+
         // send subscriptions
-        await pubsub.publish(CHAT_MESSAGE_ADDED, { chatMessageAdded: message })
+        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated })
 
         return message
       })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index cbf5bcd63..c5ab92d87 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -1,7 +1,20 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
+import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
+import { withFilter } from 'graphql-subscriptions'
 
 export default {
+  Subscription: {
+    roomCountUpdated: {
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
+        (payload, variables) => {
+          console.log('sub', payload, variables)
+          return true // payload.chatMessageAdded.senderId !== variables.userId
+        },
+      ),
+    },
+  },
   Query: {
     Room: async (object, params, context, resolveInfo) => {
       if (!params.filter) params.filter = {}
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index e15a27d91..671c5523a 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -45,7 +45,3 @@ type Query {
     orderBy: [_MessageOrdering]
   ): [Message]
 }
-
-type Subscription {
-  chatMessageAdded(userId: ID!): Message
-}
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 80f61c83a..580edcfac 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -35,3 +35,7 @@ type Query {
   ): [Room]
   UnreadRooms: Int
 }
+
+type Subscription {
+  roomCountUpdated(userId: ID!): Int
+}
diff --git a/backend/src/server.ts b/backend/src/server.ts
index 8192e44bc..feceeb9eb 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -14,7 +14,8 @@ import bodyParser from 'body-parser'
 import { graphqlUploadExpress } from 'graphql-upload'
 
 export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
-export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
+// export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
+export const ROOM_COUNT_UPDATED = 'ROOM_COUNT_UPDATED'
 const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG
 let prodPubsub, devPubsub
 const options = {
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 34368a787..92cb9d25a 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -16,8 +16,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
-import { unreadRoomsQuery } from '~/graphql/Rooms'
-import { chatMessageAdded } from '~/graphql/Messages'
+import { unreadRoomsQuery, roomCountUpdated } from '~/graphql/Rooms'
 
 export default {
   name: 'ChatNotificationMenu',
@@ -43,15 +42,14 @@ export default {
         this.count = UnreadRooms
       },
       subscribeToMore: {
-        document: chatMessageAdded(),
+        document: roomCountUpdated(),
         variables() {
           return {
             userId: this.user.id,
           }
         },
         updateQuery: (previousResult, { subscriptionData }) => {
-          // TODO emit chat reload
-          return { UnreadRooms: previousResult.UnreadRooms + 1}
+          return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
       },
     },
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 2cb2ee667..1d7917bfc 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -33,16 +33,3 @@ export const createMessageMutation = () => {
     }
   `
 }
-
-export const chatMessageAdded = () => {
-  return gql`
-    subscription chatMessageAdded($userId: ID!) {
-      chatMessageAdded(userId: $userId) {
-        id
-        room {
-          id
-        }
-      }
-    }
-  `
-}
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e42cae2e8..68baccf3f 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -35,3 +35,11 @@ export const unreadRoomsQuery = () => {
     }
   `
 }
+
+export const roomCountUpdated = () => {
+  return gql`
+    subscription roomCountUpdated($userId: ID!) {
+      roomCountUpdated(userId: $userId)
+    }
+  `
+}

From 34145cfa061512f889151b8c1f196ce67304e1b0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:10:28 +0200
Subject: [PATCH 049/181] fix typo

---
 .github/workflows/test-backend.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 84d87c770..d144928e8 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3.3.0
 
-      - name: Check for frontend file changes
+      - name: Check for backend file changes
         uses: dorny/paths-filter@v2.11.1
         id: changes
         with:
@@ -93,11 +93,11 @@ jobs:
       - name: Load Docker Image
         run: docker load < /tmp/neo4j.tar
 
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp
+      # - name: Download Docker Image (Backend)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-backend-test
+      #     path: /tmp
 
       - name: Load Docker Image
         run: docker load < /tmp/backend.tar

From e09c91235edea3a3d2a1d09ea34804456021cdd4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 13:11:33 +0200
Subject: [PATCH 050/181] properly propagte user into unreadRoomCount
 subscription

---
 backend/src/schema/resolvers/messages.ts | 10 +++++-----
 backend/src/schema/resolvers/rooms.ts    |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 49756d4d1..ececd65a6 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -63,8 +63,8 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
-          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
-          WITH MAX(m.indexId) as maxIndex, room, currentUser
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)<-[:CHATS_IN]-(otherUser:User)
+          WITH MAX(m.indexId) as maxIndex, room, currentUser, otherUser
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -74,7 +74,7 @@ export default {
             distributed: false,
             seen: false
           })-[:INSIDE]->(room)
-          RETURN message { .*, room: properties(room), senderId: currentUser.id }
+          RETURN message { .*, room: properties(room), senderId: currentUser.id, otherUser: properties(otherUser) }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,
@@ -86,11 +86,11 @@ export default {
           record.get('message'),
         )
 
-        // TODO change user in context - mark message as seen
+        // TODO change user in context - mark message as seen - chattingUser is the correct user.
         const roomCountUpdated = await RoomResolver.Query.UnreadRooms(null, null, context, null)
 
         // send subscriptions
-        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated })
+        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
 
         return message
       })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index c5ab92d87..00d9d7b26 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -9,8 +9,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
         (payload, variables) => {
-          console.log('sub', payload, variables)
-          return true // payload.chatMessageAdded.senderId !== variables.userId
+          return payload.user.id === variables.userId
         },
       ),
     },

From b15148b985ec0df4a89203dca620ce58a2cf9e04 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:18:35 +0200
Subject: [PATCH 051/181] replace artefact upload by caching in neo4j build
 test job

---
 .github/workflows/test-backend.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index d144928e8..e6bc213fe 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -35,11 +35,16 @@ jobs:
           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+      
+      - name: Cache docker images
+        id: cache-neo4j
+        uses: actions/cache/save@v3.3.1
         with:
-          name: docker-neo4j-image
           path: /tmp/neo4j.tar
+          key: backend-neo4j-cache-pr${{ steps.pr.outputs.number }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -53,13 +58,13 @@ jobs:
       - name: backend | Build 'test' image
         run: |
           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: docker-backend-test
-          path: /tmp/backend.tar
+          path: /tmp/images/backend.tar
 
   lint_backend:
     name: Lint Backend

From 7e171fb5218911810459f1936c47245818809b42 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:21:02 +0200
Subject: [PATCH 052/181] replace artefact upload by caching in backend build
 test job

---
 .github/workflows/test-backend.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e6bc213fe..c484dc702 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -58,13 +58,18 @@ jobs:
       - name: backend | Build 'test' image
         run: |
           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+      
+      - name: Cache docker images
+        id: cache-backend
+        uses: actions/cache/save@v3.3.1
         with:
-          name: docker-backend-test
-          path: /tmp/images/backend.tar
+          path: /tmp/backend.tar
+          key: backend-cache-pr${{ steps.pr.outputs.number }}
 
   lint_backend:
     name: Lint Backend

From 4ec4b3659041be9b250b8cbc4c977f5ed18a2734 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:57:53 +0200
Subject: [PATCH 053/181] replace artefact download by caching in backend unit
 test job

---
 .github/workflows/test-backend.yml | 46 ++++++++++++++----------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index c484dc702..c90d0e1ea 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -10,6 +10,7 @@ jobs:
     outputs:
       backend: ${{ steps.changes.outputs.backend }}
       docker: ${{ steps.changes.outputs.docker }}
+      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - uses: actions/checkout@v3.3.0
 
@@ -21,6 +22,10 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+
   build_test_neo4j:
     name: Docker Build Test - Neo4J
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
@@ -34,17 +39,13 @@ jobs:
         run: |
           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
-
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
       
       - name: Cache docker images
         id: cache-neo4j
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-pr${{ steps.pr.outputs.number }}
+          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -59,17 +60,13 @@ jobs:
         run: |
           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
           docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
-
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
       
       - name: Cache docker images
         id: cache-backend
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-pr${{ steps.pr.outputs.number }}
+          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
   lint_backend:
     name: Lint Backend
@@ -94,23 +91,24 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Download Docker Image (Neo4J)
-        uses: actions/download-artifact@v3
+      - name: Restore Neo4J cache
+        uses: actions/cache/restore@v3.3.1
         with:
-          name: docker-neo4j-image
-          path: /tmp
+          path: /tmp/neo4j.tar
+          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          fail-on-cache-miss: true
 
-      - name: Load Docker Image
-        run: docker load < /tmp/neo4j.tar
+      - name: Restore Backend cache
+        uses: actions/cache/restore@v3.3.1
+        with:
+          path: /tmp/backend.tar
+          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          fail-on-cache-miss: true
 
-      # - name: Download Docker Image (Backend)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-backend-test
-      #     path: /tmp
-
-      - name: Load Docker Image
-        run: docker load < /tmp/backend.tar
+      - name: Load Docker Images
+        run: |
+          docker load < /tmp/neo4j.tar
+          docker load < /tmp/backend.tar
 
       - name: backend | copy env files webapp
         run: cp webapp/.env.template webapp/.env

From 89719b3cdad35b2de700fe869dc98c85b2de6cf3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 14:01:14 +0200
Subject: [PATCH 054/181] merge env copy steps into single step

---
 .github/workflows/test-backend.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index c90d0e1ea..e293f3e99 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -110,10 +110,10 @@ jobs:
           docker load < /tmp/neo4j.tar
           docker load < /tmp/backend.tar
 
-      - name: backend | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
+      - name: backend | copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
       - name: backend | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend

From e44c3493e2a7bde4583d2efb88f0929ebfc1a232 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 14:29:00 +0200
Subject: [PATCH 055/181] add backend test worfkflow file to file filter

---
 .github/file-filters.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/file-filters.yml b/.github/file-filters.yml
index d7f9cb6c0..1c2f4fc62 100644
--- a/.github/file-filters.yml
+++ b/.github/file-filters.yml
@@ -1,4 +1,5 @@
 backend: &backend
+  - '.github/workflows/test-backend.yml'
   - 'backend/**/*'
   - 'neo4j/**/*'
 

From f7e8d85b5f59c34dd00b2b427fd12cda53a1a37a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 14:29:35 +0200
Subject: [PATCH 056/181] add webapp test worfkflow file to file filter

---
 .github/file-filters.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/file-filters.yml b/.github/file-filters.yml
index 1c2f4fc62..8d2d93fac 100644
--- a/.github/file-filters.yml
+++ b/.github/file-filters.yml
@@ -7,4 +7,5 @@ docker: &docker
   - 'docker-compose.*'
 
 webapp: &webapp
+  - '.github/workflows/test-webapp.yml'
   - 'webapp/**/*'

From ced4996f4769bae5821e70b42a7dcadf4cfa6fc5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 14:55:57 +0200
Subject: [PATCH 057/181] implement chatMessageAdded subscription

---
 backend/src/schema/resolvers/messages.ts  | 18 +++++++++++++-
 backend/src/schema/types/type/Message.gql |  4 ++++
 backend/src/server.ts                     |  2 +-
 webapp/components/Chat/Chat.vue           | 29 ++++++++++++++++++++++-
 webapp/graphql/Messages.js                | 26 ++++++++++++++++++++
 5 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index ececd65a6..f363f9a44 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,9 +1,21 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
 import RoomResolver from './rooms'
-import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
+import { pubsub, ROOM_COUNT_UPDATED, CHAT_MESSAGE_ADDED } from '../../server'
+import { withFilter } from 'graphql-subscriptions'
 
 export default {
+  Subscription: {
+    chatMessageAdded: {
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
+        (payload, variables) => {
+          console.log('chatMessageAdded', payload, variables)
+          return true // payload.user.id === variables.userId
+        },
+      ),
+    },
+  },
   Query: {
     Message: async (object, params, context, resolveInfo) => {
       const { roomId } = params
@@ -91,6 +103,10 @@ export default {
 
         // send subscriptions
         await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
+        await pubsub.publish(CHAT_MESSAGE_ADDED, {
+          chatMessageAdded: message,
+          user: message.otherUser,
+        })
 
         return message
       })
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 671c5523a..e15a27d91 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -45,3 +45,7 @@ type Query {
     orderBy: [_MessageOrdering]
   ): [Message]
 }
+
+type Subscription {
+  chatMessageAdded(userId: ID!): Message
+}
diff --git a/backend/src/server.ts b/backend/src/server.ts
index feceeb9eb..0522f5fc8 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -14,7 +14,7 @@ import bodyParser from 'body-parser'
 import { graphqlUploadExpress } from 'graphql-upload'
 
 export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
-// export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
+export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
 export const ROOM_COUNT_UPDATED = 'ROOM_COUNT_UPDATED'
 const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG
 let prodPubsub, devPubsub
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dd39e7bcd..1e4636e8b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -61,7 +61,7 @@
 
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation } from '~/graphql/Messages'
+import { messageQuery, createMessageMutation, chatMessageAdded } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters } from 'vuex'
 
@@ -182,6 +182,22 @@ export default {
     } else {
       this.fetchRooms()
     }
+
+    // Subscriptions
+    const observer = this.$apollo.subscribe({
+      query: chatMessageAdded(),
+      variables: {
+        userId: this.currentUser.id,
+      },
+    })
+
+    observer.subscribe({
+      next: this.chatMessageAdded,
+      error (error) {
+        console.error(error)
+      },
+    })
+
   },
   computed: {
     ...mapGetters({
@@ -269,6 +285,17 @@ export default {
       }
     },
 
+    async chatMessageAdded({data}){
+      console.log(data)
+      if(data.chatMessageAdded.room.id === this.selectedRoom?.id){
+        this.fetchMessages({ room: this.selectedRoom}, { refetch: true})
+      } else {
+        // TODO this might be optimized selectively (first page vs rest)
+        this.rooms = []
+        this.fetchRooms()
+      }
+    },
+
     async sendMessage(message) {
       try {
         await this.$apollo.mutate({
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 1d7917bfc..bc0d1e5ff 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -33,3 +33,29 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const chatMessageAdded = () => {
+  return gql`
+    subscription chatMessageAdded($userId: ID!) {
+      chatMessageAdded(userId: $userId){
+        #_id
+        id
+        # indexId
+        content
+        senderId
+        #author {
+        #  id
+        #}
+        #username
+        #avatar
+        #date
+        room {
+          id
+        }
+        saved
+        distributed
+        seen
+      }
+    }
+  `
+}

From 69408007e7d943ad387335633585e90d5e735883 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 15:04:12 +0200
Subject: [PATCH 058/181] replace artefact upload by caching in webapp build
 test job

---
 .github/workflows/test-webapp.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index c1aee47cf..3e484d292 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -26,6 +26,8 @@ jobs:
     if: needs.files-changed.outputs.webapp == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
+    outputs:
+      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -34,7 +36,11 @@ jobs:
         run: |
           scripts/translations/sort.sh
           scripts/translations/missing-keys.sh
-          
+
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+
   build_test_webapp:
     name: Docker Build Test - Webapp
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
@@ -44,16 +50,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: webapp | Build 'test' image
+      - name: Webapp | Build 'test' image
         run: |
           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Cache docker image
+        uses: actions/cache/save@v3.3.1
         with:
-          name: docker-webapp-test
           path: /tmp/webapp.tar
+          key: webapp-cache-pr${{ needs.prepare.outputs.pr-number }}
 
   lint_webapp:
     name: Lint Webapp

From 4a9199229b2c71098bd25bc5d329c855d5a94d16 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:05:51 +0200
Subject: [PATCH 059/181] redurce changeset

---
 webapp/components/Chat/Chat.vue | 45 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dc3619ac6..386e4743e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -84,31 +84,32 @@ export default {
           name: 'dummyItem',
           title: 'Just a dummy item',
         },
-        /* {
-            name: 'inviteUser',
-            title: 'Invite User',
-            },
-            {
-            name: 'removeUser',
-            title: 'Remove User',
-            },
-            {
-            name: 'deleteRoom',
-            title: 'Delete Room',
-            },
-          */
+        /*
+          {
+          name: 'inviteUser',
+          title: 'Invite User',
+          },
+          {
+          name: 'removeUser',
+          title: 'Remove User',
+          },
+          {
+          name: 'deleteRoom',
+          title: 'Delete Room',
+          },
+        */
       ],
       messageActions: [
         /*
-            {
-            name: 'addMessageToFavorite',
-            title: 'Add To Favorite',
-            },
-            {
-            name: 'shareMessage',
-            title: 'Share Message',
-            },
-          */
+          {
+          name: 'addMessageToFavorite',
+          title: 'Add To Favorite',
+          },
+          {
+          name: 'shareMessage',
+          title: 'Share Message',
+          },
+        */
       ],
       templatesText: [
         {

From 19e441b44939a132dc5c2bf12fe667a5cfb58b62 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:06:37 +0200
Subject: [PATCH 060/181] more changeset reduction

---
 webapp/components/Chat/Chat.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 386e4743e..1b5dd45ea 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -85,30 +85,30 @@ export default {
           title: 'Just a dummy item',
         },
         /*
-          {
+        {
           name: 'inviteUser',
           title: 'Invite User',
-          },
-          {
+        },
+        {
           name: 'removeUser',
           title: 'Remove User',
-          },
-          {
+        },
+        {
           name: 'deleteRoom',
           title: 'Delete Room',
-          },
+        },
         */
       ],
       messageActions: [
         /*
-          {
+        {
           name: 'addMessageToFavorite',
           title: 'Add To Favorite',
-          },
-          {
+        },
+        {
           name: 'shareMessage',
           title: 'Share Message',
-          },
+        },
         */
       ],
       templatesText: [

From 045d13996094682908dcb7b07565b260960d585a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 15:11:18 +0200
Subject: [PATCH 061/181] replace artefact upload by caching in webapp unit
 test job

---
 .github/workflows/test-webapp.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 3e484d292..5d603e388 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       docker: ${{ steps.changes.outputs.docker }}
+      pr-number: ${{ steps.pr.outputs.number }}
       webapp: ${{ steps.changes.outputs.webapp }}
     steps:
       - uses: actions/checkout@v3.3.0
@@ -21,13 +22,15 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+
   prepare:
     name: Prepare
     if: needs.files-changed.outputs.webapp == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
-    outputs:
-      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -37,10 +40,6 @@ jobs:
           scripts/translations/sort.sh
           scripts/translations/missing-keys.sh
 
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
-
   build_test_webapp:
     name: Docker Build Test - Webapp
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
@@ -59,7 +58,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-pr${{ needs.prepare.outputs.pr-number }}
+          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
   lint_webapp:
     name: Lint Webapp
@@ -84,11 +83,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Download Docker Image (Webapp)
-        uses: actions/download-artifact@v3
+      - name: Restore webapp cache
+        uses: actions/cache/restore@v3.3.1
         with:
-          name: docker-webapp-test
-          path: /tmp
+          path: /tmp/webapp.tar
+          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar

From e1374c05ac5707edaa0eaecea0f77cdb14920131 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 15:17:58 +0200
Subject: [PATCH 062/181] add cache deletion job to backend and webapp workflow
 files

---
 .github/workflows/test-backend.yml | 16 ++++++++++++++++
 .github/workflows/test-webapp.yml  | 23 ++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e293f3e99..a96cff028 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -126,3 +126,19 @@ jobs:
 
       - name: backend | Unit test incl. coverage check
         run: docker-compose exec -T backend yarn test
+
+  cleanup:
+    name: Cleanup
+    if: always()
+    needs: [files-changed, unit_test_backend]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+          KEY="backend-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 5d603e388..772182778 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -92,11 +92,10 @@ jobs:
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
 
-      - name: backend | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
       - name: backend | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
@@ -104,3 +103,17 @@ jobs:
       - name: webapp | Unit tests incl. coverage check
         run: docker-compose exec -T webapp yarn test
 
+  cleanup:
+    name: Cleanup
+    if: always()
+    needs: [files-changed, unit_test_webapp]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+

From b8f0e1ef59b2c6f38bce96d607edb3ae174e38b3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:23:34 +0200
Subject: [PATCH 063/181] "fix" room avatar query

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 0ddc65533..76823d364 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,7 +19,7 @@ type Room {
 
   roomId: String! @cypher(statement: "RETURN this.id")
   roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
-  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+  avatar: String @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
 
   lastMessageAt: String
 

From edeb22e70cc36f01661bf6570cf7e75afb8492d8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 15:58:46 +0200
Subject: [PATCH 064/181] room avatar is working (returns other users avatar
 image if present)

---
 backend/src/schema/types/type/Room.gql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 76823d364..9950407b7 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,7 +19,12 @@ type Room {
 
   roomId: String! @cypher(statement: "RETURN this.id")
   roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
-  avatar: String @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+  avatar: String @cypher(statement: """
+    MATCH (this)<-[:CHATS_IN]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+    OPTIONAL MATCH (:User)-[:AVATAR_IMAGE]->(image:Image)
+    RETURN image.url
+  """)
 
   lastMessageAt: String
 

From 27600f0e79538d7ab1260c36b9848ebef6bb290e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:59:32 +0200
Subject: [PATCH 065/181] fix merge error

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e1b988221..8c32a76bd 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -73,7 +73,7 @@ export default {
           RETURN message {
             .*,
             room: properties(room)
-            otherUser: properties(otherUser)
+            otherUser: properties(otherUser),
             senderId: currentUser.id,
             username: currentUser.name,
             avatar: image.url,

From 45db186dfdcdc2939b9d4d36471f667f5344c5f5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 16:00:08 +0200
Subject: [PATCH 066/181] more merge errors

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 8c32a76bd..e7651f613 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -72,7 +72,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
-            room: properties(room)
+            room: properties(room),
             otherUser: properties(otherUser),
             senderId: currentUser.id,
             username: currentUser.name,

From b1102f6e3e5e10480b39aca57fdb04d572807e80 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 16:07:12 +0200
Subject: [PATCH 067/181] only mark other users messages as seen

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 1b5dd45ea..761973ef1 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -267,7 +267,7 @@ export default {
 
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
-          m.seen = true
+          if (m.senderId !== this.currentUser.id) m.seen = true
           m.date = new Date(m.date).toDateString()
           msgs[m.indexId] = m
         })

From 884ee1713cc65d9136e148ec2ad8393e922baefd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 16:36:39 +0200
Subject: [PATCH 068/181] unread room count query as function

---
 backend/src/schema/resolvers/messages.ts | 14 +++++++-------
 backend/src/schema/resolvers/rooms.ts    | 23 +++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e7651f613..785b8d99c 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,6 +1,6 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
-import RoomResolver from './rooms'
+import { getUnreadRoomsCount } from './rooms'
 import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 
 export default {
@@ -90,16 +90,16 @@ export default {
           record.get('message'),
         )
 
-        // TODO change user in context - mark message as seen - chattingUser is the correct user.
-        const roomCountUpdated = await RoomResolver.Query.UnreadRooms(null, null, context, null)
-
-        // send subscriptions
-        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
-
         return message
       })
       try {
         const message = await writeTxResultPromise
+
+        const roomCountUpdated = await getUnreadRoomsCount(currentUserId, session)
+
+        // send subscriptions
+        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
+
         return message
       } catch (error) {
         throw new Error(error)
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 6774dad98..029b44b94 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -3,6 +3,18 @@ import Resolver from './helpers/Resolver'
 import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 import { withFilter } from 'graphql-subscriptions'
 
+export const getUnreadRoomsCount = async (userId, session) => {
+  return session.readTransaction(async (transaction) => {
+    const unreadRoomsCypher = `
+      MATCH (:User { id: $userId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
+      WHERE NOT sender.id = $userId AND NOT message.seen
+      RETURN toString(COUNT(DISTINCT room)) AS count
+    `
+    const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { userId })
+    return unreadRoomsTxResponse.records.map((record) => record.get('count'))[0]
+  })
+}
+
 export default {
   Subscription: {
     roomCountUpdated: {
@@ -27,17 +39,8 @@ export default {
         user: { id: currentUserId },
       } = context
       const session = context.driver.session()
-      const readTxResultPromise = session.readTransaction(async (transaction) => {
-        const unreadRoomsCypher = `
-          MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
-          WHERE NOT sender.id = $currentUserId AND NOT message.seen
-          RETURN toString(COUNT(DISTINCT room)) AS count
-        `
-        const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { currentUserId })
-        return unreadRoomsTxResponse.records.map((record) => record.get('count'))[0]
-      })
       try {
-        const count = await readTxResultPromise
+        const count = await getUnreadRoomsCount(currentUserId, session)
         return count
       } finally {
         session.close()

From ea28f4afebf9453c7bb6671b3c3ba2cba4c8e627 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 17:33:51 +0200
Subject: [PATCH 069/181] recipient user of message to send subscription, test
 subscription

---
 backend/src/schema/resolvers/messages.spec.ts | 17 ++++++++++++++---
 backend/src/schema/resolvers/messages.ts      | 18 ++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 628034be5..07ae2dd85 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -3,11 +3,13 @@ import Factory, { cleanDatabase } from '../../db/factories'
 import { getNeode, getDriver } from '../../db/neo4j'
 import { createRoomMutation, roomQuery } from '../../graphql/rooms'
 import { createMessageMutation, messageQuery, markMessagesAsSeen } from '../../graphql/messages'
-import createServer from '../../server'
+import createServer, { pubsub } from '../../server'
 
 const driver = getDriver()
 const neode = getNeode()
 
+const pubsubSpy = jest.spyOn(pubsub, 'publish')
+
 let query
 let mutate
 let authenticatedUser
@@ -58,6 +60,10 @@ describe('Message', () => {
   })
 
   describe('create message', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         await expect(
@@ -80,7 +86,7 @@ describe('Message', () => {
       })
 
       describe('room does not exist', () => {
-        it('returns null', async () => {
+        it('returns null and does not publish subscription', async () => {
           await expect(
             mutate({
               mutation: createMessageMutation(),
@@ -95,6 +101,7 @@ describe('Message', () => {
               CreateMessage: null,
             },
           })
+          expect(pubsubSpy).not.toBeCalled()
         })
       })
 
@@ -110,7 +117,7 @@ describe('Message', () => {
         })
 
         describe('user chats in room', () => {
-          it('returns the message', async () => {
+          it('returns the message and publishes subscription', async () => {
             await expect(
               mutate({
                 mutation: createMessageMutation(),
@@ -135,6 +142,10 @@ describe('Message', () => {
                 },
               },
             })
+            expect(pubsubSpy).toBeCalledWith('ROOM_COUNT_UPDATED', {
+              roomCountUpdated: '1',
+              user: 'other-chatting-user',
+            })
           })
 
           describe('room is updated as well', () => {
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 785b8d99c..ea2ed3614 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -58,8 +58,10 @@ export default {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
           OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
-          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)<-[:CHATS_IN]-(otherUser:User)
-          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, otherUser
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
+          OPTIONAL MATCH (room)<-[:CHATS_IN]-(recipientUser:User)
+            WHERE NOT recipientUser.id = $currentUserId
+          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, recipientUser 
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -72,8 +74,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
-            room: properties(room),
-            otherUser: properties(otherUser),
+            recipientId: recipientUser.id,
             senderId: currentUser.id,
             username: currentUser.name,
             avatar: image.url,
@@ -94,11 +95,12 @@ export default {
       })
       try {
         const message = await writeTxResultPromise
+        if (message) {
+          const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
-        const roomCountUpdated = await getUnreadRoomsCount(currentUserId, session)
-
-        // send subscriptions
-        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
+          // send subscriptions
+          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.recipientId })
+        }
 
         return message
       } catch (error) {

From 887f2c9362584e68c2fd4c43b7d319f4c506b082 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 17:42:45 +0200
Subject: [PATCH 070/181] more subscription tests for create message

---
 backend/src/schema/resolvers/messages.spec.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 07ae2dd85..14ed9890a 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -325,6 +325,18 @@ describe('Message', () => {
             })
           })
 
+          it('sends two subscriptions', () => {
+            expect(pubsubSpy).toBeCalledTimes(2)
+            expect(pubsubSpy).nthCalledWith(1, 'ROOM_COUNT_UPDATED', {
+              roomCountUpdated: '1',
+              user: 'chatting-user',
+            })
+            expect(pubsubSpy).nthCalledWith(2, 'ROOM_COUNT_UPDATED', {
+              roomCountUpdated: '1',
+              user: 'other-chatting-user',
+            })
+          })
+
           it('returns the messages', async () => {
             await expect(
               query({

From c24a9a56c2fcfafa3e6829a6f408379704945ed7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 18:24:31 +0200
Subject: [PATCH 071/181] profile query fix to return the correct user avatar
 not the first found

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 9950407b7..744d63e6b 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -22,7 +22,7 @@ type Room {
   avatar: String @cypher(statement: """
     MATCH (this)<-[:CHATS_IN]-(user:User)
     WHERE NOT user.id = $cypherParams.currentUserId
-    OPTIONAL MATCH (:User)-[:AVATAR_IMAGE]->(image:Image)
+    OPTIONAL MATCH (user:User)-[:AVATAR_IMAGE]->(image:Image)
     RETURN image.url
   """)
 

From 3a86c892b4a59feee6978721adb99d71fd624971 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 18:27:00 +0200
Subject: [PATCH 072/181] further query simplification

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 744d63e6b..8b9982dda 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -22,7 +22,7 @@ type Room {
   avatar: String @cypher(statement: """
     MATCH (this)<-[:CHATS_IN]-(user:User)
     WHERE NOT user.id = $cypherParams.currentUserId
-    OPTIONAL MATCH (user:User)-[:AVATAR_IMAGE]->(image:Image)
+    OPTIONAL MATCH (user)-[:AVATAR_IMAGE]->(image:Image)
     RETURN image.url
   """)
 

From 846fe26091923ca2a0f0c6d6b73c3c6c689aef69 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:34:35 +0200
Subject: [PATCH 073/181] some changes

---
 webapp/components/Chat/Chat.vue               | 58 +++++++++----------
 .../ChatNotificationMenu.vue                  |  1 +
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 88d0b811c..ee5d147c5 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -85,30 +85,30 @@ export default {
           title: 'Just a dummy item',
         },
         /* {
-          name: 'inviteUser',
-          title: 'Invite User',
-        },
-        {
-          name: 'removeUser',
-          title: 'Remove User',
-        },
-        {
-          name: 'deleteRoom',
-          title: 'Delete Room',
-        },
-        */
+            name: 'inviteUser',
+            title: 'Invite User',
+            },
+            {
+            name: 'removeUser',
+            title: 'Remove User',
+            },
+            {
+            name: 'deleteRoom',
+            title: 'Delete Room',
+            },
+          */
       ],
       messageActions: [
         /*
-        {
-          name: 'addMessageToFavorite',
-          title: 'Add To Favorite',
-        },
-        {
-          name: 'shareMessage',
-          title: 'Share Message',
-        },
-        */
+            {
+            name: 'addMessageToFavorite',
+            title: 'Add To Favorite',
+            },
+            {
+            name: 'shareMessage',
+            title: 'Share Message',
+            },
+          */
       ],
       templatesText: [
         {
@@ -122,14 +122,14 @@ export default {
       ],
       roomActions: [
         /*
-        {
-          name: 'archiveRoom',
-          title: 'Archive Room',
-        },
-        { name: 'inviteUser', title: 'Invite User' },
-        { name: 'removeUser', title: 'Remove User' },
-        { name: 'deleteRoom', title: 'Delete Room' },
-        */
+            {
+            name: 'archiveRoom',
+            title: 'Archive Room',
+            },
+            { name: 'inviteUser', title: 'Invite User' },
+            { name: 'removeUser', title: 'Remove User' },
+            { name: 'deleteRoom', title: 'Delete Room' },
+          */
       ],
 
       showDemoOptions: true,
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 92cb9d25a..a6f2e2917 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -49,6 +49,7 @@ export default {
           }
         },
         updateQuery: (previousResult, { subscriptionData }) => {
+          console.log(subscriptionData)
           return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
       },

From fb1d540eb24db3c8341099e7fb7377112e673e0b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:35:10 +0200
Subject: [PATCH 074/181] subscription send on message query

---
 backend/src/schema/resolvers/messages.ts | 50 +++++++++++++++---------
 backend/src/schema/resolvers/rooms.ts    |  2 +-
 backend/src/schema/types/type/Room.gql   |  9 ++++-
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index ea2ed3614..44cbacbd4 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -3,6 +3,21 @@ import Resolver from './helpers/Resolver'
 import { getUnreadRoomsCount } from './rooms'
 import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 
+const setMessagesAsDistributed = async (undistributedMessagesIds, session) => {
+  return session.writeTransaction(async (transaction) => {
+    const setDistributedCypher = `
+      MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
+      SET m.distributed = true
+      RETURN m { .* }
+    `
+    const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
+      undistributedMessagesIds,
+    })
+    const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
+    return messages
+  })
+}
+
 export default {
   Query: {
     Message: async (object, params, context, resolveInfo) => {
@@ -18,31 +33,27 @@ export default {
 
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
+      console.log(resolved)
+
       if (resolved) {
         const undistributedMessagesIds = resolved
           .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
           .map((msg) => msg.id)
-        if (undistributedMessagesIds.length > 0) {
-          const session = context.driver.session()
-          const writeTxResultPromise = session.writeTransaction(async (transaction) => {
-            const setDistributedCypher = `
-              MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
-              SET m.distributed = true
-              RETURN m { .* }
-            `
-            const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
-              undistributedMessagesIds,
-            })
-            const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
-            return messages
-          })
-          try {
-            await writeTxResultPromise
-          } finally {
-            session.close()
+        const session = context.driver.session()
+        try {
+          if (undistributedMessagesIds.length > 0) {
+            await setMessagesAsDistributed(undistributedMessagesIds, session)
           }
-          // send subscription to author to updated the messages
+          const roomCountUpdated = await getUnreadRoomsCount(context.user.id, session)
+          console.log(roomCountUpdated)
+
+          // send subscriptions
+          console.log({ roomCountUpdated, user: context.user.id })
+          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: context.user.id })
+        } finally {
+          session.close()
         }
+        // send subscription to author to updated the messages
       }
       return resolved.reverse()
     },
@@ -99,6 +110,7 @@ export default {
           const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
           // send subscriptions
+          console.log({ roomCountUpdated, user: message.recipientId })
           await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.recipientId })
         }
 
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 029b44b94..e2195fe0b 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -21,7 +21,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
         (payload, variables) => {
-          return payload.user.id === variables.userId
+          return true // payload.user.id === variables.userId
         },
       ),
     },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ffbc2b96..f20c7a812 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,8 +19,13 @@ type Room {
 
   roomId: String! @cypher(statement: "RETURN this.id")
   roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
-  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
-
+  avatar: String @cypher(statement: """
+    MATCH (this)<-[:CHATS_IN]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+    OPTIONAL MATCH (user)-[:AVATAR_IMAGE]->(image:Image)
+    RETURN image.url
+  """)
+  
   lastMessageAt: String
 
   lastMessage: Message @cypher(statement: """

From 2eb94d91e14baf86d151de5d246db60391a6134e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:54:17 +0200
Subject: [PATCH 075/181] no subscription on message query

---
 backend/src/schema/resolvers/#messages.ts# | 150 +++++++++++++++++++++
 backend/src/schema/resolvers/messages.ts   |  14 +-
 backend/src/schema/resolvers/rooms.ts      |   2 +-
 3 files changed, 155 insertions(+), 11 deletions(-)
 create mode 100644 backend/src/schema/resolvers/#messages.ts#

diff --git a/backend/src/schema/resolvers/#messages.ts# b/backend/src/schema/resolvers/#messages.ts#
new file mode 100644
index 000000000..43a3fabf1
--- /dev/null
+++ b/backend/src/schema/resolvers/#messages.ts#
@@ -0,0 +1,150 @@
+import { neo4jgraphql } from 'neo4j-graphql-js'
+import Resolver from './helpers/Resolver'
+import { getUnreadRoomsCount } from './rooms'
+import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
+
+const setMessagesAsDistributed = async (undistributedMessagesIds, session) => {
+  return session.writeTransaction(async (transaction) => {
+    const setDistributedCypher = `
+      MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
+      SET m.distributed = true
+      RETURN m { .* }
+    `
+    const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
+      undistributedMessagesIds,
+    })
+    const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
+    return messages
+  })
+}
+
+export default {
+  Query: {
+    Message: async (object, params, context, resolveInfo) => {
+      const { roomId } = params
+      delete params.roomId
+      if (!params.filter) params.filter = {}
+      params.filter.room = {
+        id: roomId,
+        users_some: {
+          id: context.user.id,
+        },
+      }
+
+      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
+
+      if (resolved) {
+        const undistributedMessagesIds = resolved
+          .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
+          .map((msg) => msg.id)
+        const session = context.driver.session()
+        try {
+          if (undistributedMessagesIds.length > 0) {
+            await setMessagesAsDistributed(undistributedMessagesIds, session)
+          }
+        } finally {
+          session.close()
+        }
+        // send subscription to author to updated the messages
+      }
+      return resolved.reverse()
+    },
+  },
+  Mutation: {
+    CreateMessage: async (_parent, params, context, _resolveInfo) => {
+      const { roomId, content } = params
+      const {
+        user: { id: currentUserId },
+      } = context
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const createMessageCypher = `
+          MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
+          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
+          OPTIONAL MATCH (room)<-[:CHATS_IN]-(recipientUser:User)
+            WHERE NOT recipientUser.id = $currentUserId
+          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, recipientUser 
+          CREATE (currentUser)-[:CREATED]->(message:Message {
+            createdAt: toString(datetime()),
+            id: apoc.create.uuid(),
+            indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
+            content: $content,
+            saved: true,
+            distributed: false,
+            seen: false
+          })-[:INSIDE]->(room)
+          SET room.lastMessageAt = toString(datetime())
+          RETURN message {
+            .*,
+            recipientId: recipientUser.id,
+            senderId: currentUser.id,
+            username: currentUser.name,
+            avatar: image.url,
+            date: message.createdAt
+          }
+        `
+        const createMessageTxResponse = await transaction.run(createMessageCypher, {
+          currentUserId,
+          roomId,
+          content,
+        })
+
+        const [message] = await createMessageTxResponse.records.map((record) =>
+          record.get('message'),
+        )
+
+        return message
+      })
+      try {
+        const message = await writeTxResultPromise
+        if (message) {
+          const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
+
+          // send subscriptions
+          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, userId: message.recipientId })
+        }
+
+        return message
+      } catch (error) {
+        throw new Error(error)
+      } finally {
+        session.close()
+      }
+    },
+    MarkMessagesAsSeen: async (_parent, params, context, _resolveInfo) => {
+      const { messageIds } = params
+      const currentUserId = context.user.id
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const setSeenCypher = `
+          MATCH (m:Message)<-[:CREATED]-(user:User)
+          WHERE m.id IN $messageIds AND NOT user.id = $currentUserId
+          SET m.seen = true
+          RETURN m { .* }
+        `
+        const setSeenTxResponse = await transaction.run(setSeenCypher, {
+          messageIds,
+          currentUserId,
+        })
+        const messages = await setSeenTxResponse.records.map((record) => record.get('m'))
+        return messages
+      })
+      try {
+        await writeTxResultPromise
+        // send subscription to author to updated the messages
+        return true
+      } finally {
+        session.close()
+      }
+    },
+  },
+  Message: {
+    ...Resolver('Message', {
+      hasOne: {
+        author: '<-[:CREATED]-(related:User)',
+        room: '-[:INSIDE]->(related:Room)',
+      },
+    }),
+  },
+}
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 44cbacbd4..a908f3fd8 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -33,8 +33,6 @@ export default {
 
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
-      console.log(resolved)
-
       if (resolved) {
         const undistributedMessagesIds = resolved
           .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
@@ -44,12 +42,6 @@ export default {
           if (undistributedMessagesIds.length > 0) {
             await setMessagesAsDistributed(undistributedMessagesIds, session)
           }
-          const roomCountUpdated = await getUnreadRoomsCount(context.user.id, session)
-          console.log(roomCountUpdated)
-
-          // send subscriptions
-          console.log({ roomCountUpdated, user: context.user.id })
-          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: context.user.id })
         } finally {
           session.close()
         }
@@ -110,8 +102,10 @@ export default {
           const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
           // send subscriptions
-          console.log({ roomCountUpdated, user: message.recipientId })
-          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.recipientId })
+          await pubsub.publish(ROOM_COUNT_UPDATED, {
+            roomCountUpdated,
+            userId: message.recipientId,
+          })
         }
 
         return message
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index e2195fe0b..5e931a446 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -21,7 +21,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
         (payload, variables) => {
-          return true // payload.user.id === variables.userId
+          return payload.userId === variables.userId
         },
       ),
     },

From 0dcda35678cca43af0d296188e5e3c9393a29933 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:55:36 +0200
Subject: [PATCH 076/181] no console

---
 webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index a6f2e2917..92cb9d25a 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -49,7 +49,6 @@ export default {
           }
         },
         updateQuery: (previousResult, { subscriptionData }) => {
-          console.log(subscriptionData)
           return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
       },

From 74af79921754901ffd93508bec725044e31a8010 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 19:28:56 +0200
Subject: [PATCH 077/181] unread room count in store

---
 webapp/components/Chat/Chat.vue               | 43 ++++++++++++-------
 .../ChatNotificationMenu.vue                  | 17 ++++----
 webapp/store/chat.js                          |  7 +++
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 226a0287a..05472c56f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -60,10 +60,10 @@
 </template>
 
 <script>
-import { roomQuery, createRoom } from '~/graphql/Rooms'
+import { roomQuery, createRoom, unreadRoomsQuery } from '~/graphql/Rooms'
 import { messageQuery, createMessageMutation, markMessagesAsSeen } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   name: 'Chat',
@@ -85,19 +85,19 @@ export default {
           title: 'Just a dummy item',
         },
         /*
-        {
-          name: 'inviteUser',
-          title: 'Invite User',
-        },
-        {
-          name: 'removeUser',
-          title: 'Remove User',
-        },
-        {
-          name: 'deleteRoom',
-          title: 'Delete Room',
-        },
-        */
+            {
+            name: 'inviteUser',
+            title: 'Invite User',
+            },
+            {
+            name: 'removeUser',
+            title: 'Remove User',
+            },
+            {
+            name: 'deleteRoom',
+            title: 'Delete Room',
+            },
+          */
       ],
       messageActions: [
         /*
@@ -195,6 +195,9 @@ export default {
     },
   },
   methods: {
+    ...mapMutations({
+      commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
+    }),
     async fetchRooms({ room } = {}) {
       this.roomsLoaded = false
       const offset = this.roomPage * this.roomPageSize
@@ -257,12 +260,20 @@ export default {
 
         const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
         if (newMsgIds.length) {
-          this.$apollo.mutate({
+          await this.$apollo.mutate({
             mutation: markMessagesAsSeen(),
             variables: {
               messageIds: newMsgIds,
             },
           })
+          this.$apollo
+            .query({
+              query: unreadRoomsQuery(),
+              fetchPolicy: 'network-only',
+            })
+            .then(({ data: { UnreadRooms } }) => {
+              this.commitUnreadRoomCount(UnreadRooms)
+            })
         }
 
         const msgs = []
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 92cb9d25a..ec3f9fbc7 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -8,13 +8,13 @@
         placement: 'bottom-start',
       }"
     >
-      <counter-icon icon="chat-bubble" :count="count" danger />
+      <counter-icon icon="chat-bubble" :count="unreadRoomCount" danger />
     </base-button>
   </nuxt-link>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import { unreadRoomsQuery, roomCountUpdated } from '~/graphql/Rooms'
 
@@ -23,14 +23,15 @@ export default {
   components: {
     CounterIcon,
   },
-  data() {
-    return {
-      count: 0,
-    }
-  },
   computed: {
     ...mapGetters({
       user: 'auth/user',
+      unreadRoomCount: 'chat/unreadRoomCount',
+    }),
+  },
+  methods: {
+    ...mapMutations({
+      commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
     }),
   },
   apollo: {
@@ -39,7 +40,7 @@ export default {
         return unreadRoomsQuery()
       },
       update({ UnreadRooms }) {
-        this.count = UnreadRooms
+        this.commitUnreadRoomCount(UnreadRooms)
       },
       subscribeToMore: {
         document: roomCountUpdated(),
diff --git a/webapp/store/chat.js b/webapp/store/chat.js
index be4ddaec0..ed6b5256c 100644
--- a/webapp/store/chat.js
+++ b/webapp/store/chat.js
@@ -2,6 +2,7 @@ export const state = () => {
   return {
     showChat: false,
     roomID: null,
+    unreadRoomCount: 0,
   }
 }
 
@@ -10,6 +11,9 @@ export const mutations = {
     state.showChat = ctx.showChat || false
     state.roomID = ctx.roomID || null
   },
+  UPDATE_ROOM_COUNT(state, count) {
+    state.unreadRoomCount = count
+  },
 }
 
 export const getters = {
@@ -19,4 +23,7 @@ export const getters = {
   roomID(state) {
     return state
   },
+  unreadRoomCount(state) {
+    return state.unreadRoomCount
+  },
 }

From 27fe3068e06f8389854ca21e5b43bc9177b9a3d6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 19:30:44 +0200
Subject: [PATCH 078/181] remove emacs fragment

---
 backend/src/schema/resolvers/#messages.ts# | 150 ---------------------
 1 file changed, 150 deletions(-)
 delete mode 100644 backend/src/schema/resolvers/#messages.ts#

diff --git a/backend/src/schema/resolvers/#messages.ts# b/backend/src/schema/resolvers/#messages.ts#
deleted file mode 100644
index 43a3fabf1..000000000
--- a/backend/src/schema/resolvers/#messages.ts#
+++ /dev/null
@@ -1,150 +0,0 @@
-import { neo4jgraphql } from 'neo4j-graphql-js'
-import Resolver from './helpers/Resolver'
-import { getUnreadRoomsCount } from './rooms'
-import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
-
-const setMessagesAsDistributed = async (undistributedMessagesIds, session) => {
-  return session.writeTransaction(async (transaction) => {
-    const setDistributedCypher = `
-      MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
-      SET m.distributed = true
-      RETURN m { .* }
-    `
-    const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
-      undistributedMessagesIds,
-    })
-    const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
-    return messages
-  })
-}
-
-export default {
-  Query: {
-    Message: async (object, params, context, resolveInfo) => {
-      const { roomId } = params
-      delete params.roomId
-      if (!params.filter) params.filter = {}
-      params.filter.room = {
-        id: roomId,
-        users_some: {
-          id: context.user.id,
-        },
-      }
-
-      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
-
-      if (resolved) {
-        const undistributedMessagesIds = resolved
-          .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
-          .map((msg) => msg.id)
-        const session = context.driver.session()
-        try {
-          if (undistributedMessagesIds.length > 0) {
-            await setMessagesAsDistributed(undistributedMessagesIds, session)
-          }
-        } finally {
-          session.close()
-        }
-        // send subscription to author to updated the messages
-      }
-      return resolved.reverse()
-    },
-  },
-  Mutation: {
-    CreateMessage: async (_parent, params, context, _resolveInfo) => {
-      const { roomId, content } = params
-      const {
-        user: { id: currentUserId },
-      } = context
-      const session = context.driver.session()
-      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
-        const createMessageCypher = `
-          MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
-          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
-          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
-          OPTIONAL MATCH (room)<-[:CHATS_IN]-(recipientUser:User)
-            WHERE NOT recipientUser.id = $currentUserId
-          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, recipientUser 
-          CREATE (currentUser)-[:CREATED]->(message:Message {
-            createdAt: toString(datetime()),
-            id: apoc.create.uuid(),
-            indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
-            content: $content,
-            saved: true,
-            distributed: false,
-            seen: false
-          })-[:INSIDE]->(room)
-          SET room.lastMessageAt = toString(datetime())
-          RETURN message {
-            .*,
-            recipientId: recipientUser.id,
-            senderId: currentUser.id,
-            username: currentUser.name,
-            avatar: image.url,
-            date: message.createdAt
-          }
-        `
-        const createMessageTxResponse = await transaction.run(createMessageCypher, {
-          currentUserId,
-          roomId,
-          content,
-        })
-
-        const [message] = await createMessageTxResponse.records.map((record) =>
-          record.get('message'),
-        )
-
-        return message
-      })
-      try {
-        const message = await writeTxResultPromise
-        if (message) {
-          const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
-
-          // send subscriptions
-          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, userId: message.recipientId })
-        }
-
-        return message
-      } catch (error) {
-        throw new Error(error)
-      } finally {
-        session.close()
-      }
-    },
-    MarkMessagesAsSeen: async (_parent, params, context, _resolveInfo) => {
-      const { messageIds } = params
-      const currentUserId = context.user.id
-      const session = context.driver.session()
-      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
-        const setSeenCypher = `
-          MATCH (m:Message)<-[:CREATED]-(user:User)
-          WHERE m.id IN $messageIds AND NOT user.id = $currentUserId
-          SET m.seen = true
-          RETURN m { .* }
-        `
-        const setSeenTxResponse = await transaction.run(setSeenCypher, {
-          messageIds,
-          currentUserId,
-        })
-        const messages = await setSeenTxResponse.records.map((record) => record.get('m'))
-        return messages
-      })
-      try {
-        await writeTxResultPromise
-        // send subscription to author to updated the messages
-        return true
-      } finally {
-        session.close()
-      }
-    },
-  },
-  Message: {
-    ...Resolver('Message', {
-      hasOne: {
-        author: '<-[:CREATED]-(related:User)',
-        room: '-[:INSIDE]->(related:Room)',
-      },
-    }),
-  },
-}

From 4b2fae9a2c15c5a6fd38f3f71c878e2f06aa530b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 19:52:41 +0200
Subject: [PATCH 079/181] do not await for mark messages as seen

---
 webapp/components/Chat/Chat.vue | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 05472c56f..43994ef5d 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -260,19 +260,22 @@ export default {
 
         const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
         if (newMsgIds.length) {
-          await this.$apollo.mutate({
-            mutation: markMessagesAsSeen(),
-            variables: {
-              messageIds: newMsgIds,
-            },
-          })
           this.$apollo
-            .query({
-              query: unreadRoomsQuery(),
-              fetchPolicy: 'network-only',
+            .mutate({
+              mutation: markMessagesAsSeen(),
+              variables: {
+                messageIds: newMsgIds,
+              },
             })
-            .then(({ data: { UnreadRooms } }) => {
-              this.commitUnreadRoomCount(UnreadRooms)
+            .then(() => {
+              this.$apollo
+                .query({
+                  query: unreadRoomsQuery(),
+                  fetchPolicy: 'network-only',
+                })
+                .then(({ data: { UnreadRooms } }) => {
+                  this.commitUnreadRoomCount(UnreadRooms)
+                })
             })
         }
 

From dfd7107714f26a260c01bb8497affa763b5778a4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 20:37:52 +0200
Subject: [PATCH 080/181] remove unused ubscription test, fix subscription
 params in test

---
 backend/src/schema/resolvers/messages.spec.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 14ed9890a..1679b0c34 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -144,7 +144,7 @@ describe('Message', () => {
             })
             expect(pubsubSpy).toBeCalledWith('ROOM_COUNT_UPDATED', {
               roomCountUpdated: '1',
-              user: 'other-chatting-user',
+              userId: 'other-chatting-user',
             })
           })
 
@@ -325,18 +325,6 @@ describe('Message', () => {
             })
           })
 
-          it('sends two subscriptions', () => {
-            expect(pubsubSpy).toBeCalledTimes(2)
-            expect(pubsubSpy).nthCalledWith(1, 'ROOM_COUNT_UPDATED', {
-              roomCountUpdated: '1',
-              user: 'chatting-user',
-            })
-            expect(pubsubSpy).nthCalledWith(2, 'ROOM_COUNT_UPDATED', {
-              roomCountUpdated: '1',
-              user: 'other-chatting-user',
-            })
-          })
-
           it('returns the messages', async () => {
             await expect(
               query({

From 6b7047e604b7b10d6afdd6cc969404a5aea9bbb1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 10:25:12 +0200
Subject: [PATCH 081/181] set workflow not to fail while deleting cache

---
 .github/workflows/test-backend.yml | 1 +
 .github/workflows/test-webapp.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index a96cff028..af53e1fbc 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -138,6 +138,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
+          set +e
           KEY="backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
           KEY="backend-cache-pr${{ needs.files-changed.outputs.pr-number }}"
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 772182778..421ce5187 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -114,6 +114,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
+          set +e
           KEY="webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From 63bf3a307101f4a7db9d2acd8df2c116baf72154 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 10:31:56 +0200
Subject: [PATCH 082/181] set workflow not to fail while deleting cache

---
 .github/workflows/test-e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 2e6986722..e37b9fed0 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -113,5 +113,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
+          set +e
           KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file

From 98cad5b568a49a246463abc113545e0aafefd3df Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:47:56 +0200
Subject: [PATCH 083/181] changed order of room to lastMessageAt

---
 backend/src/graphql/rooms.ts           | 2 +-
 backend/src/schema/types/type/Room.gql | 2 +-
 webapp/graphql/Rooms.js                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 294b50641..b35a3e999 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -25,7 +25,7 @@ export const createRoomMutation = () => {
 export const roomQuery = () => {
   return gql`
     query Room($first: Int, $offset: Int, $id: ID) {
-      Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
+      Room(first: $first, offset: $offset, id: $id, orderBy: lastMessageAt_desc) {
         id
         roomId
         roomName
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index fdce6865b..0cf5b22c8 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -7,7 +7,7 @@
 
 # TODO change this to last message date
 enum _RoomOrdering {
-  createdAt_desc
+  lastMessageAt_desc
 }
 
 type Room {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 68baccf3f..bbdd95a04 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: lastMessageAt_desc) {
       id
       roomId
       roomName

From d7aba44fbeb9ddefe39e8ef9ea7f066829e4325a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:48:42 +0200
Subject: [PATCH 084/181] removed console log and fixed reloading of messages

---
 backend/src/schema/resolvers/messages.ts | 1 -
 webapp/components/Chat/Chat.vue          | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index cd6e5827e..0dd91a905 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -26,7 +26,6 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
         (payload, variables) => {
-          console.log('chatMessageAdded', payload, variables)
           return true // payload.user.id === variables.userId
         },
       ),
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 870e2a46c..5f747d9de 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -314,12 +314,13 @@ export default {
     },
 
     async chatMessageAdded({data}){
-      console.log(data)
       if(data.chatMessageAdded.room.id === this.selectedRoom?.id){
-        this.fetchMessages({ room: this.selectedRoom}, { refetch: true})
+        this.fetchMessages({ room: this.selectedRoom, options: { refetch: true }})
       } else {
         // TODO this might be optimized selectively (first page vs rest)
         this.rooms = []
+        this.roomPage = 0
+        this.roomsLoaded = false
         this.fetchRooms()
       }
     },

From ae2d6c7ad53b6f6a8d9edd3bc3b4db2bd095b942 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:52:18 +0200
Subject: [PATCH 085/181] fix recipient selection

---
 backend/src/schema/resolvers/messages.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 0dd91a905..e473c2bb5 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -26,7 +26,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
         (payload, variables) => {
-          return true // payload.user.id === variables.userId
+          return payload.userId === variables.userId
         },
       ),
     },
@@ -114,13 +114,13 @@ export default {
           const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
           // send subscriptions
-          await pubsub.publish(ROOM_COUNT_UPDATED, {
+          void pubsub.publish(ROOM_COUNT_UPDATED, {
             roomCountUpdated,
             userId: message.recipientId,
           })
-          await pubsub.publish(CHAT_MESSAGE_ADDED, {
+          void pubsub.publish(CHAT_MESSAGE_ADDED, {
             chatMessageAdded: message,
-            user: message.recipientId,
+            userId: message.recipientId,
           })
         }
 

From 33ecc4764e88d52a64e61745293ec74cb459b447 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:54:27 +0200
Subject: [PATCH 086/181] linting

---
 webapp/components/Chat/Chat.vue | 18 +++++++++++-------
 webapp/graphql/Messages.js      |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 5f747d9de..3a059f64e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -61,7 +61,12 @@
 
 <script>
 import { roomQuery, createRoom, unreadRoomsQuery } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation, chatMessageAdded, markMessagesAsSeen } from '~/graphql/Messages'
+import {
+  messageQuery,
+  createMessageMutation,
+  chatMessageAdded,
+  markMessagesAsSeen,
+} from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters, mapMutations } from 'vuex'
 
@@ -180,11 +185,10 @@ export default {
 
     observer.subscribe({
       next: this.chatMessageAdded,
-      error (error) {
-        console.error(error)
+      error(error) {
+        this.$toast.error(error)
       },
     })
-
   },
   computed: {
     ...mapGetters({
@@ -313,9 +317,9 @@ export default {
       }
     },
 
-    async chatMessageAdded({data}){
-      if(data.chatMessageAdded.room.id === this.selectedRoom?.id){
-        this.fetchMessages({ room: this.selectedRoom, options: { refetch: true }})
+    async chatMessageAdded({ data }) {
+      if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
+        this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })
       } else {
         // TODO this might be optimized selectively (first page vs rest)
         this.rooms = []
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 994b28f51..9efd35cf1 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -37,7 +37,7 @@ export const createMessageMutation = () => {
 export const chatMessageAdded = () => {
   return gql`
     subscription chatMessageAdded($userId: ID!) {
-      chatMessageAdded(userId: $userId){
+      chatMessageAdded(userId: $userId) {
         #_id
         id
         # indexId

From cca020b6b325be22ba2910621145602f6cc0a651 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 11:14:06 +0200
Subject: [PATCH 087/181] aligned backend and frontend queries, show last
 message and unread count in room list

---
 backend/src/graphql/messages.ts |  3 +++
 backend/src/graphql/rooms.ts    |  2 ++
 webapp/graphql/Messages.js      | 22 +++++++++++-----------
 webapp/graphql/Rooms.js         | 32 +++++++++++++++++++++++---------
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index fde45083b..2842c7230 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -27,6 +27,9 @@ export const messageQuery = () => {
         indexId
         content
         senderId
+        author {
+          id
+        }
         username
         avatar
         date
diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 294b50641..a5cd1841b 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -9,6 +9,7 @@ export const createRoomMutation = () => {
         roomName
         lastMessageAt
         unreadCount
+        #avatar
         users {
           _id
           id
@@ -29,6 +30,7 @@ export const roomQuery = () => {
         id
         roomId
         roomName
+        avatar
         lastMessageAt
         unreadCount
         lastMessage {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 86b9c81ca..01ba413f4 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -1,5 +1,16 @@
 import gql from 'graphql-tag'
 
+export const createMessageMutation = () => {
+  return gql`
+    mutation ($roomId: ID!, $content: String!) {
+      CreateMessage(roomId: $roomId, content: $content) {
+        id
+        content
+      }
+    }
+  `
+}
+
 export const messageQuery = () => {
   return gql`
     query ($roomId: ID!, $first: Int, $offset: Int) {
@@ -23,17 +34,6 @@ export const messageQuery = () => {
   `
 }
 
-export const createMessageMutation = () => {
-  return gql`
-    mutation ($roomId: ID!, $content: String!) {
-      CreateMessage(roomId: $roomId, content: $content) {
-        id
-        content
-      }
-    }
-  `
-}
-
 export const markMessagesAsSeen = () => {
   return gql`
     mutation ($messageIds: [String!]) {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 68baccf3f..a7414ecb7 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -1,5 +1,14 @@
 import gql from 'graphql-tag'
 
+export const createRoom = () => gql`
+  mutation ($userId: ID!) {
+    CreateRoom(userId: $userId) {
+      id
+      roomId
+    }
+  }
+`
+
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
     Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
@@ -7,6 +16,20 @@ export const roomQuery = () => gql`
       roomId
       roomName
       avatar
+      lastMessageAt
+      unreadCount
+      lastMessage {
+        _id
+        id
+        content
+        senderId
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
+      }
       users {
         _id
         id
@@ -19,15 +42,6 @@ export const roomQuery = () => gql`
   }
 `
 
-export const createRoom = () => gql`
-  mutation ($userId: ID!) {
-    CreateRoom(userId: $userId) {
-      id
-      roomId
-    }
-  }
-`
-
 export const unreadRoomsQuery = () => {
   return gql`
     query {

From 0b96388a42cc77bbf306f24a71ab3e8b61d0b031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 11:47:05 +0200
Subject: [PATCH 088/181] Remove '*.js' on imports in 'Editor.vue'

---
 webapp/components/Editor/Editor.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Editor/Editor.vue b/webapp/components/Editor/Editor.vue
index cf0fd710b..8bc0a04d3 100644
--- a/webapp/components/Editor/Editor.vue
+++ b/webapp/components/Editor/Editor.vue
@@ -28,10 +28,10 @@ import { replace, build } from 'xregexp/xregexp-all.js'
 
 import * as key from '../../constants/keycodes'
 import { HASHTAG, MENTION } from '../../constants/editor'
-import defaultExtensions from './defaultExtensions.js'
-import EventHandler from './plugins/eventHandler.js'
-import Hashtag from './nodes/Hashtag.js'
-import Mention from './nodes/Mention.js'
+import defaultExtensions from './defaultExtensions'
+import EventHandler from './plugins/eventHandler'
+import Hashtag from './nodes/Hashtag'
+import Mention from './nodes/Mention'
 import MenuBar from './MenuBar'
 import ContextMenu from './ContextMenu'
 import SuggestionList from './SuggestionList'

From 1cc60cd154296f2a34979ff2bafecb20a24b1f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 12:23:09 +0200
Subject: [PATCH 089/181] Change text for chat room search to 'Filter chat
 rooms'

---
 webapp/locales/de.json | 2 +-
 webapp/locales/en.json | 2 +-
 webapp/locales/es.json | 3 +++
 webapp/locales/fr.json | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e1137deb7..2b7fc3b37 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -88,7 +88,7 @@
     "newMessages": "Neue Nachrichten",
     "roomEmpty": "Keinen Raum selektiert",
     "roomsEmpty": "Keine Räume",
-    "search": "Suche",
+    "search": "Chat-Räume filtern",
     "typeMessage": "Nachricht schreiben",
     "userProfileButton": {
       "label": "Chat",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 2e1e361ab..50009d69c 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -88,7 +88,7 @@
     "newMessages": "New Messages",
     "roomEmpty": "No room selected",
     "roomsEmpty": "No rooms",
-    "search": "Search",
+    "search": "Filter chat rooms",
     "typeMessage": "Type message",
     "userProfileButton": {
       "label": "Chat",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index a313b3dc4..ae455e5eb 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -75,6 +75,9 @@
       }
     }
   },
+  "chat": {
+    "search": "Filtrar salas de chat"
+  },
   "code-of-conduct": {
     "subheader": "para la red social de {ORGANIZATION_NAME}"
   },
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 511ca4568..3f97d84c2 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -75,6 +75,9 @@
       }
     }
   },
+  "chat": {
+    "search": "Filtrer les salons de chat"
+  },
   "code-of-conduct": {
     "subheader": "pour le réseau social de {ORGANIZATION_NAME}"
   },

From 507f0c0880b9c79c710c5f933570581192f83caf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 12:23:24 +0200
Subject: [PATCH 090/181] removed promise all

---
 backend/src/db/seed.ts | 1417 +++++++++++++++++++---------------------
 1 file changed, 669 insertions(+), 748 deletions(-)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index 7286683dd..53cd4cea6 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -269,17 +269,17 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await dagobert.relateTo(louie, 'blocked')
 
     // categories
-    await Promise.all(
-      categories.map(({ icon, name }, index) => {
-        return Factory.build('category', {
-          id: `cat${index + 1}`,
-          slug: name,
-          name,
-          icon,
-        })
-      }),
-    )
+    let i = 0
+    for (const category of categories) {
+      await Factory.build('category', {
+        id: `cat${i++}`,
+        slug: category.name,
+        naem: category.name,
+        icon: category.icon,
+      })
+    }
 
+    // tags
     const environment = await Factory.build('tag', {
       id: 'Environment',
     })
@@ -295,361 +295,324 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     // groups
     authenticatedUser = await peterLustig.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createGroupMutation(),
-        variables: {
-          id: 'g0',
-          name: 'Investigative Journalism',
-          about: 'Investigative journalists share ideas and insights and can collaborate.',
-          description: `<p class=""><em>English:</em></p><p class="">This group is hidden.</p><h3>What is our group for?</h3><p>This group was created to allow investigative journalists to share and collaborate.</p><h3>How does it work?</h3><p>Here you can internally share posts and comments about them.</p><p><br></p><p><em>Deutsch:</em></p><p class="">Diese Gruppe ist verborgen.</p><h3>Wofür ist unsere Gruppe?</h3><p class="">Diese Gruppe wurde geschaffen, um investigativen Journalisten den Austausch und die Zusammenarbeit zu ermöglichen.</p><h3>Wie funktioniert das?</h3><p class="">Hier könnt ihr euch intern über Beiträge und Kommentare zu ihnen austauschen.</p>`,
-          groupType: 'hidden',
-          actionRadius: 'global',
-          categoryIds: ['cat6', 'cat12', 'cat16'],
-          locationName: 'Hamburg, Germany',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u2',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u4',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u6',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u2',
-          roleInGroup: 'usual',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u4',
-          roleInGroup: 'admin',
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createGroupMutation(),
+      variables: {
+        id: 'g0',
+        name: 'Investigative Journalism',
+        about: 'Investigative journalists share ideas and insights and can collaborate.',
+        description: `<p class=""><em>English:</em></p><p class="">This group is hidden.</p><h3>What is our group for?</h3><p>This group was created to allow investigative journalists to share and collaborate.</p><h3>How does it work?</h3><p>Here you can internally share posts and comments about them.</p><p><br></p><p><em>Deutsch:</em></p><p class="">Diese Gruppe ist verborgen.</p><h3>Wofür ist unsere Gruppe?</h3><p class="">Diese Gruppe wurde geschaffen, um investigativen Journalisten den Austausch und die Zusammenarbeit zu ermöglichen.</p><h3>Wie funktioniert das?</h3><p class="">Hier könnt ihr euch intern über Beiträge und Kommentare zu ihnen austauschen.</p>`,
+        groupType: 'hidden',
+        actionRadius: 'global',
+        categoryIds: ['cat6', 'cat12', 'cat16'],
+        locationName: 'Hamburg, Germany',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u2',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u4',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u6',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u2',
+        roleInGroup: 'usual',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u4',
+        roleInGroup: 'admin',
+      },
+    })
 
     // post into group
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p0-g0',
-          groupId: 'g0',
-          title: `What happend in Shanghai?`,
-          content: 'A sack of rise dropped in Shanghai. Should we further investigate?',
-          categoryIds: ['cat6'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p0-g0',
+        groupId: 'g0',
+        title: `What happend in Shanghai?`,
+        content: 'A sack of rise dropped in Shanghai. Should we further investigate?',
+        categoryIds: ['cat6'],
+      },
+    })
+
     authenticatedUser = await bobDerBaumeister.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p1-g0',
-          groupId: 'g0',
-          title: `The man on the moon`,
-          content: 'We have to further investigate about the stories of a man living on the moon.',
-          categoryIds: ['cat12', 'cat16'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p1-g0',
+        groupId: 'g0',
+        title: `The man on the moon`,
+        content: 'We have to further investigate about the stories of a man living on the moon.',
+        categoryIds: ['cat12', 'cat16'],
+      },
+    })
 
     authenticatedUser = await jennyRostock.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createGroupMutation(),
-        variables: {
-          id: 'g1',
-          name: 'School For Citizens',
-          about: 'Our children shall receive education for life.',
-          description: `<p class=""><em>English</em></p><h3>Our goal</h3><p>Only those who enjoy learning and do not lose their curiosity can obtain a good education for life and continue to learn with joy throughout their lives.</p><h3>Curiosity</h3><p>For this we need a school that takes up the curiosity of the children, the people, and satisfies it through a lot of experience.</p><p><br></p><p><em>Deutsch</em></p><h3>Unser Ziel</h3><p class="">Nur wer Spaß am Lernen hat und seine Neugier nicht verliert, kann gute Bildung für's Leben erlangen und sein ganzes Leben mit Freude weiter lernen.</p><h3>Neugier</h3><p class="">Dazu benötigen wir eine Schule, die die Neugier der Kinder, der Menschen, aufnimmt und durch viel Erfahrung befriedigt.</p>`,
-          groupType: 'closed',
-          actionRadius: 'national',
-          categoryIds: ['cat8', 'cat14'],
-          locationName: 'France',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u1',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u2',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u5',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u6',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u7',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u1',
-          roleInGroup: 'usual',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u5',
-          roleInGroup: 'admin',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u6',
-          roleInGroup: 'owner',
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createGroupMutation(),
+      variables: {
+        id: 'g1',
+        name: 'School For Citizens',
+        about: 'Our children shall receive education for life.',
+        description: `<p class=""><em>English</em></p><h3>Our goal</h3><p>Only those who enjoy learning and do not lose their curiosity can obtain a good education for life and continue to learn with joy throughout their lives.</p><h3>Curiosity</h3><p>For this we need a school that takes up the curiosity of the children, the people, and satisfies it through a lot of experience.</p><p><br></p><p><em>Deutsch</em></p><h3>Unser Ziel</h3><p class="">Nur wer Spaß am Lernen hat und seine Neugier nicht verliert, kann gute Bildung für's Leben erlangen und sein ganzes Leben mit Freude weiter lernen.</p><h3>Neugier</h3><p class="">Dazu benötigen wir eine Schule, die die Neugier der Kinder, der Menschen, aufnimmt und durch viel Erfahrung befriedigt.</p>`,
+        groupType: 'closed',
+        actionRadius: 'national',
+        categoryIds: ['cat8', 'cat14'],
+        locationName: 'France',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u1',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u2',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u5',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u6',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u7',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u1',
+        roleInGroup: 'usual',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u5',
+        roleInGroup: 'admin',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u6',
+        roleInGroup: 'owner',
+      },
+    })
     // post into group
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p0-g1',
-          groupId: 'g1',
-          title: `Can we use ocelot for education?`,
-          content: 'I like the concept of this school. Can we use our software in this?',
-          categoryIds: ['cat8'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p0-g1',
+        groupId: 'g1',
+        title: `Can we use ocelot for education?`,
+        content: 'I like the concept of this school. Can we use our software in this?',
+        categoryIds: ['cat8'],
+      },
+    })
     authenticatedUser = await peterLustig.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p1-g1',
-          groupId: 'g1',
-          title: `Can we push this idea out of France?`,
-          content: 'This idea is too inportant to have the scope only on France.',
-          categoryIds: ['cat14'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p1-g1',
+        groupId: 'g1',
+        title: `Can we push this idea out of France?`,
+        content: 'This idea is too inportant to have the scope only on France.',
+        categoryIds: ['cat14'],
+      },
+    })
 
     authenticatedUser = await bobDerBaumeister.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createGroupMutation(),
-        variables: {
-          id: 'g2',
-          name: 'Yoga Practice',
-          about: 'We do yoga around the clock.',
-          description: `<h3>What Is yoga?</h3><p>Yoga is not just about practicing asanas. It's about how we do it.</p><p class="">And practicing asanas doesn't have to be yoga, it can be more athletic than yogic.</p><h3>What makes practicing asanas yogic?</h3><p class="">The important thing is:</p><ul><li><p>Use the exercises (consciously) for your personal development.</p></li></ul>`,
-          groupType: 'public',
-          actionRadius: 'interplanetary',
-          categoryIds: ['cat4', 'cat5', 'cat17'],
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u3',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u4',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u5',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u6',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u7',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u3',
-          roleInGroup: 'usual',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u4',
-          roleInGroup: 'pending',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u5',
-          roleInGroup: 'admin',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u6',
-          roleInGroup: 'usual',
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createGroupMutation(),
+      variables: {
+        id: 'g2',
+        name: 'Yoga Practice',
+        about: 'We do yoga around the clock.',
+        description: `<h3>What Is yoga?</h3><p>Yoga is not just about practicing asanas. It's about how we do it.</p><p class="">And practicing asanas doesn't have to be yoga, it can be more athletic than yogic.</p><h3>What makes practicing asanas yogic?</h3><p class="">The important thing is:</p><ul><li><p>Use the exercises (consciously) for your personal development.</p></li></ul>`,
+        groupType: 'public',
+        actionRadius: 'interplanetary',
+        categoryIds: ['cat4', 'cat5', 'cat17'],
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u3',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u4',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u5',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u6',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u7',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u3',
+        roleInGroup: 'usual',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u4',
+        roleInGroup: 'pending',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u5',
+        roleInGroup: 'admin',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u6',
+        roleInGroup: 'usual',
+      },
+    })
 
     authenticatedUser = await louie.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p0-g2',
-          groupId: 'g2',
-          title: `I am a Noob`,
-          content: 'I am new to Yoga and did not join this group so far.',
-          categoryIds: ['cat4'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p0-g2',
+        groupId: 'g2',
+        title: `I am a Noob`,
+        content: 'I am new to Yoga and did not join this group so far.',
+        categoryIds: ['cat4'],
+      },
+    })
 
     // Create Events (by peter lustig)
     authenticatedUser = await peterLustig.toJson()
     const now = new Date()
 
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'e0',
-          title: 'Illegaler Kindergeburtstag',
-          content: 'Elli hat nächste Woche Geburtstag. Wir feiern das!',
-          categoryIds: ['cat4'],
-          postType: 'Event',
-          eventInput: {
-            eventStart: new Date(
-              now.getFullYear(),
-              now.getMonth(),
-              now.getDate() + 7,
-            ).toISOString(),
-            eventVenue: 'Ellis Kinderzimmer',
-            eventLocationName: 'Deutschland',
-          },
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'e0',
+        title: 'Illegaler Kindergeburtstag',
+        content: 'Elli hat nächste Woche Geburtstag. Wir feiern das!',
+        categoryIds: ['cat4'],
+        postType: 'Event',
+        eventInput: {
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7).toISOString(),
+          eventVenue: 'Ellis Kinderzimmer',
+          eventLocationName: 'Deutschland',
         },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'e1',
-          title: 'Wir Schützen den Stuttgarter Schlossgarten',
-          content: 'Kein Baum wird gefällt werden!',
-          categoryIds: ['cat5'],
-          postType: 'Event',
-          eventInput: {
-            eventStart: new Date(
-              now.getFullYear(),
-              now.getMonth(),
-              now.getDate() + 1,
-            ).toISOString(),
-            eventVenue: 'Schlossgarten',
-            eventLocationName: 'Stuttgart',
-          },
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'e1',
+        title: 'Wir Schützen den Stuttgarter Schlossgarten',
+        content: 'Kein Baum wird gefällt werden!',
+        categoryIds: ['cat5'],
+        postType: 'Event',
+        eventInput: {
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString(),
+          eventVenue: 'Schlossgarten',
+          eventLocationName: 'Stuttgart',
         },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'e2',
-          title: 'IT 4 Change Treffen',
-          content: 'Wir sitzen eine Woche zusammen rum und glotzen uns blöde an.',
-          categoryIds: ['cat5'],
-          postType: 'Event',
-          eventInput: {
-            eventStart: new Date(
-              now.getFullYear(),
-              now.getMonth(),
-              now.getDate() + 1,
-            ).toISOString(),
-            eventEnd: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 4).toISOString(),
-            eventVenue: 'Ferienlager',
-            eventLocationName: 'Bahra, Sachsen',
-          },
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'e2',
+        title: 'IT 4 Change Treffen',
+        content: 'Wir sitzen eine Woche zusammen rum und glotzen uns blöde an.',
+        categoryIds: ['cat5'],
+        postType: 'Event',
+        eventInput: {
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString(),
+          eventEnd: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 4).toISOString(),
+          eventVenue: 'Ferienlager',
+          eventLocationName: 'Bahra, Sachsen',
         },
-      }),
-    ])
+      },
+    })
 
     let passedEvent = await neode.find('Post', 'e1')
     await passedEvent.update({ eventStart: new Date(2010, 8, 30, 10).toISOString() })
@@ -836,48 +799,49 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     const hashtagAndMention1 =
       'The new physics of <a class="hashtag" data-hashtag-id="QuantenFlussTheorie" href="/?hashtag=QuantenFlussTheorie">#QuantenFlussTheorie</a> can explain <a class="hashtag" data-hashtag-id="QuantumGravity" href="/?hashtag=QuantumGravity">#QuantumGravity</a>! <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> got that already. ;-)'
 
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p2',
-          title: `Nature Philosophy Yoga`,
-          content: hashtag1,
-          categoryIds: ['cat2'],
-        },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p7',
-          title: 'This is post #7',
-          content: `${mention1} ${faker.lorem.paragraph()}`,
-          categoryIds: ['cat7'],
-        },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p8',
-          image: faker.image.unsplash.nature(),
-          title: `Quantum Flow Theory explains Quantum Gravity`,
-          content: hashtagAndMention1,
-          categoryIds: ['cat8'],
-        },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p12',
-          title: 'This is post #12',
-          content: `${mention2} ${faker.lorem.paragraph()}`,
-          categoryIds: ['cat12'],
-        },
-      }),
-    ])
-    const [p2, p7, p8, p12] = await Promise.all(
-      ['p2', 'p7', 'p8', 'p12'].map((id) => neode.find('Post', id)),
-    )
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p2',
+        title: `Nature Philosophy Yoga`,
+        content: hashtag1,
+        categoryIds: ['cat2'],
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p7',
+        title: 'This is post #7',
+        content: `${mention1} ${faker.lorem.paragraph()}`,
+        categoryIds: ['cat7'],
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p8',
+        image: faker.image.unsplash.nature(),
+        title: `Quantum Flow Theory explains Quantum Gravity`,
+        content: hashtagAndMention1,
+        categoryIds: ['cat8'],
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p12',
+        title: 'This is post #12',
+        content: `${mention2} ${faker.lorem.paragraph()}`,
+        categoryIds: ['cat12'],
+      },
+    })
+
+    const p2 = await neode.find('Post', 'p2')
+    const p7 = await neode.find('Post', 'p7')
+    const p8 = await neode.find('Post', 'p8')
+    const p12 = await neode.find('Post', 'p12')
+
     authenticatedUser = null
 
     authenticatedUser = await dewey.toJson()
@@ -885,31 +849,30 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       'I heard <a class="mention" data-mention-id="u3" href="/profile/u3">@jenny-rostock</a> has practiced it for 3 years now.'
     const mentionInComment2 =
       'Did <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> tell you?'
-    await Promise.all([
-      mutate({
-        mutation: createCommentMutation,
-        variables: {
-          id: 'c4',
-          postId: 'p2',
-          content: mentionInComment1,
-        },
-      }),
-      mutate({
-        mutation: createCommentMutation,
-        variables: {
-          id: 'c4-1',
-          postId: 'p2',
-          content: mentionInComment2,
-        },
-      }),
-      mutate({
-        mutation: createCommentMutation,
-        variables: {
-          postId: 'p14',
-          content: faker.lorem.paragraph(),
-        },
-      }), // should send a notification
-    ])
+    await mutate({
+      mutation: createCommentMutation,
+      variables: {
+        id: 'c4',
+        postId: 'p2',
+        content: mentionInComment1,
+      },
+    })
+    await mutate({
+      mutation: createCommentMutation,
+      variables: {
+        id: 'c4-1',
+        postId: 'p2',
+        content: mentionInComment2,
+      },
+    })
+    await mutate({
+      mutation: createCommentMutation,
+      variables: {
+        postId: 'p14',
+        content: faker.lorem.paragraph(),
+      },
+    }) // should send a notification
+
     authenticatedUser = null
 
     const comments: any[] = []
@@ -1193,366 +1156,324 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       closed: true,
     })
 
-    const additionalUsers = await Promise.all(
-      [...Array(30).keys()].map(() => Factory.build('user')),
-    )
+    const additionalUsers: any[] = []
+    for (let i = 0; i < 30; i++) {
+      const user = await Factory.build('user')
+      await jennyRostock.relateTo(user, 'following')
+      await user.relateTo(jennyRostock, 'following')
+      additionalUsers.push(user)
+    }
 
-    await Promise.all(
-      additionalUsers.map(async (user) => {
-        await jennyRostock.relateTo(user, 'following')
-        await user.relateTo(jennyRostock, 'following')
-      }),
-    )
+    // Jenny users
+    for (let i = 0; i < 30; i++) {
+      await Factory.build('user', { name: `Jenny${i}` })
+    }
 
-    await Promise.all(
-      [...Array(30).keys()].map((index) => Factory.build('user', { name: `Jenny${index}` })),
-    )
+    // Jenny posts
+    for (let i = 0; i < 30; i++) {
+      await Factory.build(
+        'post',
+        { content: `Jenny ${faker.lorem.sentence()}` },
+        {
+          categoryIds: ['cat1'],
+          author: jennyRostock,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.objects(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(30).keys()].map(() =>
-        Factory.build(
-          'post',
-          { content: `Jenny ${faker.lorem.sentence()}` },
-          {
-            categoryIds: ['cat1'],
-            author: jennyRostock,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.objects(),
-            }),
-          },
-        ),
-      ),
-    )
+    // comments on p2 jenny
+    for (let i = 0; i < 6; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: jennyRostock,
+          postId: 'p2',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(30).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: jennyRostock,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.objects(),
-            }),
-          },
-        ),
-      ),
-    )
+    // comments on p15 jenny
+    for (let i = 0; i < 4; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: jennyRostock,
+          postId: 'p15',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(6).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p2',
-          },
-        ),
-      ),
-    )
+    // comments on p4 jenny
+    for (let i = 0; i < 2; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: jennyRostock,
+          postId: 'p4',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(4).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p15',
-          },
-        ),
-      ),
-    )
+    // Posts Peter Lustig
+    for (let i = 0; i < 21; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: peterLustig,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.buildings(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(2).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p4',
-          },
-        ),
-      ),
-    )
+    // comments p4 peter
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: peterLustig,
+          postId: 'p4',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(21).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: peterLustig,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.buildings(),
-            }),
-          },
-        ),
-      ),
-    )
+    // comments p14 peter
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: peterLustig,
+          postId: 'p14',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(3).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p4',
-          },
-        ),
-      ),
-    )
+    // comments p0 peter
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: peterLustig,
+          postId: 'p0',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(3).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p14',
-          },
-        ),
-      ),
-    )
+    // Posts dewey
+    for (let i = 0; i < 11; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: dewey,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.food(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(6).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p0',
-          },
-        ),
-      ),
-    )
+    // Comments p2 dewey
+    for (let i = 0; i < 7; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: dewey,
+          postId: 'p2',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(11).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: dewey,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.food(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p6 dewey
+    for (let i = 0; i < 5; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: dewey,
+          postId: 'p6',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(7).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p2',
-          },
-        ),
-      ),
-    )
+    // Comments p9 dewey
+    for (let i = 0; i < 2; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: dewey,
+          postId: 'p9',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(5).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p6',
-          },
-        ),
-      ),
-    )
+    // Posts louie
+    for (let i = 0; i < 16; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: louie,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.technology(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(2).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p9',
-          },
-        ),
-      ),
-    )
+    // Comments p1 louie
+    for (let i = 0; i < 4; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          postId: 'p1',
+          author: louie,
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(16).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: louie,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.technology(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p10 louie
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: louie,
+          postId: 'p10',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(4).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            postId: 'p1',
-            author: louie,
-          },
-        ),
-      ),
-    )
+    // Comments p13 louie
+    for (let i = 0; i < 5; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: louie,
+          postId: 'p13',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: louie,
-            postId: 'p10',
-          },
-        ),
-      ),
-    )
+    // Posts Bob der Baumeister
+    for (let i = 0; i < 45; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: bobDerBaumeister,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.people(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(5).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: louie,
-            postId: 'p13',
-          },
-        ),
-      ),
-    )
+    // Comments p2 bob
+    for (let i = 0; i < 2; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: bobDerBaumeister,
+          postId: 'p2',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(45).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: bobDerBaumeister,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.people(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p12 bob
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: bobDerBaumeister,
+          postId: 'p12',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(2).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p2',
-          },
-        ),
-      ),
-    )
+    // Comments p13 bob
+    for (let i = 0; i < 7; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: bobDerBaumeister,
+          postId: 'p13',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(3).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p12',
-          },
-        ),
-      ),
-    )
+    // Posts huey
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: huey,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.nature(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(7).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p13',
-          },
-        ),
-      ),
-    )
+    // Comments p0 huey
+    for (let i = 0; i < 6; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: huey,
+          postId: 'p0',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: huey,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.nature(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p13 huey
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: huey,
+          postId: 'p13',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(6).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p0',
-          },
-        ),
-      ),
-    )
-
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p13',
-          },
-        ),
-      ),
-    )
-
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p15',
-          },
-        ),
-      ),
-    )
+    // Comments p15 huey
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: huey,
+          postId: 'p15',
+        },
+      )
+    }
 
     await Factory.build('donations')
 

From eed89f8c4b292f552a1894b8f2715d35ac04f831 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Jul 2023 12:46:19 +0200
Subject: [PATCH 091/181] add chat middleware to add new message subscription

---
 backend/src/middleware/chatMiddleware.ts      |  3 +++
 backend/src/schema/resolvers/messages.spec.ts | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index c28d6a70d..8ae252e13 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -54,4 +54,7 @@ export default {
   Mutation: {
     CreateRoom: roomProperties,
   },
+  Subscription: {
+    chatMessageAdded: messageProperties,
+  },
 }
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 1679b0c34..83d9fdc6b 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -117,7 +117,7 @@ describe('Message', () => {
         })
 
         describe('user chats in room', () => {
-          it('returns the message and publishes subscription', async () => {
+          it('returns the message and publishes subscriptions', async () => {
             await expect(
               mutate({
                 mutation: createMessageMutation(),
@@ -146,6 +146,20 @@ describe('Message', () => {
               roomCountUpdated: '1',
               userId: 'other-chatting-user',
             })
+            expect(pubsubSpy).toBeCalledWith('CHAT_MESSAGE_ADDED', {
+              chatMessageAdded: expect.objectContaining({
+                id: expect.any(String),
+                content: 'Some nice message to other chatting user',
+                senderId: 'chatting-user',
+                username: 'Chatting User',
+                avatar: expect.any(String),
+                date: expect.any(String),
+                saved: true,
+                distributed: false,
+                seen: false,
+              }),
+              userId: 'other-chatting-user',
+            })
           })
 
           describe('room is updated as well', () => {

From 81a08ff04e32090cbfc14a98f98aca1ec59df007 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Jul 2023 12:47:23 +0200
Subject: [PATCH 092/181] query all props on add message subscription

---
 webapp/graphql/Messages.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 9efd35cf1..13d27ac58 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -38,17 +38,17 @@ export const chatMessageAdded = () => {
   return gql`
     subscription chatMessageAdded($userId: ID!) {
       chatMessageAdded(userId: $userId) {
-        #_id
+        _id
         id
-        # indexId
+        indexId
         content
         senderId
-        #author {
-        #  id
-        #}
-        #username
-        #avatar
-        #date
+        author {
+          id
+        }
+        username
+        avatar
+        date
         room {
           id
         }

From c0fe7028e5efa5ed7c1b70658be11d6209509ff3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Jul 2023 13:23:03 +0200
Subject: [PATCH 093/181] fix unit test

---
 backend/src/schema/resolvers/rooms.spec.ts | 249 +++++++++++----------
 1 file changed, 128 insertions(+), 121 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index ee291a6c9..2e26dc1e3 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -423,125 +423,147 @@ describe('Room', () => {
     })
 
     it('returns the rooms paginated', async () => {
-      expect(await query({ query: roomQuery(), variables: { first: 3, offset: 0 } })).toMatchObject(
-        {
-          errors: undefined,
-          data: {
-            Room: [
-              {
+      await expect(
+        query({ query: roomQuery(), variables: { first: 3, offset: 0 } }),
+      ).resolves.toMatchObject({
+        errors: undefined,
+        data: {
+          Room: expect.arrayContaining([
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Third Chatting User',
+              lastMessageAt: null,
+              unreadCount: 0,
+              lastMessage: null,
+              users: expect.arrayContaining([
+                expect.objectContaining({
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+                expect.objectContaining({
+                  _id: 'third-chatting-user',
+                  id: 'third-chatting-user',
+                  name: 'Third Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+              ]),
+            }),
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Second Chatting User',
+              lastMessageAt: null,
+              unreadCount: 0,
+              lastMessage: null,
+              users: expect.arrayContaining([
+                expect.objectContaining({
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+                expect.objectContaining({
+                  _id: 'second-chatting-user',
+                  id: 'second-chatting-user',
+                  name: 'Second Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+              ]),
+            }),
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Other Chatting User',
+              lastMessageAt: expect.any(String),
+              unreadCount: 0,
+              lastMessage: {
+                _id: expect.any(String),
                 id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Third Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                  {
-                    _id: 'third-chatting-user',
-                    id: 'third-chatting-user',
-                    name: 'Third Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                ]),
+                content: '2nd message to other chatting user',
+                senderId: 'chatting-user',
+                username: 'Chatting User',
+                avatar: expect.any(String),
+                date: expect.any(String),
+                saved: true,
+                distributed: false,
+                seen: false,
               },
-              {
-                id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Second Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+              users: expect.arrayContaining([
+                expect.objectContaining({
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                  {
-                    _id: 'second-chatting-user',
-                    id: 'second-chatting-user',
-                    name: 'Second Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+                }),
+                expect.objectContaining({
+                  _id: 'other-chatting-user',
+                  id: 'other-chatting-user',
+                  name: 'Other Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                ]),
-              },
-              {
-                id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Not Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                  {
-                    _id: 'not-chatting-user',
-                    id: 'not-chatting-user',
-                    name: 'Not Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                ]),
-              },
-            ],
-          },
+                }),
+              ]),
+            }),
+          ]),
         },
-      )
-      expect(await query({ query: roomQuery(), variables: { first: 3, offset: 3 } })).toMatchObject(
-        {
-          errors: undefined,
-          data: {
-            Room: [
-              {
-                id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Other Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+      })
+      await expect(
+        query({ query: roomQuery(), variables: { first: 3, offset: 3 } }),
+      ).resolves.toMatchObject({
+        errors: undefined,
+        data: {
+          Room: [
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Not Chatting User',
+              users: expect.arrayContaining([
+                {
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                  {
-                    _id: 'other-chatting-user',
-                    id: 'other-chatting-user',
-                    name: 'Other Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+                },
+                {
+                  _id: 'not-chatting-user',
+                  id: 'not-chatting-user',
+                  name: 'Not Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                ]),
-              },
-            ],
-          },
+                },
+              ]),
+            }),
+          ],
         },
-      )
+      })
     })
   })
 
   describe('query single room', () => {
     let result: any = null
+
     beforeAll(async () => {
       authenticatedUser = await chattingUser.toJson()
       result = await query({ query: roomQuery() })
     })
+
     describe('as chatter of room', () => {
       it('returns the room', async () => {
         expect(
@@ -556,34 +578,19 @@ describe('Room', () => {
               {
                 id: expect.any(String),
                 roomId: expect.any(String),
-                roomName: 'Third Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                  {
-                    _id: 'third-chatting-user',
-                    id: 'third-chatting-user',
-                    name: 'Third Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                ]),
+                roomName: result.data.Room[0].roomName,
+                users: expect.any(Array),
               },
             ],
           },
         })
       })
+
       describe('as not chatter of room', () => {
         beforeAll(async () => {
           authenticatedUser = await notChattingUser.toJson()
         })
+
         it('returns no room', async () => {
           authenticatedUser = await notChattingUser.toJson()
           expect(

From 785a0279899f12952abb7f94f78e603647842910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 14:17:40 +0200
Subject: [PATCH 094/181] Close mini chat on visit chat room page

---
 webapp/pages/chat.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index b23a6e8dc..b5f255506 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -6,9 +6,18 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
   components: { Chat },
+  mounted() {
+    this.showChat({ showChat: false, roomID: null })
+  },
+  methods: {
+    ...mapMutations({
+      showChat: 'chat/SET_OPEN_CHAT',
+    }),
+  },
 }
 </script>

From cc4cb8af46a6e077283d5d38c1aac2d08ac516a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 14:41:10 +0200
Subject: [PATCH 095/181] Rename tag 'chat-module' to 'chat'

---
 webapp/layouts/default.vue | 8 ++++----
 webapp/pages/chat.vue      | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index bd518b976..27efcdd89 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -14,9 +14,9 @@
       <modal />
     </client-only>
     <div v-if="$store.getters['chat/showChat'].showChat" class="chat-modul">
-      <chat-module
-        v-on:close-single-room="closeSingleRoom"
+      <chat
         :singleRoomId="$store.getters['chat/showChat'].roomID"
+        @close-single-room="closeSingleRoom"
       />
     </div>
   </div>
@@ -27,14 +27,14 @@ import mobile from '~/mixins/mobile'
 import HeaderMenu from '~/components/HeaderMenu/HeaderMenu'
 import Modal from '~/components/Modal'
 import PageFooter from '~/components/PageFooter/PageFooter'
-import ChatModule from '~/components/Chat/Chat.vue'
+import Chat from '~/components/Chat/Chat.vue'
 
 export default {
   components: {
     HeaderMenu,
     Modal,
     PageFooter,
-    ChatModule,
+    Chat,
   },
   mixins: [seo, mobile()],
   methods: {
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index b5f255506..e2a577c5e 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -14,6 +14,11 @@ export default {
   mounted() {
     this.showChat({ showChat: false, roomID: null })
   },
+  data() {
+    return {
+      // former,
+    }
+  },
   methods: {
     ...mapMutations({
       showChat: 'chat/SET_OPEN_CHAT',

From 4a474a6a4a487dc460f6865c67b9557e28e3c0c4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 16:35:18 +0200
Subject: [PATCH 096/181] convert indexId to string (neo4j number problem)

---
 backend/src/schema/resolvers/messages.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e473c2bb5..078584c9d 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -89,6 +89,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
+            indexId: toString(message.indexId),
             recipientId: recipientUser.id,
             senderId: currentUser.id,
             username: currentUser.name,

From c7deefa5636e5e1f95839e86a2910682330024cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 17:33:45 +0200
Subject: [PATCH 097/181] Close small chat if one changes to the chat room page

---
 webapp/components/Chat/Chat.vue | 16 +++++++++++-----
 webapp/layouts/default.vue      | 14 +++++++++-----
 webapp/pages/chat.vue           | 12 ++++++------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 43994ef5d..42dd1cf98 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -4,7 +4,7 @@
       <vue-advanced-chat
         :theme="theme"
         :current-user-id="currentUser.id"
-        :room-id="null"
+        :room-id="!singleRoom ? roomId : null"
         :template-actions="JSON.stringify(templatesText)"
         :menu-actions="JSON.stringify(menuActions)"
         :text-messages="JSON.stringify(textMessages)"
@@ -70,13 +70,20 @@ export default {
   props: {
     theme: {
       type: String,
+      default: 'light',
     },
-    singleRoomId: {
+    singleRoom: {
+      type: Boolean,
+      default: false,
+    },
+    roomId: {
       type: String,
       default: null,
     },
   },
   data() {
+    // Wolle console.log('this.singleRoom: ', this.singleRoom)
+    // console.log('this.roomId: ', this.roomId)
     return {
       menuActions: [
         // NOTE: if menuActions is empty, the related slot is not shown
@@ -139,8 +146,7 @@ export default {
       roomsLoaded: false,
       roomPage: 0,
       roomPageSize: 10,
-      singleRoom: !!this.singleRoomId || false,
-      selectedRoom: null,
+      selectedRoom: this.roomId,
       loadingRooms: true,
       messagesLoaded: false,
       messagePage: 0,
@@ -154,7 +160,7 @@ export default {
         .mutate({
           mutation: createRoom(),
           variables: {
-            userId: this.singleRoomId,
+            userId: this.roomId,
           },
         })
         .then(({ data: { CreateRoom } }) => {
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 27efcdd89..13e5bdb95 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -13,15 +13,14 @@
     <client-only>
       <modal />
     </client-only>
-    <div v-if="$store.getters['chat/showChat'].showChat" class="chat-modul">
-      <chat
-        :singleRoomId="$store.getters['chat/showChat'].roomID"
-        @close-single-room="closeSingleRoom"
-      />
+    <div v-if="getShowChat.showChat" class="chat-modul">
+      <chat singleRoom :roomId="getShowChat.roomID" @close-single-room="closeSingleRoom" />
     </div>
   </div>
 </template>
+
 <script>
+import { mapGetters } from 'vuex'
 import seo from '~/mixins/seo'
 import mobile from '~/mixins/mobile'
 import HeaderMenu from '~/components/HeaderMenu/HeaderMenu'
@@ -37,6 +36,11 @@ export default {
     Chat,
   },
   mixins: [seo, mobile()],
+  computed: {
+    ...mapGetters({
+      getShowChat: 'chat/showChat',
+    }),
+  },
   methods: {
     closeSingleRoom() {
       this.$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: null })
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index e2a577c5e..920cbabe9 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
-    <chat />
+    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" />
   </div>
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
@@ -14,10 +14,10 @@ export default {
   mounted() {
     this.showChat({ showChat: false, roomID: null })
   },
-  data() {
-    return {
-      // former,
-    }
+  computed: {
+    ...mapGetters({
+      getShowChat: 'chat/showChat',
+    }),
   },
   methods: {
     ...mapMutations({

From a9835288e205d39560493d1633b6cbc917cfb940 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 17:39:50 +0200
Subject: [PATCH 098/181] fix github cache in workflow

---
 .github/workflows/test-backend.yml | 19 +++++++------------
 .github/workflows/test-e2e.yml     | 14 ++++----------
 .github/workflows/test-webapp.yml  | 13 ++++---------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index af53e1fbc..50c24441e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -10,7 +10,6 @@ jobs:
     outputs:
       backend: ${{ steps.changes.outputs.backend }}
       docker: ${{ steps.changes.outputs.docker }}
-      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - uses: actions/checkout@v3.3.0
 
@@ -22,10 +21,6 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
-
   build_test_neo4j:
     name: Docker Build Test - Neo4J
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
@@ -45,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -66,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
 
   lint_backend:
     name: Lint Backend
@@ -95,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -132,14 +127,14 @@ jobs:
     if: always()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Delete cache
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          set +e
-          KEY="backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          KEY="backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          KEY="backend-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index e37b9fed0..49b4877fa 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -5,8 +5,6 @@ jobs:
   docker_preparation:
     name: Fullstack test preparation
     runs-on: ubuntu-latest
-    outputs:
-      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -34,10 +32,6 @@ jobs:
           yarn build
           cd ..
           yarn install
-
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
       
       - name: Cache docker images
         id: cache
@@ -48,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-pr${{ steps.pr.outputs.number }}
+          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
 
   fullstack_tests:
     name: Fullstack tests
@@ -71,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}
+          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -107,12 +101,12 @@ jobs:
     if: always()
     needs: [docker_preparation, fullstack_tests]
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Delete cache
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          set +e
-          KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
+          KEY="e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 421ce5187..9bd588420 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -9,7 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       docker: ${{ steps.changes.outputs.docker }}
-      pr-number: ${{ steps.pr.outputs.number }}
       webapp: ${{ steps.changes.outputs.webapp }}
     steps:
       - uses: actions/checkout@v3.3.0
@@ -22,10 +21,6 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
-
   prepare:
     name: Prepare
     if: needs.files-changed.outputs.webapp == 'true'
@@ -58,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
 
   lint_webapp:
     name: Lint Webapp
@@ -87,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -108,13 +103,13 @@ jobs:
     if: always()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Delete cache
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          set +e
-          KEY="webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          KEY="webapp-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From 45c70f7910ba6596d42cda4903e7805f82c701fa Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 17:55:22 +0200
Subject: [PATCH 099/181] corrected var reference

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 50c24441e..366196978 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="backend-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 49b4877fa..09c6f3136 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 9bd588420..d468d0859 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
+          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
+          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="webapp-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From a3b3e02ebc9cb035996f72481e757dd1974de572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 18:20:04 +0200
Subject: [PATCH 100/181] Use 'mapMutations' in default layout

---
 webapp/layouts/default.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 13e5bdb95..a75535a84 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import seo from '~/mixins/seo'
 import mobile from '~/mixins/mobile'
 import HeaderMenu from '~/components/HeaderMenu/HeaderMenu'
@@ -42,8 +42,11 @@ export default {
     }),
   },
   methods: {
+    ...mapMutations({
+      showChat: 'chat/SET_OPEN_CHAT',
+    }),
     closeSingleRoom() {
-      this.$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: null })
+      this.showChat({ showChat: false, roomID: null })
     },
   },
   beforeCreate() {

From 9157e14dedc039a50508b30f35e597cce4db12d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 18:21:05 +0200
Subject: [PATCH 101/181] Change small chat partner on click the chat button on
 different user profile

---
 webapp/pages/profile/_id/_slug.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index ce97cd53a..cef3a5d45 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -85,7 +85,7 @@
                 content: $t('chat.userProfileButton.tooltip', { name: userName }),
                 placement: 'bottom-start',
               }"
-              @click="showChat({ showChat: true, roomID: user.id })"
+              @click="showOrChangeChat(user.id)"
             >
               {{ $t('chat.userProfileButton.label') }}
             </base-button>
@@ -182,7 +182,7 @@
 
 <script>
 import uniqBy from 'lodash/uniqBy'
-import { mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import postListActions from '~/mixins/postListActions'
 import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
 import HcFollowButton from '~/components/Button/FollowButton'
@@ -254,6 +254,9 @@ export default {
     }
   },
   computed: {
+    ...mapGetters({
+      getShowChat: 'chat/showChat',
+    }),
     myProfile() {
       return this.$route.params.id === this.$store.getters['auth/user'].id
     },
@@ -403,6 +406,12 @@ export default {
       if (type === 'following') this.followingCount = count
       if (type === 'followedBy') this.followedByCount = count
     },
+    async showOrChangeChat(roomID) {
+      if (this.getShowChat.showChat) {
+        await this.showChat({ showChat: false, roomID: null })
+      }
+      await this.showChat({ showChat: true, roomID })
+    },
   },
   apollo: {
     profilePagePosts: {

From b85d5345a0230c4848ef833e8c5461b45b92c0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 18:30:03 +0200
Subject: [PATCH 102/181] Clean up

---
 webapp/components/Chat/Chat.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 42dd1cf98..5723d3140 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -82,8 +82,6 @@ export default {
     },
   },
   data() {
-    // Wolle console.log('this.singleRoom: ', this.singleRoom)
-    // console.log('this.roomId: ', this.roomId)
     return {
       menuActions: [
         // NOTE: if menuActions is empty, the related slot is not shown

From 6ccd4dde543759cb2d99bddb20fdf60f4f827f04 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 18:34:13 +0200
Subject: [PATCH 103/181] reference GITHUB_RUN_NUMBER differently

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 366196978..e9a05b998 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-cache-$GITHUB_RUN_NUMBER
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-cache-$GITHUB_RUN_NUMBER
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="backend-neo4j-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="backend-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 09c6f3136..6bad6fb4f 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="e2e-preparation-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index d468d0859..f89437317 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: webapp-cache-$GITHUB_RUN_NUMBER
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: webapp-cache-$GITHUB_RUN_NUMBER
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="webapp-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From bf7d4e13c81ab408a4279847fb0b24a5d79ea85e Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 18:33:25 +0200
Subject: [PATCH 104/181] run cache deletion job only, if needed jobs were
 successful

---
 .github/workflows/test-backend.yml | 2 +-
 .github/workflows/test-e2e.yml     | 2 +-
 .github/workflows/test-webapp.yml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e9a05b998..b963a9e45 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -124,7 +124,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: success()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 6bad6fb4f..c4ddc620f 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -98,7 +98,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: success()
     needs: [docker_preparation, fullstack_tests]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index f89437317..8e59bdf10 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -100,7 +100,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: success()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
     continue-on-error: true

From 4d611638687426518235290778bf67cc7791d0e5 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 18:41:16 +0200
Subject: [PATCH 105/181] run cache deletion job only, if file change condition
 is true

---
 .github/workflows/test-backend.yml | 2 +-
 .github/workflows/test-webapp.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index b963a9e45..0e8b7f3e6 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -124,7 +124,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: success()
+    if: (needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true') || success()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 8e59bdf10..32cd563ef 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -100,7 +100,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: success()
+    if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
     continue-on-error: true

From b1feca35d6e34b642d344dbad1162930f00105d9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 18:53:50 +0200
Subject: [PATCH 106/181] another try fixing run id

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 0e8b7f3e6..9fd6adb49 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
+          key: backend-neo4j-cache-${{github.run_id}}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-$GITHUB_RUN_NUMBER
+          key: backend-cache-${{github.run_id}}
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
+          key: backend-neo4j-cache-${{github.run_id}}
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-$GITHUB_RUN_NUMBER
+          key: backend-cache-${{github.run_id}}
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-$GITHUB_RUN_NUMBER"
+          KEY="backend-neo4j-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-$GITHUB_RUN_NUMBER"
+          KEY="backend-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index c4ddc620f..4d25ef5fe 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
+          key: e2e-preparation-cache-${{github.run_id}}
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
+          key: e2e-preparation-cache-${{github.run_id}}
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-$GITHUB_RUN_NUMBER"
+          KEY="e2e-preparation-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 32cd563ef..5c6cce0f6 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-$GITHUB_RUN_NUMBER
+          key: "webapp-cache-${{ github.run_id }}"
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-$GITHUB_RUN_NUMBER
+          key: "webapp-cache-${{ github.run_id }}"
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-$GITHUB_RUN_NUMBER"
+          KEY="webapp-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From d468af8104a8fac439de8f14bdffb34e36b0c23a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:18:38 +0200
Subject: [PATCH 107/181] fix cache naming

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 9fd6adb49..fa43c9b81 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-backend-neo4j-cache
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-backend-cache
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{github.run_id}}
+          key: ${{ github.run_id }}backend-cache
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-backend-neo4j-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-backend-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 4d25ef5fe..921fb4fc8 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-e2e-preparation-cache
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{github.run_id}}
+          key: ${{ github.run_id }}e2e-preparation-cache
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-e2e-preparation-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 5c6cce0f6..0f578dc46 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: "webapp-cache-${{ github.run_id }}"
+          key: ${{ github.run_id }}-webapp-cache
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: "webapp-cache-${{ github.run_id }}"
+          key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-webapp-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From b2632e3a8881b86fd1f629c7130a85eb72d5d77c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:34:36 +0200
Subject: [PATCH 108/181] for testing use only backend test workflow triggered
 by pushes on this branch

---
 .github/workflows/test-backend.yml |   5 +-
 .github/workflows/test-e2e.yml     | 202 ++++++++++++++---------------
 .github/workflows/test-webapp.yml  | 192 +++++++++++++--------------
 3 files changed, 201 insertions(+), 198 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index fa43c9b81..2d2c9bb6b 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,7 +1,10 @@
 name: ocelot.social backend test CI
 
 
-on: [push]
+on:
+  push:
+    branches:
+      - fix-runner
 
 jobs:
   files-changed:
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 921fb4fc8..9eafcddaa 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,112 +1,112 @@
-name: ocelot.social end-to-end test CI
-on: push
+# name: ocelot.social end-to-end test CI
+# on: push
 
-jobs:
-  docker_preparation:
-    name: Fullstack test preparation
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+# jobs:
+#   docker_preparation:
+#     name: Fullstack test preparation
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Copy env files
-        run: |
-          cp webapp/.env.template webapp/.env
-          cp backend/.env.template backend/.env
+#       - name: Copy env files
+#         run: |
+#           cp webapp/.env.template webapp/.env
+#           cp backend/.env.template backend/.env
 
-      - name: Build docker images
-        run: |
-          mkdir /tmp/images
-          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
-          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
-          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
-          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-          docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
+#       - name: Build docker images
+#         run: |
+#           mkdir /tmp/images
+#           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+#           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
+#           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+#           docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
 
-      - name: Install cypress requirements
-        run: |
-          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
-          cd backend
-          yarn install
-          yarn build
-          cd ..
-          yarn install
+#       - name: Install cypress requirements
+#         run: |
+#           wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+#           cd backend
+#           yarn install
+#           yarn build
+#           cd ..
+#           yarn install
       
-      - name: Cache docker images
-        id: cache
-        uses: actions/cache/save@v3.3.1
-        with:
-          path: |
-            /opt/cucumber-json-formatter
-            /home/runner/.cache/Cypress
-            /home/runner/work/Ocelot-Social/Ocelot-Social
-            /tmp/images/
-          key: ${{ github.run_id }}-e2e-preparation-cache
+#       - name: Cache docker images
+#         id: cache
+#         uses: actions/cache/save@v3.3.1
+#         with:
+#           path: |
+#             /opt/cucumber-json-formatter
+#             /home/runner/.cache/Cypress
+#             /home/runner/work/Ocelot-Social/Ocelot-Social
+#             /tmp/images/
+#           key: ${{ github.run_id }}-e2e-preparation-cache
 
-  fullstack_tests:
-    name: Fullstack tests
-    if: success()
-    needs: docker_preparation
-    runs-on: ubuntu-latest
-    env:
-      jobs: 8
-    strategy:
-      matrix:
-        # run copies of the current job in parallel
-        job: [1, 2, 3, 4, 5, 6, 7, 8]
-    steps:
-      - name: Restore cache
-        uses: actions/cache/restore@v3.3.1
-        id: cache
-        with:
-          path: |
-            /opt/cucumber-json-formatter
-            /home/runner/.cache/Cypress
-            /home/runner/work/Ocelot-Social/Ocelot-Social
-            /tmp/images/
-          key: ${{ github.run_id }}e2e-preparation-cache
-          fail-on-cache-miss: true
+#   fullstack_tests:
+#     name: Fullstack tests
+#     if: success()
+#     needs: docker_preparation
+#     runs-on: ubuntu-latest
+#     env:
+#       jobs: 8
+#     strategy:
+#       matrix:
+#         # run copies of the current job in parallel
+#         job: [1, 2, 3, 4, 5, 6, 7, 8]
+#     steps:
+#       - name: Restore cache
+#         uses: actions/cache/restore@v3.3.1
+#         id: cache
+#         with:
+#           path: |
+#             /opt/cucumber-json-formatter
+#             /home/runner/.cache/Cypress
+#             /home/runner/work/Ocelot-Social/Ocelot-Social
+#             /tmp/images/
+#           key: ${{ github.run_id }}e2e-preparation-cache
+#           fail-on-cache-miss: true
 
-      - name: Boot up test system | docker-compose
-        run: |
-          chmod +x /opt/cucumber-json-formatter
-          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
-          docker load < /tmp/images/neo4j.tar
-          docker load < /tmp/images/backend.tar
-          docker load < /tmp/images/webapp.tar
-          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
-          sleep 90s
+#       - name: Boot up test system | docker-compose
+#         run: |
+#           chmod +x /opt/cucumber-json-formatter
+#           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+#           docker load < /tmp/images/neo4j.tar
+#           docker load < /tmp/images/backend.tar
+#           docker load < /tmp/images/webapp.tar
+#           docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+#           sleep 90s
 
-      - name: Full stack tests | run tests
-        id: e2e-tests
-        run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
+#       - name: Full stack tests | run tests
+#         id: e2e-tests
+#         run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
 
-      - name: Full stack tests | if tests failed, compile html report
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        run: |
-          cd cypress/
-          node create-cucumber-html-report.js
+#       - name: Full stack tests | if tests failed, compile html report
+#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+#         run: |
+#           cd cypress/
+#           node create-cucumber-html-report.js
 
-      - name: Full stack tests | if tests failed, upload report
-        id: e2e-report
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
-          path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
+#       - name: Full stack tests | if tests failed, upload report
+#         id: e2e-report
+#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+#         uses: actions/upload-artifact@v3
+#         with:
+#           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
+#           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 
-  cleanup:
-    name: Cleanup
-    if: success()
-    needs: [docker_preparation, fullstack_tests]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Delete cache
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh extension install actions/gh-actions-cache
-          KEY="${{ github.run_id }}-e2e-preparation-cache"
-          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
+#   cleanup:
+#     name: Cleanup
+#     if: success()
+#     needs: [docker_preparation, fullstack_tests]
+#     runs-on: ubuntu-latest
+#     continue-on-error: true
+#     steps:
+#       - name: Delete cache
+#         env:
+#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         run: |
+#           gh extension install actions/gh-actions-cache
+#           KEY="${{ github.run_id }}-e2e-preparation-cache"
+#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 0f578dc46..0def21da3 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -1,115 +1,115 @@
-name: ocelot.social webapp test CI
+# name: ocelot.social webapp test CI
 
 
-on: [push]
+# on: [push]
 
-jobs:
-  files-changed:
-    name: Detect File Changes - Webapp
-    runs-on: ubuntu-latest
-    outputs:
-      docker: ${{ steps.changes.outputs.docker }}
-      webapp: ${{ steps.changes.outputs.webapp }}
-    steps:
-      - uses: actions/checkout@v3.3.0
+# jobs:
+#   files-changed:
+#     name: Detect File Changes - Webapp
+#     runs-on: ubuntu-latest
+#     outputs:
+#       docker: ${{ steps.changes.outputs.docker }}
+#       webapp: ${{ steps.changes.outputs.webapp }}
+#     steps:
+#       - uses: actions/checkout@v3.3.0
 
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@v2.11.1
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
+#       - name: Check for frontend file changes
+#         uses: dorny/paths-filter@v2.11.1
+#         id: changes
+#         with:
+#           token: ${{ github.token }}
+#           filters: .github/file-filters.yml
+#           list-files: shell
 
-  prepare:
-    name: Prepare
-    if: needs.files-changed.outputs.webapp == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   prepare:
+#     name: Prepare
+#     if: needs.files-changed.outputs.webapp == 'true'
+#     needs: files-changed
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Check translation files
-        run: |
-          scripts/translations/sort.sh
-          scripts/translations/missing-keys.sh
+#       - name: Check translation files
+#         run: |
+#           scripts/translations/sort.sh
+#           scripts/translations/missing-keys.sh
 
-  build_test_webapp:
-    name: Docker Build Test - Webapp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-    needs: [files-changed, prepare]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   build_test_webapp:
+#     name: Docker Build Test - Webapp
+#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+#     needs: [files-changed, prepare]
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Webapp | Build 'test' image
-        run: |
-          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-          docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
+#       - name: Webapp | Build 'test' image
+#         run: |
+#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
-      - name: Cache docker image
-        uses: actions/cache/save@v3.3.1
-        with:
-          path: /tmp/webapp.tar
-          key: ${{ github.run_id }}-webapp-cache
+#       - name: Cache docker image
+#         uses: actions/cache/save@v3.3.1
+#         with:
+#           path: /tmp/webapp.tar
+#           key: ${{ github.run_id }}-webapp-cache
 
-  lint_webapp:
-    name: Lint Webapp
-    if: needs.files-changed.outputs.webapp == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   lint_webapp:
+#     name: Lint Webapp
+#     if: needs.files-changed.outputs.webapp == 'true'
+#     needs: files-changed
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: webapp | Lint
-        run: cd webapp && yarn && yarn run lint
+#       - name: webapp | Lint
+#         run: cd webapp && yarn && yarn run lint
 
-  unit_test_webapp:
-    name: Unit Tests - Webapp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-    needs: [files-changed, build_test_webapp]
-    runs-on: ubuntu-latest
-    permissions: 
-      checks: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   unit_test_webapp:
+#     name: Unit Tests - Webapp
+#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+#     needs: [files-changed, build_test_webapp]
+#     runs-on: ubuntu-latest
+#     permissions: 
+#       checks: write
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Restore webapp cache
-        uses: actions/cache/restore@v3.3.1
-        with:
-          path: /tmp/webapp.tar
-          key: ${{ github.run_id }}-webapp-cache
+#       - name: Restore webapp cache
+#         uses: actions/cache/restore@v3.3.1
+#         with:
+#           path: /tmp/webapp.tar
+#           key: ${{ github.run_id }}-webapp-cache
 
-      - name: Load Docker Image
-        run: docker load < /tmp/webapp.tar
+#       - name: Load Docker Image
+#         run: docker load < /tmp/webapp.tar
 
-      - name: Copy env files
-        run: |
-          cp webapp/.env.template webapp/.env
-          cp backend/.env.template backend/.env
+#       - name: Copy env files
+#         run: |
+#           cp webapp/.env.template webapp/.env
+#           cp backend/.env.template backend/.env
 
-      - name: backend | docker-compose
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
+#       - name: backend | docker-compose
+#         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
 
-      - name: webapp | Unit tests incl. coverage check
-        run: docker-compose exec -T webapp yarn test
+#       - name: webapp | Unit tests incl. coverage check
+#         run: docker-compose exec -T webapp yarn test
 
-  cleanup:
-    name: Cleanup
-    if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
-    needs: [files-changed, unit_test_webapp]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Delete cache
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh extension install actions/gh-actions-cache
-          KEY="${{ github.run_id }}-webapp-cache"
-          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+#   cleanup:
+#     name: Cleanup
+#     if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
+#     needs: [files-changed, unit_test_webapp]
+#     runs-on: ubuntu-latest
+#     continue-on-error: true
+#     steps:
+#       - name: Delete cache
+#         env:
+#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         run: |
+#           gh extension install actions/gh-actions-cache
+#           KEY="${{ github.run_id }}-webapp-cache"
+#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From ca721228cd768d1f1ae80456a8b85a7bf2e0061b Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:41:24 +0200
Subject: [PATCH 109/181] change backend cache deletion job dependency

---
 .github/workflows/test-backend.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 2d2c9bb6b..357a8f26e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -127,7 +127,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: (needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true') || success()
+    if: ${{ needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true' }}
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true

From 991e5c5ec30338e1e93c5bf17c8d94f7d06a9dd1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:55:27 +0200
Subject: [PATCH 110/181] make backend tests fail for testing

---
 .github/workflows/test-backend.yml     | 2 +-
 backend/src/schema/resolvers/groups.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 357a8f26e..64647dde7 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -123,7 +123,7 @@ jobs:
         run: docker-compose exec -T backend yarn db:migrate up
 
       - name: backend | Unit test incl. coverage check
-        run: docker-compose exec -T backend yarn test
+        run: docker-compose exec -T backend yarn test src/schema/resolvers/groups.spec.ts
 
   cleanup:
     name: Cleanup
diff --git a/backend/src/schema/resolvers/groups.ts b/backend/src/schema/resolvers/groups.ts
index cd1eb8db3..16d1ecc23 100644
--- a/backend/src/schema/resolvers/groups.ts
+++ b/backend/src/schema/resolvers/groups.ts
@@ -1,4 +1,4 @@
-import { v4 as uuid } from 'uuid'
+import { v4TEST as uuid } from 'uuid'
 import { UserInputError } from 'apollo-server'
 import CONFIG from '../../config'
 import { CATEGORIES_MIN, CATEGORIES_MAX } from '../../constants/categories'

From 0e73d53e9afbf7bbb2e1ef792fa1893da6088222 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:57:37 +0200
Subject: [PATCH 111/181] fix typo

---
 .github/workflows/test-backend.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 64647dde7..bda03edf3 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -100,7 +100,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: ${{ github.run_id }}backend-cache
+          key: ${{ github.run_id }}-backend-cache
           fail-on-cache-miss: true
 
       - name: Load Docker Images

From b712e3084ee22a6d4274f99c16f01f0dac9a1af1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 20:26:09 +0200
Subject: [PATCH 112/181] Revert "make backend tests fail for testing"

This reverts commit 991e5c5ec30338e1e93c5bf17c8d94f7d06a9dd1.
---
 .github/workflows/test-backend.yml     | 2 +-
 backend/src/schema/resolvers/groups.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index bda03edf3..3f7559980 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -123,7 +123,7 @@ jobs:
         run: docker-compose exec -T backend yarn db:migrate up
 
       - name: backend | Unit test incl. coverage check
-        run: docker-compose exec -T backend yarn test src/schema/resolvers/groups.spec.ts
+        run: docker-compose exec -T backend yarn test
 
   cleanup:
     name: Cleanup
diff --git a/backend/src/schema/resolvers/groups.ts b/backend/src/schema/resolvers/groups.ts
index 16d1ecc23..cd1eb8db3 100644
--- a/backend/src/schema/resolvers/groups.ts
+++ b/backend/src/schema/resolvers/groups.ts
@@ -1,4 +1,4 @@
-import { v4TEST as uuid } from 'uuid'
+import { v4 as uuid } from 'uuid'
 import { UserInputError } from 'apollo-server'
 import CONFIG from '../../config'
 import { CATEGORIES_MIN, CATEGORIES_MAX } from '../../constants/categories'

From 715ab9d0cb0460c2cd6320a1b87f11da5bd97019 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:06:00 +0200
Subject: [PATCH 113/181] set webapp cache delete job wo run only, if needed
 jobs were successful

---
 .github/workflows/test-webapp.yml | 195 +++++++++++++++---------------
 1 file changed, 99 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 0def21da3..364ad4796 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -1,115 +1,118 @@
-# name: ocelot.social webapp test CI
+name: ocelot.social webapp test CI
 
 
-# on: [push]
+on:
+  push:
+    branches:
+      - fix-runner
 
-# jobs:
-#   files-changed:
-#     name: Detect File Changes - Webapp
-#     runs-on: ubuntu-latest
-#     outputs:
-#       docker: ${{ steps.changes.outputs.docker }}
-#       webapp: ${{ steps.changes.outputs.webapp }}
-#     steps:
-#       - uses: actions/checkout@v3.3.0
+jobs:
+  files-changed:
+    name: Detect File Changes - Webapp
+    runs-on: ubuntu-latest
+    outputs:
+      docker: ${{ steps.changes.outputs.docker }}
+      webapp: ${{ steps.changes.outputs.webapp }}
+    steps:
+      - uses: actions/checkout@v3.3.0
 
-#       - name: Check for frontend file changes
-#         uses: dorny/paths-filter@v2.11.1
-#         id: changes
-#         with:
-#           token: ${{ github.token }}
-#           filters: .github/file-filters.yml
-#           list-files: shell
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
 
-#   prepare:
-#     name: Prepare
-#     if: needs.files-changed.outputs.webapp == 'true'
-#     needs: files-changed
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  prepare:
+    name: Prepare
+    if: needs.files-changed.outputs.webapp == 'true'
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Check translation files
-#         run: |
-#           scripts/translations/sort.sh
-#           scripts/translations/missing-keys.sh
+      - name: Check translation files
+        run: |
+          scripts/translations/sort.sh
+          scripts/translations/missing-keys.sh
 
-#   build_test_webapp:
-#     name: Docker Build Test - Webapp
-#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-#     needs: [files-changed, prepare]
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  build_test_webapp:
+    name: Docker Build Test - Webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+    needs: [files-changed, prepare]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Webapp | Build 'test' image
-#         run: |
-#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
+      - name: Webapp | Build 'test' image
+        run: |
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
-#       - name: Cache docker image
-#         uses: actions/cache/save@v3.3.1
-#         with:
-#           path: /tmp/webapp.tar
-#           key: ${{ github.run_id }}-webapp-cache
+      - name: Cache docker image
+        uses: actions/cache/save@v3.3.1
+        with:
+          path: /tmp/webapp.tar
+          key: ${{ github.run_id }}-webapp-cache
 
-#   lint_webapp:
-#     name: Lint Webapp
-#     if: needs.files-changed.outputs.webapp == 'true'
-#     needs: files-changed
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  lint_webapp:
+    name: Lint Webapp
+    if: needs.files-changed.outputs.webapp == 'true'
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: webapp | Lint
-#         run: cd webapp && yarn && yarn run lint
+      - name: webapp | Lint
+        run: cd webapp && yarn && yarn run lint
 
-#   unit_test_webapp:
-#     name: Unit Tests - Webapp
-#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-#     needs: [files-changed, build_test_webapp]
-#     runs-on: ubuntu-latest
-#     permissions: 
-#       checks: write
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  unit_test_webapp:
+    name: Unit Tests - Webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+    needs: [files-changed, build_test_webapp]
+    runs-on: ubuntu-latest
+    permissions: 
+      checks: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Restore webapp cache
-#         uses: actions/cache/restore@v3.3.1
-#         with:
-#           path: /tmp/webapp.tar
-#           key: ${{ github.run_id }}-webapp-cache
+      - name: Restore webapp cache
+        uses: actions/cache/restore@v3.3.1
+        with:
+          path: /tmp/webapp.tar
+          key: ${{ github.run_id }}-webapp-cache
 
-#       - name: Load Docker Image
-#         run: docker load < /tmp/webapp.tar
+      - name: Load Docker Image
+        run: docker load < /tmp/webapp.tar
 
-#       - name: Copy env files
-#         run: |
-#           cp webapp/.env.template webapp/.env
-#           cp backend/.env.template backend/.env
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
-#       - name: backend | docker-compose
-#         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
+      - name: backend | docker-compose
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
 
-#       - name: webapp | Unit tests incl. coverage check
-#         run: docker-compose exec -T webapp yarn test
+      - name: webapp | Unit tests incl. coverage check
+        run: docker-compose exec -T webapp yarn test
 
-#   cleanup:
-#     name: Cleanup
-#     if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
-#     needs: [files-changed, unit_test_webapp]
-#     runs-on: ubuntu-latest
-#     continue-on-error: true
-#     steps:
-#       - name: Delete cache
-#         env:
-#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         run: |
-#           gh extension install actions/gh-actions-cache
-#           KEY="${{ github.run_id }}-webapp-cache"
-#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+  cleanup:
+    name: Cleanup
+    if: ${{ needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true' }}
+    needs: [files-changed, unit_test_webapp]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="${{ github.run_id }}-webapp-cache"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From b4383d38a10a609aa0c25b984785cd83ddfe6a89 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:10:54 +0200
Subject: [PATCH 114/181] set e2e test cache delete job wo run only, if needed
 jobs were successful

---
 .github/workflows/test-e2e.yml | 201 ++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 101 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9eafcddaa..0012f15da 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,112 +1,111 @@
-# name: ocelot.social end-to-end test CI
-# on: push
+name: ocelot.social end-to-end test CI
+on: push
 
-# jobs:
-#   docker_preparation:
-#     name: Fullstack test preparation
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+jobs:
+  docker_preparation:
+    name: Fullstack test preparation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Copy env files
-#         run: |
-#           cp webapp/.env.template webapp/.env
-#           cp backend/.env.template backend/.env
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
-#       - name: Build docker images
-#         run: |
-#           mkdir /tmp/images
-#           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
-#           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
-#           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-#           docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
-#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
+      - name: Build docker images
+        run: |
+          mkdir /tmp/images
+          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
+          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
 
-#       - name: Install cypress requirements
-#         run: |
-#           wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
-#           cd backend
-#           yarn install
-#           yarn build
-#           cd ..
-#           yarn install
+      - name: Install cypress requirements
+        run: |
+          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          cd backend
+          yarn install
+          yarn build
+          cd ..
+          yarn install
       
-#       - name: Cache docker images
-#         id: cache
-#         uses: actions/cache/save@v3.3.1
-#         with:
-#           path: |
-#             /opt/cucumber-json-formatter
-#             /home/runner/.cache/Cypress
-#             /home/runner/work/Ocelot-Social/Ocelot-Social
-#             /tmp/images/
-#           key: ${{ github.run_id }}-e2e-preparation-cache
+      - name: Cache docker images
+        id: cache
+        uses: actions/cache/save@v3.3.1
+        with:
+          path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
+            /tmp/images/
+          key: ${{ github.run_id }}-e2e-preparation-cache
 
-#   fullstack_tests:
-#     name: Fullstack tests
-#     if: success()
-#     needs: docker_preparation
-#     runs-on: ubuntu-latest
-#     env:
-#       jobs: 8
-#     strategy:
-#       matrix:
-#         # run copies of the current job in parallel
-#         job: [1, 2, 3, 4, 5, 6, 7, 8]
-#     steps:
-#       - name: Restore cache
-#         uses: actions/cache/restore@v3.3.1
-#         id: cache
-#         with:
-#           path: |
-#             /opt/cucumber-json-formatter
-#             /home/runner/.cache/Cypress
-#             /home/runner/work/Ocelot-Social/Ocelot-Social
-#             /tmp/images/
-#           key: ${{ github.run_id }}e2e-preparation-cache
-#           fail-on-cache-miss: true
+  fullstack_tests:
+    name: Fullstack tests
+    if: success()
+    needs: docker_preparation
+    runs-on: ubuntu-latest
+    env:
+      jobs: 8
+    strategy:
+      matrix:
+        # run copies of the current job in parallel
+        job: [1, 2, 3, 4, 5, 6, 7, 8]
+    steps:
+      - name: Restore cache
+        uses: actions/cache/restore@v3.3.1
+        id: cache
+        with:
+          path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
+            /tmp/images/
+          key: ${{ github.run_id }}e2e-preparation-cache
+          fail-on-cache-miss: true
 
-#       - name: Boot up test system | docker-compose
-#         run: |
-#           chmod +x /opt/cucumber-json-formatter
-#           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
-#           docker load < /tmp/images/neo4j.tar
-#           docker load < /tmp/images/backend.tar
-#           docker load < /tmp/images/webapp.tar
-#           docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
-#           sleep 90s
+      - name: Boot up test system | docker-compose
+        run: |
+          chmod +x /opt/cucumber-json-formatter
+          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+          docker load < /tmp/images/neo4j.tar
+          docker load < /tmp/images/backend.tar
+          docker load < /tmp/images/webapp.tar
+          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+          sleep 90s
 
-#       - name: Full stack tests | run tests
-#         id: e2e-tests
-#         run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
+      - name: Full stack tests | run tests
+        id: e2e-tests
+        run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
 
-#       - name: Full stack tests | if tests failed, compile html report
-#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-#         run: |
-#           cd cypress/
-#           node create-cucumber-html-report.js
+      - name: Full stack tests | if tests failed, compile html report
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+        run: |
+          cd cypress/
+          node create-cucumber-html-report.js
 
-#       - name: Full stack tests | if tests failed, upload report
-#         id: e2e-report
-#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-#         uses: actions/upload-artifact@v3
-#         with:
-#           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
-#           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
+      - name: Full stack tests | if tests failed, upload report
+        id: e2e-report
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
+          path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 
-#   cleanup:
-#     name: Cleanup
-#     if: success()
-#     needs: [docker_preparation, fullstack_tests]
-#     runs-on: ubuntu-latest
-#     continue-on-error: true
-#     steps:
-#       - name: Delete cache
-#         env:
-#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         run: |
-#           gh extension install actions/gh-actions-cache
-#           KEY="${{ github.run_id }}-e2e-preparation-cache"
-#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
+  cleanup:
+    name: Cleanup
+    needs: [docker_preparation, fullstack_tests]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="${{ github.run_id }}-e2e-preparation-cache"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file

From d0a597b07d1b53da2f9210e45ba1998046a4db46 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:12:31 +0200
Subject: [PATCH 115/181] make e2e testing fail for testing

---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 0012f15da..2437f680c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Boot up test system | docker-compose
         run: |
-          chmod +x /opt/cucumber-json-formatter
+          chmod +x /opt/cucumber-json-formatterTEST
           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
           docker load < /tmp/images/neo4j.tar
           docker load < /tmp/images/backend.tar

From 7f5730edc8efec15c1d4f911346f752463bebe68 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:37:26 +0200
Subject: [PATCH 116/181] fix typo

---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 2437f680c..371765ec3 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: ${{ github.run_id }}e2e-preparation-cache
+          key: ${{ github.run_id }}-e2e-preparation-cache
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose

From 2eb507170a0f6042921d4948d55f4343fef2b24b Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:59:22 +0200
Subject: [PATCH 117/181] Revert "make e2e testing fail for testing"

This reverts commit d0a597b07d1b53da2f9210e45ba1998046a4db46.
---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 371765ec3..81c068ba5 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Boot up test system | docker-compose
         run: |
-          chmod +x /opt/cucumber-json-formatterTEST
+          chmod +x /opt/cucumber-json-formatter
           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
           docker load < /tmp/images/neo4j.tar
           docker load < /tmp/images/backend.tar

From 09e887fc3c86e21258d7e697daae68c292ddb4d8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 22:32:21 +0200
Subject: [PATCH 118/181] make workflows fail to stress test github cache
 deletion

---
 .../workflows/cleanup-cache-at-pr-closing.yml | 24 +++++++++++++++++++
 .github/workflows/test-backend.yml            |  2 +-
 .github/workflows/test-e2e.yml                |  2 +-
 .github/workflows/test-webapp.yml             |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/cleanup-cache-at-pr-closing.yml

diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
new file mode 100644
index 000000000..2171cc2d5
--- /dev/null
+++ b/.github/workflows/cleanup-cache-at-pr-closing.yml
@@ -0,0 +1,24 @@
+name: ocelot.social cache cleanup on pr closing
+
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  clean-branch-cache:
+    name: Clean branch cache
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name:
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          gh actions-cache list --branch TODO:this_current_branch --order desc --sort created-at
+ #         gh actions-cache delete -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 3f7559980..a24a9415e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Restore Neo4J cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/neo4j.tar
+          path: /tmp/neo4j.tarTEST
           key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 81c068ba5..059e758bf 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -61,7 +61,7 @@ jobs:
         id: cache
         with:
           path: |
-            /opt/cucumber-json-formatter
+            /opt/cucumber-json-formatterTEST
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 364ad4796..80b93f3f7 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Restore webapp cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/webapp.tar
+          path: /tmp/webapp.tarTEST
           key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image

From f348e18ce2330159b01ddbf1cc2b67bd9d22512c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 22:54:14 +0200
Subject: [PATCH 119/181] Revert "make workflows fail to stress test github
 cache deletion"

This reverts commit 09e887fc3c86e21258d7e697daae68c292ddb4d8.
---
 .../workflows/cleanup-cache-at-pr-closing.yml | 24 -------------------
 .github/workflows/test-backend.yml            |  2 +-
 .github/workflows/test-e2e.yml                |  2 +-
 .github/workflows/test-webapp.yml             |  2 +-
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/cleanup-cache-at-pr-closing.yml

diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
deleted file mode 100644
index 2171cc2d5..000000000
--- a/.github/workflows/cleanup-cache-at-pr-closing.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: ocelot.social cache cleanup on pr closing
-
-
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  clean-branch-cache:
-    name: Clean branch cache
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name:
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache list --branch TODO:this_current_branch --order desc --sort created-at
- #         gh actions-cache delete -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index a24a9415e..3f7559980 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Restore Neo4J cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/neo4j.tarTEST
+          path: /tmp/neo4j.tar
           key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 059e758bf..81c068ba5 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -61,7 +61,7 @@ jobs:
         id: cache
         with:
           path: |
-            /opt/cucumber-json-formatterTEST
+            /opt/cucumber-json-formatter
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 80b93f3f7..364ad4796 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Restore webapp cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/webapp.tarTEST
+          path: /tmp/webapp.tar
           key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image

From 3ffa8c9af5dbcb19dfef2d7335233492896a00ad Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 23:37:44 +0200
Subject: [PATCH 120/181] add recommended branch cache cleanup at pr closing
 workflow

---
 .../workflows/cleanup-cache-at-pr-closing.yml | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/cleanup-cache-at-pr-closing.yml

diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
new file mode 100644
index 000000000..284702e76
--- /dev/null
+++ b/.github/workflows/cleanup-cache-at-pr-closing.yml
@@ -0,0 +1,42 @@
+###############################################################################
+# A Github repo has max 10 GB of cache.
+# https://github.blog/changelog/2021-11-23-github-actions-cache-size-is-now-increased-to-10gb-per-repository/
+#
+# To avoid "cache thrashing" by their cache eviction policy it is recommended
+# to apply a cache cleanup workflow at PR closing to dele cache leftovers of
+# the current branch:
+# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
+###############################################################################
+
+name: ocelot.social cache cleanup on pr closing
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  clean-branch-cache:
+    name: Cleanup branch cache
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+          REPO=${{ github.repository }}
+          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From aa7c54a052e723b5ad2e72d023ce471a4f13c0e1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 23:59:34 +0200
Subject: [PATCH 121/181] set back workflow triggers to push

---
 .github/workflows/test-backend.yml | 5 +----
 .github/workflows/test-e2e.yml     | 1 +
 .github/workflows/test-webapp.yml  | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 3f7559980..03e517826 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,10 +1,7 @@
 name: ocelot.social backend test CI
 
 
-on:
-  push:
-    branches:
-      - fix-runner
+on: push
 
 jobs:
   files-changed:
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 81c068ba5..02d65ba9e 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,4 +1,5 @@
 name: ocelot.social end-to-end test CI
+
 on: push
 
 jobs:
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 364ad4796..2b1e144a5 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -1,10 +1,7 @@
 name: ocelot.social webapp test CI
 
 
-on:
-  push:
-    branches:
-      - fix-runner
+on: push
 
 jobs:
   files-changed:

From 85e68795a3a422f492e863252f14957fc6fc18af Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 10:09:04 +0200
Subject: [PATCH 122/181] [fix] all group related pages are now under one
 route, so link highlighting works

---
 webapp/components/ContentMenu/GroupContentMenu.vue            | 4 ++--
 webapp/components/Group/GroupTeaser.vue                       | 2 +-
 webapp/components/Notification/Notification.vue               | 2 +-
 webapp/components/NotificationsTable/NotificationsTable.vue   | 2 +-
 webapp/components/UserTeaser/UserTeaser.vue                   | 2 +-
 webapp/components/generic/SearchableInput/SearchableInput.vue | 2 +-
 webapp/pages/{group => groups}/_id.spec.js                    | 0
 webapp/pages/{group => groups}/_id.vue                        | 2 +-
 webapp/pages/{group => groups}/_id/_slug.spec.js              | 0
 webapp/pages/{group => groups}/_id/_slug.vue                  | 0
 webapp/pages/{group => groups}/create.vue                     | 2 +-
 webapp/pages/{group => groups}/edit/_id.vue                   | 4 ++--
 webapp/pages/{group => groups}/edit/_id/index.vue             | 2 +-
 webapp/pages/{group => groups}/edit/_id/members.vue           | 0
 webapp/pages/{groups.spec.js => groups/index.spec.js}         | 2 +-
 webapp/pages/{groups.vue => groups/index.vue}                 | 2 +-
 16 files changed, 14 insertions(+), 14 deletions(-)
 rename webapp/pages/{group => groups}/_id.spec.js (100%)
 rename webapp/pages/{group => groups}/_id.vue (96%)
 rename webapp/pages/{group => groups}/_id/_slug.spec.js (100%)
 rename webapp/pages/{group => groups}/_id/_slug.vue (100%)
 rename webapp/pages/{group => groups}/create.vue (98%)
 rename webapp/pages/{group => groups}/edit/_id.vue (93%)
 rename webapp/pages/{group => groups}/edit/_id/index.vue (97%)
 rename webapp/pages/{group => groups}/edit/_id/members.vue (100%)
 rename webapp/pages/{groups.spec.js => groups/index.spec.js} (94%)
 rename webapp/pages/{groups.vue => groups/index.vue} (98%)

diff --git a/webapp/components/ContentMenu/GroupContentMenu.vue b/webapp/components/ContentMenu/GroupContentMenu.vue
index 7a7737320..1ca1b5b33 100644
--- a/webapp/components/ContentMenu/GroupContentMenu.vue
+++ b/webapp/components/ContentMenu/GroupContentMenu.vue
@@ -58,14 +58,14 @@ export default {
         routes.push({
           label: this.$t('group.contentMenu.visitGroupPage'),
           icon: 'home',
-          name: 'group-id-slug',
+          path: `/groups/${this.group.id}`,
           params: { id: this.group.id, slug: this.group.slug },
         })
       }
       if (this.group.myRole === 'owner') {
         routes.push({
           label: this.$t('admin.settings.name'),
-          path: `/group/edit/${this.group.id}`,
+          path: `/groups/edit/${this.group.id}`,
           icon: 'edit',
         })
       }
diff --git a/webapp/components/Group/GroupTeaser.vue b/webapp/components/Group/GroupTeaser.vue
index 791845c75..b75036057 100644
--- a/webapp/components/Group/GroupTeaser.vue
+++ b/webapp/components/Group/GroupTeaser.vue
@@ -1,7 +1,7 @@
 <template>
   <nuxt-link
     class="group-teaser"
-    :to="{ name: 'group-id-slug', params: { id: group.id, slug: group.slug } }"
+    :to="{ name: 'groups-id-slug', params: { id: group.id, slug: group.slug } }"
   >
     <base-card
       :class="{
diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 9b70da794..a657b10ba 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -9,7 +9,7 @@
     <p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
     <nuxt-link
       class="link"
-      :to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, ...hashParam }"
+      :to="{ name: isGroup ? 'groups-id-slug' : 'post-id-slug', params, ...hashParam }"
       @click.native="$emit('read')"
     >
       <base-card wideContent>
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 41d593a23..9ff106e62 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -65,7 +65,7 @@
                     class="notification-mention-post"
                     :class="{ 'notification-status': notification.read }"
                     :to="{
-                      name: isGroup(notification.from) ? 'group-id-slug' : 'post-id-slug',
+                      name: isGroup(notification.from) ? 'groups-id-slug' : 'post-id-slug',
                       params: params(notification.from),
                       hash: hashParam(notification.from),
                     }"
diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue
index 9fa3252ff..a82b91039 100644
--- a/webapp/components/UserTeaser/UserTeaser.vue
+++ b/webapp/components/UserTeaser/UserTeaser.vue
@@ -96,7 +96,7 @@ export default {
     groupLink() {
       const { id, slug } = this.group
       if (!(id && slug)) return ''
-      return { name: 'group-id-slug', params: { slug, id } }
+      return { name: 'groups-id-slug', params: { slug, id } }
     },
     groupSlug() {
       const { slug } = this.group || {}
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index b0e813b45..d08655893 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -148,7 +148,7 @@ export default {
         case 'User':
           return 'profile-id-slug'
         case 'Group':
-          return 'group-id-slug'
+          return 'groups-id-slug'
         default:
           return null
       }
diff --git a/webapp/pages/group/_id.spec.js b/webapp/pages/groups/_id.spec.js
similarity index 100%
rename from webapp/pages/group/_id.spec.js
rename to webapp/pages/groups/_id.spec.js
diff --git a/webapp/pages/group/_id.vue b/webapp/pages/groups/_id.vue
similarity index 96%
rename from webapp/pages/group/_id.vue
rename to webapp/pages/groups/_id.vue
index d743633d1..ab8f3c41e 100644
--- a/webapp/pages/group/_id.vue
+++ b/webapp/pages/groups/_id.vue
@@ -24,7 +24,7 @@ const options = {
     }
   `,
   message: 'error-pages.group-not-found',
-  path: 'group',
+  path: 'groups',
 }
 const persistentLinks = PersistentLinks(options)
 
diff --git a/webapp/pages/group/_id/_slug.spec.js b/webapp/pages/groups/_id/_slug.spec.js
similarity index 100%
rename from webapp/pages/group/_id/_slug.spec.js
rename to webapp/pages/groups/_id/_slug.spec.js
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/groups/_id/_slug.vue
similarity index 100%
rename from webapp/pages/group/_id/_slug.vue
rename to webapp/pages/groups/_id/_slug.vue
diff --git a/webapp/pages/group/create.vue b/webapp/pages/groups/create.vue
similarity index 98%
rename from webapp/pages/group/create.vue
rename to webapp/pages/groups/create.vue
index ebdbbe37c..8dd661d8d 100644
--- a/webapp/pages/group/create.vue
+++ b/webapp/pages/groups/create.vue
@@ -59,7 +59,7 @@ export default {
         })
         this.$toast.success(this.$t('group.groupCreated'))
         this.$router.history.push({
-          name: 'group-id-slug',
+          name: 'groups-id-slug',
           params: { id: responseId, slug: responseSlug },
         })
       } catch (error) {
diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/groups/edit/_id.vue
similarity index 93%
rename from webapp/pages/group/edit/_id.vue
rename to webapp/pages/groups/edit/_id.vue
index 7a0f9d051..57c7d9f6a 100644
--- a/webapp/pages/group/edit/_id.vue
+++ b/webapp/pages/groups/edit/_id.vue
@@ -33,11 +33,11 @@ export default {
       return [
         {
           name: this.$t('group.general'),
-          path: `/group/edit/${this.group.id}`,
+          path: `/groups/edit/${this.group.id}`,
         },
         {
           name: this.$t('group.members'),
-          path: `/group/edit/${this.group.id}/members`,
+          path: `/groups/edit/${this.group.id}/members`,
         },
       ]
     },
diff --git a/webapp/pages/group/edit/_id/index.vue b/webapp/pages/groups/edit/_id/index.vue
similarity index 97%
rename from webapp/pages/group/edit/_id/index.vue
rename to webapp/pages/groups/edit/_id/index.vue
index e3c934dc5..70807b338 100644
--- a/webapp/pages/group/edit/_id/index.vue
+++ b/webapp/pages/groups/edit/_id/index.vue
@@ -60,7 +60,7 @@ export default {
         })
         this.$toast.success(this.$t('group.updatedGroup'))
         this.$router.history.push({
-          name: 'group-id-slug',
+          name: 'groups-id-slug',
           params: { id: responseId, slug: responseSlug },
         })
       } catch (error) {
diff --git a/webapp/pages/group/edit/_id/members.vue b/webapp/pages/groups/edit/_id/members.vue
similarity index 100%
rename from webapp/pages/group/edit/_id/members.vue
rename to webapp/pages/groups/edit/_id/members.vue
diff --git a/webapp/pages/groups.spec.js b/webapp/pages/groups/index.spec.js
similarity index 94%
rename from webapp/pages/groups.spec.js
rename to webapp/pages/groups/index.spec.js
index 3761f7ec2..ecb28c2c9 100644
--- a/webapp/pages/groups.spec.js
+++ b/webapp/pages/groups/index.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import groups from './groups.vue'
+import groups from './index.vue'
 
 const localVue = global.localVue
 
diff --git a/webapp/pages/groups.vue b/webapp/pages/groups/index.vue
similarity index 98%
rename from webapp/pages/groups.vue
rename to webapp/pages/groups/index.vue
index 52366d0af..13002859b 100644
--- a/webapp/pages/groups.vue
+++ b/webapp/pages/groups/index.vue
@@ -7,7 +7,7 @@
     <ds-space>
       <!-- create group -->
       <ds-space centered>
-        <nuxt-link :to="{ name: 'group-create' }">
+        <nuxt-link :to="{ name: 'groups-create' }">
           <base-button
             class="group-add-button"
             icon="plus"

From 0bc19cf226c0b5ed31af0fd40b853ce3b2e56e83 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 10:15:56 +0200
Subject: [PATCH 123/181] [fix] added usertag as allowed html tags, so user
 highlighting works for the chat

---
 backend/src/middleware/helpers/cleanHtml.ts | 1 +
 webapp/components/Chat/Chat.vue             | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/backend/src/middleware/helpers/cleanHtml.ts b/backend/src/middleware/helpers/cleanHtml.ts
index ac71f6bdc..84497760d 100644
--- a/backend/src/middleware/helpers/cleanHtml.ts
+++ b/backend/src/middleware/helpers/cleanHtml.ts
@@ -30,6 +30,7 @@ const standardSanitizeHtmlOptions = {
     'strike',
     'span',
     'blockquote',
+    'usertag',
   ],
   allowedAttributes: {
     a: ['href', 'class', 'target', 'data-*', 'contenteditable'],
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..171d75f63 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -334,12 +334,6 @@ export default {
     },
 
     async sendMessage(message) {
-      // check for usersTag and change userid to username
-      message.usersTag.forEach((userTag) => {
-        const needle = `<usertag>${userTag.id}</usertag>`
-        const replacement = `<usertag>@${userTag.name.replaceAll(' ', '-').toLowerCase()}</usertag>`
-        message.content = message.content.replaceAll(needle, replacement)
-      })
       try {
         await this.$apollo.mutate({
           mutation: createMessageMutation(),

From 961a260044573db0d92cd95ada7395635497899a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 10:39:54 +0200
Subject: [PATCH 124/181] remove default avatar, allow refetch rooms, count
 down read messages, update lastMessage & lastMessageAt, ...

---
 webapp/components/Chat/Chat.vue | 42 ++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..4ac5606e8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -35,7 +35,7 @@
 
         <div slot="room-header-avatar">
           <div
-            v-if="selectedRoom && selectedRoom.avatar && selectedRoom.avatar !== 'default-avatar'"
+            v-if="selectedRoom && selectedRoom.avatar"
             class="vac-avatar"
             :style="{ 'background-image': `url('${selectedRoom.avatar}')` }"
           />
@@ -46,7 +46,7 @@
 
         <div v-for="room in rooms" :slot="'room-list-avatar_' + room.id" :key="room.id">
           <div
-            v-if="room.avatar && room.avatar !== 'default-avatar'"
+            v-if="room.avatar"
             class="vac-avatar"
             :style="{ 'background-image': `url('${room.avatar}')` }"
           />
@@ -222,9 +222,9 @@ export default {
     ...mapMutations({
       commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
     }),
-    async fetchRooms({ room } = {}) {
-      this.roomsLoaded = false
-      const offset = this.roomPage * this.roomPageSize
+    async fetchRooms({ room, options = {} } = {}) {
+      this.roomsLoaded = options.refetch ? this.roomsLoaded : false
+      const offset = (options.refetch ? 0 : this.roomPage) * this.roomPageSize
       try {
         const {
           data: { Room },
@@ -238,16 +238,19 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        const newRooms = Room.map((r) => {
-          return {
-            ...r,
+
+        const rms = []
+        const rmsIds = []
+        ;[...Room, ...this.rooms].forEach((r) => {
+          if(!rmsIds.find((v) => v === r.id)){
+            rms.push({...r, index: r.lastMessage.date,
             users: r.users.map((u) => {
               return { ...u, username: u.name, avatar: u.avatar?.url }
-            }),
+            })})
+            rmsIds.push(r.id)
           }
         })
-
-        this.rooms = [...this.rooms, ...newRooms]
+        this.rooms = rms
 
         if (Room.length < this.roomPageSize) {
           this.roomsLoaded = true
@@ -282,8 +285,12 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
+        const newMsgIds = Message.filter((m) => m.seen === false && m.senderId !== this.currentUser.id).map((m) => m.id)
         if (newMsgIds.length) {
+          const roomIndex = this.rooms.findIndex((r) => r.id === room.id)
+          const changedRoom = {...this.rooms[roomIndex]}
+          changedRoom.unreadCount = changedRoom.unreadCount - newMsgIds.length
+          this.rooms[roomIndex] = changedRoom
           this.$apollo
             .mutate({
               mutation: markMessagesAsSeen(),
@@ -322,14 +329,15 @@ export default {
     },
 
     async chatMessageAdded({ data }) {
+      const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
+      const changedRoom = {...this.rooms[roomIndex]}
+      changedRoom.lastMessage = data.chatMessageAdded
+      changedRoom.lastMessageAt = data.chatMessageAdded.date
+      this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
         this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })
       } else {
-        // TODO this might be optimized selectively (first page vs rest)
-        this.rooms = []
-        this.roomPage = 0
-        this.roomsLoaded = false
-        this.fetchRooms()
+        this.fetchRooms({ options: { refetch: true } })
       }
     },
 

From 41cca4f4ec93d28a265aa3683973c24eec67db21 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 10:42:21 +0200
Subject: [PATCH 125/181] lint

---
 webapp/components/Chat/Chat.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 4ac5606e8..698a270b7 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -238,15 +238,17 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-
         const rms = []
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
-          if(!rmsIds.find((v) => v === r.id)){
-            rms.push({...r, index: r.lastMessage.date,
-            users: r.users.map((u) => {
-              return { ...u, username: u.name, avatar: u.avatar?.url }
-            })})
+          if (!rmsIds.find((v) => v === r.id)) {
+            rms.push({
+              ...r,
+              index: r.lastMessage.date,
+              users: r.users.map((u) => {
+                return { ...u, username: u.name, avatar: u.avatar?.url }
+              }),
+            })
             rmsIds.push(r.id)
           }
         })
@@ -285,10 +287,12 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        const newMsgIds = Message.filter((m) => m.seen === false && m.senderId !== this.currentUser.id).map((m) => m.id)
+        const newMsgIds = Message.filter(
+          (m) => m.seen === false && m.senderId !== this.currentUser.id,
+        ).map((m) => m.id)
         if (newMsgIds.length) {
           const roomIndex = this.rooms.findIndex((r) => r.id === room.id)
-          const changedRoom = {...this.rooms[roomIndex]}
+          const changedRoom = { ...this.rooms[roomIndex] }
           changedRoom.unreadCount = changedRoom.unreadCount - newMsgIds.length
           this.rooms[roomIndex] = changedRoom
           this.$apollo
@@ -330,7 +334,7 @@ export default {
 
     async chatMessageAdded({ data }) {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
-      const changedRoom = {...this.rooms[roomIndex]}
+      const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
       changedRoom.lastMessageAt = data.chatMessageAdded.date
       this.rooms[roomIndex] = changedRoom

From 897794b0eee36e3cad9fa379ed2ee02a66b5770b Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 11:06:05 +0200
Subject: [PATCH 126/181] [feature] changed seen checks for chat component

---
 webapp/assets/_new/styles/export.scss | 4 ++++
 webapp/assets/_new/styles/tokens.scss | 3 +++
 webapp/constants/chat.js              | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/webapp/assets/_new/styles/export.scss b/webapp/assets/_new/styles/export.scss
index 88b42bfc9..5b866d6b7 100644
--- a/webapp/assets/_new/styles/export.scss
+++ b/webapp/assets/_new/styles/export.scss
@@ -27,4 +27,8 @@
     chatMessageBgOthers: $chat-message-bg-others;
   
     chatNewMessageColor: $chat-new-message-color;
+    
+    chatMessageTimestamp: $chat-message-timestamp;
+    chatMessageCheckmarkSeen: $chat-message-checkmark-seen;
+    chatMessageCheckmark: $chat-message-checkmark;
   }
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index e001ffa84..ef5086240 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -417,3 +417,6 @@ $chat-message-color: $text-color-base;
 $chat-message-bg-others: $color-neutral-80;
 $chat-sidemenu-bg: $color-secondary-active;
 $chat-new-message-color: $color-secondary-active;
+$chat-message-timestamp: $text-color-soft;
+$chat-message-checkmark-seen: $text-color-secondary;
+$chat-message-checkmark: $text-color-soft;
diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index a183a3922..181d88e0e 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -65,7 +65,7 @@ const STYLE = {
       backgroundSelected: '#c2dcf2',
       colorDeleted: '#757e85',
       colorUsername: '#9ca6af',
-      colorTimestamp: '#828c94',
+      colorTimestamp: styleData.chatMessageTimestamp,
       backgroundDate: '#e5effa',
       colorDate: '#505a62',
       backgroundSystem: '#e5effa',
@@ -134,8 +134,8 @@ const STYLE = {
       emojiReaction: 'rgba(0, 0, 0, 0.3)',
       document: styleData.colorPrimary,
       pencil: '#9e9e9e',
-      checkmark: '#9e9e9e',
-      checkmarkSeen: '#0696c7',
+      checkmark: styleData.chatMessageCheckmark,
+      checkmarkSeen: styleData.chatMessageCheckmarkSeen,
       eye: '#fff',
       dropdownMessage: '#fff',
       dropdownMessageBackground: 'rgba(0, 0, 0, 0.25)',

From f7dd605838466b8d1acaf21de3c0ba05d6f7dc08 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:36:35 +0200
Subject: [PATCH 127/181] shorten room message, update room message when
 sending

---
 webapp/components/Chat/Chat.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 698a270b7..320ea3357 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -245,6 +245,7 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage.date,
+              lastMessage: {...r.lastMessage, content: r.lastMessage.content.trim().substring(0,30)},
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -336,6 +337,7 @@ export default {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
       const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
+      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
@@ -360,6 +362,12 @@ export default {
             content: message.content,
           },
         })
+        const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
+        const changedRoom = { ...this.rooms[roomIndex] }
+        console.log(changedRoom)
+        changedRoom.lastMessage = message
+        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+        this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)
       }

From 24187bf8a92d08e85988d2dbe9f640d54e9ec9a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:45:36 +0200
Subject: [PATCH 128/181] increase unreadCount when receiving a message, fix
 problem with empty room

---
 webapp/components/Chat/Chat.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 320ea3357..9fec8d96f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -244,8 +244,8 @@ export default {
           if (!rmsIds.find((v) => v === r.id)) {
             rms.push({
               ...r,
-              index: r.lastMessage.date,
-              lastMessage: {...r.lastMessage, content: r.lastMessage.content.trim().substring(0,30)},
+              index: r.lastMessage?.date,
+              lastMessage: {...r.lastMessage, content: r.lastMessage?.content.trim().substring(0,30)},
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -339,6 +339,7 @@ export default {
       changedRoom.lastMessage = data.chatMessageAdded
       changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
+      changedRoom.unreadCount++ 
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
         this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })

From 93aaea4aa1bb21c6841728c3c402fec3168ae414 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:51:41 +0200
Subject: [PATCH 129/181] only take 2000 chat message characters

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 078584c9d..b7e7a7a73 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -81,7 +81,7 @@ export default {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
             indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
-            content: $content,
+            content: LEFT($content,2000),
             saved: true,
             distributed: false,
             seen: false

From 779d5641592c4386dbafdd5134adafefe486df93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:53:13 +0200
Subject: [PATCH 130/181] lint fixes

---
 webapp/components/Chat/Chat.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 9fec8d96f..fdf1b3301 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -245,7 +245,10 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage?.date,
-              lastMessage: {...r.lastMessage, content: r.lastMessage?.content.trim().substring(0,30)},
+              lastMessage: {
+                ...r.lastMessage,
+                content: r.lastMessage?.content.trim().substring(0, 30),
+              },
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -337,9 +340,9 @@ export default {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
       const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
-      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
-      changedRoom.unreadCount++ 
+      changedRoom.unreadCount++
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
         this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })
@@ -365,9 +368,8 @@ export default {
         })
         const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
         const changedRoom = { ...this.rooms[roomIndex] }
-        console.log(changedRoom)
         changedRoom.lastMessage = message
-        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
         this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)

From 02cbe6c19b4c4d676094f849cd05a740feb2360a Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 11:56:38 +0200
Subject: [PATCH 131/181] [feature] chat component can now show clickable urls

---
 webapp/components/Chat/Chat.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..d00133a56 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -315,6 +315,12 @@ export default {
           this.messagesLoaded = true
         }
         this.messagePage += 1
+
+        // hacky way to make urls clickable for the chat component
+        // --> linkify in the backend is changing the syntax of the url
+        this.messages.forEach((msg) => {
+          msg.content = msg.content.replace(/<\/?a[^>]*>/g, '')
+        })
       } catch (error) {
         this.messages = []
         this.$toast.error(error.message)

From 6acdde177fc4d0aa5a885927bff337dea174cabf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 12:13:18 +0200
Subject: [PATCH 132/181] Revert "[feature] chat component can now show
 clickable urls"

This reverts commit 02cbe6c19b4c4d676094f849cd05a740feb2360a.
---
 webapp/components/Chat/Chat.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d00133a56..d7864ebef 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -315,12 +315,6 @@ export default {
           this.messagesLoaded = true
         }
         this.messagePage += 1
-
-        // hacky way to make urls clickable for the chat component
-        // --> linkify in the backend is changing the syntax of the url
-        this.messages.forEach((msg) => {
-          msg.content = msg.content.replace(/<\/?a[^>]*>/g, '')
-        })
       } catch (error) {
         this.messages = []
         this.$toast.error(error.message)

From 256bcc2af7d12e00a9253e92bab515fd2c51d9c6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 12:13:49 +0200
Subject: [PATCH 133/181] do not filter chat message content with
 xss-middleware

---
 backend/src/middleware/xssMiddleware.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/middleware/xssMiddleware.ts b/backend/src/middleware/xssMiddleware.ts
index ede0cc199..9d8671137 100644
--- a/backend/src/middleware/xssMiddleware.ts
+++ b/backend/src/middleware/xssMiddleware.ts
@@ -3,7 +3,7 @@ import { cleanHtml } from '../middleware/helpers/cleanHtml'
 
 // exclamation mark separetes field names, that should not be sanitized
 const fields = [
-  'content',
+  'content!message',
   'contentExcerpt',
   'reasonDescription',
   'description!embed',

From 9f8f2635ab8516171f73f25c5bd8c81dbf4cb8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 12:19:45 +0200
Subject: [PATCH 134/181] Fix linting

---
 webapp/components/ContributionForm/ContributionForm.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 261c1d28d..b595357f9 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -169,11 +169,7 @@
           </ds-flex-item>
           <ds-flex-item width="0.15" />
           <ds-flex-item class="action-buttons-group" width="2">
-            <base-button
-              data-test="cancel-button"
-              :disabled="loading"
-              @click="$router.back()"
-            >
+            <base-button data-test="cancel-button" :disabled="loading" @click="$router.back()">
               {{ $t('actions.cancel') }}
             </base-button>
             <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>

From 5ecf6a7fee917cbb5e8fdd59cbdd55818fff0c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 12:31:52 +0200
Subject: [PATCH 135/181] Change cancel button in 'MySomethingList' from danger
 to green

---
 .../_new/features/MySomethingList/MySomethingList.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/_new/features/MySomethingList/MySomethingList.vue b/webapp/components/_new/features/MySomethingList/MySomethingList.vue
index e4f625c11..5d904675e 100644
--- a/webapp/components/_new/features/MySomethingList/MySomethingList.vue
+++ b/webapp/components/_new/features/MySomethingList/MySomethingList.vue
@@ -56,7 +56,7 @@
         >
           {{ isEditing ? $t('actions.save') : texts.addButton }}
         </base-button>
-        <base-button v-if="isEditing" id="cancel" danger @click="handleCancel()">
+        <base-button v-if="isEditing" id="cancel" @click="handleCancel()">
           {{ $t('actions.cancel') }}
         </base-button>
       </ds-space>

From a114b8a12c3778798b91565fdb88fff815a06c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 14:06:38 +0200
Subject: [PATCH 136/181] Give the chat plus button a function and show hide
 the user search

---
 webapp/components/Chat/Chat.vue            | 11 ++++++++---
 webapp/components/Group/AddGroupMember.vue |  1 +
 webapp/pages/chat.vue                      | 17 +++++++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..c02165248 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -19,12 +19,13 @@
         show-audio="false"
         :styles="JSON.stringify(computedChatStyle)"
         :show-footer="true"
-        @send-message="sendMessage($event.detail[0])"
-        @fetch-messages="fetchMessages($event.detail[0])"
-        @fetch-more-rooms="fetchRooms"
         :responsive-breakpoint="responsiveBreakpoint"
         :single-room="singleRoom"
         show-reaction-emojis="false"
+        @send-message="sendMessage($event.detail[0])"
+        @fetch-messages="fetchMessages($event.detail[0])"
+        @fetch-more-rooms="fetchRooms"
+        @add-room="addRoom"
         @show-demo-options="showDemoOptions = $event"
       >
         <div slot="menu-icon" @click.prevent.stop="$emit('close-single-room', true)">
@@ -361,6 +362,10 @@ export default {
       if (!fullname) return
       return fullname.match(/\b\w/g).join('').substring(0, 3).toUpperCase()
     },
+
+    addRoom() {
+      this.$emit('open-user-search')
+    }
   },
 }
 </script>
diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index ff049ca4d..8e66c7be2 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -49,6 +49,7 @@
     </ds-space>
   </div>
 </template>
+
 <script>
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 import { searchUsers } from '~/graphql/Search.js'
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 920cbabe9..f28d3a880 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,16 +1,29 @@
 <template>
   <div>
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
-    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" />
+    <add-group-member
+      v-if="showUserSearch"
+      :groupId="0"
+      :groupMembers="[]"
+      @loadGroupMembers="null"
+    />
+    <ds-space margin-bottom="small" />
+    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" @open-user-search="showUserSearch = !showUserSearch" />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
+import AddGroupMember from '~/components/Group/AddGroupMember'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
-  components: { Chat },
+  components: { AddGroupMember, Chat },
+  data() {
+    return {
+      showUserSearch: false,
+    }
+  },
   mounted() {
     this.showChat({ showChat: false, roomID: null })
   },

From 4448ecd6fedea53ad45c8e29bd58b8066c4ff5d6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 14:12:25 +0200
Subject: [PATCH 137/181] fix walk recursive & field definitions

---
 backend/src/helpers/walkRecursive.ts    |  8 ++++----
 backend/src/middleware/xssMiddleware.ts | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/helpers/walkRecursive.ts b/backend/src/helpers/walkRecursive.ts
index f560cf9cb..4f7adf497 100644
--- a/backend/src/helpers/walkRecursive.ts
+++ b/backend/src/helpers/walkRecursive.ts
@@ -9,10 +9,10 @@ function walkRecursive(data, fields, fieldName, callback, _key?) {
   if (!Array.isArray(fields)) {
     throw new Error('please provide an fields array for the walkRecursive helper')
   }
-  if (data && typeof data === 'string' && fields.includes(_key)) {
-    // well we found what we searched for, lets replace the value with our callback result
-    const key = _key.split('!')
-    if (key.length === 1 || key[1] !== fieldName) data = callback(data, key[0])
+  // console.log(_key)
+  const fieldDef = fields.find((f) => f.field === _key)
+  if (data && typeof data === 'string' && fieldDef) {
+    if (!fieldDef.excludes?.includes(fieldName)) data = callback(data, _key)
   } else if (data && Array.isArray(data)) {
     // go into the rabbit hole and dig through that array
     data.forEach((res, index) => {
diff --git a/backend/src/middleware/xssMiddleware.ts b/backend/src/middleware/xssMiddleware.ts
index 9d8671137..33fdcf2c6 100644
--- a/backend/src/middleware/xssMiddleware.ts
+++ b/backend/src/middleware/xssMiddleware.ts
@@ -3,11 +3,11 @@ import { cleanHtml } from '../middleware/helpers/cleanHtml'
 
 // exclamation mark separetes field names, that should not be sanitized
 const fields = [
-  'content!message',
-  'contentExcerpt',
-  'reasonDescription',
-  'description!embed',
-  'descriptionExcerpt',
+  { field: 'content', excludes: ['message'] },
+  { field: 'contentExcerpt' },
+  { field: 'reasonDescription' },
+  { field: 'description', excludes: ['embed'] },
+  { field: 'descriptionExcerpt' },
 ]
 
 export default {

From bc1015da8c754bb28ffd0ab1616962b1d1ed7fd9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 14:22:04 +0200
Subject: [PATCH 138/181] corrected field names to exclude, remove comment

---
 backend/src/helpers/walkRecursive.ts    | 1 -
 backend/src/middleware/xssMiddleware.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/helpers/walkRecursive.ts b/backend/src/helpers/walkRecursive.ts
index 4f7adf497..f3be67575 100644
--- a/backend/src/helpers/walkRecursive.ts
+++ b/backend/src/helpers/walkRecursive.ts
@@ -9,7 +9,6 @@ function walkRecursive(data, fields, fieldName, callback, _key?) {
   if (!Array.isArray(fields)) {
     throw new Error('please provide an fields array for the walkRecursive helper')
   }
-  // console.log(_key)
   const fieldDef = fields.find((f) => f.field === _key)
   if (data && typeof data === 'string' && fieldDef) {
     if (!fieldDef.excludes?.includes(fieldName)) data = callback(data, _key)
diff --git a/backend/src/middleware/xssMiddleware.ts b/backend/src/middleware/xssMiddleware.ts
index 33fdcf2c6..c10997e8d 100644
--- a/backend/src/middleware/xssMiddleware.ts
+++ b/backend/src/middleware/xssMiddleware.ts
@@ -3,7 +3,7 @@ import { cleanHtml } from '../middleware/helpers/cleanHtml'
 
 // exclamation mark separetes field names, that should not be sanitized
 const fields = [
-  { field: 'content', excludes: ['message'] },
+  { field: 'content', excludes: ['CreateMessage', 'Message'] },
   { field: 'contentExcerpt' },
   { field: 'reasonDescription' },
   { field: 'description', excludes: ['embed'] },

From 2f76d0b502936d0265dcb6e07eec0409868c568e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 14:38:23 +0200
Subject: [PATCH 139/181] fix lastMessage to contain proper values

---
 webapp/components/Chat/Chat.vue |  4 ++--
 webapp/graphql/Messages.js      | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d333deecc..af8a2490f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -353,7 +353,7 @@ export default {
 
     async sendMessage(message) {
       try {
-        await this.$apollo.mutate({
+        const { data: { CreateMessage: createdMessage }} = await this.$apollo.mutate({
           mutation: createMessageMutation(),
           variables: {
             roomId: message.roomId,
@@ -362,7 +362,7 @@ export default {
         })
         const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
         const changedRoom = { ...this.rooms[roomIndex] }
-        changedRoom.lastMessage = message
+        changedRoom.lastMessage = createdMessage
         changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
         this.rooms[roomIndex] = changedRoom
       } catch (error) {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index e6292c509..cb5d37df9 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -4,8 +4,23 @@ export const createMessageMutation = () => {
   return gql`
     mutation ($roomId: ID!, $content: String!) {
       CreateMessage(roomId: $roomId, content: $content) {
+        #_id
         id
+        indexId
         content
+        senderId
+        author {
+          id
+        }
+        username
+        avatar
+        date
+        room {
+          id
+        }
+        saved
+        distributed
+        seen
       }
     }
   `
@@ -26,6 +41,9 @@ export const messageQuery = () => {
         username
         avatar
         date
+        room {
+          id
+        }
         saved
         distributed
         seen

From ea368cd0f308831550ba27d28f682a17ae5e39cc Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 15:09:13 +0200
Subject: [PATCH 140/181] lint fixes

---
 webapp/components/Chat/Chat.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index af8a2490f..63cf045e8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -353,7 +353,9 @@ export default {
 
     async sendMessage(message) {
       try {
-        const { data: { CreateMessage: createdMessage }} = await this.$apollo.mutate({
+        const {
+          data: { CreateMessage: createdMessage },
+        } = await this.$apollo.mutate({
           mutation: createMessageMutation(),
           variables: {
             roomId: message.roomId,

From ffe51a0743cb9a586ba5b07a09f932ba89411f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 15:48:05 +0200
Subject: [PATCH 141/181] Separate 'ds-select' of 'AddGroupMember' into
 separate component 'SelectUserSearch'

---
 webapp/components/Chat/Chat.vue               |   2 +-
 webapp/components/Group/AddGroupMember.vue    |  94 ++-------------
 .../SelectUserSearch/SelectUserSearch.vue     | 109 ++++++++++++++++++
 webapp/pages/chat.vue                         |  10 +-
 4 files changed, 128 insertions(+), 87 deletions(-)
 create mode 100644 webapp/components/generic/SelectUserSearch/SelectUserSearch.vue

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index c02165248..fccaee5b8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -365,7 +365,7 @@ export default {
 
     addRoom() {
       this.$emit('open-user-search')
-    }
+    },
   },
 }
 </script>
diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index 8e66c7be2..2cb71f011 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -3,33 +3,7 @@
     <h2 class="title">{{ $t('group.addUser') }}</h2>
     <ds-space margin-bottom="small" />
     <ds-space>
-      <ds-select
-        type="search"
-        icon="search"
-        label-prop="id"
-        v-model="query"
-        :id="id"
-        :icon-right="null"
-        :options="users"
-        :loading="$apollo.queries.searchUsers.loading"
-        :filter="(item) => item"
-        :no-options-available="$t('group.addUserNoOptions')"
-        :auto-reset-search="true"
-        :placeholder="$t('group.addUserPlaceholder')"
-        @focus.capture.native="onFocus"
-        @input.native="handleInput"
-        @keyup.enter.native="onEnter"
-        @keyup.delete.native="onDelete"
-        @keyup.esc.native="clear"
-        @blur.capture.native="onBlur"
-        @input.exact="onSelect"
-      >
-        <template #option="{ option }">
-          <p>
-            <user-teaser :user="option" :showPopover="false" :linkToProfile="false" />
-          </p>
-        </template>
-      </ds-select>
+      <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
       <ds-modal
         v-if="isOpen"
         force
@@ -52,14 +26,14 @@
 
 <script>
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
-import { searchUsers } from '~/graphql/Search.js'
+import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
 import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
-import { isEmpty } from 'lodash'
 
 export default {
   name: 'AddGroupMember',
   components: {
     UserTeaser,
+    SelectUserSearch,
   },
   props: {
     groupId: {
@@ -73,62 +47,34 @@ export default {
   },
   data() {
     return {
-      users: [],
       id: 'search-user-to-add-to-group',
-      query: '',
       user: {},
       isOpen: false,
     }
   },
-  computed: {
-    startSearch() {
-      return this.query && this.query.length > 3
-    },
-  },
   methods: {
     cancelModal() {
-      this.clear()
+      this.$refs.selectUserSearch.clear()
       this.isOpen = false
     },
     closeModal() {
-      this.clear()
+      this.$refs.selectUserSearch.clear()
       this.isOpen = false
     },
     confirmModal() {
       this.addMemberToGroup()
       this.isOpen = false
-      this.clear()
+      this.$refs.selectUserSearch.clear()
     },
-    onFocus() {},
-    onBlur() {
-      this.query = ''
-    },
-    handleInput(event) {
-      this.query = event.target ? event.target.value.trim() : ''
-    },
-    onDelete(event) {
-      const value = event.target ? event.target.value.trim() : ''
-      if (isEmpty(value)) {
-        this.clear()
-      } else {
-        this.handleInput(event)
-      }
-    },
-    clear() {
-      this.query = ''
-      this.user = {}
-      this.users = []
-    },
-    onSelect(item) {
-      this.user = item
+    selectUser(user) {
+      this.user = user
       if (this.groupMembers.find((member) => member.id === this.user.id)) {
         this.$toast.error(this.$t('group.errors.userAlreadyMember', { name: this.user.name }))
-        this.clear()
+        this.$refs.selectUserSearch.clear()
         return
       }
       this.isOpen = true
     },
-    onEnter() {},
     async addMemberToGroup() {
       const newRole = 'usual'
       const username = this.user.name
@@ -149,29 +95,9 @@ export default {
       }
     },
   },
-  apollo: {
-    searchUsers: {
-      query() {
-        return searchUsers
-      },
-      variables() {
-        return {
-          query: this.query,
-          firstUsers: 5,
-          usersOffset: 0,
-        }
-      },
-      skip() {
-        return !this.startSearch
-      },
-      update({ searchUsers }) {
-        this.users = searchUsers.users
-      },
-      fetchPolicy: 'cache-and-network',
-    },
-  },
 }
 </script>
+
 <style lang="scss">
 .add-group-member {
   background-color: white;
diff --git a/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue b/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
new file mode 100644
index 000000000..effa185f3
--- /dev/null
+++ b/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
@@ -0,0 +1,109 @@
+<template>
+  <ds-select
+    class="select-user-search"
+    type="search"
+    icon="search"
+    label-prop="id"
+    v-model="query"
+    :id="id"
+    :icon-right="null"
+    :options="users"
+    :loading="$apollo.queries.searchUsers.loading"
+    :filter="(item) => item"
+    :no-options-available="$t('group.addUserNoOptions')"
+    :auto-reset-search="true"
+    :placeholder="$t('group.addUserPlaceholder')"
+    @focus.capture.native="onFocus"
+    @input.native="handleInput"
+    @keyup.enter.native="onEnter"
+    @keyup.delete.native="onDelete"
+    @keyup.esc.native="clear"
+    @blur.capture.native="onBlur"
+    @input.exact="onSelect"
+  >
+    <template #option="{ option }">
+      <p>
+        <user-teaser :user="option" :showPopover="false" :linkToProfile="false" />
+      </p>
+    </template>
+  </ds-select>
+</template>
+
+<script>
+import { isEmpty } from 'lodash'
+import { searchUsers } from '~/graphql/Search.js'
+import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
+
+export default {
+  name: 'SelectUserSearch',
+  components: {
+    UserTeaser,
+  },
+  props: {
+    id: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      users: [],
+      query: '',
+      user: {},
+    }
+  },
+  computed: {
+    startSearch() {
+      return this.query && this.query.length > 3
+    },
+  },
+  methods: {
+    onFocus() {},
+    onBlur() {
+      this.query = ''
+    },
+    handleInput(event) {
+      this.query = event.target ? event.target.value.trim() : ''
+    },
+    onDelete(event) {
+      const value = event.target ? event.target.value.trim() : ''
+      if (isEmpty(value)) {
+        this.clear()
+      } else {
+        this.handleInput(event)
+      }
+    },
+    clear() {
+      this.query = ''
+      this.user = {}
+      this.users = []
+    },
+    onSelect(item) {
+      this.user = item
+      this.$emit('select-user', this.user)
+    },
+    onEnter() {},
+  },
+  apollo: {
+    searchUsers: {
+      query() {
+        return searchUsers
+      },
+      variables() {
+        return {
+          query: this.query,
+          firstUsers: 5,
+          usersOffset: 0,
+        }
+      },
+      skip() {
+        return !this.startSearch
+      },
+      update({ searchUsers }) {
+        this.users = searchUsers.users
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
+}
+</script>
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index f28d3a880..8d9d55e46 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -8,7 +8,10 @@
       @loadGroupMembers="null"
     />
     <ds-space margin-bottom="small" />
-    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" @open-user-search="showUserSearch = !showUserSearch" />
+    <chat
+      :roomId="getShowChat.showChat ? getShowChat.roomID : null"
+      @open-user-search="showUserSearch = !showUserSearch"
+    />
   </div>
 </template>
 
@@ -18,7 +21,10 @@ import AddGroupMember from '~/components/Group/AddGroupMember'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
-  components: { AddGroupMember, Chat },
+  components: {
+    AddGroupMember,
+    Chat,
+  },
   data() {
     return {
       showUserSearch: false,

From 5bae7cbd949045ad08080aa1053dce959f051cb7 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 15:54:31 +0200
Subject: [PATCH 142/181] [feature] open chat page via link from single chat
 window and open the used room after loading

---
 webapp/components/Chat/Chat.vue | 59 +++++++++++++++++++++++++++------
 webapp/store/chat.js            |  3 ++
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..f947f4886 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -4,7 +4,7 @@
       <vue-advanced-chat
         :theme="theme"
         :current-user-id="currentUser.id"
-        :room-id="!singleRoom ? roomId : null"
+        :room-id="computedRoomId"
         :template-actions="JSON.stringify(templatesText)"
         :menu-actions="JSON.stringify(menuActions)"
         :text-messages="JSON.stringify(textMessages)"
@@ -27,10 +27,28 @@
         show-reaction-emojis="false"
         @show-demo-options="showDemoOptions = $event"
       >
-        <div slot="menu-icon" @click.prevent.stop="$emit('close-single-room', true)">
-          <div v-if="singleRoom">
-            <ds-icon name="close"></ds-icon>
-          </div>
+        <div
+          v-if="selectedRoom && selectedRoom.roomId"
+          slot="room-options"
+          class="chat-room-options"
+        >
+          <ds-flex v-if="singleRoom">
+            <ds-flex-item centered class="single-chat-bubble">
+              <nuxt-link :to="{ name: 'chat' }">
+                <base-icon name="chat-bubble" />
+              </nuxt-link>
+            </ds-flex-item>
+            <ds-flex-item centered>
+              <div
+                class="vac-svg-button vac-room-options"
+                @click="$emit('close-single-room', true)"
+              >
+                <slot name="menu-icon">
+                  <ds-icon name="close" />
+                </slot>
+              </div>
+            </ds-flex-item>
+          </ds-flex>
         </div>
 
         <div slot="room-header-avatar">
@@ -89,11 +107,6 @@ export default {
   data() {
     return {
       menuActions: [
-        // NOTE: if menuActions is empty, the related slot is not shown
-        {
-          name: 'dummyItem',
-          title: 'Just a dummy item',
-        },
         /*
             {
             name: 'inviteUser',
@@ -197,10 +210,24 @@ export default {
   computed: {
     ...mapGetters({
       currentUser: 'auth/user',
+      getStoreRoomId: 'chat/roomID',
     }),
     computedChatStyle() {
       return chatStyle.STYLE.light
     },
+    computedRoomId() {
+      let roomId = null
+
+      if (!this.singleRoom) {
+        roomId = this.roomId
+
+        if (this.getStoreRoomId.roomId) {
+          roomId = this.getStoreRoomId.roomId
+        }
+      }
+
+      return roomId
+    },
     textMessages() {
       return {
         ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
@@ -221,6 +248,7 @@ export default {
   methods: {
     ...mapMutations({
       commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
+      commitRoomIdFromSingleRoom: 'chat/UPDATE_ROOM_ID',
     }),
     async fetchRooms({ room } = {}) {
       this.roomsLoaded = false
@@ -253,6 +281,13 @@ export default {
           this.roomsLoaded = true
         }
         this.roomPage += 1
+
+        if (this.singleRoom && this.rooms.length > 0) {
+          this.commitRoomIdFromSingleRoom(this.rooms[0].roomId)
+        } else if (this.getStoreRoomId.roomId) {
+          // reset store room id
+          this.commitRoomIdFromSingleRoom(null)
+        }
       } catch (error) {
         this.rooms = []
         this.$toast.error(error.message)
@@ -389,4 +424,8 @@ body {
     transform: translate(-50%, -50%);
   }
 }
+
+.single-chat-bubble {
+  margin-right: 1em;
+}
 </style>
diff --git a/webapp/store/chat.js b/webapp/store/chat.js
index ed6b5256c..1e0b496ac 100644
--- a/webapp/store/chat.js
+++ b/webapp/store/chat.js
@@ -14,6 +14,9 @@ export const mutations = {
   UPDATE_ROOM_COUNT(state, count) {
     state.unreadRoomCount = count
   },
+  UPDATE_ROOM_ID(state, roomid) {
+    state.roomId = roomid || null
+  },
 }
 
 export const getters = {

From 26282c67b7bd6d44be3334342d6269068471bf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 16:41:23 +0200
Subject: [PATCH 143/181] =?UTF-8?q?Make=20user=20search=20in=20chats=20fun?=
 =?UTF-8?q?ction=20=E2=80=93=20second=20step?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Chat/AddChatRoomByUserSearch.vue          | 110 ++++++++++++++++++
 webapp/components/Chat/Chat.vue               |   2 +-
 webapp/pages/chat.vue                         |  18 +--
 3 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 webapp/components/Chat/AddChatRoomByUserSearch.vue

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
new file mode 100644
index 000000000..b5cf0fd4c
--- /dev/null
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="add-chat-room-by-user-search">
+    <!-- Wolle -->
+    <h2 class="title">{{ $t('group.addUser') }}</h2>
+    <ds-space margin-bottom="small" />
+    <ds-space>
+      <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
+      <!-- <ds-modal
+        v-if="isOpen"
+        force
+        extended
+        :confirm-label="$t('group.modal.confirm')"
+        :cancel-label="$t('group.modal.cancel')"
+        :title="$t('group.modal.confirmAddGroupMemberTitle')"
+        v-model="isOpen"
+        @close="closeModal"
+        @confirm="confirmModal"
+        @cancel="cancelModal"
+      >
+        <ds-text size="large">
+          {{ $t('group.modal.confirmAddGroupMemberText', { name: user.name }) }}
+        </ds-text>
+      </ds-modal> -->
+    </ds-space>
+  </div>
+</template>
+
+<script>
+// import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
+import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
+import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
+
+export default {
+  name: 'AddChatRoomByUserSearch',
+  components: {
+    UserTeaser,
+    SelectUserSearch,
+  },
+  props: {
+    // groupId: {
+    //   type: String,
+    //   required: true,
+    // },
+    // chatRooms: {
+    //   type: Array,
+    //   default: [],
+    // },
+  },
+  data() {
+    return {
+      id: 'search-user-to-add-to-group',
+      user: {},
+      // isOpen: false,
+    }
+  },
+  methods: {
+    // cancelModal() {
+    //   this.$refs.selectUserSearch.clear()
+    //   // this.isOpen = false
+    // },
+    // closeModal() {
+    //   this.$refs.selectUserSearch.clear()
+    //   // this.isOpen = false
+    // },
+    // confirmModal() {
+    //   this.addChatRoom()
+    //   // this.isOpen = false
+    //   this.$refs.selectUserSearch.clear()
+    // },
+    selectUser(user) {
+      this.user = user
+      // if (this.groupMembers.find((member) => member.id === this.user.id)) {
+      //   this.$toast.error(this.$t('group.errors.userAlreadyMember', { name: this.user.name }))
+      //   this.$refs.selectUserSearch.clear()
+      //   return
+      // }
+      this.$refs.selectUserSearch.clear()
+      this.$emit('close-user-search')
+      this.addChatRoom()
+    },
+    async addChatRoom() {
+      this.$emit('load-chat-rooms', 'XXX') // Wolle
+      // const newRole = 'usual'
+      // const username = this.user.name
+      // try {
+      //   await this.$apollo.mutate({
+      //     mutation: changeGroupMemberRoleMutation(),
+      //     variables: { groupId: this.groupId, userId: this.user.id, roleInGroup: newRole },
+      //   })
+      //   this.$toast.success(
+      //     this.$t('group.addMemberToGroupSuccess', {
+      //       role: this.$t(`group.roles.${newRole}`),
+      //       name: username,
+      //     }),
+      //   )
+      //   this.$emit('loadGroupMembers')
+      // } catch (error) {
+      //   this.$toast.error(error.message)
+      // }
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.add-chat-room-by-user-search {
+  background-color: white;
+  padding: $space-base;
+}
+</style>
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fccaee5b8..68abfe657 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -364,7 +364,7 @@ export default {
     },
 
     addRoom() {
-      this.$emit('open-user-search')
+      this.$emit('open-close-user-search')
     },
   },
 }
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 8d9d55e46..bdc2a1ee2 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,33 +1,34 @@
 <template>
   <div>
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
-    <add-group-member
+    <add-chat-room-by-user-search
       v-if="showUserSearch"
-      :groupId="0"
-      :groupMembers="[]"
-      @loadGroupMembers="null"
+      @load-chat-rooms="loadChatRooms"
+      @close-user-search="showUserSearch = false"
     />
+    <!-- Wolle :chatRooms="chatRooms" -->
     <ds-space margin-bottom="small" />
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
-      @open-user-search="showUserSearch = !showUserSearch"
+      @open-close-user-search="showUserSearch = !showUserSearch"
     />
   </div>
 </template>
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import AddGroupMember from '~/components/Group/AddGroupMember'
+import AddChatRoomByUserSearch from '~/components/Chat/AddChatRoomByUserSearch'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
   components: {
-    AddGroupMember,
+    AddChatRoomByUserSearch,
     Chat,
   },
   data() {
     return {
       showUserSearch: false,
+      // chatRooms: [] // Wolle
     }
   },
   mounted() {
@@ -42,6 +43,9 @@ export default {
     ...mapMutations({
       showChat: 'chat/SET_OPEN_CHAT',
     }),
+    loadChatRooms(newChatRoomID) {
+      console.log('loadChatRooms !!! newChatRoomID: ', newChatRoomID)
+    },
   },
 }
 </script>

From 45dba25a7ad28852dcdf5c8acd9ffc9c8852b371 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 17:24:37 +0200
Subject: [PATCH 144/181] [fix] changed css rule for single chat icon

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index f947f4886..139e30290 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -425,7 +425,7 @@ body {
   }
 }
 
-.single-chat-bubble {
+.ds-flex-item.single-chat-bubble {
   margin-right: 1em;
 }
 </style>

From 3d9a9cd5a096d4b1fbbf82b7597db53a03542b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 17:47:56 +0200
Subject: [PATCH 145/181] Create the chat room on user search in chats function

---
 .../Chat/AddChatRoomByUserSearch.vue          | 58 +------------------
 webapp/components/Chat/Chat.vue               | 36 +++++++-----
 webapp/pages/chat.vue                         |  8 ++-
 3 files changed, 28 insertions(+), 74 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index b5cf0fd4c..a9a2a5bf6 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -5,28 +5,11 @@
     <ds-space margin-bottom="small" />
     <ds-space>
       <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
-      <!-- <ds-modal
-        v-if="isOpen"
-        force
-        extended
-        :confirm-label="$t('group.modal.confirm')"
-        :cancel-label="$t('group.modal.cancel')"
-        :title="$t('group.modal.confirmAddGroupMemberTitle')"
-        v-model="isOpen"
-        @close="closeModal"
-        @confirm="confirmModal"
-        @cancel="cancelModal"
-      >
-        <ds-text size="large">
-          {{ $t('group.modal.confirmAddGroupMemberText', { name: user.name }) }}
-        </ds-text>
-      </ds-modal> -->
     </ds-space>
   </div>
 </template>
 
 <script>
-// import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
 import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
@@ -37,10 +20,6 @@ export default {
     SelectUserSearch,
   },
   props: {
-    // groupId: {
-    //   type: String,
-    //   required: true,
-    // },
     // chatRooms: {
     //   type: Array,
     //   default: [],
@@ -50,23 +29,9 @@ export default {
     return {
       id: 'search-user-to-add-to-group',
       user: {},
-      // isOpen: false,
     }
   },
   methods: {
-    // cancelModal() {
-    //   this.$refs.selectUserSearch.clear()
-    //   // this.isOpen = false
-    // },
-    // closeModal() {
-    //   this.$refs.selectUserSearch.clear()
-    //   // this.isOpen = false
-    // },
-    // confirmModal() {
-    //   this.addChatRoom()
-    //   // this.isOpen = false
-    //   this.$refs.selectUserSearch.clear()
-    // },
     selectUser(user) {
       this.user = user
       // if (this.groupMembers.find((member) => member.id === this.user.id)) {
@@ -76,27 +41,10 @@ export default {
       // }
       this.$refs.selectUserSearch.clear()
       this.$emit('close-user-search')
-      this.addChatRoom()
+      this.addChatRoom(this.user?.id)
     },
-    async addChatRoom() {
-      this.$emit('load-chat-rooms', 'XXX') // Wolle
-      // const newRole = 'usual'
-      // const username = this.user.name
-      // try {
-      //   await this.$apollo.mutate({
-      //     mutation: changeGroupMemberRoleMutation(),
-      //     variables: { groupId: this.groupId, userId: this.user.id, roleInGroup: newRole },
-      //   })
-      //   this.$toast.success(
-      //     this.$t('group.addMemberToGroupSuccess', {
-      //       role: this.$t(`group.roles.${newRole}`),
-      //       name: username,
-      //     }),
-      //   )
-      //   this.$emit('loadGroupMembers')
-      // } catch (error) {
-      //   this.$toast.error(error.message)
-      // }
+    async addChatRoom(userId) {
+      this.$emit('add-chat-room', userId)
     },
   },
 }
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 68abfe657..21843e498 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -160,22 +160,7 @@ export default {
   },
   mounted() {
     if (this.singleRoom) {
-      this.$apollo
-        .mutate({
-          mutation: createRoom(),
-          variables: {
-            userId: this.roomId,
-          },
-        })
-        .then(({ data: { CreateRoom } }) => {
-          this.fetchRooms({ room: CreateRoom })
-        })
-        .catch((error) => {
-          this.$toast.error(error)
-        })
-        .finally(() => {
-          // this.loading = false
-        })
+      this.newRoom(this.roomId)
     } else {
       this.fetchRooms()
     }
@@ -366,6 +351,25 @@ export default {
     addRoom() {
       this.$emit('open-close-user-search')
     },
+
+    newRoom(userId) {
+      this.$apollo
+        .mutate({
+          mutation: createRoom(),
+          variables: {
+            userId,
+          },
+        })
+        .then(({ data: { CreateRoom } }) => {
+          this.fetchRooms({ room: CreateRoom })
+        })
+        .catch((error) => {
+          this.$toast.error(error)
+        })
+        .finally(() => {
+          // this.loading = false
+        })
+    },
   },
 }
 </script>
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index bdc2a1ee2..a16fca5c5 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -3,13 +3,14 @@
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
     <add-chat-room-by-user-search
       v-if="showUserSearch"
-      @load-chat-rooms="loadChatRooms"
+      @add-chat-room="addChatRoom"
       @close-user-search="showUserSearch = false"
     />
     <!-- Wolle :chatRooms="chatRooms" -->
     <ds-space margin-bottom="small" />
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
+      ref="chat"
       @open-close-user-search="showUserSearch = !showUserSearch"
     />
   </div>
@@ -43,8 +44,9 @@ export default {
     ...mapMutations({
       showChat: 'chat/SET_OPEN_CHAT',
     }),
-    loadChatRooms(newChatRoomID) {
-      console.log('loadChatRooms !!! newChatRoomID: ', newChatRoomID)
+    addChatRoom(userID) {
+      console.log('addChatRoom !!! newChatRoomID: ', userID)
+      this.$refs.chat.newRoom(userID)
     },
   },
 }

From 419261229346941f99f92dbc487b36795721c290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 17:51:05 +0200
Subject: [PATCH 146/181] Fix linting

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 2 --
 webapp/components/Group/AddGroupMember.vue         | 2 --
 webapp/pages/chat.vue                              | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index a9a2a5bf6..0e7b243d8 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -11,12 +11,10 @@
 
 <script>
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
-import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
 export default {
   name: 'AddChatRoomByUserSearch',
   components: {
-    UserTeaser,
     SelectUserSearch,
   },
   props: {
diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index 2cb71f011..cc3e3b1e8 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -27,12 +27,10 @@
 <script>
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
-import UserTeaser from '~/components/UserTeaser/UserTeaser.vue'
 
 export default {
   name: 'AddGroupMember',
   components: {
-    UserTeaser,
     SelectUserSearch,
   },
   props: {
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index a16fca5c5..c988493c5 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -29,7 +29,7 @@ export default {
   data() {
     return {
       showUserSearch: false,
-      // chatRooms: [] // Wolle
+      // excludeUsers: [] // Wolle
     }
   },
   mounted() {
@@ -45,7 +45,6 @@ export default {
       showChat: 'chat/SET_OPEN_CHAT',
     }),
     addChatRoom(userID) {
-      console.log('addChatRoom !!! newChatRoomID: ', userID)
       this.$refs.chat.newRoom(userID)
     },
   },

From 20e6fb51222cc421ff3b6685c61fb64bb28474c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 19 Jul 2023 17:59:20 +0200
Subject: [PATCH 147/181] Change headline for search user for new chat on chat
 page

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 2 +-
 webapp/locales/de.json                             | 1 +
 webapp/locales/en.json                             | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index 0e7b243d8..b5cf5a063 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="add-chat-room-by-user-search">
     <!-- Wolle -->
-    <h2 class="title">{{ $t('group.addUser') }}</h2>
+    <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
     <ds-space margin-bottom="small" />
     <ds-space>
       <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cafa030ff..372703214 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -78,6 +78,7 @@
     }
   },
   "chat": {
+    "addRoomHeadline": "Suche Nutzer für neuen Chat",
     "cancelSelectMessage": "Abbrechen",
     "conversationStarted": "Unterhaltung startete am:",
     "isOnline": "online",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 29df284bd..7e914612e 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -78,6 +78,7 @@
     }
   },
   "chat": {
+    "addRoomHeadline": "Search User for new Chat",
     "cancelSelectMessage": "Cancel",
     "conversationStarted": "Conversation started on:",
     "isOnline": "is online",
@@ -475,7 +476,7 @@
     "addMemberToGroupSuccess": "“{name}” was added to the group with the role “{role}”!",
     "addUser": "Add User",
     "addUserNoOptions": "No users found!",
-    "addUserPlaceholder": " Username",
+    "addUserPlaceholder": " User name",
     "allGroups": "All Groups",
     "button": {
       "tooltip": "Show groups"

From 6659238fa1a29f97a8bf4e0b109df1ebfae9d16f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 10:15:15 +0200
Subject: [PATCH 148/181] Add fetchRooms option & check null on content.

---
 webapp/components/Chat/Chat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index abaaf8f0c..2480b487c 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -261,7 +261,7 @@ export default {
               index: r.lastMessage?.date,
               lastMessage: {
                 ...r.lastMessage,
-                content: r.lastMessage?.content.trim().substring(0, 30),
+                content: r.lastMessage?.content?.trim().substring(0, 30),
               },
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
@@ -415,7 +415,7 @@ export default {
           },
         })
         .then(({ data: { CreateRoom } }) => {
-          this.fetchRooms({ room: CreateRoom })
+          this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
         })
         .catch((error) => {
           this.$toast.error(error)

From 18f932f1b69627ccf0390b045e7fd05f43de51a9 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 20 Jul 2023 10:15:39 +0200
Subject: [PATCH 149/181] [refactor] fixed wrong title on edit post page

---
 .../components/ContributionForm/ContributionForm.vue |  8 --------
 webapp/pages/post/create.vue                         | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 6d42eed61..7ce9da981 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -1,13 +1,5 @@
 <template>
   <div>
-    <div>
-      <h1 v-if="!createEvent" class="title">
-        {{ $t('post.createNewPost.title') }}
-      </h1>
-      <h1 v-else class="title">
-        {{ $t('post.createNewEvent.title') }}
-      </h1>
-    </div>
     <ds-form
       class="contribution-form"
       ref="contributionForm"
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index 5fff07f19..25b4ed44e 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -16,7 +16,17 @@
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', md: 1 }">
         <transition name="slide-up" appear>
-          <contribution-form :group="group" :createEvent="createEvent" />
+          <div>
+            <div>
+              <h1 v-if="!createEvent" class="title">
+                {{ $t('post.createNewPost.title') }}
+              </h1>
+              <h1 v-else class="title">
+                {{ $t('post.createNewEvent.title') }}
+              </h1>
+            </div>
+            <contribution-form :group="group" :createEvent="createEvent" />
+          </div>
         </transition>
       </ds-flex-item>
     </ds-flex>

From 858e3fdee8a2ca6de0f590bc2d052a9116c5e6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 10:40:04 +0200
Subject: [PATCH 150/181] Rename 'addRoom' to 'toggleUserSearch' in chat
 component

---
 webapp/components/Chat/Chat.vue | 13 +++++++------
 webapp/locales/en.json          |  2 +-
 webapp/pages/chat.vue           |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2480b487c..d1a60a87d 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -25,7 +25,7 @@
         @send-message="sendMessage($event.detail[0])"
         @fetch-messages="fetchMessages($event.detail[0])"
         @fetch-more-rooms="fetchRooms"
-        @add-room="addRoom"
+        @add-room="toggleUserSearch"
         @show-demo-options="showDemoOptions = $event"
       >
         <div
@@ -236,9 +236,10 @@ export default {
       commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
       commitRoomIdFromSingleRoom: 'chat/UPDATE_ROOM_ID',
     }),
-    async fetchRooms({ room, options = {} } = {}) {
-      this.roomsLoaded = options.refetch ? this.roomsLoaded : false
-      const offset = (options.refetch ? 0 : this.roomPage) * this.roomPageSize
+
+    async fetchRooms({ room } = {}) {
+      this.roomsLoaded = false
+      const offset = this.roomPage * this.roomPageSize
       try {
         const {
           data: { Room },
@@ -402,8 +403,8 @@ export default {
       return fullname.match(/\b\w/g).join('').substring(0, 3).toUpperCase()
     },
 
-    addRoom() {
-      this.$emit('open-close-user-search')
+    toggleUserSearch() {
+      this.$emit('toggle-user-search')
     },
 
     newRoom(userId) {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 7e914612e..e5bdee4fc 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -476,7 +476,7 @@
     "addMemberToGroupSuccess": "“{name}” was added to the group with the role “{role}”!",
     "addUser": "Add User",
     "addUserNoOptions": "No users found!",
-    "addUserPlaceholder": " User name",
+    "addUserPlaceholder": "User name",
     "allGroups": "All Groups",
     "button": {
       "tooltip": "Show groups"
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index c988493c5..acb186f4e 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -11,7 +11,7 @@
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
       ref="chat"
-      @open-close-user-search="showUserSearch = !showUserSearch"
+      @toggle-user-search="showUserSearch = !showUserSearch"
     />
   </div>
 </template>

From b76802f59fc4cd4339e5a4372e5d8660eb65c7a8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 11:01:18 +0200
Subject: [PATCH 151/181] Add close button and style the headline of the
 UserSearch.

---
 .../components/Chat/AddChatRoomByUserSearch.vue  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index b5cf5a063..f88b4f1e6 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="add-chat-room-by-user-search">
     <!-- Wolle -->
-    <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
+    <ds-flex class="headline">
+      <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
+      <base-button class="close-button" icon="close" circle @click="closeUserSearch"/>
+    </ds-flex>
     <ds-space margin-bottom="small" />
     <ds-space>
       <select-user-search :id="id" ref="selectUserSearch" @select-user="selectUser" />
@@ -15,7 +18,7 @@ import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSe
 export default {
   name: 'AddChatRoomByUserSearch',
   components: {
-    SelectUserSearch,
+    SelectUserSearch
   },
   props: {
     // chatRooms: {
@@ -44,6 +47,9 @@ export default {
     async addChatRoom(userId) {
       this.$emit('add-chat-room', userId)
     },
+    closeUserSearch() {
+      this.$emit('close-user-search')
+    },
   },
 }
 </script>
@@ -53,4 +59,10 @@ export default {
   background-color: white;
   padding: $space-base;
 }
+.ds-flex.headline {
+  justify-content: space-between;
+}
+.ds-flex.headline .close-button {
+  margin-top: -6px;
+}
 </style>

From a82d245f636230be4030f1b75a5703ece532fa3f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 11:03:20 +0200
Subject: [PATCH 152/181] Change toast error to error.message.

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d1a60a87d..39dd465e2 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -419,7 +419,7 @@ export default {
           this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
         })
         .catch((error) => {
-          this.$toast.error(error)
+          this.$toast.error(error.message)
         })
         .finally(() => {
           // this.loading = false

From 13da3ba3f46482c1488fab85300d1075c183255e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 11:35:06 +0200
Subject: [PATCH 153/181] Add returned properties to the CreateRoom mutation,
 add emit to change the roomID.

---
 webapp/components/Chat/Chat.vue |  2 ++
 webapp/graphql/Rooms.js         | 12 ++++++++++++
 webapp/pages/chat.vue           |  4 ++++
 3 files changed, 18 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 39dd465e2..0cc9bc28b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -417,6 +417,8 @@ export default {
         })
         .then(({ data: { CreateRoom } }) => {
           this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
+          this.roomId = CreateRoom.id
+          this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
           this.$toast.error(error.message)
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 757a6cfa4..3433a84a7 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -5,6 +5,18 @@ export const createRoom = () => gql`
     CreateRoom(userId: $userId) {
       id
       roomId
+      roomName
+      lastMessageAt
+      unreadCount
+      #avatar
+      users {
+        _id
+        id
+        name
+        avatar {
+          url
+        }
+      }
     }
   }
 `
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index acb186f4e..96df8cc6b 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -12,6 +12,7 @@
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
       ref="chat"
       @toggle-user-search="showUserSearch = !showUserSearch"
+      :show-room="showRoom"
     />
   </div>
 </template>
@@ -47,6 +48,9 @@ export default {
     addChatRoom(userID) {
       this.$refs.chat.newRoom(userID)
     },
+    showRoom(roomId) {
+      this.showChat({ showChat: true, roomID: roomId })
+    }
   },
 }
 </script>

From dee77df5f60da57449faa72645985447d44ba6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 12:02:24 +0200
Subject: [PATCH 154/181] Cleanup

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 1 -
 webapp/pages/chat.vue                              | 2 --
 2 files changed, 3 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index f88b4f1e6..10a4d2bc4 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="add-chat-room-by-user-search">
-    <!-- Wolle -->
     <ds-flex class="headline">
       <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
       <base-button class="close-button" icon="close" circle @click="closeUserSearch"/>
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 96df8cc6b..7524bc0ad 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -6,7 +6,6 @@
       @add-chat-room="addChatRoom"
       @close-user-search="showUserSearch = false"
     />
-    <!-- Wolle :chatRooms="chatRooms" -->
     <ds-space margin-bottom="small" />
     <chat
       :roomId="getShowChat.showChat ? getShowChat.roomID : null"
@@ -30,7 +29,6 @@ export default {
   data() {
     return {
       showUserSearch: false,
-      // excludeUsers: [] // Wolle
     }
   },
   mounted() {

From 883d7d89ab58f78e5524a63a071c3e826530f31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 12:04:37 +0200
Subject: [PATCH 155/181] Fix linting

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 4 ++--
 webapp/pages/chat.vue                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index 10a4d2bc4..b48120603 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -2,7 +2,7 @@
   <div class="add-chat-room-by-user-search">
     <ds-flex class="headline">
       <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
-      <base-button class="close-button" icon="close" circle @click="closeUserSearch"/>
+      <base-button class="close-button" icon="close" circle @click="closeUserSearch" />
     </ds-flex>
     <ds-space margin-bottom="small" />
     <ds-space>
@@ -17,7 +17,7 @@ import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSe
 export default {
   name: 'AddChatRoomByUserSearch',
   components: {
-    SelectUserSearch
+    SelectUserSearch,
   },
   props: {
     // chatRooms: {
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 7524bc0ad..9f93fabcb 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -48,7 +48,7 @@ export default {
     },
     showRoom(roomId) {
       this.showChat({ showChat: true, roomID: roomId })
-    }
+    },
   },
 }
 </script>

From 0b64fce5aa5dcc8043e9f694d38879490fc88cf1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 12:19:32 +0200
Subject: [PATCH 156/181] Add selectedRoom equaling the createdRoom

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 0cc9bc28b..a0c7deedd 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -417,7 +417,7 @@ export default {
         })
         .then(({ data: { CreateRoom } }) => {
           this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
-          this.roomId = CreateRoom.id
+          this.selectedRoom = CreateRoom
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {

From 999255b2b5e2a74ba94f75ed3d6a3fb4d09bf604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 12:38:43 +0200
Subject: [PATCH 157/181] Change general search hint

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

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cafa030ff..1ad5b0926 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -901,7 +901,7 @@
       "Tag": "Hashtag ::: Hashtags",
       "User": "Nutzer ::: Nutzer"
     },
-    "hint": "Wonach suchst Du? Nutze !… für Beiträge, @… für Mitglieder, &… für Gruppen, #… für Hashtags",
+    "hint": "!... sucht Beiträge, @... sucht Nutzer, &... sucht Gruppen, #… sucht Hashtags",
     "no-results": "Keine Ergebnisse für \"{search}\" gefunden. Versuch' es mit einem anderen Begriff!",
     "page": "Seite",
     "placeholder": "Suchen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 29df284bd..9d7ce1a5f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -901,7 +901,7 @@
       "Tag": "Hashtag ::: Hashtags",
       "User": "User ::: Users"
     },
-    "hint": "What are you searching for? Use !… for posts, @… for users, &… for groups, #… for hashtags.",
+    "hint": "!... searches posts, @... searches users, &... searches groups, #… searches hashtags",
     "no-results": "No results found for \"{search}\". Try a different search term!",
     "page": "Page",
     "placeholder": "Search",

From 624f379677623969deae1a3efe4c96fe7adc40e0 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 12:57:18 +0200
Subject: [PATCH 158/181] fix new room mechanic

---
 webapp/components/Chat/Chat.vue | 23 +++++++++++++++++++----
 webapp/graphql/Rooms.js         |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index a0c7deedd..59f3eefc3 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -260,10 +260,10 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage?.date,
-              lastMessage: {
+              lastMessage: r.lastMessage ? {
                 ...r.lastMessage,
                 content: r.lastMessage?.content?.trim().substring(0, 30),
-              },
+              }: null,
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -416,8 +416,23 @@ export default {
           },
         })
         .then(({ data: { CreateRoom } }) => {
-          this.fetchRooms({ room: CreateRoom, options: { refetch: true } })
-          this.selectedRoom = CreateRoom
+          const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
+          const room = {...CreateRoom, index: CreateRoom.lastMessage?.date, lastMessage: CreateRoom.lastMessage ? {
+                ...CreateRoom.lastMessage,
+                content: CreateRoom.lastMessage?.content?.trim().substring(0, 30),
+              }: null,
+              users: CreateRoom.users.map((u) => {
+                return { ...u, username: u.name, avatar: u.avatar?.url }
+              })
+            }
+
+          // as long as we cannot query avatar on CreateRoom
+          room.avatar = room.users.find((u) => u.id === this.currentUser.id).avatar
+
+          if(roomIndex === -1){
+            this.rooms = [room, ...this.rooms]
+          }
+          this.fetchMessages({room, options: { refetch: true }})
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 3433a84a7..34c1b2fd6 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -23,7 +23,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: lastMessageAt_desc) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc createdAt_desc] ) {
       id
       roomId
       roomName

From 01fb28da3cae4b5050c50bcafc5a76c28918621f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:09:38 +0200
Subject: [PATCH 159/181] unify function to fix room result, propose order
 fix(not 100%)

---
 webapp/components/Chat/Chat.vue | 48 ++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 59f3eefc3..9b2c28fe5 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,17 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.push({
-              ...r,
-              index: r.lastMessage?.date,
-              lastMessage: r.lastMessage ? {
-                ...r.lastMessage,
-                content: r.lastMessage?.content?.trim().substring(0, 30),
-              }: null,
-              users: r.users.map((u) => {
-                return { ...u, username: u.name, avatar: u.avatar?.url }
-              }),
-            })
+            rms.push(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
@@ -388,6 +378,10 @@ export default {
         const changedRoom = { ...this.rooms[roomIndex] }
         changedRoom.lastMessage = createdMessage
         changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
+        // move current room to top (not 100% working)
+        // const rooms = [...this.rooms]
+        // rooms.splice(roomIndex,1)
+        // this.rooms = [changedRoom, ...rooms]
         this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)
@@ -407,6 +401,26 @@ export default {
       this.$emit('toggle-user-search')
     },
 
+    fixRoomObject(room){
+      // This fixes the room object which arrives from the backend
+      const fixedRoom = {
+        ...room,
+        index: room.lastMessage?.date,
+        lastMessage: room.lastMessage ? {
+          ...room.lastMessage,
+          content: room.lastMessage?.content?.trim().substring(0, 30),
+        }: null,
+        users: room.users.map((u) => {
+          return { ...u, username: u.name, avatar: u.avatar?.url }
+        })
+      }
+      if(!fixedRoom.avatar){
+        // as long as we cannot query avatar on CreateRoom
+        fixedRoom.avatar = fixedRoom.users.find((u) => u.id !== this.currentUser.id).avatar
+      }
+      return fixedRoom
+    },
+
     newRoom(userId) {
       this.$apollo
         .mutate({
@@ -417,17 +431,7 @@ export default {
         })
         .then(({ data: { CreateRoom } }) => {
           const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
-          const room = {...CreateRoom, index: CreateRoom.lastMessage?.date, lastMessage: CreateRoom.lastMessage ? {
-                ...CreateRoom.lastMessage,
-                content: CreateRoom.lastMessage?.content?.trim().substring(0, 30),
-              }: null,
-              users: CreateRoom.users.map((u) => {
-                return { ...u, username: u.name, avatar: u.avatar?.url }
-              })
-            }
-
-          // as long as we cannot query avatar on CreateRoom
-          room.avatar = room.users.find((u) => u.id === this.currentUser.id).avatar
+          const room = this.fixRoomObject(CreateRoom)
 
           if(roomIndex === -1){
             this.rooms = [room, ...this.rooms]

From 70a1c521650c84ef4c5e64cdf12051f311faaa93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:10:25 +0200
Subject: [PATCH 160/181] lint fixes

---
 webapp/components/Chat/Chat.vue | 20 +++++++++++---------
 webapp/graphql/Rooms.js         |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 9b2c28fe5..fedaeedba 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -401,20 +401,22 @@ export default {
       this.$emit('toggle-user-search')
     },
 
-    fixRoomObject(room){
+    fixRoomObject(room) {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
         index: room.lastMessage?.date,
-        lastMessage: room.lastMessage ? {
-          ...room.lastMessage,
-          content: room.lastMessage?.content?.trim().substring(0, 30),
-        }: null,
+        lastMessage: room.lastMessage
+          ? {
+              ...room.lastMessage,
+              content: room.lastMessage?.content?.trim().substring(0, 30),
+            }
+          : null,
         users: room.users.map((u) => {
           return { ...u, username: u.name, avatar: u.avatar?.url }
-        })
+        }),
       }
-      if(!fixedRoom.avatar){
+      if (!fixedRoom.avatar) {
         // as long as we cannot query avatar on CreateRoom
         fixedRoom.avatar = fixedRoom.users.find((u) => u.id !== this.currentUser.id).avatar
       }
@@ -433,10 +435,10 @@ export default {
           const roomIndex = this.rooms.findIndex((r) => r.id === CreateRoom.roomId)
           const room = this.fixRoomObject(CreateRoom)
 
-          if(roomIndex === -1){
+          if (roomIndex === -1) {
             this.rooms = [room, ...this.rooms]
           }
-          this.fetchMessages({room, options: { refetch: true }})
+          this.fetchMessages({ room, options: { refetch: true } })
           this.$emit('show-chat', CreateRoom.id)
         })
         .catch((error) => {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 34c1b2fd6..077d73f9a 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -23,7 +23,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc createdAt_desc] ) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc, createdAt_desc]) {
       id
       roomId
       roomName

From e2c23ad4a2fc054dab4181af80587c57f7ff86d3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:10:32 +0200
Subject: [PATCH 161/181] more lint fixes

---
 backend/src/schema/types/type/Room.gql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 0cf5b22c8..d758808bb 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -8,6 +8,7 @@
 # TODO change this to last message date
 enum _RoomOrdering {
   lastMessageAt_desc
+  createdAt_desc
 }
 
 type Room {

From 2decf90b6b2f9ebb62b35b34292e6b5c44fbdb0c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 13:40:29 +0200
Subject: [PATCH 162/181] Change the background color of my messages to the
 same color as the one in side menu.

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

diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index 181d88e0e..082d018f3 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -58,7 +58,7 @@ const STYLE = {
 
     message: {
       background: styleData.chatMessageBgOthers,
-      backgroundMe: styleData.chatMessageBgMe,
+      backgroundMe: styleData.colorPrimaryLight,
       color: styleData.chatMessageColor,
       colorStarted: '#9ca6af',
       backgroundDeleted: '#dadfe2',

From 1b8b356432e753ba0919f63bd7629f1c5adabd97 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:41:59 +0200
Subject: [PATCH 163/181] notification subscription

---
 backend/src/schema/resolvers/notifications.ts           | 4 ++--
 backend/src/schema/types/type/NOTIFIED.gql              | 2 +-
 webapp/components/NotificationMenu/NotificationMenu.vue | 5 -----
 webapp/graphql/User.js                                  | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/backend/src/schema/resolvers/notifications.ts b/backend/src/schema/resolvers/notifications.ts
index e427de227..6a3e232cc 100644
--- a/backend/src/schema/resolvers/notifications.ts
+++ b/backend/src/schema/resolvers/notifications.ts
@@ -7,8 +7,8 @@ export default {
     notificationAdded: {
       subscribe: withFilter(
         () => pubsub.asyncIterator(NOTIFICATION_ADDED),
-        (payload, variables) => {
-          return payload.notificationAdded.to.id === variables.userId
+        (payload, variables, context) => {
+          return payload.notificationAdded.to.id === context.user?.id
         },
       ),
     },
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 62a1f3696..1f825decc 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -38,5 +38,5 @@ type Mutation {
 }
 
 type Subscription {
-  notificationAdded(userId: ID!): NOTIFIED
+  notificationAdded: NOTIFIED
 }
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 9e94e07d7..d0e21bf96 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -137,11 +137,6 @@ export default {
       },
       subscribeToMore: {
         document: notificationAdded(),
-        variables() {
-          return {
-            userId: this.user.id,
-          }
-        },
         updateQuery: (previousResult, { subscriptionData }) => {
           const {
             data: { notificationAdded: newNotification },
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index fcdac0989..4b743a0e3 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -245,8 +245,8 @@ export const notificationAdded = () => {
     ${postFragment}
     ${groupFragment}
 
-    subscription notifications($userId: ID!) {
-      notificationAdded(userId: $userId) {
+    subscription notifications {
+      notificationAdded {
         id
         read
         reason

From f7c381efd820e11f872544516df3c35ec0c6e850 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:44:04 +0200
Subject: [PATCH 164/181] subscription chatMessageAdded security fix

---
 backend/src/schema/resolvers/messages.ts  | 4 ++--
 backend/src/schema/types/type/Message.gql | 2 +-
 webapp/components/Chat/Chat.vue           | 3 ---
 webapp/graphql/Messages.js                | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index b7e7a7a73..c1381045f 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -25,8 +25,8 @@ export default {
     chatMessageAdded: {
       subscribe: withFilter(
         () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
-        (payload, variables) => {
-          return payload.userId === variables.userId
+        (payload, variables, context) => {
+          return payload.userId === context.user?.id
         },
       ),
     },
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 71d175e1c..16e458151 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -46,5 +46,5 @@ type Query {
 }
 
 type Subscription {
-  chatMessageAdded(userId: ID!): Message
+  chatMessageAdded: Message
 }
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index c2c7c412c..a1e5adf01 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -195,9 +195,6 @@ export default {
     // Subscriptions
     const observer = this.$apollo.subscribe({
       query: chatMessageAdded(),
-      variables: {
-        userId: this.currentUser.id,
-      },
     })
 
     observer.subscribe({
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index cb5d37df9..ffa2760f9 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -54,8 +54,8 @@ export const messageQuery = () => {
 
 export const chatMessageAdded = () => {
   return gql`
-    subscription chatMessageAdded($userId: ID!) {
-      chatMessageAdded(userId: $userId) {
+    subscription chatMessageAdded {
+      chatMessageAdded {
         _id
         id
         indexId

From 604e1d8465bc6054eebc1f16b6778c6d34507cb9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 20 Jul 2023 13:44:23 +0200
Subject: [PATCH 165/181] subscription roomCountUpdated security fix

---
 backend/src/schema/resolvers/rooms.ts                        | 4 ++--
 backend/src/schema/types/type/Room.gql                       | 2 +-
 .../components/ChatNotificationMenu/ChatNotificationMenu.vue | 5 -----
 webapp/graphql/Rooms.js                                      | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 5e931a446..5382c5ee7 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -20,8 +20,8 @@ export default {
     roomCountUpdated: {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
-        (payload, variables) => {
-          return payload.userId === variables.userId
+        (payload, variables, context) => {
+          return payload.userId === context.user?.id
         },
       ),
     },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 0cf5b22c8..221df8299 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -57,5 +57,5 @@ type Query {
 }
 
 type Subscription {
-  roomCountUpdated(userId: ID!): Int
+  roomCountUpdated: Int
 }
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index ec3f9fbc7..dd36b965a 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -44,11 +44,6 @@ export default {
       },
       subscribeToMore: {
         document: roomCountUpdated(),
-        variables() {
-          return {
-            userId: this.user.id,
-          }
-        },
         updateQuery: (previousResult, { subscriptionData }) => {
           return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 757a6cfa4..577eb8eff 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -52,8 +52,8 @@ export const unreadRoomsQuery = () => {
 
 export const roomCountUpdated = () => {
   return gql`
-    subscription roomCountUpdated($userId: ID!) {
-      roomCountUpdated(userId: $userId)
+    subscription roomCountUpdated {
+      roomCountUpdated
     }
   `
 }

From 21124bcd71d925654212229783101c1867ddc8b1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 14:18:25 +0200
Subject: [PATCH 166/181] Fix: Order of rooms.

---
 webapp/components/Chat/Chat.vue | 4 ++--
 webapp/graphql/Rooms.js         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fedaeedba..dd724d200 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,7 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.push(this.fixRoomObject(r))
+            rms.unshift(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
@@ -405,7 +405,7 @@ export default {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
-        index: room.lastMessage?.date,
+        index: room.lastMessage? room.lastMessage.date : room.createdAt,
         lastMessage: room.lastMessage
           ? {
               ...room.lastMessage,
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 077d73f9a..4e9cd0209 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -7,6 +7,7 @@ export const createRoom = () => gql`
       roomId
       roomName
       lastMessageAt
+      createdAt
       unreadCount
       #avatar
       users {
@@ -29,6 +30,7 @@ export const roomQuery = () => gql`
       roomName
       avatar
       lastMessageAt
+      createdAt
       unreadCount
       lastMessage {
         _id

From 074711dd907fc216d386f78dfc9d9a1423e36664 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 14:31:57 +0200
Subject: [PATCH 167/181] Fix: order createdAt_desc & lastMessageAt_desc

---
 webapp/components/Chat/Chat.vue | 2 +-
 webapp/graphql/Rooms.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dd724d200..fd14ced6e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -257,7 +257,7 @@ export default {
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
           if (!rmsIds.find((v) => v === r.id)) {
-            rms.unshift(this.fixRoomObject(r))
+            rms.push(this.fixRoomObject(r))
             rmsIds.push(r.id)
           }
         })
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 4e9cd0209..46f089e36 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -24,7 +24,7 @@ export const createRoom = () => gql`
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: [lastMessageAt_desc, createdAt_desc]) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: [createdAt_desc, lastMessageAt_desc]) {
       id
       roomId
       roomName

From db3c625dfb0100c7c5b294d22c23e1bf0ad1e7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 15:39:11 +0200
Subject: [PATCH 168/181] Revert general change of PR

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

diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index 082d018f3..181d88e0e 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -58,7 +58,7 @@ const STYLE = {
 
     message: {
       background: styleData.chatMessageBgOthers,
-      backgroundMe: styleData.colorPrimaryLight,
+      backgroundMe: styleData.chatMessageBgMe,
       color: styleData.chatMessageColor,
       colorStarted: '#9ca6af',
       backgroundDeleted: '#dadfe2',

From 65e5545c9a2396340699632b8ba755160e938acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 15:40:21 +0200
Subject: [PATCH 169/181] Test branding

---
 webapp/assets/styles/imports/_branding.scss | 127 +++++++++++++++++++-
 1 file changed, 126 insertions(+), 1 deletion(-)

diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss
index 75058595d..1bb4291af 100644
--- a/webapp/assets/styles/imports/_branding.scss
+++ b/webapp/assets/styles/imports/_branding.scss
@@ -2,4 +2,129 @@
     *
     * Here, all SCSS variables and classes can be adapted to your custom design. 
     *
-*/
\ No newline at end of file
+*/
+
+$color-primary: rgb(110, 139, 135);
+$color-primary-light: rgb(161, 179, 177);
+$color-primary-dark: rgb(81, 99, 97);
+$color-primary-active: rgb(123, 160, 149);
+$color-primary-inverse: rgb(241, 248, 243);
+
+$color-secondary: rgb(166, 255, 0);
+$color-secondary-active: rgb(188, 255, 130);
+$color-secondary-inverse: rgb(241, 255, 225);
+
+$font-family-heading: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
+$font-family-text: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
+
+$color-header-background: $color-primary;
+$color-footer-background: $color-secondary;
+
+$color-locale-menu: $color-secondary;
+
+$color-donation-bar: $color-secondary;
+
+$color-toast-blue: rgb(0, 142, 230);
+$color-toast-green: $color-primary;
+
+$chat-message-bg-me: $color-primary-light;
+// $chat-message-color: $text-color-base;
+// $chat-message-bg-others: $color-neutral-80;
+// $chat-sidemenu-bg: $color-secondary-active;
+// $chat-new-message-color: $color-secondary-active;
+// $chat-message-timestamp: $text-color-soft;
+$chat-message-checkmark-seen: $color-secondary;
+$chat-message-checkmark: $text-color-inverse;
+
+
+.main-navigation a {
+  color: #fff;
+  text-transform: uppercase;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.main-navigation a:hover {
+  color: hsla(0, 0%, 100%, .8);
+}
+
+.main-navigation .router-link-exact-active {
+  color: #A6FF00 !important;
+}
+
+.main-navigation .locale-menu {
+  color: #fff;
+}
+
+.main-navigation .base-button {
+  color: #fff;
+}
+
+#nav-search-box .hc-hashtag a {
+  color: #17b53f;
+}
+
+#footer {
+  background-color: $color-secondary;
+}
+
+#footer a {
+  color: $color-primary;
+}
+
+.avatar-menu .profile-avatar {
+  color: $color-primary;
+}
+
+.profile-avatar .initials {
+  color: $color-primary;
+}
+
+.branding-menu .ds-text {
+  font-family: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
+  font-weight: 500;
+  text-transform: uppercase;
+  font-size: 16px;
+}
+
+/* avoid uppercase for user slug */
+span.slug {
+  text-transform: none;
+}
+
+.ds-footer {
+  font-family: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
+  text-transform: uppercase;
+  font-size: 16px;
+  font-weight: 300;
+}
+
+/* chips on group teaser */
+a.group-teaser footer .ds-chip-primary {
+  background-color: $color-primary;
+}
+
+/* chips on group profile */
+.group-profile .ds-chip-primary {
+  background-color: $color-primary;
+}
+
+/* number count color */
+div.ds-number>p.ds-number-count {
+  color: $color-primary;
+}
+
+/* active tab border bottom color */
+div.tab-navigation li.Tabs__tab {
+  border-bottom-color: $color-primary;
+}
+
+/* submit button color group form */
+form.group-form button.ds-button-primary {
+  background-color: $color-primary;
+}
+
+/* color of active filter tags in post teaser */
+span.category-tag.filterActive {
+  background-color: $color-primary;
+}
\ No newline at end of file

From b26e4545629a29b2c718fbbdb031afe35c727199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jul 2023 15:42:40 +0200
Subject: [PATCH 170/181] Fix linting

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fd14ced6e..c18c12a58 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -405,7 +405,7 @@ export default {
       // This fixes the room object which arrives from the backend
       const fixedRoom = {
         ...room,
-        index: room.lastMessage? room.lastMessage.date : room.createdAt,
+        index: room.lastMessage ? room.lastMessage.date : room.createdAt,
         lastMessage: room.lastMessage
           ? {
               ...room.lastMessage,

From 39eef13a51a561b3a015e8502ea6cc1bb80ce174 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 16:45:44 +0200
Subject: [PATCH 171/181] Change the ocelot chat room badge color

---
 webapp/assets/_new/styles/export.scss       | 3 +++
 webapp/assets/_new/styles/tokens.scss       | 2 ++
 webapp/assets/styles/imports/_branding.scss | 7 ++-----
 webapp/constants/chat.js                    | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webapp/assets/_new/styles/export.scss b/webapp/assets/_new/styles/export.scss
index 5b866d6b7..e29c014e2 100644
--- a/webapp/assets/_new/styles/export.scss
+++ b/webapp/assets/_new/styles/export.scss
@@ -31,4 +31,7 @@
     chatMessageTimestamp: $chat-message-timestamp;
     chatMessageCheckmarkSeen: $chat-message-checkmark-seen;
     chatMessageCheckmark: $chat-message-checkmark;
+
+    chatRoomBackgroundCounterBadge: $chat-room-background-counter-badge;
+    chatRoomColorCounterBadge: $chat-room-color-counter-badge;
   }
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index ef5086240..3e189abf2 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -420,3 +420,5 @@ $chat-new-message-color: $color-secondary-active;
 $chat-message-timestamp: $text-color-soft;
 $chat-message-checkmark-seen: $text-color-secondary;
 $chat-message-checkmark: $text-color-soft;
+$chat-room-color-counter-badge: $color-primary;
+$chat-room-background-counter-badge: $color-secondary;
diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss
index 1bb4291af..733f2856c 100644
--- a/webapp/assets/styles/imports/_branding.scss
+++ b/webapp/assets/styles/imports/_branding.scss
@@ -28,13 +28,10 @@ $color-toast-blue: rgb(0, 142, 230);
 $color-toast-green: $color-primary;
 
 $chat-message-bg-me: $color-primary-light;
-// $chat-message-color: $text-color-base;
-// $chat-message-bg-others: $color-neutral-80;
-// $chat-sidemenu-bg: $color-secondary-active;
-// $chat-new-message-color: $color-secondary-active;
-// $chat-message-timestamp: $text-color-soft;
 $chat-message-checkmark-seen: $color-secondary;
 $chat-message-checkmark: $text-color-inverse;
+$chat-room-color-counter-badge: $color-primary;
+$chat-room-background-counter-badge: $color-secondary;
 
 
 .main-navigation a {
diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index 181d88e0e..de391707d 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -109,8 +109,8 @@ const STYLE = {
       colorTimestamp: '#a2aeb8',
       colorStateOnline: '#4caf50',
       colorStateOffline: '#9ca6af',
-      backgroundCounterBadge: '#0696c7',
-      colorCounterBadge: '#fff',
+      backgroundCounterBadge: styleData.chatRoomBackgroundCounterBadge,
+      colorCounterBadge: styleData.chatRoomColorCounterBadge,
     },
 
     emoji: {

From 69394d800b6766e87a39c6a065359d90746cdf91 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 16:53:10 +0200
Subject: [PATCH 172/181] Change default ocelot badge color to
 text-color-inverted.

---
 webapp/assets/_new/styles/tokens.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 3e189abf2..dd3a042d1 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -420,5 +420,5 @@ $chat-new-message-color: $color-secondary-active;
 $chat-message-timestamp: $text-color-soft;
 $chat-message-checkmark-seen: $text-color-secondary;
 $chat-message-checkmark: $text-color-soft;
-$chat-room-color-counter-badge: $color-primary;
+$chat-room-color-counter-badge: $text-color-inverse;
 $chat-room-background-counter-badge: $color-secondary;

From fa9b8390812a7f89648719876f351b1d8110df56 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 20 Jul 2023 16:56:33 +0200
Subject: [PATCH 173/181] Remove client customizing.

---
 webapp/assets/styles/imports/_branding.scss | 124 +-------------------
 1 file changed, 1 insertion(+), 123 deletions(-)

diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss
index 733f2856c..75058595d 100644
--- a/webapp/assets/styles/imports/_branding.scss
+++ b/webapp/assets/styles/imports/_branding.scss
@@ -2,126 +2,4 @@
     *
     * Here, all SCSS variables and classes can be adapted to your custom design. 
     *
-*/
-
-$color-primary: rgb(110, 139, 135);
-$color-primary-light: rgb(161, 179, 177);
-$color-primary-dark: rgb(81, 99, 97);
-$color-primary-active: rgb(123, 160, 149);
-$color-primary-inverse: rgb(241, 248, 243);
-
-$color-secondary: rgb(166, 255, 0);
-$color-secondary-active: rgb(188, 255, 130);
-$color-secondary-inverse: rgb(241, 255, 225);
-
-$font-family-heading: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
-$font-family-text: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
-
-$color-header-background: $color-primary;
-$color-footer-background: $color-secondary;
-
-$color-locale-menu: $color-secondary;
-
-$color-donation-bar: $color-secondary;
-
-$color-toast-blue: rgb(0, 142, 230);
-$color-toast-green: $color-primary;
-
-$chat-message-bg-me: $color-primary-light;
-$chat-message-checkmark-seen: $color-secondary;
-$chat-message-checkmark: $text-color-inverse;
-$chat-room-color-counter-badge: $color-primary;
-$chat-room-background-counter-badge: $color-secondary;
-
-
-.main-navigation a {
-  color: #fff;
-  text-transform: uppercase;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.main-navigation a:hover {
-  color: hsla(0, 0%, 100%, .8);
-}
-
-.main-navigation .router-link-exact-active {
-  color: #A6FF00 !important;
-}
-
-.main-navigation .locale-menu {
-  color: #fff;
-}
-
-.main-navigation .base-button {
-  color: #fff;
-}
-
-#nav-search-box .hc-hashtag a {
-  color: #17b53f;
-}
-
-#footer {
-  background-color: $color-secondary;
-}
-
-#footer a {
-  color: $color-primary;
-}
-
-.avatar-menu .profile-avatar {
-  color: $color-primary;
-}
-
-.profile-avatar .initials {
-  color: $color-primary;
-}
-
-.branding-menu .ds-text {
-  font-family: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
-  font-weight: 500;
-  text-transform: uppercase;
-  font-size: 16px;
-}
-
-/* avoid uppercase for user slug */
-span.slug {
-  text-transform: none;
-}
-
-.ds-footer {
-  font-family: 'Overpass', Helvetica, Arial, Lucida, sans-serif;
-  text-transform: uppercase;
-  font-size: 16px;
-  font-weight: 300;
-}
-
-/* chips on group teaser */
-a.group-teaser footer .ds-chip-primary {
-  background-color: $color-primary;
-}
-
-/* chips on group profile */
-.group-profile .ds-chip-primary {
-  background-color: $color-primary;
-}
-
-/* number count color */
-div.ds-number>p.ds-number-count {
-  color: $color-primary;
-}
-
-/* active tab border bottom color */
-div.tab-navigation li.Tabs__tab {
-  border-bottom-color: $color-primary;
-}
-
-/* submit button color group form */
-form.group-form button.ds-button-primary {
-  background-color: $color-primary;
-}
-
-/* color of active filter tags in post teaser */
-span.category-tag.filterActive {
-  background-color: $color-primary;
-}
\ No newline at end of file
+*/
\ No newline at end of file

From f9c71bad747caa8853ce3ccbc5cfe5a088ecd7fa Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 11:17:05 +0200
Subject: [PATCH 174/181] Start search after three characters.

---
 webapp/components/generic/SelectUserSearch/SelectUserSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue b/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
index effa185f3..841e0b19f 100644
--- a/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
+++ b/webapp/components/generic/SelectUserSearch/SelectUserSearch.vue
@@ -54,7 +54,7 @@ export default {
   },
   computed: {
     startSearch() {
-      return this.query && this.query.length > 3
+      return this.query && this.query.length >= 3
     },
   },
   methods: {

From 2706fbfaf42be98ee128cb2acfc0f719fddb8a91 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 12:58:19 +0200
Subject: [PATCH 175/181] Import svg from Nitro-Styleguide.

---
 webapp/assets/_new/icons/svgs/align-center.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/align-justify.svg        | 5 +++++
 webapp/assets/_new/icons/svgs/align-left.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/align-right.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/angle-left.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/angle-right.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/archive.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/arrow-up.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/bar-chart.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/briefcase.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/bug.svg                  | 5 +++++
 webapp/assets/_new/icons/svgs/calculator.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/camera.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/cart-plus.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/certificate.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/chain-broken.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/chain.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/cloud-download.svg       | 5 +++++
 webapp/assets/_new/icons/svgs/cloud-upload.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/cloud.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/code.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/coffee.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/columns.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/compass.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/credit-card.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/crop.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/crosshairs.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/cube.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/cubes.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/cut.svg                  | 5 +++++
 webapp/assets/_new/icons/svgs/dashboard.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/diamond.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/exchange.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/exclamation-triangle.svg | 5 +++++
 webapp/assets/_new/icons/svgs/expand.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/external-link.svg        | 5 +++++
 webapp/assets/_new/icons/svgs/eyedropper.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/facebook.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/female.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/file-archive.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/file-audio.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-code.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/file-excel.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-image.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-movie.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-pdf.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/file-photo.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-picture.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/file-powerpoint.svg      | 5 +++++
 webapp/assets/_new/icons/svgs/file-sound.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-text.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/file-video.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/file-word.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/file-zip.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/files.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/film.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/fire.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/flask.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/floppy.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/folder-open.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/folder.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/frown.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/gamepad.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/gear.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/gears.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/gift.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/github.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/glass.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/group.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/hand-down.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/hand-left.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/hand-pointer.svg         | 2 +-
 webapp/assets/_new/icons/svgs/hand-right.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/hand-stop.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/hand-up.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/headphones.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/heart.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/history.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/hourglass.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/inbox.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/indent.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/info-circle.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/keyboard.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/leaf.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/level-up.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/life-ring.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/list.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/location-arrow.svg       | 5 +++++
 webapp/assets/_new/icons/svgs/magnet.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/male.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/map-pin.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/map-signs.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/map.svg                  | 5 +++++
 webapp/assets/_new/icons/svgs/microphone.svg           | 1 -
 webapp/assets/_new/icons/svgs/mobile-phone.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/paperclip.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/paste.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/pause.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/pencil.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/phone.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/photo.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/pie-chart.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/play-circle.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/play.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/power-off.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/print.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/recycle.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/refresh.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/rocket.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/server.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/share.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/sort-alpha-asc.svg       | 5 +++++
 webapp/assets/_new/icons/svgs/sort-alpha-desc.svg      | 5 +++++
 webapp/assets/_new/icons/svgs/sort.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/spinner.svg              | 5 +++++
 webapp/assets/_new/icons/svgs/star-half-o.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/star-o.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/star.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/subscript.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/sun.svg                  | 5 +++++
 webapp/assets/_new/icons/svgs/superscript.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/table.svg                | 5 +++++
 webapp/assets/_new/icons/svgs/tablet.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/tag.svg                  | 5 +++++
 webapp/assets/_new/icons/svgs/tags.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/terminal.svg             | 5 +++++
 webapp/assets/_new/icons/svgs/ticket.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/toggle-off.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/toggle-on.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/undo.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/upload.svg               | 5 +++++
 webapp/assets/_new/icons/svgs/video-camera.svg         | 5 +++++
 webapp/assets/_new/icons/svgs/volume-down.svg          | 5 +++++
 webapp/assets/_new/icons/svgs/volume-off.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/volume-up.svg            | 5 +++++
 webapp/assets/_new/icons/svgs/wheelchair.svg           | 5 +++++
 webapp/assets/_new/icons/svgs/wifi.svg                 | 5 +++++
 webapp/assets/_new/icons/svgs/youtube-play.svg         | 5 +++++
 138 files changed, 681 insertions(+), 2 deletions(-)
 create mode 100755 webapp/assets/_new/icons/svgs/align-center.svg
 create mode 100755 webapp/assets/_new/icons/svgs/align-justify.svg
 create mode 100755 webapp/assets/_new/icons/svgs/align-left.svg
 create mode 100755 webapp/assets/_new/icons/svgs/align-right.svg
 create mode 100755 webapp/assets/_new/icons/svgs/angle-left.svg
 create mode 100755 webapp/assets/_new/icons/svgs/angle-right.svg
 create mode 100755 webapp/assets/_new/icons/svgs/archive.svg
 create mode 100755 webapp/assets/_new/icons/svgs/arrow-up.svg
 create mode 100755 webapp/assets/_new/icons/svgs/bar-chart.svg
 create mode 100755 webapp/assets/_new/icons/svgs/briefcase.svg
 create mode 100755 webapp/assets/_new/icons/svgs/bug.svg
 create mode 100755 webapp/assets/_new/icons/svgs/calculator.svg
 create mode 100755 webapp/assets/_new/icons/svgs/camera.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cart-plus.svg
 create mode 100755 webapp/assets/_new/icons/svgs/certificate.svg
 create mode 100755 webapp/assets/_new/icons/svgs/chain-broken.svg
 create mode 100755 webapp/assets/_new/icons/svgs/chain.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cloud-download.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cloud-upload.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cloud.svg
 create mode 100755 webapp/assets/_new/icons/svgs/code.svg
 create mode 100755 webapp/assets/_new/icons/svgs/coffee.svg
 create mode 100755 webapp/assets/_new/icons/svgs/columns.svg
 create mode 100755 webapp/assets/_new/icons/svgs/compass.svg
 create mode 100755 webapp/assets/_new/icons/svgs/credit-card.svg
 create mode 100755 webapp/assets/_new/icons/svgs/crop.svg
 create mode 100755 webapp/assets/_new/icons/svgs/crosshairs.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cube.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cubes.svg
 create mode 100755 webapp/assets/_new/icons/svgs/cut.svg
 create mode 100755 webapp/assets/_new/icons/svgs/dashboard.svg
 create mode 100755 webapp/assets/_new/icons/svgs/diamond.svg
 create mode 100755 webapp/assets/_new/icons/svgs/exchange.svg
 create mode 100755 webapp/assets/_new/icons/svgs/exclamation-triangle.svg
 create mode 100755 webapp/assets/_new/icons/svgs/expand.svg
 create mode 100755 webapp/assets/_new/icons/svgs/external-link.svg
 create mode 100755 webapp/assets/_new/icons/svgs/eyedropper.svg
 create mode 100755 webapp/assets/_new/icons/svgs/facebook.svg
 create mode 100755 webapp/assets/_new/icons/svgs/female.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-archive.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-audio.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-code.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-excel.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-image.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-movie.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-pdf.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-photo.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-picture.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-powerpoint.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-sound.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-text.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-video.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-word.svg
 create mode 100755 webapp/assets/_new/icons/svgs/file-zip.svg
 create mode 100755 webapp/assets/_new/icons/svgs/files.svg
 create mode 100755 webapp/assets/_new/icons/svgs/film.svg
 create mode 100755 webapp/assets/_new/icons/svgs/fire.svg
 create mode 100755 webapp/assets/_new/icons/svgs/flask.svg
 create mode 100755 webapp/assets/_new/icons/svgs/floppy.svg
 create mode 100755 webapp/assets/_new/icons/svgs/folder-open.svg
 create mode 100755 webapp/assets/_new/icons/svgs/folder.svg
 create mode 100755 webapp/assets/_new/icons/svgs/frown.svg
 create mode 100755 webapp/assets/_new/icons/svgs/gamepad.svg
 create mode 100755 webapp/assets/_new/icons/svgs/gear.svg
 create mode 100755 webapp/assets/_new/icons/svgs/gears.svg
 create mode 100755 webapp/assets/_new/icons/svgs/gift.svg
 create mode 100755 webapp/assets/_new/icons/svgs/github.svg
 create mode 100755 webapp/assets/_new/icons/svgs/glass.svg
 create mode 100755 webapp/assets/_new/icons/svgs/group.svg
 create mode 100755 webapp/assets/_new/icons/svgs/hand-down.svg
 create mode 100755 webapp/assets/_new/icons/svgs/hand-left.svg
 create mode 100755 webapp/assets/_new/icons/svgs/hand-right.svg
 create mode 100755 webapp/assets/_new/icons/svgs/hand-stop.svg
 create mode 100755 webapp/assets/_new/icons/svgs/hand-up.svg
 create mode 100755 webapp/assets/_new/icons/svgs/headphones.svg
 create mode 100755 webapp/assets/_new/icons/svgs/heart.svg
 create mode 100755 webapp/assets/_new/icons/svgs/history.svg
 create mode 100755 webapp/assets/_new/icons/svgs/hourglass.svg
 create mode 100755 webapp/assets/_new/icons/svgs/inbox.svg
 create mode 100755 webapp/assets/_new/icons/svgs/indent.svg
 create mode 100755 webapp/assets/_new/icons/svgs/info-circle.svg
 create mode 100755 webapp/assets/_new/icons/svgs/keyboard.svg
 create mode 100755 webapp/assets/_new/icons/svgs/leaf.svg
 create mode 100755 webapp/assets/_new/icons/svgs/level-up.svg
 create mode 100755 webapp/assets/_new/icons/svgs/life-ring.svg
 create mode 100755 webapp/assets/_new/icons/svgs/list.svg
 create mode 100755 webapp/assets/_new/icons/svgs/location-arrow.svg
 create mode 100755 webapp/assets/_new/icons/svgs/magnet.svg
 create mode 100755 webapp/assets/_new/icons/svgs/male.svg
 create mode 100755 webapp/assets/_new/icons/svgs/map-pin.svg
 create mode 100755 webapp/assets/_new/icons/svgs/map-signs.svg
 create mode 100755 webapp/assets/_new/icons/svgs/map.svg
 create mode 100755 webapp/assets/_new/icons/svgs/mobile-phone.svg
 create mode 100755 webapp/assets/_new/icons/svgs/paperclip.svg
 create mode 100755 webapp/assets/_new/icons/svgs/paste.svg
 create mode 100755 webapp/assets/_new/icons/svgs/pause.svg
 create mode 100755 webapp/assets/_new/icons/svgs/pencil.svg
 create mode 100755 webapp/assets/_new/icons/svgs/phone.svg
 create mode 100755 webapp/assets/_new/icons/svgs/photo.svg
 create mode 100755 webapp/assets/_new/icons/svgs/pie-chart.svg
 create mode 100755 webapp/assets/_new/icons/svgs/play-circle.svg
 create mode 100755 webapp/assets/_new/icons/svgs/play.svg
 create mode 100755 webapp/assets/_new/icons/svgs/power-off.svg
 create mode 100755 webapp/assets/_new/icons/svgs/print.svg
 create mode 100755 webapp/assets/_new/icons/svgs/recycle.svg
 create mode 100755 webapp/assets/_new/icons/svgs/refresh.svg
 create mode 100755 webapp/assets/_new/icons/svgs/rocket.svg
 create mode 100755 webapp/assets/_new/icons/svgs/server.svg
 create mode 100755 webapp/assets/_new/icons/svgs/share.svg
 create mode 100755 webapp/assets/_new/icons/svgs/sort-alpha-asc.svg
 create mode 100755 webapp/assets/_new/icons/svgs/sort-alpha-desc.svg
 create mode 100755 webapp/assets/_new/icons/svgs/sort.svg
 create mode 100755 webapp/assets/_new/icons/svgs/spinner.svg
 create mode 100755 webapp/assets/_new/icons/svgs/star-half-o.svg
 create mode 100755 webapp/assets/_new/icons/svgs/star-o.svg
 create mode 100755 webapp/assets/_new/icons/svgs/star.svg
 create mode 100755 webapp/assets/_new/icons/svgs/subscript.svg
 create mode 100755 webapp/assets/_new/icons/svgs/sun.svg
 create mode 100755 webapp/assets/_new/icons/svgs/superscript.svg
 create mode 100755 webapp/assets/_new/icons/svgs/table.svg
 create mode 100755 webapp/assets/_new/icons/svgs/tablet.svg
 create mode 100755 webapp/assets/_new/icons/svgs/tag.svg
 create mode 100755 webapp/assets/_new/icons/svgs/tags.svg
 create mode 100755 webapp/assets/_new/icons/svgs/terminal.svg
 create mode 100755 webapp/assets/_new/icons/svgs/ticket.svg
 create mode 100755 webapp/assets/_new/icons/svgs/toggle-off.svg
 create mode 100755 webapp/assets/_new/icons/svgs/toggle-on.svg
 create mode 100755 webapp/assets/_new/icons/svgs/undo.svg
 create mode 100755 webapp/assets/_new/icons/svgs/upload.svg
 create mode 100755 webapp/assets/_new/icons/svgs/video-camera.svg
 create mode 100755 webapp/assets/_new/icons/svgs/volume-down.svg
 create mode 100755 webapp/assets/_new/icons/svgs/volume-off.svg
 create mode 100755 webapp/assets/_new/icons/svgs/volume-up.svg
 create mode 100755 webapp/assets/_new/icons/svgs/wheelchair.svg
 create mode 100755 webapp/assets/_new/icons/svgs/wifi.svg
 create mode 100755 webapp/assets/_new/icons/svgs/youtube-play.svg

diff --git a/webapp/assets/_new/icons/svgs/align-center.svg b/webapp/assets/_new/icons/svgs/align-center.svg
new file mode 100755
index 000000000..4232dff91
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/align-center.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>align-center</title>
+<path d="M3 7h26v2h-26v-2zM7 11h18v2h-18v-2zM3 15h26v2h-26v-2zM7 19h18v2h-18v-2zM3 23h26v2h-26v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/align-justify.svg b/webapp/assets/_new/icons/svgs/align-justify.svg
new file mode 100755
index 000000000..ce82c7f0a
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/align-justify.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>align-justify</title>
+<path d="M3 7h26v2h-26v-2zM3 11h26v2h-26v-2zM3 15h26v2h-26v-2zM3 19h26v2h-26v-2zM3 23h26v2h-26v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/align-left.svg b/webapp/assets/_new/icons/svgs/align-left.svg
new file mode 100755
index 000000000..c76e93dc9
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/align-left.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>align-left</title>
+<path d="M3 7h26v2h-26v-2zM3 11h18v2h-18v-2zM3 15h26v2h-26v-2zM3 19h18v2h-18v-2zM3 23h26v2h-26v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/align-right.svg b/webapp/assets/_new/icons/svgs/align-right.svg
new file mode 100755
index 000000000..24972ed83
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/align-right.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>align-right</title>
+<path d="M3 7h26v2h-26v-2zM11 11h18v2h-18v-2zM3 15h26v2h-26v-2zM11 19h18v2h-18v-2zM3 23h26v2h-26v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/angle-left.svg b/webapp/assets/_new/icons/svgs/angle-left.svg
new file mode 100755
index 000000000..826dd8e34
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/angle-left.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>angle-left</title>
+<path d="M19.031 4.281l1.438 1.438-10.281 10.281 10.281 10.281-1.438 1.438-11-11-0.688-0.719 0.688-0.719z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/angle-right.svg b/webapp/assets/_new/icons/svgs/angle-right.svg
new file mode 100755
index 000000000..1df45a590
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/angle-right.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>angle-right</title>
+<path d="M12.969 4.281l11 11 0.688 0.719-0.688 0.719-11 11-1.438-1.438 10.281-10.281-10.281-10.281z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/archive.svg b/webapp/assets/_new/icons/svgs/archive.svg
new file mode 100755
index 000000000..878713822
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/archive.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>archive</title>
+<path d="M4 5h24v6h-1v16h-22v-16h-1v-6zM6 7v2h20v-2h-20zM7 11v14h18v-14h-18zM12.813 13c0.013-0.001 0.034-0.001 0.047-0.001s0.034 0.001 0.047 0.001c0.013-0.001 0.034-0.001 0.047-0.001s0.034 0.001 0.047 0.001l6.014-0c0.552 0 1 0.448 1 1s-0.448 1-1 1l-0.014-0h-6c-0.026 0.002-0.068 0.004-0.094 0.004-0.554 0-1.004-0.45-1.004-1.004 0-0.505 0.408-0.953 0.911-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/arrow-up.svg b/webapp/assets/_new/icons/svgs/arrow-up.svg
new file mode 100755
index 000000000..f48c186c0
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/arrow-up.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>arrow-up</title>
+<path d="M16 4.094l0.719 0.688 8.5 8.5-1.438 1.438-6.781-6.781v20.063h-2v-20.063l-6.781 6.781-1.438-1.438 8.5-8.5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/bar-chart.svg b/webapp/assets/_new/icons/svgs/bar-chart.svg
new file mode 100755
index 000000000..0c853e737
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/bar-chart.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>bar-chart</title>
+<path d="M21 4h8v24h-8v-24zM23 6v20h4v-20h-4zM3 10h8v18h-8v-18zM5 12v14h4v-14h-4zM12 16h8v12h-8v-12zM14 18v8h4v-8h-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/briefcase.svg b/webapp/assets/_new/icons/svgs/briefcase.svg
new file mode 100755
index 000000000..c0f6552a0
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/briefcase.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>briefcase</title>
+<path d="M16 3c1.864 0 3.399 1.275 3.844 3h9.156v20h-26v-20h9.156c0.445-1.725 1.98-3 3.844-3zM16 5c-0.81 0-1.428 0.385-1.75 1h3.5c-0.322-0.615-0.94-1-1.75-1zM5 8v9h22v-9h-22zM16 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM5 19v5h22v-5h-22z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/bug.svg b/webapp/assets/_new/icons/svgs/bug.svg
new file mode 100755
index 000000000..66374d8bc
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/bug.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>bug</title>
+<path d="M10.719 3.281l2.313 2.313c0.923-0.39 1.922-0.594 2.969-0.594s2.046 0.203 2.969 0.594l2.313-2.313 1.438 1.438-1.938 1.938c1.462 1.119 2.61 2.755 3.344 4.656l2.438-1.219 0.875 1.813-2.75 1.375c0.183 0.876 0.313 1.782 0.313 2.719 0 0.34-0.006 0.666-0.031 1h3.031v2h-3.375c-0.242 1.043-0.561 2.039-1.031 2.938l3 2.25-1.188 1.625-2.938-2.188c-1.618 2.056-3.885 3.375-6.469 3.375s-4.851-1.319-6.469-3.375l-2.938 2.188-1.188-1.625 3-2.25c-0.47-0.898-0.789-1.894-1.031-2.938h-3.375v-2h3.031c-0.025-0.334-0.031-0.66-0.031-1 0-0.937 0.13-1.843 0.313-2.719l-2.75-1.375 0.875-1.813 2.438 1.219c0.734-1.901 1.882-3.538 3.344-4.656l-1.938-1.938zM16 7c-1.978 0-3.827 1.094-5.125 2.875 1.134 0.511 2.924 1.125 5.125 1.125s3.991-0.614 5.125-1.125c-1.298-1.781-3.147-2.875-5.125-2.875zM9.906 11.594c-0.569 1.292-0.906 2.788-0.906 4.406 0 4.629 2.698 8.282 6 8.906v-11.969c-2.17-0.162-3.941-0.801-5.094-1.344zM22.094 11.594c-1.153 0.542-2.924 1.182-5.094 1.344v11.969c3.302-0.625 6-4.278 6-8.906 0-1.618-0.337-3.115-0.906-4.406z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/calculator.svg b/webapp/assets/_new/icons/svgs/calculator.svg
new file mode 100755
index 000000000..657b19919
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/calculator.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>calculator</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-16zM9 7h12v6h-12v-6zM11 9v2h8v-2h-8zM10 15h2v2h-2v-2zM14 15h2v2h-2v-2zM18 15h2v2h-2v-2zM10 19h2v2h-2v-2zM14 19h2v2h-2v-2zM18 19h2v2h-2v-2zM10 23h2v2h-2v-2zM14 23h2v2h-2v-2zM18 23h2v2h-2v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/camera.svg b/webapp/assets/_new/icons/svgs/camera.svg
new file mode 100755
index 000000000..793620544
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/camera.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>camera</title>
+<path d="M11.5 6h9l0.313 0.406 1.188 1.594h7v18h-26v-18h7l1.188-1.594zM12.5 8l-1.188 1.594-0.313 0.406h-6v14h22v-14h-6l-0.313-0.406-1.188-1.594h-7zM8 11c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM16 11c3.302 0 6 2.698 6 6s-2.698 6-6 6-6-2.698-6-6 2.698-6 6-6zM16 13c-2.221 0-4 1.779-4 4s1.779 4 4 4 4-1.779 4-4-1.779-4-4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cart-plus.svg b/webapp/assets/_new/icons/svgs/cart-plus.svg
new file mode 100755
index 000000000..84ea385bd
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cart-plus.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>cart-plus</title>
+<path d="M4 7h2.219c0.918 0 1.716 0.61 1.938 1.5l2.625 10.5h12.469l2.406-9h2.094l-2.594 9.531c-0.238 0.87-1.004 1.469-1.906 1.469h-12.469c-0.918 0-1.714-0.61-1.938-1.5l-2.625-10.5h-2.219c-0.552 0-1-0.448-1-1s0.448-1 1-1zM22 21c1.645 0 3 1.355 3 3s-1.355 3-3 3-3-1.355-3-3 1.355-3 3-3zM13 21c1.645 0 3 1.355 3 3s-1.355 3-3 3-3-1.355-3-3 1.355-3 3-3zM16 7h2v3h3v2h-3v3h-2v-3h-3v-2h3v-3zM13 23c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1zM22 23c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/certificate.svg b/webapp/assets/_new/icons/svgs/certificate.svg
new file mode 100755
index 000000000..341b4af3e
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/certificate.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>certificate</title>
+<path d="M16 3c0.624 0 1.248 0.213 1.781 0.594l1.656 1.156 1.875 0.25h0.031c1.314 0.16 2.352 1.223 2.531 2.531 0.003 0.024 0.029 0.038 0.031 0.063h-0.031l0.375 1.875 1.156 1.656c0.762 1.067 0.73 2.476 0.031 3.594v0.031l-0.031 0.031-1.156 1.656-0.25 1.875 3.125 4.75 1.031 1.531h-4.781l-1.156 2.688-0.719 1.719-1.031-1.563-3.156-4.75c-0.818 0.379-1.779 0.349-2.625 0l-3.156 4.75-1.031 1.563-0.719-1.719-1.156-2.688h-4.781l1.031-1.531 3.219-4.906-0.313-1.719-1.188-1.656c-0.762-1.067-0.73-2.507-0.031-3.625v-0.031l0.031-0.031 1.156-1.5 0.25-1.938v-0.031l0.031-0.031c0.283-1.275 1.287-2.279 2.563-2.563l0.031-0.031h0.031l1.906-0.25 1.656-1.156c0.533-0.381 1.157-0.594 1.781-0.594zM16 5.031c-0.229 0-0.458 0.068-0.625 0.188l-2 1.438-0.25 0.031-2.094 0.281c-0.015 0.003-0.016 0.027-0.031 0.031-0.487 0.125-0.875 0.513-1 1-0.004 0.015-0.028 0.016-0.031 0.031l-0.281 2.094-0.031 0.281-0.156 0.188-1.25 1.625c-0.301 0.482-0.269 1.073-0.031 1.406l1.281 1.781 0.156 0.188 0.031 0.25 0.406 2.281v0.063c0.015 0.138 0.063 0.266 0.125 0.375 0.139 0.244 0.378 0.403 0.688 0.438h0.031l2.188 0.313 0.281 0.031 0.188 0.156 1.625 1.25c0.482 0.302 1.073 0.269 1.406 0.031l1.781-1.281 0.188-0.156 0.25-0.031 2.281-0.406h0.063c0.25-0.028 0.45-0.142 0.594-0.313v-0.031l0.063-0.031c0.084-0.122 0.138-0.273 0.156-0.438v-0.031l0.313-2.188 0.031-0.25 1.406-1.969c0.302-0.482 0.269-1.042 0.031-1.375l-1.281-1.781-0.156-0.188-0.031-0.219-0.406-2.219v-0.063c-0.050-0.447-0.365-0.763-0.813-0.813h-0.031l-2.188-0.313-0.25-0.031-0.219-0.156-1.781-1.281c-0.167-0.119-0.396-0.188-0.625-0.188zM22.906 20.25c-0.409 0.323-0.9 0.552-1.438 0.625-0.024 0.003-0.038 0.029-0.063 0.031v-0.031l-1.969 0.344-0.469 0.344 2.125 3.25 0.688-1.594 0.25-0.625h2.406zM9.094 20.281l-1.531 2.313h2.406l0.25 0.625 0.688 1.594 2.125-3.219-0.438-0.344-1.906-0.25c-0.010-0.001-0.021 0.001-0.031 0-0.595-0.072-1.135-0.338-1.563-0.719z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/chain-broken.svg b/webapp/assets/_new/icons/svgs/chain-broken.svg
new file mode 100755
index 000000000..4ba13f49c
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/chain-broken.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>chain-broken</title>
+<path d="M21.75 4c1.603 0 3.189 0.626 4.406 1.844 2.435 2.435 2.435 6.409 0 8.844l-1.469 1.469c-1.015 1.016-2.304 1.618-3.625 1.781l-0.25-2c0.901-0.111 1.745-0.494 2.438-1.188h0.031l1.469-1.469c1.671-1.671 1.671-4.36 0-6.031s-4.36-1.671-6.031 0l-1.469 1.469c-0.692 0.692-1.076 1.564-1.188 2.469l-2-0.25c0.162-1.319 0.765-2.609 1.781-3.625l1.469-1.469c1.218-1.218 2.834-1.844 4.438-1.844zM7.719 6.281l4 4-1.438 1.438-4-4zM10.938 14.063l0.25 2c-0.901 0.111-1.745 0.494-2.438 1.188h-0.031l-1.469 1.469c-1.671 1.671-1.671 4.36 0 6.031s4.36 1.671 6.031 0l1.469-1.469c0.692-0.692 1.076-1.564 1.188-2.469l2 0.25c-0.162 1.319-0.765 2.609-1.781 3.625l-1.469 1.469c-2.435 2.435-6.409 2.435-8.844 0s-2.435-6.409 0-8.844l1.469-1.469c1.015-1.016 2.304-1.618 3.625-1.781zM21.719 20.281l4 4-1.438 1.438-4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/chain.svg b/webapp/assets/_new/icons/svgs/chain.svg
new file mode 100755
index 000000000..9d390e126
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/chain.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>chain</title>
+<path d="M21.75 4c1.671 0 3.225 0.661 4.406 1.844s1.844 2.735 1.844 4.406-0.662 3.255-1.844 4.438l-1.469 1.469c-1.181 1.183-2.766 1.844-4.438 1.844-0.793 0-1.565-0.153-2.281-0.438l1.625-1.625c0.215 0.038 0.432 0.063 0.656 0.063 1.138 0 2.226-0.445 3.031-1.25l1.469-1.469c1.66-1.66 1.66-4.372 0-6.031-0.804-0.805-1.863-1.25-3-1.25s-2.227 0.444-3.031 1.25l-1.469 1.469c-0.997 0.996-1.391 2.393-1.188 3.688l-1.625 1.625c-0.285-0.716-0.438-1.487-0.438-2.281 0-1.671 0.662-3.255 1.844-4.438l1.469-1.469c1.181-1.183 2.766-1.844 4.438-1.844zM19.281 11.281l1.438 1.438-8 8-1.438-1.438zM11.75 14c0.793 0 1.565 0.153 2.281 0.438l-1.625 1.625c-0.215-0.038-0.432-0.063-0.656-0.063-1.138 0-2.226 0.445-3.031 1.25l-1.469 1.469c-1.66 1.66-1.66 4.372 0 6.031 0.804 0.805 1.863 1.25 3 1.25s2.227-0.444 3.031-1.25l1.469-1.469c0.997-0.996 1.391-2.393 1.188-3.688l1.625-1.625c0.285 0.716 0.438 1.487 0.438 2.281 0 1.671-0.662 3.256-1.844 4.438l-1.469 1.469c-1.181 1.183-2.766 1.844-4.438 1.844s-3.225-0.661-4.406-1.844c-1.182-1.182-1.844-2.735-1.844-4.406s0.662-3.256 1.844-4.438l1.469-1.469c1.181-1.183 2.766-1.844 4.438-1.844z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cloud-download.svg b/webapp/assets/_new/icons/svgs/cloud-download.svg
new file mode 100755
index 000000000..fcc46456b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cloud-download.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>cloud-download</title>
+<path d="M16 5c3.378 0 6.14 2.131 7.344 5.063 3.527 0.182 6.33 2.986 6.563 6.5 1.239 1.102 2.094 2.677 2.094 4.438 0 3.324-2.676 6-6 6h-20c-3.324 0-6-2.676-6-6 0-2.751 1.884-4.944 4.344-5.656 0.597-1.699 2.050-2.919 3.844-3.219 0.454-3.994 3.694-7.125 7.813-7.125zM16 7c-3.37 0-6 2.63-6 6v1h-1c-1.444 0-2.638 0.964-2.938 2.313l-0.125 0.656-0.656 0.125c-1.832 0.319-3.281 1.886-3.281 3.906 0 2.276 1.724 4 4 4h20c2.276 0 4-1.724 4-4 0-1.267-0.65-2.48-1.594-3.188l-0.406-0.313v-0.5c0-2.755-2.245-5-5-5h-1.031l-0.219-0.719c-0.779-2.51-2.988-4.281-5.75-4.281zM15 12h2v6.563l2.281-2.281 1.438 1.438-4 4-0.719 0.688-0.719-0.688-4-4 1.438-1.438 2.281 2.281v-6.563z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cloud-upload.svg b/webapp/assets/_new/icons/svgs/cloud-upload.svg
new file mode 100755
index 000000000..8a0c486b2
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cloud-upload.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>cloud-upload</title>
+<path d="M16 4c3.378 0 6.14 2.131 7.344 5.063 3.527 0.182 6.33 2.986 6.563 6.5 1.239 1.102 2.094 2.677 2.094 4.438 0 3.324-2.676 6-6 6h-20c-3.324 0-6-2.676-6-6 0-2.751 1.884-4.944 4.344-5.656 0.597-1.699 2.050-2.919 3.844-3.219 0.454-3.994 3.694-7.125 7.813-7.125zM16 6c-3.37 0-6 2.63-6 6v1h-1c-1.444 0-2.638 0.964-2.938 2.313l-0.125 0.656-0.656 0.125c-1.832 0.319-3.281 1.886-3.281 3.906 0 2.276 1.724 4 4 4h20c2.276 0 4-1.724 4-4 0-1.267-0.65-2.48-1.594-3.188l-0.406-0.313v-0.5c0-2.755-2.245-5-5-5h-1.031l-0.219-0.719c-0.779-2.51-2.988-4.281-5.75-4.281zM16 11.594l0.719 0.688 4 4-1.438 1.438-2.281-2.281v6.563h-2v-6.563l-2.281 2.281-1.438-1.438 4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cloud.svg b/webapp/assets/_new/icons/svgs/cloud.svg
new file mode 100755
index 000000000..7ee840e92
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cloud.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>cloud</title>
+<path d="M16 5c2.451 0 4.563 1.302 5.813 3.219 0.392-0.089 0.755-0.219 1.188-0.219 3.302 0 6 2.698 6 6 1.73 1.055 3 2.835 3 5 0 3.302-2.698 6-6 6h-20c-3.302 0-6-2.698-6-6s2.698-6 6-6c0.211 0 0.394 0.040 0.594 0.063 0.531-1.191 1.439-2.083 2.656-2.563 0.698-3.129 3.419-5.5 6.75-5.5zM16 7c-2.522 0-4.581 1.836-4.938 4.25l-0.094 0.688-0.656 0.156c-1.11 0.265-2.002 1.136-2.25 2.25l-0.188 0.969-1-0.219c-0.298-0.067-0.584-0.094-0.875-0.094-2.22 0-4 1.78-4 4s1.78 4 4 4h20c2.22 0 4-1.78 4-4 0-1.662-1.009-3.078-2.438-3.688l-0.656-0.281 0.063-0.719c0.018-0.235 0.031-0.321 0.031-0.313 0-2.22-1.78-4-4-4-0.444 0-0.875 0.096-1.313 0.25l-0.844 0.281-0.375-0.781c-0.824-1.631-2.511-2.75-4.469-2.75z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/code.svg b/webapp/assets/_new/icons/svgs/code.svg
new file mode 100755
index 000000000..2581fa884
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/code.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>code</title>
+<path d="M18 5h2l-6 22h-2zM7.938 6.406l1.625 1.188-6.313 8.406 6.313 8.406-1.625 1.188-6.75-9-0.438-0.594 0.438-0.594zM24.063 6.406l6.75 9 0.438 0.594-0.438 0.594-6.75 9-1.625-1.188 6.313-8.406-6.313-8.406z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/coffee.svg b/webapp/assets/_new/icons/svgs/coffee.svg
new file mode 100755
index 000000000..302150d0a
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/coffee.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>coffee</title>
+<path d="M16-2h2v4h-2v-4zM20-1h2v3h-2v-3zM10 3h18v4h2c1.645 0 3 1.355 3 3v3c0 1.645-1.355 3-3 3h-2v5c0 1.645-1.355 3-3 3h-12c-1.645 0-3-1.355-3-3v-18zM12 5v16c0 0.555 0.445 1 1 1h12c0.555 0 1-0.445 1-1v-16h-14zM28 9v5h2c0.555 0 1-0.445 1-1v-3c0-0.555-0.445-1-1-1h-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/columns.svg b/webapp/assets/_new/icons/svgs/columns.svg
new file mode 100755
index 000000000..f77576ed4
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/columns.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>columns</title>
+<path d="M5 5h22v22h-22v-22zM7 7v18h8v-18h-8zM17 7v18h8v-18h-8z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/compass.svg b/webapp/assets/_new/icons/svgs/compass.svg
new file mode 100755
index 000000000..935cb5791
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/compass.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>compass</title>
+<path d="M16 3c7.168 0 13 5.832 13 13s-5.832 13-13 13-13-5.832-13-13 5.832-13 13-13zM14.875 5.063c-5.226 0.529-9.341 4.695-9.813 9.938h0.938v2h-0.938c0.475 5.284 4.653 9.462 9.938 9.938v-0.938h2v0.938c5.284-0.475 9.462-4.653 9.938-9.938h-0.938v-2h0.938c-0.475-5.284-4.653-9.462-9.938-9.938v0.938h-2v-0.938c-0.041 0.004-0.084-0.004-0.125 0zM22.094 9.906l-3.688 8.5-8.5 3.688 3.688-8.5zM16 14.5c-0.8 0-1.5 0.7-1.5 1.5s0.7 1.5 1.5 1.5 1.5-0.7 1.5-1.5-0.7-1.5-1.5-1.5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/credit-card.svg b/webapp/assets/_new/icons/svgs/credit-card.svg
new file mode 100755
index 000000000..29c1fb96f
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/credit-card.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>credit-card</title>
+<path d="M5 5h18c1.645 0 3 1.355 3 3v1h1c1.645 0 3 1.355 3 3v12c0 1.645-1.355 3-3 3h-18c-1.645 0-3-1.355-3-3v-1h-1c-1.645 0-3-1.355-3-3v-12c0-1.645 1.355-3 3-3zM5 7c-0.565 0-1 0.435-1 1v12c0 0.565 0.435 1 1 1h18c0.565 0 1-0.435 1-1v-9h-19v-2h19v-1c0-0.565-0.435-1-1-1h-18zM26 11v2h2v-1c0-0.565-0.435-1-1-1h-1zM26 15v5c0 1.645-1.355 3-3 3h-15v1c0 0.565 0.435 1 1 1h18c0.565 0 1-0.435 1-1v-9h-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/crop.svg b/webapp/assets/_new/icons/svgs/crop.svg
new file mode 100755
index 000000000..069de9d1e
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/crop.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>crop</title>
+<path d="M8 4h2v16.563l10.563-10.563h-9.563v-2h11.563l3.719-3.719 1.438 1.438-3.719 3.719v11.563h-2v-9.563l-10.563 10.563h16.563v2h-4v4h-2v-4h-14v-14h-4v-2h4v-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/crosshairs.svg b/webapp/assets/_new/icons/svgs/crosshairs.svg
new file mode 100755
index 000000000..6d8b9aa04
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/crosshairs.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>crosshairs</title>
+<path d="M15 3h2v2.063c5.268 0.477 9.46 4.67 9.938 9.938h2.063v2h-2.063c-0.477 5.268-4.67 9.46-9.938 9.938v2.063h-2v-2.063c-5.268-0.477-9.46-4.67-9.938-9.938h-2.063v-2h2.063c0.477-5.268 4.67-9.46 9.938-9.938v-2.063zM15 7.031c-4.193 0.453-7.515 3.776-7.969 7.969h1.969v2h-1.969c0.453 4.193 3.776 7.515 7.969 7.969v-1.969h2v1.969c4.193-0.453 7.515-3.776 7.969-7.969h-1.969v-2h1.969c-0.453-4.193-3.776-7.515-7.969-7.969v1.969h-2v-1.969z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cube.svg b/webapp/assets/_new/icons/svgs/cube.svg
new file mode 100755
index 000000000..97fbdf121
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cube.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>cube</title>
+<path d="M16 4.406l0.406 0.188 10 4.5 0.594 0.25v12.688l-0.5 0.281-10.5 5.844-0.5-0.281-10.5-5.844v-12.688l0.594-0.25 10-4.5zM16 6.594l-7.688 3.438 7.688 3.844 7.688-3.844zM7 11.625v9.219l8 4.438v-9.656zM25 11.625l-8 4v9.656l8-4.438v-9.219z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cubes.svg b/webapp/assets/_new/icons/svgs/cubes.svg
new file mode 100755
index 000000000..aeb3d66d1
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cubes.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>cubes</title>
+<path d="M16 4l0.375 0.156 6.625 2.656v6.719l5.406 2.344 0.594 0.281v8.063l-0.5 0.313-6 3.344-0.469 0.25-0.469-0.219-5.563-2.781-5.563 2.781-0.469 0.219-0.469-0.25-6-3.344-0.5-0.313v-8.063l0.594-0.281 5.406-2.344v-6.719l6.625-2.656zM16 6.188l-3.281 1.281 3.281 1.281 3.281-1.281zM11 8.938v4.625l4 1.781v-4.875zM21 8.938l-4 1.531v4.875l4-1.781v-4.625zM10 15.313l-3.625 1.563 3.625 1.813 3.625-1.781zM22 15.313l-2.5 1.094-1.125 0.5 3.625 1.781 3.625-1.813zM5 18.406v4.656l4 2.25v-4.906zM27 18.406l-4 2v4.906l4-2.25v-4.656zM15 18.469l-4 1.938v4.969l4-2v-4.906zM17 18.469v4.906l4 2v-4.969z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/cut.svg b/webapp/assets/_new/icons/svgs/cut.svg
new file mode 100755
index 000000000..f04b85c3b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/cut.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>cut</title>
+<path d="M6 6c2.197 0 4 1.803 4 4 0 0.494-0.115 0.969-0.281 1.406l6.063 3.438 10.219-5.844h4l-20.281 11.594c0.166 0.438 0.281 0.913 0.281 1.406 0 2.197-1.803 4-4 4s-4-1.803-4-4 1.803-4 4-4c0.981 0 1.864 0.375 2.563 0.969l5.156-2.938-5.219-2.969c-0.691 0.568-1.543 0.938-2.5 0.938-2.197 0-4-1.803-4-4s1.803-4 4-4zM6 8c-0.977 0-1.784 0.677-1.969 1.594-0.026 0.131-0.031 0.267-0.031 0.406 0 1.116 0.884 2 2 2s2-0.884 2-2-0.884-2-2-2zM19.094 16.813l10.906 6.188h-4l-8.906-5.094zM6 20c-0.977 0-1.784 0.677-1.969 1.594-0.026 0.131-0.031 0.267-0.031 0.406 0 1.116 0.884 2 2 2s2-0.884 2-2-0.884-2-2-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/dashboard.svg b/webapp/assets/_new/icons/svgs/dashboard.svg
new file mode 100755
index 000000000..74358fd41
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/dashboard.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>dashboard</title>
+<path d="M16 4c6.616 0 12 5.384 12 12s-5.384 12-12 12-12-5.384-12-12 5.384-12 12-12zM16 6c-5.535 0-10 4.465-10 10s4.465 10 10 10 10-4.465 10-10-4.465-10-10-10zM16 7c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM10.344 9.344c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM20.938 9.656l1.438 1.406-4.438 4.438c0.041 0.16 0.063 0.327 0.063 0.5 0 1.105-0.895 2-2 2s-2-0.895-2-2 0.895-2 2-2c0.173 0 0.34 0.021 0.5 0.063zM8 15c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM24 15c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM10.344 20.656c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM21.656 20.656c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/diamond.svg b/webapp/assets/_new/icons/svgs/diamond.svg
new file mode 100755
index 000000000..5cad085d9
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/diamond.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>diamond</title>
+<path d="M9.531 6h12.938l5.313 6.375 0.5 0.594-0.5 0.656-11.781 15-0.781-1-11-14-0.5-0.656 0.5-0.594 5-6zM10.469 8l-3.344 4h4.313l2.688-4h-3.656zM17.875 8l2.688 4h4.313l-3.344-4h-3.656zM16 8.844l-2.125 3.156h4.25zM7.031 14l6.594 8.406-2.375-8.406h-4.219zM13.313 14l2.688 9.313 2.656-9.313h-5.344zM20.75 14l-2.375 8.375 6.594-8.375h-4.219z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/exchange.svg b/webapp/assets/_new/icons/svgs/exchange.svg
new file mode 100755
index 000000000..fc8bfaa48
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/exchange.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>exchange</title>
+<path d="M26.188-1.719l6.719 6.719-6.719 6.719-1.406-1.438 4.281-4.281h-21.063v-2h21.063l-4.281-4.281zM13.813 12.281l1.406 1.438-4.281 4.281h21.063v2h-21.063l4.281 4.281-1.406 1.438-6.719-6.719 0.719-0.719z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/exclamation-triangle.svg b/webapp/assets/_new/icons/svgs/exclamation-triangle.svg
new file mode 100755
index 000000000..aa2f7bbac
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/exclamation-triangle.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>exclamation-triangle</title>
+<path d="M16 3.219l0.875 1.5 12 20.781 0.844 1.5h-27.438l0.844-1.5 12-20.781zM16 7.219l-10.25 17.781h20.5zM15 14h2v6h-2v-6zM15 21h2v2h-2v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/expand.svg b/webapp/assets/_new/icons/svgs/expand.svg
new file mode 100755
index 000000000..dc21a7e24
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/expand.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>expand</title>
+<path d="M14 5h13v13h-2v-9.563l-16.563 16.563h9.563v2h-13v-13h2v9.563l16.563-16.563h-9.563v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/external-link.svg b/webapp/assets/_new/icons/svgs/external-link.svg
new file mode 100755
index 000000000..3d7f95574
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/external-link.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>external-link</title>
+<path d="M18 5h9v9h-2v-5.563l-12.281 12.281-1.438-1.438 12.281-12.281h-5.563v-2zM5 9h13l-2 2h-9v14h14v-9l2-2v13h-18v-18z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/eyedropper.svg b/webapp/assets/_new/icons/svgs/eyedropper.svg
new file mode 100755
index 000000000..6cf4151ed
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/eyedropper.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>eyedropper</title>
+<path d="M24.656 3.031c1.108 0 2.222 0.41 3.063 1.25 1.681 1.681 1.681 4.444 0 6.125l-2.813 2.781 1 1-1.406 1.406-1-1-9.5 9.5c-1.064 1.064-1.845 1.684-2.531 2.063s-1.277 0.493-1.688 0.563-0.636 0.113-1.063 0.344-1.040 0.696-2 1.656l-0.719 0.688-0.719-0.688-2-2-0.688-0.719 0.688-0.719c0.986-0.986 1.475-1.621 1.719-2.063s0.276-0.66 0.344-1.063 0.196-1.011 0.563-1.688 0.96-1.429 2-2.469l9.5-9.5-1-1 1.406-1.406 1 1 2.781-2.813c0.84-0.84 1.954-1.25 3.063-1.25zM24.656 5.031c-0.592 0-1.197 0.228-1.656 0.688l-2.781 2.781 3.281 3.281 2.781-2.781c0.919-0.919 0.919-2.362 0-3.281-0.46-0.46-1.033-0.688-1.625-0.688zM18.813 9.906l-9.5 9.5c-0.96 0.96-1.426 1.605-1.656 2.031s-0.274 0.621-0.344 1.031-0.184 1.033-0.563 1.719c-0.259 0.469-0.859 1.1-1.406 1.719l0.75 0.75c0.601-0.529 1.227-1.126 1.688-1.375 0.677-0.366 1.254-0.463 1.656-0.531s0.621-0.1 1.063-0.344 1.108-0.733 2.094-1.719l9.5-9.5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/facebook.svg b/webapp/assets/_new/icons/svgs/facebook.svg
new file mode 100755
index 000000000..a9e41dfb3
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/facebook.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>facebook</title>
+<path d="M7 5h18c1.093 0 2 0.907 2 2v18c0 1.093-0.907 2-2 2h-18c-1.093 0-2-0.907-2-2v-18c0-1.093 0.907-2 2-2zM7 7v18h9.688v-6.75h-2.625v-3h2.625v-2.25c0-2.583 1.571-3.969 3.875-3.969 1.104 0 2.067 0.057 2.344 0.094v2.719h-1.625c-1.253 0-1.469 0.595-1.469 1.469v1.938h2.969l-0.375 3h-2.594v6.75h5.188v-18h-18z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/female.svg b/webapp/assets/_new/icons/svgs/female.svg
new file mode 100755
index 000000000..2cbe5b470
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/female.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>female</title>
+<path d="M18.125 4h0.594l0.281 0.5 0.938 1.656c1.545 0.156 3.628 0.829 5.438 3.25 2.055 2.749 3.625 7.468 3.625 15.594v1h-9.656c-0.989 0.617-2.104 1-3.344 1s-2.355-0.375-3.344-1h-9.656v-1c0-9.134 1.977-14.423 4.969-17.438s6.852-3.563 10.156-3.563zM17.563 6.063c-2.914 0.059-5.867 0.568-8.188 2.906-2.366 2.384-4.16 6.895-4.313 15.031h5.406c-0.119-0.152-0.233-0.311-0.344-0.469-1.357-1.941-2.125-4.333-2.125-6.531 0-0.783 0.212-1.515 0.625-2.063s0.978-0.894 1.563-1.125c1.169-0.461 2.477-0.521 3.719-0.625s2.43-0.242 3.125-0.563 0.969-0.581 0.969-1.625h2c0 1.66-0.976 2.893-2.156 3.438s-2.492 0.644-3.75 0.75-2.45 0.221-3.156 0.5c-0.353 0.139-0.585 0.292-0.719 0.469s-0.219 0.4-0.219 0.844c0 1.711 0.643 3.824 1.75 5.406s2.587 2.594 4.25 2.594c1.665 0 3.144-1.014 4.25-2.594s1.75-3.684 1.75-5.406h2c0 2.207-0.767 4.624-2.125 6.563-0.102 0.146-0.203 0.297-0.313 0.438h5.375c-0.136-7.17-1.553-11.261-3.156-13.406-1.684-2.253-3.521-2.594-4.531-2.594h-0.594l-0.281-0.5zM13 17c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM19 17c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-archive.svg b/webapp/assets/_new/icons/svgs/file-archive.svg
new file mode 100755
index 000000000..94a1e7ab8
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-archive.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>file-archive-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-7v1h-2v-1h-7zM14 7h2v2h-2v-2zM14 10h2v2h-2v-2zM14 13h2v2.188c1.156 0.418 2 1.52 2 2.813 0 1.645-1.355 3-3 3s-3-1.355-3-3c0-1.292 0.844-2.394 2-2.813v-2.188zM15 17c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-audio.svg b/webapp/assets/_new/icons/svgs/file-audio.svg
new file mode 100755
index 000000000..e253cbf94
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-audio.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>file-audio-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-16zM15 9.719l5.25 1.313-0.5 1.938-2.75-0.688v6.719c0 1.645-1.355 3-3 3s-3-1.355-3-3 1.355-3 3-3c0.353 0 0.684 0.073 1 0.188v-6.469zM14 18c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-code.svg b/webapp/assets/_new/icons/svgs/file-code.svg
new file mode 100755
index 000000000..c241a932b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-code.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>file-code-o</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM15 13h2l-2 12h-2zM11.219 15.375l1.563 1.25-1.969 2.375 1.969 2.375-1.563 1.25-2.5-3-0.531-0.625 0.531-0.625zM18.781 15.375l2.5 3 0.531 0.625-0.531 0.625-2.5 3-1.563-1.25 1.969-2.375-1.969-2.375z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-excel.svg b/webapp/assets/_new/icons/svgs/file-excel.svg
new file mode 100755
index 000000000..77a7a73b0
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-excel.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>file-excel-o</title>
+<path d="M5 3h20v7h-2v-5h-16v5h-2v-7zM7 12h2l1 2 1-2h2l-2 4 2 4h-2l-1-2-1 2h-2l2-4zM14 12h2v6h2v2h-4v-8zM21.5 12c0.733 0 1.402 0.287 1.844 0.75s0.656 1.068 0.656 1.656h-2c0-0.112-0.035-0.22-0.094-0.281s-0.14-0.125-0.406-0.125c-0.217 0-0.5 0.283-0.5 0.5s0.283 0.5 0.5 0.5c1.383 0 2.5 1.117 2.5 2.5 0 1.3-1.081 2.5-2.5 2.5-0.732 0-1.413-0.232-1.875-0.719s-0.625-1.121-0.625-1.688h2c0 0.233 0.049 0.299 0.063 0.313s0.069 0.094 0.438 0.094c0.381 0 0.5-0.2 0.5-0.5 0-0.217-0.283-0.5-0.5-0.5-1.383 0-2.5-1.117-2.5-2.5s1.117-2.5 2.5-2.5zM5 22h2v5h16v-5h2v7h-20v-7z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-image.svg b/webapp/assets/_new/icons/svgs/file-image.svg
new file mode 100755
index 000000000..ba296f51b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-image.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>file-image-o</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM20.094 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM13 15.594l0.719 0.688 2.281 2.281 1.281-1.281 0.719-0.688 0.719 0.688 3 3-1.438 1.438-2.281-2.281-1.281 1.281-0.719 0.688-0.719-0.688-2.281-2.281-3.281 3.281-1.438-1.438 4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-movie.svg b/webapp/assets/_new/icons/svgs/file-movie.svg
new file mode 100755
index 000000000..fd88fd23d
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-movie.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>file-movie-o</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM12 13.219l1.5 0.938 5 3 1.438 0.844-1.438 0.844-5 3-1.5 0.938v-9.563zM14 16.75v2.5l2.094-1.25z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-pdf.svg b/webapp/assets/_new/icons/svgs/file-pdf.svg
new file mode 100755
index 000000000..810128b55
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-pdf.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>file-pdf-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-16zM14.406 10.344h0.031c0.33 0.007 0.656 0.135 0.906 0.344 0.257 0.215 0.428 0.498 0.531 0.781 0.207 0.567 0.235 1.188 0.188 1.906-0.039 0.595-0.326 1.352-0.469 2.031 0.187 0.42 0.248 0.774 0.469 1.188 0.409 0.766 0.86 1.217 1.313 1.813 0.517-0.027 1.127-0.182 1.563-0.125 0.567 0.074 1.089 0.186 1.5 0.625 0.206 0.22 0.369 0.553 0.375 0.875s-0.098 0.607-0.25 0.875v0.031h-0.031c-0.345 0.586-0.969 0.976-1.594 0.938s-1.148-0.368-1.625-0.781c-0.236-0.205-0.429-0.616-0.656-0.875-0.529 0.060-0.906-0.001-1.469 0.125-0.537 0.12-0.902 0.332-1.406 0.5-0.334 0.672-0.599 1.509-0.969 2-0.4 0.531-0.818 0.984-1.406 1.188-0.294 0.102-0.645 0.097-0.969-0.031s-0.566-0.349-0.75-0.625c-0.372-0.529-0.404-1.263-0.125-1.781s0.747-0.887 1.281-1.219c0.496-0.308 1.245-0.45 1.875-0.688 0.276-0.598 0.576-0.984 0.813-1.656 0.275-0.783 0.321-1.455 0.5-2.219-0.35-0.837-0.787-1.712-0.938-2.438-0.128-0.62-0.169-1.181-0.031-1.719 0.069-0.269 0.184-0.535 0.438-0.75 0.246-0.208 0.601-0.317 0.906-0.313zM15.063 17.75c-0.060 0.184-0.061 0.348-0.125 0.531-0.055 0.157-0.13 0.252-0.188 0.406 0.048-0.011 0.077-0.052 0.125-0.063 0.285-0.064 0.499-0.012 0.781-0.063-0.193-0.295-0.413-0.496-0.594-0.813zM18.75 19.781c-0.064-0.008-0.211 0.037-0.281 0.031 0.243 0.17 0.495 0.308 0.563 0.313 0.080 0.005 0.096 0.018 0.219-0.188 0.012-0.021-0.007-0.015 0-0.031-0.045-0.019-0.163-0.081-0.5-0.125zM11.75 21.344c-0.031 0.019-0.095 0.044-0.125 0.063-0.409 0.254-0.646 0.522-0.719 0.656s-0.103 0.072 0 0.219h0.031c0.020 0.030-0.012 0.018 0 0.031 0.071-0.030 0.351-0.219 0.656-0.625 0.054-0.072 0.101-0.262 0.156-0.344z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-photo.svg b/webapp/assets/_new/icons/svgs/file-photo.svg
new file mode 100755
index 000000000..c67616527
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-photo.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>file-photo-o</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM20.094 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM13 15.594l0.719 0.688 2.281 2.281 1.281-1.281 0.719-0.688 0.719 0.688 3 3-1.438 1.438-2.281-2.281-1.281 1.281-0.719 0.688-0.719-0.688-2.281-2.281-3.281 3.281-1.438-1.438 4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-picture.svg b/webapp/assets/_new/icons/svgs/file-picture.svg
new file mode 100755
index 000000000..e16498317
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-picture.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>file-picture-o</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM20.094 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM13 15.594l0.719 0.688 2.281 2.281 1.281-1.281 0.719-0.688 0.719 0.688 3 3-1.438 1.438-2.281-2.281-1.281 1.281-0.719 0.688-0.719-0.688-2.281-2.281-3.281 3.281-1.438-1.438 4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-powerpoint.svg b/webapp/assets/_new/icons/svgs/file-powerpoint.svg
new file mode 100755
index 000000000..8df8f896b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-powerpoint.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>file-powerpoint-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-16zM12 11h4c2.21 0 4 1.79 4 4s-1.79 4-4 4c-0.74 0-1.406-0.244-2-0.594v3.594h-2v-7h2c0 1.19 0.81 2 2 2s2-0.81 2-2-0.81-2-2-2h-4v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-sound.svg b/webapp/assets/_new/icons/svgs/file-sound.svg
new file mode 100755
index 000000000..cb9b5dc76
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-sound.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>file-sound-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-16zM15 9.719l5.25 1.313-0.5 1.938-2.75-0.688v6.719c0 1.645-1.355 3-3 3s-3-1.355-3-3 1.355-3 3-3c0.353 0 0.684 0.073 1 0.188v-6.469zM14 18c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-text.svg b/webapp/assets/_new/icons/svgs/file-text.svg
new file mode 100755
index 000000000..38d75ef65
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-text.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>file-text</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM10 13h10v2h-10v-2zM10 17h10v2h-10v-2zM10 21h10v2h-10v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-video.svg b/webapp/assets/_new/icons/svgs/file-video.svg
new file mode 100755
index 000000000..4a6db285b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-video.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>file-video-o</title>
+<path d="M5 3h13.406l0.313 0.281 6 6 0.281 0.313v19.406h-20v-26zM7 5v22h16v-16h-6v-6h-10zM19 6.438v2.563h2.563zM12 13.219l1.5 0.938 5 3 1.438 0.844-1.438 0.844-5 3-1.5 0.938v-9.563zM14 16.75v2.5l2.094-1.25z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-word.svg b/webapp/assets/_new/icons/svgs/file-word.svg
new file mode 100755
index 000000000..c8447a696
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-word.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>file-word-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-16zM17 12h4v2h-2v4.5c0 1.383-1.117 2.5-2.5 2.5-0.386 0-0.604-0.283-0.906-0.469-0.408 0.824-1.11 1.469-2.094 1.469-1.383 0-2.5-1.117-2.5-2.5v-4.5h-2v-2h4v6.5c0 0.217 0.283 0.5 0.5 0.5s0.5-0.283 0.5-0.5v-4.5h2v2s0.007 0.652 0.156 1.25c0.075 0.299 0.198 0.577 0.281 0.688s0.021 0.063 0.063 0.063c0.217 0 0.5-0.283 0.5-0.5v-6.5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/file-zip.svg b/webapp/assets/_new/icons/svgs/file-zip.svg
new file mode 100755
index 000000000..c4eb66dd0
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/file-zip.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>file-zip-o</title>
+<path d="M5 3h20v26h-20v-26zM7 5v22h16v-22h-7v1h-2v-1h-7zM14 7h2v2h-2v-2zM14 10h2v2h-2v-2zM14 13h2v2.188c1.156 0.418 2 1.52 2 2.813 0 1.645-1.355 3-3 3s-3-1.355-3-3c0-1.292 0.844-2.394 2-2.813v-2.188zM15 17c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/files.svg b/webapp/assets/_new/icons/svgs/files.svg
new file mode 100755
index 000000000..602a25658
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/files.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>files-o</title>
+<path d="M4 4h16v3h-2v-1h-12v16h5v2h-7v-20zM12 8h16v20h-16v-20zM14 10v16h12v-16h-12z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/film.svg b/webapp/assets/_new/icons/svgs/film.svg
new file mode 100755
index 000000000..2318d2f73
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/film.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>film</title>
+<path d="M4 4h24v24h-24v-24zM6 6v20h2v-1h2v1h12v-1h2v1h2v-20h-2v1h-2v-1h-12v1h-2v-1h-2zM8 9h2v2h-2v-2zM22 9h2v2h-2v-2zM8 13h2v2h-2v-2zM22 13h2v2h-2v-2zM8 17h2v2h-2v-2zM22 17h2v2h-2v-2zM8 21h2v2h-2v-2zM22 21h2v2h-2v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/fire.svg b/webapp/assets/_new/icons/svgs/fire.svg
new file mode 100755
index 000000000..0d579c495
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/fire.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>fire</title>
+<path d="M13.375 3h1.281l0.281 0.219s2.507 2.024 5 5.094 5.063 7.224 5.063 11.688c0 1.978-0.333 4.263-1.938 6.063-1.369 1.535-3.592 2.567-6.938 2.844-0.085 0.007-0.163 0.025-0.25 0.031-0.283 0.028-0.57 0.063-0.875 0.063-0.097 0-0.186-0.028-0.281-0.031-0.139 0.002-0.263 0.031-0.406 0.031-3.265 0-5.674-1.113-7.188-2.781s-2.125-3.807-2.125-5.813c0-4.244 1.984-7.63 3.969-10.344s3.919-4.935 4.219-6.281zM14.5 5.5c-0.868 1.866-2.366 3.645-3.906 5.75-1.892 2.586-3.594 5.534-3.594 9.156 0 1.595 0.508 3.237 1.625 4.469 0.238 0.262 0.514 0.493 0.813 0.719-0.078-0.193-0.164-0.391-0.219-0.594-0.619-2.311 0.099-5.073 1.969-7.594l0.938-1.281 0.75 1.406c0.511 0.955 1.047 1.345 1.344 1.438s0.424 0.063 0.719-0.281c0.589-0.689 1.141-3.002 0.094-6.406l-0.375-1.281h1.938l0.281 0.344c0.548 0.633 1.188 1.78 1.938 3.406s1.529 3.644 1.938 5.656c0.358 1.761 0.476 3.535-0.063 5.094 0.34-0.241 0.632-0.509 0.875-0.781 1.13-1.267 1.438-2.963 1.438-4.719 0-3.669-2.272-7.509-4.625-10.406-1.705-2.099-3.067-3.383-3.875-4.094zM17.563 17.219c-0.157 1.133-0.503 2.089-1.094 2.781-0.688 0.806-1.824 1.195-2.844 0.875-0.551-0.173-1.025-0.508-1.469-0.969-0.903 1.704-1.324 3.385-1 4.594 0.392 1.464 1.431 2.428 3.594 2.5 0.086 0.003 0.16 0 0.25 0 0.345-0.011 0.686-0.037 1-0.063 0.15-0.018 0.303-0.036 0.438-0.063 1.21-0.239 1.804-0.811 2.188-1.594 0.511-1.044 0.519-2.681 0.156-4.469-0.25-1.23-0.756-2.418-1.219-3.594z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/flask.svg b/webapp/assets/_new/icons/svgs/flask.svg
new file mode 100755
index 000000000..e1ca6bde6
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/flask.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>flask</title>
+<path d="M17 0c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM14 3c0.552 0 1 0.448 1 1h7v2h-1v7.656l6.156 7.938c0.543 0.698 0.844 1.553 0.844 2.438 0 2.185-1.784 3.969-3.969 3.969h-16.063c-2.185 0-3.969-1.784-3.969-3.969 0-0.885 0.301-1.74 0.844-2.438l6.156-7.938v-7.656h-1v-2h3c0-0.552 0.448-1 1-1zM13 6v8.344l-2.844 3.656h11.688l-2.844-3.656v-8.344h-6zM17 10c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM8.594 20l-2.188 2.813c-0.269 0.346-0.406 0.779-0.406 1.219 0 1.105 0.864 1.969 1.969 1.969h16.063c1.105 0 1.969-0.864 1.969-1.969 0-0.439-0.137-0.873-0.406-1.219l-2.188-2.813h-14.813z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/floppy.svg b/webapp/assets/_new/icons/svgs/floppy.svg
new file mode 100755
index 000000000..f924d3bb5
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/floppy.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>floppy-o</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>
diff --git a/webapp/assets/_new/icons/svgs/folder-open.svg b/webapp/assets/_new/icons/svgs/folder-open.svg
new file mode 100755
index 000000000..63a941b71
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/folder-open.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>folder-open</title>
+<path d="M5 3h22v10.406l-0.281 0.313-1.719 1.719v12.563h-6v2.719l-1.219-0.25-12.781-2.656v-24.813zM14.125 5l2.875 0.719v9.344l1.719 1.719 0.281 0.313v8.906h4v-11.406l0.281-0.313 1.719-1.719v-7.563h-10.875zM7 5.281v20.906l10 2.094v-10.344l-1.719-1.719-0.281-0.313v-8.625z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/folder.svg b/webapp/assets/_new/icons/svgs/folder.svg
new file mode 100755
index 000000000..287a37768
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/folder.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>folder</title>
+<path d="M6 3h22v10.406l-0.281 0.313-1.719 1.719v13.563h-20v-26zM8 5v22h16v-11.563l-1.719-1.719-0.281-0.313v-8.406h-14zM24 5v7.563l1 1 1-1v-7.563h-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/frown.svg b/webapp/assets/_new/icons/svgs/frown.svg
new file mode 100755
index 000000000..a03906c69
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/frown.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>frown-o</title>
+<path d="M16 4c6.616 0 12 5.384 12 12s-5.384 12-12 12-12-5.384-12-12 5.384-12 12-12zM16 6c-5.535 0-10 4.465-10 10s4.465 10 10 10 10-4.465 10-10-4.465-10-10-10zM11.5 12c0.828 0 1.5 0.672 1.5 1.5s-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5 0.672-1.5 1.5-1.5zM20.5 12c0.828 0 1.5 0.672 1.5 1.5s-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5 0.672-1.5 1.5-1.5zM16 18c2.667 0 5.020 1.335 6.469 3.344l-1.625 1.156c-1.092-1.514-2.835-2.5-4.844-2.5s-3.752 0.986-4.844 2.5l-1.625-1.156c1.448-2.008 3.801-3.344 6.469-3.344z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/gamepad.svg b/webapp/assets/_new/icons/svgs/gamepad.svg
new file mode 100755
index 000000000..85a2b7434
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/gamepad.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>gamepad</title>
+<path d="M16 7c6.383 0 11.969 2.063 11.969 2.063l0.594 0.219 0.063 0.594 1.344 10.25c0.365 2.835-1.665 5.479-4.5 5.844-2.639 0.34-5.005-1.44-5.625-3.969h-7.688c-0.619 2.529-2.985 4.309-5.625 3.969-2.835-0.365-4.865-3.009-4.5-5.844l1.344-10.25 0.063-0.594 0.594-0.219s5.586-2.063 11.969-2.063zM16 9c-5.486 0-10.007 1.524-10.75 1.781l-1.219 9.625c-0.227 1.763 0.987 3.335 2.75 3.563s3.368-0.987 3.594-2.75l0.031-0.344 0.125-0.875h10.938l0.125 0.875 0.031 0.344c0.227 1.763 1.832 2.977 3.594 2.75 1.763-0.227 2.977-1.8 2.75-3.563l-1.219-9.625c-0.743-0.258-5.264-1.781-10.75-1.781zM9 12h2v2h2v2h-2v2h-2v-2h-2v-2h2v-2zM22 12c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM20 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM24 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM22 16c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/gear.svg b/webapp/assets/_new/icons/svgs/gear.svg
new file mode 100755
index 000000000..f657c9494
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/gear.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>gear</title>
+<path d="M13.188 3h5.625l0.156 0.813 0.594 2.969c0.951 0.374 1.814 0.903 2.594 1.531l2.906-1 0.781-0.25 0.406 0.719 2 3.438 0.406 0.719-0.594 0.531-2.25 1.969c0.084 0.513 0.188 1.022 0.188 1.563s-0.104 1.050-0.188 1.563l2.25 1.969 0.594 0.531-0.406 0.719-2 3.438-0.406 0.719-0.781-0.25-2.906-1c-0.78 0.628-1.642 1.157-2.594 1.531l-0.594 2.969-0.156 0.813h-5.625l-0.156-0.813-0.594-2.969c-0.951-0.374-1.814-0.903-2.594-1.531l-2.906 1-0.781 0.25-0.406-0.719-2-3.438-0.406-0.719 0.594-0.531 2.25-1.969c-0.084-0.513-0.188-1.022-0.188-1.563s0.104-1.050 0.188-1.563l-2.25-1.969-0.594-0.531 0.406-0.719 2-3.438 0.406-0.719 0.781 0.25 2.906 1c0.78-0.628 1.642-1.157 2.594-1.531l0.594-2.969zM14.813 5l-0.5 2.594-0.125 0.594-0.563 0.188c-1.138 0.355-2.169 0.955-3.031 1.75l-0.438 0.406-0.563-0.188-2.531-0.875-1.188 2.031 2 1.781 0.469 0.375-0.156 0.594c-0.128 0.57-0.188 1.153-0.188 1.75s0.060 1.18 0.188 1.75l0.156 0.594-0.469 0.375-2 1.781 1.188 2.031 2.531-0.875 0.563-0.188 0.438 0.406c0.863 0.795 1.894 1.395 3.031 1.75l0.563 0.188 0.125 0.594 0.5 2.594h2.375l0.5-2.594 0.125-0.594 0.563-0.188c1.138-0.355 2.169-0.955 3.031-1.75l0.438-0.406 0.563 0.188 2.531 0.875 1.188-2.031-2-1.781-0.438-0.375 0.125-0.594c0.128-0.572 0.188-1.153 0.188-1.75s-0.060-1.18-0.188-1.75l-0.156-0.594 0.469-0.375 2-1.781-1.188-2.031-2.531 0.875-0.563 0.188-0.438-0.406c-0.863-0.795-1.894-1.395-3.031-1.75l-0.563-0.188-0.125-0.594-0.5-2.594h-2.375zM16 11c2.75 0 5 2.25 5 5s-2.25 5-5 5-5-2.25-5-5 2.25-5 5-5zM16 13c-1.669 0-3 1.331-3 3s1.331 3 3 3 3-1.331 3-3-1.331-3-3-3z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/gears.svg b/webapp/assets/_new/icons/svgs/gears.svg
new file mode 100755
index 000000000..f9727888d
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/gears.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>gears</title>
+<path d="M21.5 2.5h2v1.406c0.828 0.146 1.586 0.474 2.25 0.938l0.938-0.938 1.406 1.406-0.938 0.938c0.464 0.664 0.792 1.421 0.938 2.25h1.406v2h-1.406c-0.147 0.837-0.466 1.613-0.938 2.281l0.969 1.031-1.469 1.375-0.938-1c-0.656 0.451-1.405 0.763-2.219 0.906v1.406h-2v-1.406c-0.828-0.146-1.586-0.474-2.25-0.938l-1.031 1.063-1.438-1.438 1.063-1.031c-0.464-0.664-0.792-1.421-0.938-2.25h-1.406v-2h1.406c0.143-0.814 0.456-1.563 0.906-2.219l-1-0.938 1.375-1.469 1.031 0.969c0.669-0.471 1.445-0.79 2.281-0.938v-1.406zM22.5 5.813c-2.055 0-3.688 1.632-3.688 3.688s1.632 3.688 3.688 3.688 3.688-1.632 3.688-3.688-1.632-3.688-3.688-3.688zM9.531 11.719l0.719 1.813c0.53-0.132 1.087-0.219 1.656-0.219 0.571 0 1.126 0.085 1.656 0.219l0.719-1.813 1.844 0.75-0.719 1.813c0.944 0.571 1.742 1.372 2.313 2.313l1.813-0.719 0.75 1.844-1.813 0.719c0.132 0.529 0.219 1.087 0.219 1.656s-0.086 1.126-0.219 1.656l1.813 0.719-0.75 1.844-1.813-0.719c-0.569 0.952-1.367 1.766-2.313 2.344l0.719 1.781-1.844 0.75-0.719-1.781c-0.529 0.134-1.087 0.219-1.656 0.219-0.573 0-1.123-0.084-1.656-0.219l-0.719 1.781-1.844-0.75 0.719-1.781c-0.961-0.577-1.765-1.384-2.344-2.344l-1.781 0.719-0.75-1.844 1.781-0.719c-0.134-0.53-0.219-1.087-0.219-1.656s0.085-1.128 0.219-1.656l-1.781-0.719 0.75-1.844 1.781 0.719c0.577-0.945 1.392-1.743 2.344-2.313l-0.719-1.813zM11.906 15.313c-2.663 0-4.813 2.118-4.813 4.781s2.15 4.813 4.813 4.813 4.781-2.15 4.781-4.813-2.118-4.781-4.781-4.781z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/gift.svg b/webapp/assets/_new/icons/svgs/gift.svg
new file mode 100755
index 000000000..355dc7b08
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/gift.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>gift</title>
+<path d="M12 5c1.749 0 2.939 1.329 3.719 2.438 0.104 0.148 0.189 0.293 0.281 0.438 0.092-0.145 0.177-0.289 0.281-0.438 0.779-1.108 1.97-2.438 3.719-2.438 1.645 0 3 1.355 3 3 0 0.353-0.073 0.684-0.188 1h5.188v6h-1v13h-22v-13h-1v-6h5.188c-0.114-0.316-0.188-0.647-0.188-1 0-1.645 1.355-3 3-3zM12 7c-0.565 0-1 0.435-1 1s0.435 1 1 1h2.313c-0.121-0.206-0.097-0.22-0.25-0.438-0.627-0.892-1.436-1.563-2.063-1.563zM20 7c-0.626 0-1.436 0.671-2.063 1.563-0.153 0.217-0.129 0.232-0.25 0.438h2.313c0.565 0 1-0.435 1-1s-0.435-1-1-1zM6 11v2h9v-1h2v1h9v-2h-20zM7 15v11h8v-10h2v10h8v-11h-18z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/github.svg b/webapp/assets/_new/icons/svgs/github.svg
new file mode 100755
index 000000000..1d61e0788
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/github.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>github</title>
+<path d="M15.999 4c6.628 0 12.001 5.373 12.001 12.001 0 5.3-3.435 9.794-8.2 11.385-0.609 0.117-0.825-0.256-0.825-0.577 0-0.394 0.015-1.688 0.015-3.292 0-1.119-0.384-1.852-0.815-2.222 2.673-0.297 5.479-1.311 5.479-5.921 0-1.31-0.464-2.381-1.233-3.22 0.124-0.304 0.536-1.524-0.119-3.176 0 0-1.006-0.323-3.297 1.23-0.958-0.266-1.985-0.399-3.004-0.404-1.020 0.005-2.047 0.138-3.004 0.404-2.292-1.553-3.3-1.23-3.3-1.23-0.653 1.652-0.241 2.872-0.118 3.176-0.767 0.839-1.235 1.91-1.235 3.22 0 4.599 2.801 5.628 5.466 5.931-0.343 0.3-0.653 0.829-0.762 1.604-0.683 0.307-2.422 0.837-3.492-0.997 0 0-0.634-1.152-1.838-1.237 0 0-1.172-0.016-0.082 0.729 0 0 0.786 0.369 1.332 1.755 0 0 0.704 2.334 4.042 1.609 0.006 1.001 0.016 1.756 0.016 2.041 0 0.318-0.219 0.688-0.819 0.578-4.769-1.587-8.207-6.085-8.207-11.386 0-6.628 5.373-12.001 11.999-12.001z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/glass.svg b/webapp/assets/_new/icons/svgs/glass.svg
new file mode 100755
index 000000000..c2a18e99f
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/glass.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>glass</title>
+<path d="M8.25 5h15.5l0.25 0.594c0.585 1.326 1 3.076 1 5.406 0 4.616-3.516 8.431-8 8.938v6.063h5v2h-12v-2h5v-6.063c-4.484-0.506-8-4.322-8-8.938 0-2.325 0.413-4.077 1-5.406zM9.656 7c-0.362 1.001-0.656 2.235-0.656 4 0 3.877 3.123 7 7 7 3.535 0 6.421-2.603 6.906-6h-11.906v-2h11.938c-0.081-1.241-0.277-2.207-0.563-3h-12.719z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/group.svg b/webapp/assets/_new/icons/svgs/group.svg
new file mode 100755
index 000000000..efb1c6184
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/group.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>group</title>
+<path d="M8 7c3.302 0 6 2.698 6 6 0 1.984-0.975 3.75-2.469 4.844 1.459 0.725 2.68 1.862 3.469 3.281 0.789-1.42 2.010-2.557 3.469-3.281-1.494-1.094-2.469-2.86-2.469-4.844 0-3.302 2.698-6 6-6s6 2.698 6 6c0 1.984-0.975 3.75-2.469 4.844 2.638 1.31 4.469 4.020 4.469 7.156h-2c0-3.326-2.674-6-6-6s-6 2.674-6 6h-2c0-3.326-2.674-6-6-6s-6 2.674-6 6h-2c0-3.136 1.831-5.846 4.469-7.156-1.494-1.094-2.469-2.86-2.469-4.844 0-3.302 2.698-6 6-6zM8 9c-2.221 0-4 1.779-4 4s1.779 4 4 4 4-1.779 4-4-1.779-4-4-4zM22 9c-2.221 0-4 1.779-4 4s1.779 4 4 4 4-1.779 4-4-1.779-4-4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/hand-down.svg b/webapp/assets/_new/icons/svgs/hand-down.svg
new file mode 100755
index 000000000..1a06a97fd
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/hand-down.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>hand-o-down</title>
+<path d="M10 2h16v16.844c0 1.409-0.998 2.642-2.375 2.938l-7.625 1.656v3.563c0 1.645-1.355 3-3 3s-3-1.355-3-3v-10.75l-0.75 0.188c-0.156 0.203-0.224 0.331-0.625 0.625-0.642 0.47-1.633 0.938-2.969 0.938-1.426 0.002-2.656-1.29-2.656-2.906v-0.406l0.281-0.313 6.719-6.781v-5.594zM12 4v3h12v-3h-12zM11.406 9l-6.313 6.406c0.082 0.421 0.255 0.594 0.563 0.594 0.903 0 1.459-0.273 1.813-0.531s0.438-0.438 0.438-0.438l0.188-0.344 0.406-0.125 2.25-0.594 1.25-0.313v13.344c0 0.565 0.435 1 1 1s1-0.435 1-1v-5.188l0.781-0.188 8.438-1.781c0.467-0.1 0.781-0.523 0.781-1v-9.844h-12.594z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/hand-left.svg b/webapp/assets/_new/icons/svgs/hand-left.svg
new file mode 100755
index 000000000..49fb68314
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/hand-left.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>hand-o-left</title>
+<path d="M16.906 3h0.406l0.313 0.281 6.781 6.719h5.594v16h-16.844c-1.409 0-2.642-0.998-2.938-2.375l-1.656-7.625h-3.563c-1.645 0-3-1.355-3-3s1.355-3 3-3h10.75l-0.188-0.75c-0.203-0.156-0.331-0.224-0.625-0.625-0.47-0.642-0.938-1.633-0.938-2.969-0.002-1.426 1.29-2.656 2.906-2.656zM16.594 5.094c-0.421 0.082-0.594 0.255-0.594 0.563 0 0.903 0.273 1.459 0.531 1.813s0.438 0.438 0.438 0.438l0.344 0.188 0.125 0.406 0.594 2.25 0.313 1.25h-13.344c-0.565 0-1 0.435-1 1s0.435 1 1 1h5.188l0.188 0.781 1.781 8.438c0.1 0.467 0.523 0.781 1 0.781h9.844v-12.594zM25 12v12h3v-12h-3z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/hand-pointer.svg b/webapp/assets/_new/icons/svgs/hand-pointer.svg
index bdd2c8fe0..e74339724 100644
--- a/webapp/assets/_new/icons/svgs/hand-pointer.svg
+++ b/webapp/assets/_new/icons/svgs/hand-pointer.svg
@@ -1,5 +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>hand-pointer-o</title>
-<path  d="M13 2c1.645 0 3 1.355 3 3v4.188c0.316-0.114 0.647-0.188 1-0.188 0.767 0 1.467 0.3 2 0.781 0.533-0.481 1.233-0.781 2-0.781 1.395 0 2.578 0.982 2.906 2.281 0.368-0.163 0.762-0.281 1.188-0.281 1.645 0 3 1.355 3 3v7.813c0 4.533-3.654 8.188-8.188 8.188h-1.719c-1.935 0-3.651-0.675-5-1.688l-0.031-0.063-0.063-0.031-8.188-8.094v-0.031c-1.154-1.154-1.154-3.034 0-4.188s3.034-1.154 4.188 0l0.25 0.219 0.656 0.688v-11.813c0-1.645 1.355-3 3-3zM13 4c-0.555 0-1 0.445-1 1v16.625l-4.313-4.313c-0.446-0.446-0.929-0.446-1.375 0s-0.446 0.929 0 1.375l8.094 8c1.051 0.788 2.317 1.313 3.781 1.313h1.719c3.467 0 6.188-2.721 6.188-6.188v-7.813c0-0.555-0.445-1-1-1s-1 0.445-1 1v2h-2.094v-4c0-0.555-0.445-1-1-1s-1 0.445-1 1v4h-2v-4c0-0.555-0.445-1-1-1s-1 0.445-1 1v4h-2v-11c0-0.555-0.445-1-1-1z"></path>
+<path d="M13 2c1.645 0 3 1.355 3 3v4.188c0.316-0.114 0.647-0.188 1-0.188 0.767 0 1.467 0.3 2 0.781 0.533-0.481 1.233-0.781 2-0.781 1.395 0 2.578 0.982 2.906 2.281 0.368-0.163 0.762-0.281 1.188-0.281 1.645 0 3 1.355 3 3v7.813c0 4.533-3.654 8.188-8.188 8.188h-1.719c-1.935 0-3.651-0.675-5-1.688l-0.031-0.063-0.063-0.031-8.188-8.094v-0.031c-1.154-1.154-1.154-3.034 0-4.188s3.034-1.154 4.188 0l0.25 0.219 0.656 0.688v-11.813c0-1.645 1.355-3 3-3zM13 4c-0.555 0-1 0.445-1 1v16.625l-4.313-4.313c-0.446-0.446-0.929-0.446-1.375 0s-0.446 0.929 0 1.375l8.094 8c1.051 0.788 2.317 1.313 3.781 1.313h1.719c3.467 0 6.188-2.721 6.188-6.188v-7.813c0-0.555-0.445-1-1-1s-1 0.445-1 1v2h-2.094v-4c0-0.555-0.445-1-1-1s-1 0.445-1 1v4h-2v-4c0-0.555-0.445-1-1-1s-1 0.445-1 1v4h-2v-11c0-0.555-0.445-1-1-1z"></path>
 </svg>
diff --git a/webapp/assets/_new/icons/svgs/hand-right.svg b/webapp/assets/_new/icons/svgs/hand-right.svg
new file mode 100755
index 000000000..c165ea020
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/hand-right.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>hand-o-right</title>
+<path d="M14.688 3h0.406c1.616 0 2.908 1.23 2.906 2.656 0 1.336-0.468 2.327-0.938 2.969-0.294 0.401-0.422 0.469-0.625 0.625l-0.188 0.75h10.75c1.645 0 3 1.355 3 3s-1.355 3-3 3h-3.563l-1.656 7.625c-0.296 1.377-1.529 2.375-2.938 2.375h-16.844v-16h5.594l6.781-6.719zM15.406 5.094l-6.406 6.313v12.594h9.844c0.477 0 0.9-0.314 1-0.781l1.781-8.438 0.188-0.781h5.188c0.565 0 1-0.435 1-1s-0.435-1-1-1h-13.344l0.313-1.25 0.594-2.25 0.125-0.406 0.344-0.188s0.179-0.084 0.438-0.438 0.531-0.91 0.531-1.813c0-0.308-0.172-0.481-0.594-0.563zM4 12v12h3v-12h-3z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/hand-stop.svg b/webapp/assets/_new/icons/svgs/hand-stop.svg
new file mode 100755
index 000000000..dbf393138
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/hand-stop.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>hand-stop-o</title>
+<path d="M16 2c1.381 0 2.533 0.97 2.875 2.25 0.351-0.146 0.724-0.25 1.125-0.25 1.645 0 3 1.355 3 3v1.188c0.316-0.114 0.647-0.188 1-0.188 1.645 0 3 1.355 3 3v12c0 3.854-3.146 7-7 7h-4.625c-1.919 0-3.543-0.923-4.719-2.094l-6.781-6.781c-1.163-1.163-1.163-3.087 0-4.25s3.087-1.163 4.25 0l0.875 0.875v-10.75c0-1.645 1.355-3 3-3 0.401 0 0.774 0.104 1.125 0.25 0.342-1.28 1.494-2.25 2.875-2.25zM16 4c-0.565 0-1 0.435-1 1v10h-2v-8c0-0.565-0.435-1-1-1s-1 0.435-1 1v15.594l-1.719-1.719-2.563-2.594c-0.399-0.399-1.039-0.399-1.438 0s-0.399 1.039 0 1.438l6.813 6.75c0.913 0.909 2.009 1.531 3.281 1.531h4.625c2.774 0 5-2.226 5-5v-12c0-0.565-0.435-1-1-1s-1 0.435-1 1v4h-2v-8c0-0.565-0.435-1-1-1s-1 0.435-1 1v8h-2v-10c0-0.565-0.435-1-1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/hand-up.svg b/webapp/assets/_new/icons/svgs/hand-up.svg
new file mode 100755
index 000000000..472c8435d
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/hand-up.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>hand-o-up</title>
+<path d="M13 2c1.645 0 3 1.355 3 3v3.563l7.625 1.656c1.377 0.296 2.375 1.529 2.375 2.938v16.844h-16v-5.594l-6.719-6.781-0.281-0.313v-0.406c0-1.616 1.23-2.908 2.656-2.906 1.336 0 2.327 0.468 2.969 0.938 0.401 0.294 0.469 0.422 0.625 0.625l0.75 0.188v-10.75c0-1.645 1.355-3 3-3zM13 4c-0.565 0-1 0.435-1 1v13.344l-1.25-0.313-2.25-0.594-0.406-0.125-0.188-0.344s-0.084-0.179-0.438-0.438-0.91-0.531-1.813-0.531c-0.308-0-0.481 0.172-0.563 0.594l6.313 6.406h12.594v-9.844c0-0.477-0.314-0.9-0.781-1l-8.438-1.781-0.781-0.188v-5.188c0-0.565-0.435-1-1-1zM12 25v3h12v-3h-12z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/headphones.svg b/webapp/assets/_new/icons/svgs/headphones.svg
new file mode 100755
index 000000000..a197eca3a
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/headphones.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>headphones</title>
+<path d="M16 5c6.063 0 11 4.937 11 11v8c0 1.645-1.355 3-3 3h-3v-9h4v-2c0-4.983-4.017-9-9-9s-9 4.017-9 9v2h4v9h-3c-1.645 0-3-1.355-3-3v-8c0-6.063 4.937-11 11-11zM7 20v4c0 0.565 0.435 1 1 1h1v-5h-2zM23 20v5h1c0.565 0 1-0.435 1-1v-4h-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/heart.svg b/webapp/assets/_new/icons/svgs/heart.svg
new file mode 100755
index 000000000..64f1195b1
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/heart.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>heart</title>
+<path d="M22.5 5c4.136 0 7.5 3.364 7.5 7.5 0 2.59-2.365 4.947-2.466 5.047l-11.534 11.534-11.54-11.54c-0.095-0.094-2.46-2.451-2.46-5.041 0-4.136 3.364-7.5 7.5-7.5 2.892 0 5.327 1.804 6.5 2.854 1.173-1.050 3.608-2.854 6.5-2.854z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/history.svg b/webapp/assets/_new/icons/svgs/history.svg
new file mode 100755
index 000000000..fd5fcc328
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/history.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>history</title>
+<path d="M16 4c6.616 0 12 5.385 12 12s-5.385 12-12 12-12-5.385-12-12h2c0 5.535 4.465 10 10 10s10-4.465 10-10-4.465-10-10-10c-3.702 0-6.897 2.020-8.625 5h3.625v2h-7v-7h2v3.344c2.153-3.232 5.833-5.344 10-5.344zM15 8h2v7h5v2h-7v-9z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/hourglass.svg b/webapp/assets/_new/icons/svgs/hourglass.svg
new file mode 100755
index 000000000..e5e5ea6a1
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/hourglass.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>hourglass</title>
+<path d="M7 4h18v2h-2v4c0 2.542-1.369 4.774-3.406 6 2.038 1.226 3.406 3.458 3.406 6v4h2v2h-18v-2h2v-4c0-2.542 1.369-4.774 3.406-6-2.038-1.226-3.406-3.458-3.406-6v-4h-2v-2zM11 6v4c0 2.774 2.226 5 5 5s5-2.226 5-5v-4h-10zM16 17c-2.774 0-5 2.226-5 5v4h10v-4c0-2.774-2.226-5-5-5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/inbox.svg b/webapp/assets/_new/icons/svgs/inbox.svg
new file mode 100755
index 000000000..aba1d2eb0
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/inbox.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>inbox</title>
+<path d="M7.156 5h17.688l0.156 0.844 2 13v8.156h-22v-8.156l2-13zM8.875 7l-1.688 11h6.813v1c0 1.117 0.883 2 2 2s2-0.883 2-2v-1h6.813l-1.688-11h-14.25zM7 20v5h18v-5h-5.188c-0.453 1.711-1.966 3-3.813 3s-3.359-1.289-3.813-3h-5.188z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/indent.svg b/webapp/assets/_new/icons/svgs/indent.svg
new file mode 100755
index 000000000..35f087427
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/indent.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>indent</title>
+<path d="M3 7h13v2h-13v-2zM3 11h20v2h-20v-2zM25 11l5 5-5 5v-10zM3 15h20v2h-20v-2zM3 19h20v2h-20v-2zM3 23h13v2h-13v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/info-circle.svg b/webapp/assets/_new/icons/svgs/info-circle.svg
new file mode 100755
index 000000000..f971f5b3a
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/info-circle.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>info-circle</title>
+<path d="M16 3c7.168 0 13 5.832 13 13s-5.832 13-13 13-13-5.832-13-13 5.832-13 13-13zM16 5c-6.087 0-11 4.913-11 11s4.913 11 11 11 11-4.913 11-11-4.913-11-11-11zM15 10h2v2h-2v-2zM15 14h2v8h-2v-8z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/keyboard.svg b/webapp/assets/_new/icons/svgs/keyboard.svg
new file mode 100755
index 000000000..cf49166d4
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/keyboard.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>keyboard-o</title>
+<path d="M2 7h26c1.093 0 2 0.907 2 2v14c0 1.093-0.907 2-2 2h-26c-1.093 0-2-0.907-2-2v-14c0-1.093 0.907-2 2-2zM2 9v14h26v-14h-26zM4 11h2v2h-2v-2zM8 11h2v2h-2v-2zM12 11h2v2h-2v-2zM16 11h2v2h-2v-2zM20 11h2v2h-2v-2zM24 11h2v2h-2v-2zM4 15h4v2h-4v-2zM10 15h2v2h-2v-2zM14 15h2v2h-2v-2zM18 15h2v2h-2v-2zM22 15h4v2h-4v-2zM4 19h4v2h-4v-2zM10 19h10v2h-10v-2zM22 19h4v2h-4v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/leaf.svg b/webapp/assets/_new/icons/svgs/leaf.svg
new file mode 100755
index 000000000..52b1693ba
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/leaf.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>leaf</title>
+<path d="M25.031 4l0.313 1.094s1.656 5.616 1.656 13.438c0 3.995-0.921 6.637-2.344 8.281s-3.306 2.188-4.844 2.188c-1.728 0-3.206-0.784-4.375-1.594s-2.165-1.731-2.344-1.844l1.063-1.688c0.704 0.445 1.398 1.177 2.406 1.875s2.173 1.25 3.25 1.25c1.083 0 2.301-0.33 3.313-1.5s1.875-3.282 1.875-6.969c0-6.501-1.022-10.659-1.344-11.875-3.442 1.276-7.451 1.856-10.688 3-1.789 0.632-3.284 1.437-4.313 2.563s-1.656 2.577-1.656 4.781c0 1.938 1.058 3.143 2.219 3.969 0.603 0.429 1.187 0.698 1.625 0.875 1.72-2.744 4.356-6.157 8.438-10.531l1.438 1.375c-6.808 7.295-9.428 11.855-10.375 14.625-0.473 1.385-0.53 2.32-0.5 3s0.217 1.058 0.156 1.781l-2-0.188c-0.002 0.020-0.116-0.597-0.156-1.5s0.047-2.151 0.594-3.75c0.303-0.885 0.756-1.918 1.375-3.063-0.512-0.228-1.12-0.551-1.75-1-1.477-1.051-3.063-2.897-3.063-5.594 0-2.605 0.833-4.643 2.188-6.125s3.168-2.402 5.125-3.094c3.913-1.384 8.509-1.908 11.688-3.313z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/level-up.svg b/webapp/assets/_new/icons/svgs/level-up.svg
new file mode 100755
index 000000000..1c3c82192
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/level-up.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>level-up</title>
+<path d="M16 5.188l4.5 4.813h-3.5v10h-2v-10h-3.5zM5 11h2v14h18v-14h2v16h-22v-16z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/life-ring.svg b/webapp/assets/_new/icons/svgs/life-ring.svg
new file mode 100755
index 000000000..64f4aa7e8
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/life-ring.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>life-ring</title>
+<path d="M16 4c6.616 0 12 5.384 12 12s-5.384 12-12 12-12-5.384-12-12 5.384-12 12-12zM16 6c-0.335 0-0.673 0.030-1 0.063v3.031c0.327-0.047 0.66-0.094 1-0.094s0.673 0.046 1 0.094v-3.031c-0.327-0.032-0.665-0.063-1-0.063zM13 6.438c-3.116 0.976-5.558 3.439-6.531 6.563h3.219c0.692-1.453 1.858-2.618 3.313-3.313v-3.25zM19 6.438v3.25c1.452 0.693 2.62 1.86 3.313 3.313h3.25c-0.975-3.112-3.451-5.588-6.563-6.563zM16 11c-2.773 0-5 2.227-5 5s2.227 5 5 5 5-2.227 5-5-2.227-5-5-5zM6.063 15c-0.032 0.326-0.063 0.665-0.063 1s0.030 0.673 0.063 1h3.031c-0.047-0.327-0.094-0.66-0.094-1 0-0.337 0.016-0.675 0.063-1h-3zM22.906 15c0.047 0.327 0.094 0.66 0.094 1s-0.046 0.673-0.094 1h3.031c0.032-0.327 0.063-0.665 0.063-1s-0.030-0.673-0.063-1h-3.031zM6.438 19c0.975 3.112 3.451 5.588 6.563 6.563v-3.25c-1.452-0.693-2.62-1.86-3.313-3.313h-3.25zM22.313 19c-0.693 1.452-1.86 2.62-3.313 3.313v3.25c3.112-0.975 5.588-3.451 6.563-6.563h-3.25zM15 22.906v3.031c0.327 0.032 0.665 0.063 1 0.063s0.673-0.030 1-0.063v-3.031c-0.327 0.047-0.66 0.094-1 0.094s-0.673-0.046-1-0.094z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/list.svg b/webapp/assets/_new/icons/svgs/list.svg
new file mode 100755
index 000000000..f07692281
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/list.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>list</title>
+<path d="M4 5h6v6h-6v-6zM6 7v2h2v-2h-2zM12 7h15v2h-15v-2zM4 13h6v6h-6v-6zM6 15v2h2v-2h-2zM12 15h15v2h-15v-2zM4 21h6v6h-6v-6zM6 23v2h2v-2h-2zM12 23h15v2h-15v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/location-arrow.svg b/webapp/assets/_new/icons/svgs/location-arrow.svg
new file mode 100755
index 000000000..942a37fa5
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/location-arrow.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>location-arrow</title>
+<path d="M16 4.438l0.906 2.188 8 19 0.906 2.125-2.156-0.813-7.656-2.875-9.813 3.688 0.906-2.125 8-19zM16 9.531l-6.188 14.719 6.188-2.313 0.344 0.125 5.844 2.188z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/magnet.svg b/webapp/assets/_new/icons/svgs/magnet.svg
new file mode 100755
index 000000000..998495351
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/magnet.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>magnet</title>
+<path d="M16 5c6.063 0 11 4.937 11 11v11h-8v-11c0-1.668-1.332-3-3-3s-3 1.332-3 3v11h-8v-11c0-6.063 4.937-11 11-11zM16 7c-4.983 0-9 4.017-9 9v5h4v-5c0-2.749 2.251-5 5-5s5 2.251 5 5v5h4v-5c0-4.983-4.017-9-9-9zM7 23v2h4v-2h-4zM21 23v2h4v-2h-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/male.svg b/webapp/assets/_new/icons/svgs/male.svg
new file mode 100755
index 000000000..5c35184b4
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/male.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>male</title>
+<path d="M17 4h0.625l1.063 2.125c1.277 0.14 2.567 0.598 3.531 1.719 1.138 1.322 1.781 3.332 1.781 6.156v0.906c0.571 0.546 1 1.247 1 2.094 0 1.26-0.891 2.154-2 2.594-0.369 1.168-0.804 2.393-1.25 3.438-0.487 1.141-0.894 2.047-1.5 2.688-2.87 3.036-7.63 3.036-10.5 0-0.606-0.64-1.045-1.547-1.531-2.688-0.446-1.045-0.849-2.27-1.219-3.438-1.109-0.439-2-1.334-2-2.594 0-0.851 0.428-1.549 1-2.094v-0.906c0-3.042 0.821-5.612 2.688-7.375s4.647-2.625 8.313-2.625zM16.406 6.063c-2.973 0.1-5.062 0.789-6.344 2-1.378 1.302-2.063 3.241-2.063 5.938v1.844l-0.5 0.281c-0.307 0.177-0.5 0.501-0.5 0.875 0 0.534 0.384 0.957 0.906 1l0.688 0.031 0.188 0.656c0.37 1.203 0.831 2.474 1.281 3.531s0.967 1.957 1.125 2.125c2.128 2.252 5.497 2.252 7.625 0 0.158-0.168 0.674-1.068 1.125-2.125s0.911-2.328 1.281-3.531l0.188-0.656 0.688-0.031c0.524-0.043 0.906-0.466 0.906-1 0-0.38-0.196-0.699-0.5-0.875l-0.5-0.281v-1.844c0-2.518-0.587-4.001-1.313-4.844-0.352-0.409-0.753-0.691-1.188-0.875 0.024 0.149 0.058 0.291 0.063 0.438 0.019 0.67-0.279 1.354-0.75 1.75-0.941 0.792-2.050 0.727-3.125 0.781s-2.174 0.128-2.813 0.375-0.867 0.389-0.875 1.375h-2c0.013-1.623 1.015-2.808 2.156-3.25s2.365-0.416 3.406-0.469 1.882-0.271 1.969-0.344c0.043-0.037 0.037 0.047 0.031-0.156s-0.135-0.677-0.469-1.344zM12 16c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM18 16c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/map-pin.svg b/webapp/assets/_new/icons/svgs/map-pin.svg
new file mode 100755
index 000000000..dbba740b1
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/map-pin.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>map-pin</title>
+<path d="M16 5c3.854 0 7 3.146 7 7 0 3.514-2.617 6.417-6 6.906v9.094h-2v-9.094c-3.383-0.489-6-3.392-6-6.906 0-3.854 3.146-7 7-7zM16 7c-2.773 0-5 2.227-5 5s2.227 5 5 5 5-2.227 5-5-2.227-5-5-5zM16 8v2c-1.117 0-2 0.883-2 2h-2c0-2.197 1.803-4 4-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/map-signs.svg b/webapp/assets/_new/icons/svgs/map-signs.svg
new file mode 100755
index 000000000..0d46cc195
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/map-signs.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>map-signs</title>
+<path d="M15 5h2v2h8.469l0.281 0.344 3.563 4.156-3.563 4.156-0.281 0.344h-20.469v-9h10v-2zM7 9v5h17.531l2.156-2.5-2.156-2.5h-17.531zM15 17h2v10h-2v-10z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/map.svg b/webapp/assets/_new/icons/svgs/map.svg
new file mode 100755
index 000000000..157a29ea8
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/map.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>map</title>
+<path d="M28 4.469v19.188l-0.594 0.25-7.375 3.156-0.375-0.125-7.625-2.875-6.625 2.844-1.406 0.625v-19.188l0.594-0.25 7.375-3.156 0.375 0.125 7.625 2.875 6.625-2.844zM13 7.438v14.875l6 2.25v-14.875zM11 7.5l-5 2.156v14.844l5-2.156v-14.844zM26 7.5l-5 2.156v14.844l5-2.156v-14.844z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/microphone.svg b/webapp/assets/_new/icons/svgs/microphone.svg
index 121342b70..9a051cebe 100644
--- a/webapp/assets/_new/icons/svgs/microphone.svg
+++ b/webapp/assets/_new/icons/svgs/microphone.svg
@@ -1,4 +1,3 @@
-
 <!-- 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>microphone</title>
diff --git a/webapp/assets/_new/icons/svgs/mobile-phone.svg b/webapp/assets/_new/icons/svgs/mobile-phone.svg
new file mode 100755
index 000000000..542ad25b8
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/mobile-phone.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>mobile-phone</title>
+<path d="M11 4h10c1.645 0 3 1.355 3 3v18c0 1.645-1.355 3-3 3h-10c-1.645 0-3-1.355-3-3v-18c0-1.645 1.355-3 3-3zM11 6c-0.555 0-1 0.445-1 1v18c0 0.555 0.445 1 1 1h10c0.555 0 1-0.445 1-1v-18c0-0.555-0.445-1-1-1h-10zM16 23c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/paperclip.svg b/webapp/assets/_new/icons/svgs/paperclip.svg
new file mode 100755
index 000000000..099453e71
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/paperclip.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>paperclip</title>
+<path d="M21 4c1.39 0 2.789 0.539 3.844 1.594 2.109 2.109 2.109 5.547 0 7.656l-9.375 9.375c-1.246 1.245-3.286 1.245-4.531 0s-1.245-3.286 0-4.531l8.594-8.594 1.406 1.406-8.594 8.594c-0.481 0.481-0.481 1.237 0 1.719 0.481 0.481 1.237 0.481 1.719 0l9.375-9.375c1.345-1.345 1.345-3.499 0-4.844s-3.499-1.345-4.844 0l-9.375 9.375c-2.208 2.208-2.208 5.76 0 7.969 2.208 2.208 5.76 2.208 7.969 0l6.25-6.25 1.406 1.406-6.25 6.25c-2.973 2.972-7.809 2.972-10.781 0s-2.972-7.809 0-10.781l9.375-9.375c1.055-1.055 2.423-1.594 3.813-1.594z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/paste.svg b/webapp/assets/_new/icons/svgs/paste.svg
new file mode 100755
index 000000000..32084e808
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/paste.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>paste</title>
+<path d="M15 3c1.259 0 2.152 0.89 2.594 2h7.406v9h2v16h-14v-2h-8v-23h7.406c0.442-1.11 1.335-2 2.594-2zM15 5c-0.555 0-1 0.445-1 1v1h-3v2h8v-2h-3v-1c0-0.555-0.445-1-1-1zM7 7v19h6v-12h10v-7h-2v4h-12v-4h-2zM15 16v12h10v-12h-10z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/pause.svg b/webapp/assets/_new/icons/svgs/pause.svg
new file mode 100755
index 000000000..ce3acef04
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/pause.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>pause</title>
+<path d="M10 6h2v20h-2v-20zM20 6h2v20h-2v-20z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/pencil.svg b/webapp/assets/_new/icons/svgs/pencil.svg
new file mode 100755
index 000000000..0c1b963f8
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/pencil.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>pencil</title>
+<path d="M24.688 4.031c0.837 0 1.679 0.335 2.313 0.969 1.267 1.267 1.267 3.327 0 4.594l-0.031 0.063-0.063 0.063 0.594 0.594-16.5 16.5-0.313 0.063-5.5 1.094-1.469 0.313 0.313-1.469 1.094-5.5 0.063-0.313 16.5-16.5 0.625 0.594 0.094-0.094c0.633-0.633 1.444-0.969 2.281-0.969zM24.688 6c-0.312 0-0.608 0.14-0.875 0.406l-0.094 0.094 1.781 1.781 0.094-0.094c0.533-0.533 0.533-1.248 0-1.781-0.267-0.267-0.594-0.406-0.906-0.406zM21.719 7.313l-1.469 1.438 3 3 1.438-1.469zM18.875 10.188l-10.469 10.438 1.813 0.406 0.625 0.125 0.125 0.625 0.406 1.813 10.438-10.469zM6.969 22.344l-0.406 2.031 1.063 1.063 2.031-0.406-0.5-2.188z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/phone.svg b/webapp/assets/_new/icons/svgs/phone.svg
new file mode 100755
index 000000000..413c48f16
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/phone.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>phone</title>
+<path d="M8.656 3c0.523 0 1.041 0.189 1.469 0.531l0.063 0.031 0.031 0.031 4.094 4.219-0.031 0.031c0.886 0.826 0.873 2.221 0.031 3.063l-2 2c0.307 0.705 1.146 2.501 2.781 4.063 1.647 1.573 3.371 2.467 4.094 2.813l2-2c0.83-0.83 2.295-0.83 3.125 0l0.031 0.063 4.063 4.063c0.83 0.83 0.83 2.264 0 3.094l-3.156 3.156c-0.938 0.804-2.253 1.093-3.469 0.688h-0.031c-2.347-0.918-7.094-3.001-11.344-7.25-4.233-4.233-6.403-8.916-7.25-11.344-0.002-0.006 0.002-0.025 0-0.031-0.419-1.152-0.12-2.484 0.844-3.375l-0.031-0.031 3.156-3.25 0.063-0.031c0.428-0.342 0.945-0.531 1.469-0.531zM8.656 5c-0.073 0-0.146 0.036-0.219 0.094l-3.094 3.156c-0.355 0.304-0.465 0.906-0.313 1.313 0.758 2.178 2.825 6.669 6.781 10.625 3.924 3.924 8.326 5.86 10.594 6.75 0.584 0.195 1.069 0.115 1.531-0.281l3.063-3.063c0.17-0.17 0.17-0.111 0-0.281l-4.094-4.094c-0.17-0.17-0.142-0.17-0.313 0l-2.969 2.969-0.625-0.281s-2.739-1.16-5.063-3.281l-0.219-0.188c-2.412-2.303-3.563-5.375-3.563-5.375l-0.219-0.625 0.469-0.438 2.5-2.5c0.123-0.123 0.055-0.225 0.063-0.219l-0.094-0.094-4-4.094c-0.072-0.058-0.146-0.094-0.219-0.094z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/photo.svg b/webapp/assets/_new/icons/svgs/photo.svg
new file mode 100755
index 000000000..abc66b8f3
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/photo.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>photo</title>
+<path d="M2 5h28v22h-28v-22zM4 7v12.875l7-7 0.719 0.719 5.75 5.813 4.531-4.531 0.719 0.719 5.281 5.313v-13.906h-24zM24 9c1.105 0 2 0.895 2 2s-0.895 2-2 2-2-0.895-2-2 0.895-2 2-2zM11 15.719l-7 7v2.281h16.188zM22 17.719l-3.125 3.094 4.156 4.188h4.969v-1.281z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/pie-chart.svg b/webapp/assets/_new/icons/svgs/pie-chart.svg
new file mode 100755
index 000000000..1d942226e
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/pie-chart.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>pie-chart</title>
+<path d="M16 3c7.168 0 13 5.832 13 13s-5.832 13-13 13-13-5.832-13-13 5.832-13 13-13zM14.875 5.063c-5.555 0.562-9.875 5.231-9.875 10.938 0 6.087 4.913 11 11 11 2.687 0 5.155-0.938 7.063-2.531l-7.781-7.75-0.281-0.313v-11.344c-0.041 0.004-0.084-0.004-0.125 0zM17 5.063v9.938h9.938c-0.475-5.284-4.653-9.462-9.938-9.938zM18.438 17l6.031 6.063c1.393-1.668 2.262-3.768 2.469-6.063h-8.5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/play-circle.svg b/webapp/assets/_new/icons/svgs/play-circle.svg
new file mode 100755
index 000000000..e8b842bf5
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/play-circle.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>play-circle</title>
+<path d="M16 4c6.616 0 12 5.384 12 12s-5.384 12-12 12-12-5.384-12-12 5.384-12 12-12zM16 6c-5.535 0-10 4.465-10 10s4.465 10 10 10 10-4.465 10-10-4.465-10-10-10zM12 9.125l1.5 0.875 9 5.125 1.5 0.875-1.5 0.875-9 5.125-1.5 0.875v-13.75zM14 12.563v6.875l5.969-3.438z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/play.svg b/webapp/assets/_new/icons/svgs/play.svg
new file mode 100755
index 000000000..a0b1eafa2
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/play.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>play</title>
+<path d="M9 5.156l1.531 1 15.313 9.844-16.844 10.844v-21.688zM11 8.813v14.375l11.156-7.188z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/power-off.svg b/webapp/assets/_new/icons/svgs/power-off.svg
new file mode 100755
index 000000000..7b362c167
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/power-off.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>power-off</title>
+<path d="M15 4h2v12h-2v-12zM12 4.688v2.156c-3.526 1.546-6 5.065-6 9.156 0 5.514 4.486 10 10 10s10-4.486 10-10c0-4.091-2.474-7.609-6-9.156v-2.156c4.654 1.651 8 6.099 8 11.313 0 6.617-5.383 12-12 12s-12-5.383-12-12c0-5.213 3.346-9.662 8-11.313z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/print.svg b/webapp/assets/_new/icons/svgs/print.svg
new file mode 100755
index 000000000..a9fc409e2
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/print.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>print</title>
+<path d="M9 4h14v7h2c1.645 0 3 1.355 3 3v10h-5v4h-14v-4h-5v-10c0-1.645 1.355-3 3-3h2v-7zM11 6v5h10v-5h-10zM7 13c-0.565 0-1 0.435-1 1v8h3v-4h14v4h3v-8c0-0.565-0.435-1-1-1h-18zM8 14c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM11 20v6h10v-6h-10z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/recycle.svg b/webapp/assets/_new/icons/svgs/recycle.svg
new file mode 100755
index 000000000..9bbdb3ad3
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/recycle.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>recycle</title>
+<path d="M16 3.969c1.055 0 2.118 0.517 2.75 1.5l3.125 5.063 1.438-0.844v5.313l-4.625-2.594 1.5-0.875-3.125-5c-0.53-0.824-1.553-0.806-2.094 0l-2.813 4.594-1.719-1.031 2.813-4.625c0.632-0.983 1.695-1.5 2.75-1.5zM10.406 12.094v5.313l-1.531-0.938-2.625 4.25v0.031l-0.031 0.031c-0.665 0.968 0.015 2.219 1.281 2.219h5.5v2h-5.5c-2.712 0-4.409-3.084-2.938-5.313 0.012-0.018-0.012-0.045 0-0.063l0.031 0.031 2.563-4.219-1.25-0.75zM25.063 15.656l2.5 4v0.031c1.36 2.312-0.332 5.313-2.969 5.313h-5.594v2l-4.906-3 4.906-3v2h5.594c1.163 0 1.89-1.193 1.25-2.281l-2.5-4z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/refresh.svg b/webapp/assets/_new/icons/svgs/refresh.svg
new file mode 100755
index 000000000..1995ab604
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/refresh.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>refresh</title>
+<path d="M16 4c3.571 0 6.81 1.581 9 4.094v-3.094h2v7h-7v-2h3.938c-1.804-2.41-4.697-4-7.938-4-4.289 0-7.823 2.639-9.281 6.375l-1.844-0.75c1.742-4.464 6.014-7.625 11.125-7.625zM25.281 19.625l1.844 0.75c-1.742 4.464-6.014 7.625-11.125 7.625-3.605 0-6.811-1.614-9-4.094v3.094h-2v-7h7v2h-3.969c1.812 2.388 4.692 4 7.969 4 4.289 0 7.823-2.639 9.281-6.375z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/rocket.svg b/webapp/assets/_new/icons/svgs/rocket.svg
new file mode 100755
index 000000000..f83674f15
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/rocket.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>rocket</title>
+<path d="M25.906 4c0.697 0 1.125 0.031 1.125 0.031l0.906 0.031 0.031 0.906s0.099 1.758-0.094 3.813-0.515 4.453-1.969 5.906c-1.213 1.212-4.488 3.737-7.563 6.094-0.624 0.478-0.607 0.466-1.188 0.906l0.094 1.688c0.068 1.278-0.473 2.507-1.469 3.313l-2.563 2.094-1.281 1.031-0.344-1.625-0.656-3.281-3.844-3.844-3.281-0.656-1.625-0.313 1.031-1.313 2.094-2.563c0.805-0.995 2.034-1.537 3.313-1.469l1.719 0.094c0.43-0.564 0.41-0.55 0.875-1.156 2.353-3.068 4.893-6.331 6.125-7.563 1.466-1.466 3.826-1.81 5.875-2 1.024-0.095 1.99-0.125 2.688-0.125zM25 6c-0.398 0.001-0.91 0.030-1.594 0.094-1.886 0.175-3.973 0.754-4.656 1.438-0.918 0.918-3.626 4.321-5.969 7.375-2.064 2.692-3.463 4.604-3.875 5.156l3.063 3.063c0.544-0.406 2.449-1.862 5.156-3.938 3.062-2.347 6.451-5.046 7.344-5.938 0.651-0.651 1.229-2.761 1.406-4.656 0.129-1.375 0.105-1.982 0.094-2.563-0.288-0.007-0.571-0.033-0.969-0.031zM20.438 9.531c1.117 0 2.031 0.915 2.031 2.031s-0.915 2.031-2.031 2.031-2-0.915-2-2.031 0.883-2.031 2-2.031zM8.5 16.75c-0.64-0.034-1.253 0.253-1.656 0.75l-1.031 1.25 1.344 0.281c0.132-0.176 1.116-1.454 1.719-2.25zM6.219 21.938l1.406 1.406c-0.377 0.377-0.82 1.323-1.125 2.156 0.798-0.29 1.679-0.679 2.125-1.125l1.406 1.406c-0.894 0.894-2.079 1.385-3.063 1.719s-1.781 0.469-1.781 0.469l-1.469 0.281 0.313-1.469s0.155-0.82 0.5-1.813 0.833-2.176 1.688-3.031zM15.219 23.125c-0.797 0.598-2.074 1.588-2.25 1.719l0.281 1.344 1.281-1.031c0.498-0.403 0.753-1.017 0.719-1.656z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/server.svg b/webapp/assets/_new/icons/svgs/server.svg
new file mode 100755
index 000000000..fa00771ea
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/server.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>server</title>
+<path d="M3 6h26v20h-26v-20zM5 8v4h22v-4h-22zM7 9h8v2h-8v-2zM24 9c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM5 14v4h22v-4h-22zM7 15h8v2h-8v-2zM24 15c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM5 20v4h22v-4h-22zM7 21h8v2h-8v-2zM24 21c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/share.svg b/webapp/assets/_new/icons/svgs/share.svg
new file mode 100755
index 000000000..b2fee7622
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/share.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>share</title>
+<path d="M19.719 5.281l8 8 0.688 0.719-0.688 0.719-8 8-1.438-1.438 6.281-6.281h-13.563c-2.774 0-5 2.226-5 5s2.226 5 5 5v2c-3.854 0-7-3.146-7-7s3.146-7 7-7h13.563l-6.281-6.281z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/sort-alpha-asc.svg b/webapp/assets/_new/icons/svgs/sort-alpha-asc.svg
new file mode 100755
index 000000000..f96023d0d
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/sort-alpha-asc.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>sort-alpha-asc</title>
+<path d="M8.188 5h1.625l0.219 0.656 1.938 5.344h0.031v0.063l0.938 2.594 0.063 0.156v1.188h-2v-0.844l-0.406-1.156h-3.188l-0.406 1.156v0.844h-2v-1.188l0.063-0.156 0.938-2.594v-0.063h0.031l1.938-5.344zM22 5h2v18.688l2.594-2.594 1.406 1.406-4.281 4.313-0.719 0.688-0.719-0.688-4.281-4.313 1.406-1.406 2.594 2.594v-18.688zM9 8.656l-0.844 2.344h1.688zM5 17h8v2.406l-0.281 0.313-5.281 5.281h5.563v2h-8v-2.406l0.281-0.313 5.281-5.281h-5.563v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/sort-alpha-desc.svg b/webapp/assets/_new/icons/svgs/sort-alpha-desc.svg
new file mode 100755
index 000000000..461e65611
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/sort-alpha-desc.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>sort-alpha-desc</title>
+<path d="M5 5h8v2.406l-0.281 0.313-5.281 5.281h5.563v2h-8v-2.406l0.281-0.313 5.281-5.281h-5.563v-2zM22 5h2v18.688l2.594-2.594 1.406 1.406-4.281 4.313-0.719 0.688-0.719-0.688-4.281-4.313 1.406-1.406 2.594 2.594v-18.688zM8.188 17h1.625l0.219 0.656 1.938 5.344h0.031v0.063l0.938 2.594 0.063 0.156v1.188h-2v-0.844l-0.406-1.156h-3.188l-0.406 1.156v0.844h-2v-1.188l0.063-0.156 0.938-2.594v-0.063h0.031l1.938-5.344zM9 20.656l-0.844 2.344h1.688z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/sort.svg b/webapp/assets/_new/icons/svgs/sort.svg
new file mode 100755
index 000000000..d7fc07efd
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/sort.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>sort</title>
+<path d="M16 3.594l0.719 0.688 8 8 1.688 1.719h-20.813l1.688-1.719 8-8zM16 6.438l-5.563 5.563h11.125zM5.594 18h20.813l-1.688 1.719-8 8-0.719 0.688-0.719-0.688-8-8zM10.438 20l5.563 5.563 5.563-5.563h-11.125z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/spinner.svg b/webapp/assets/_new/icons/svgs/spinner.svg
new file mode 100755
index 000000000..b5d0cf71a
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/spinner.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>spinner</title>
+<path d="M16 3c1.657 0 3 1.343 3 3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3zM8.938 6.438c1.381 0 2.5 1.119 2.5 2.5s-1.119 2.5-2.5 2.5-2.5-1.119-2.5-2.5 1.119-2.5 2.5-2.5zM23.063 7.938c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1zM6 13.75c1.243 0 2.25 1.007 2.25 2.25s-1.007 2.25-2.25 2.25-2.25-1.007-2.25-2.25 1.007-2.25 2.25-2.25zM26 14.75c0.69 0 1.25 0.56 1.25 1.25s-0.56 1.25-1.25 1.25-1.25-0.56-1.25-1.25 0.56-1.25 1.25-1.25zM8.938 21.063c1.105 0 2 0.895 2 2s-0.895 2-2 2-2-0.895-2-2 0.895-2 2-2zM23.063 21.563c0.828 0 1.5 0.672 1.5 1.5s-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5 0.672-1.5 1.5-1.5zM16 24.25c0.966 0 1.75 0.784 1.75 1.75s-0.784 1.75-1.75 1.75-1.75-0.784-1.75-1.75 0.784-1.75 1.75-1.75z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/star-half-o.svg b/webapp/assets/_new/icons/svgs/star-half-o.svg
new file mode 100755
index 000000000..40070bbef
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/star-half-o.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>star-half-o</title>
+<path d="M16 2.375l0.906 2.031 3.25 7.313 7.938 0.813 2.25 0.25-1.688 1.5-5.906 5.344 1.656 7.813 0.469 2.188-1.969-1.125-6.906-3.969-6.906 3.969-1.938 1.125h-0.031l0.469-2.188 1.656-7.813-5.906-5.344-1.688-1.5 2.25-0.25 7.938-0.813 3.25-7.313zM16 7.281v14.938l0.5 0.281 5.469 3.156-1.313-6.188-0.125-0.563 0.438-0.375 4.719-4.25-6.875-0.719-0.25-0.5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/star-o.svg b/webapp/assets/_new/icons/svgs/star-o.svg
new file mode 100755
index 000000000..3bc7af681
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/star-o.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>star-o</title>
+<path d="M16 2.125l0.906 2.063 3.25 7.281 7.938 0.844 2.25 0.25-1.688 1.5-5.906 5.344 1.656 7.813 0.469 2.188-1.969-1.125-6.906-4-6.906 4-1.969 1.125 0.469-2.188 1.656-7.813-5.906-5.344-1.688-1.5 2.25-0.25 7.938-0.844 3.25-7.281zM16 7.031l-2.563 5.781-0.25 0.531-0.563 0.063-6.281 0.656 4.688 4.219 0.438 0.406-0.125 0.563-1.313 6.156 5.469-3.125 0.5-0.313 0.5 0.313 5.469 3.125-1.313-6.156-0.125-0.563 0.438-0.406 4.688-4.219-6.844-0.719-0.25-0.531z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/star.svg b/webapp/assets/_new/icons/svgs/star.svg
new file mode 100755
index 000000000..5b4236991
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/star.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>star</title>
+<path d="M30.336 12.547l-7.599 6.846 2.122 10.007-8.859-5.111-8.859 5.111 2.122-10.006-7.599-6.847 10.172-1.073 4.164-9.343 4.164 9.343z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/subscript.svg b/webapp/assets/_new/icons/svgs/subscript.svg
new file mode 100755
index 000000000..07663bcc6
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/subscript.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>subscript</title>
+<path d="M4.156 8h6.375l0.313 0.469 1.656 2.563 1.656-2.563 0.313-0.469h6.375l-1 1.531-4.156 6.469 4.156 6.469 1 1.531h-6.375l-0.313-0.469-1.656-2.563-1.656 2.563-0.313 0.469h-6.375l1-1.531 4.156-6.469-4.156-6.469zM7.813 10l3.875 6-0.344 0.531-3.531 5.469h1.656l2.188-3.438 0.844-1.313 0.844 1.313 2.188 3.438h1.656l-3.875-6 0.344-0.531 3.531-5.469h-1.656l-2.188 3.438-0.844 1.313-0.844-1.313-2.188-3.438h-1.656zM24.969 19h0.063c1.626 0 2.969 1.343 2.969 2.969 0 0.976-0.478 1.885-1.281 2.438l-2.125 1.469c-0.041 0.028-0.025 0.093-0.063 0.125h3.469v2h-6v-1c0-1.111 0.553-2.152 1.469-2.781l2.125-1.469c0.263-0.181 0.406-0.463 0.406-0.781 0-0.546-0.423-0.969-0.969-0.969h-0.063c-0.546 0-0.969 0.423-0.969 0.969v0.031h-2v-0.031c0-1.626 1.343-2.969 2.969-2.969z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/sun.svg b/webapp/assets/_new/icons/svgs/sun.svg
new file mode 100755
index 000000000..bddbcebcc
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/sun.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>sun-o</title>
+<path d="M15 3h2v5h-2v-5zM7.5 6.094l3.563 3.531-1.438 1.438-3.531-3.563zM24.5 6.094l1.406 1.406-3.531 3.563-1.438-1.438zM16 9c3.854 0 7 3.146 7 7s-3.146 7-7 7-7-3.146-7-7 3.146-7 7-7zM16 11c-2.773 0-5 2.227-5 5s2.227 5 5 5 5-2.227 5-5-2.227-5-5-5zM3 15h5v2h-5v-2zM24 15h5v2h-5v-2zM9.625 20.938l1.438 1.438-3.563 3.531-1.406-1.406zM22.375 20.938l3.531 3.563-1.406 1.406-3.563-3.531zM15 24h2v5h-2v-5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/superscript.svg b/webapp/assets/_new/icons/svgs/superscript.svg
new file mode 100755
index 000000000..08938a2b5
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/superscript.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>superscript</title>
+<path d="M24.969 3h0.063c1.626 0 2.969 1.343 2.969 2.969 0 0.976-0.478 1.885-1.281 2.438l-2.125 1.469c-0.041 0.028-0.025 0.093-0.063 0.125h3.469v2h-6v-1c0-1.111 0.553-2.152 1.469-2.781l2.125-1.469c0.263-0.181 0.406-0.463 0.406-0.781 0-0.546-0.423-0.969-0.969-0.969h-0.063c-0.546 0-0.969 0.423-0.969 0.969v0.031h-2v-0.031c0-1.626 1.343-2.969 2.969-2.969zM4.156 8h6.375l0.313 0.469 1.656 2.563 1.656-2.563 0.313-0.469h6.375l-1 1.531-4.156 6.469 4.156 6.469 1 1.531h-6.375l-0.313-0.469-1.656-2.563-1.656 2.563-0.313 0.469h-6.375l1-1.531 4.156-6.469-4.156-6.469zM7.813 10l3.875 6-0.344 0.531-3.531 5.469h1.656l2.188-3.438 0.844-1.313 0.844 1.313 2.188 3.438h1.656l-3.875-6 0.344-0.531 3.531-5.469h-1.656l-2.188 3.438-0.844 1.313-0.844-1.313-2.188-3.438h-1.656z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/table.svg b/webapp/assets/_new/icons/svgs/table.svg
new file mode 100755
index 000000000..bdb7c8e7b
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/table.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>table</title>
+<path d="M5 5h22v22h-22v-22zM7 7v5h5v-5h-5zM14 7v5h4v-5h-4zM20 7v5h5v-5h-5zM7 14v4h5v-4h-5zM14 14v4h4v-4h-4zM20 14v4h5v-4h-5zM7 20v5h5v-5h-5zM14 20v5h4v-5h-4zM20 20v5h5v-5h-5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/tablet.svg b/webapp/assets/_new/icons/svgs/tablet.svg
new file mode 100755
index 000000000..7142d4644
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/tablet.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>tablet</title>
+<path d="M5 6h22c1.645 0 3 1.355 3 3v14c0 1.645-1.355 3-3 3h-22c-1.645 0-3-1.355-3-3v-14c0-1.645 1.355-3 3-3zM5 8c-0.555 0-1 0.445-1 1v14c0 0.555 0.445 1 1 1h22c0.555 0 1-0.445 1-1v-14c0-0.555-0.445-1-1-1h-22zM6 15c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/tag.svg b/webapp/assets/_new/icons/svgs/tag.svg
new file mode 100755
index 000000000..875a3be33
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/tag.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>tag</title>
+<path d="M16 5h11v11l-0.281 0.313-12.219 12.094-0.719-0.688-9.5-9.5-0.688-0.719 0.688-0.688 11.406-11.531zM16.844 7l-10.438 10.5 8.094 8.094 10.5-10.438v-8.156h-8.156zM22 9c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/tags.svg b/webapp/assets/_new/icons/svgs/tags.svg
new file mode 100755
index 000000000..f248cc080
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/tags.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>tags</title>
+<path d="M14.594 4h10.406v10.406l-0.281 0.313-11 11-0.719 0.688-0.719-0.688-9-9-0.688-0.719 0.688-0.719 11-11zM15.438 6l-10 10 7.563 7.563 10-10v-7.563h-7.563zM26 7h3v11l-0.281 0.313-11.219 11.094-0.719-0.688-1.938-1.969 1.406-1.406 1.25 1.25 9.5-9.438v-8.156h-1v-2zM20 8c0.552 0 1 0.448 1 1s-0.448 1-1 1-1-0.448-1-1 0.448-1 1-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/terminal.svg b/webapp/assets/_new/icons/svgs/terminal.svg
new file mode 100755
index 000000000..9f336dc12
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/terminal.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>terminal</title>
+<path d="M4 5h24v22h-24v-22zM6 7v2h20v-2h-20zM6 11v14h20v-14h-20zM11.219 13.781l3.5 3.5 0.688 0.719-0.688 0.719-3.5 3.5-1.438-1.438 2.781-2.781-2.781-2.781zM16 20h6v2h-6v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/ticket.svg b/webapp/assets/_new/icons/svgs/ticket.svg
new file mode 100755
index 000000000..5e7cfb92c
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/ticket.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>ticket</title>
+<path d="M2 7h28v7h-1c-1.19 0-2 0.81-2 2s0.81 2 2 2h1v7h-28v-7h1c1.19 0 2-0.81 2-2s-0.81-2-2-2h-1v-7zM4 9v3.188c1.715 0.451 3 1.955 3 3.813s-1.285 3.362-3 3.813v3.188h24v-3.188c-1.715-0.451-3-1.955-3-3.813s1.285-3.362 3-3.813v-3.188h-24z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/toggle-off.svg b/webapp/assets/_new/icons/svgs/toggle-off.svg
new file mode 100755
index 000000000..c69ce1b5f
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/toggle-off.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>toggle-off</title>
+<path d="M9 7h14c4.959 0 9 4.041 9 9s-4.041 9-9 9h-14c-0.94 0-1.835-0.137-2.688-0.406-0.282-0.088-0.543-0.198-0.813-0.313-2.413-1.023-4.298-3.072-5.094-5.594-0.003-0.009 0.003-0.022 0-0.031-0.264-0.845-0.406-1.727-0.406-2.656 0-0.94 0.137-1.835 0.406-2.688 0.088-0.282 0.198-0.543 0.313-0.813 1.023-2.413 3.072-4.298 5.594-5.094 0.282-0.088 0.582-0.159 0.875-0.219 0.585-0.12 1.193-0.188 1.813-0.188zM9 9c-3.635 0-6.612 2.743-6.969 6.281-0.024 0.236-0.031 0.476-0.031 0.719 0 3.878 3.123 7 7 7s7-3.122 7-7-3.122-7-7-7zM14.625 9c2.051 1.652 3.375 4.171 3.375 7s-1.324 5.348-3.375 7h8.375c3.878 0 7-3.122 7-7s-3.122-7-7-7h-8.375z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/toggle-on.svg b/webapp/assets/_new/icons/svgs/toggle-on.svg
new file mode 100755
index 000000000..280c7d249
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/toggle-on.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>toggle-on</title>
+<path d="M9 7h14c4.959 0 9 4.041 9 9s-4.041 9-9 9h-14c-4.962 0-9-4.037-9-9s4.038-9 9-9zM23 9c-3.878 0-7 3.122-7 7s3.122 7 7 7 7-3.122 7-7-3.122-7-7-7z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/undo.svg b/webapp/assets/_new/icons/svgs/undo.svg
new file mode 100755
index 000000000..707b60150
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/undo.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>undo</title>
+<path d="M12.781 5.281l1.438 1.438-6.281 6.281h13.063c3.845 0 7 3.155 7 7v7h-2v-7c0-2.755-2.245-5-5-5h-13.063l6.281 6.281-1.438 1.438-8-8-0.688-0.719 0.688-0.719z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/upload.svg b/webapp/assets/_new/icons/svgs/upload.svg
new file mode 100755
index 000000000..83dfe5bcf
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/upload.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>upload</title>
+<path d="M16 3.594l0.719 0.688 7 7-1.438 1.438-5.281-5.281v16.563h-2v-16.563l-5.281 5.281-1.438-1.438 7-7zM7 26h18v2h-18v-2z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/video-camera.svg b/webapp/assets/_new/icons/svgs/video-camera.svg
new file mode 100755
index 000000000..b6a9cc0df
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/video-camera.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>video-camera</title>
+<path d="M2 8h22v3.375l6-3v15.25l-6-3v3.375h-22v-16zM4 10v12h18v-12h-18zM28 11.625l-4 2v4.75l4 2v-8.75z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/volume-down.svg b/webapp/assets/_new/icons/svgs/volume-down.svg
new file mode 100755
index 000000000..f8b25dc25
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/volume-down.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>volume-down</title>
+<path d="M15 4.594v22.813l-1.719-1.688-4.719-4.719h-4.563v-10h4.563l4.719-4.719zM13 9.438l-3.281 3.281-0.313 0.281h-3.406v6h3.406l0.313 0.281 3.281 3.281v-13.125zM18.5 12.031c0.939 1.059 1.5 2.446 1.5 3.969s-0.561 2.91-1.5 3.969l-1.438-1.438c0.578-0.694 0.938-1.559 0.938-2.531s-0.36-1.837-0.938-2.531z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/volume-off.svg b/webapp/assets/_new/icons/svgs/volume-off.svg
new file mode 100755
index 000000000..daaeb19f5
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/volume-off.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>volume-off</title>
+<path d="M15 4.594v22.813l-1.719-1.688-4.719-4.719h-4.563v-10h4.563l4.719-4.719zM13 9.438l-3.281 3.281-0.313 0.281h-3.406v6h3.406l0.313 0.281 3.281 3.281v-13.125zM20.219 11.781l2.781 2.781 2.781-2.781 1.438 1.438-2.781 2.781 2.781 2.781-1.438 1.438-2.781-2.781-2.781 2.781-1.438-1.438 2.781-2.781-2.781-2.781z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/volume-up.svg b/webapp/assets/_new/icons/svgs/volume-up.svg
new file mode 100755
index 000000000..03816d0d3
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/volume-up.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>volume-up</title>
+<path d="M15 4.594v22.813l-1.719-1.688-4.719-4.719h-4.563v-10h4.563l4.719-4.719zM24.125 6.375c2.385 2.511 3.875 5.896 3.875 9.625s-1.49 7.113-3.875 9.625l-1.406-1.406c2.024-2.149 3.281-5.041 3.281-8.219s-1.257-6.071-3.281-8.219zM21.313 9.188c1.661 1.786 2.688 4.187 2.688 6.813s-1.026 5.026-2.688 6.813l-1.406-1.438c1.3-1.424 2.094-3.3 2.094-5.375s-0.794-3.952-2.094-5.375zM13 9.438l-3.281 3.281-0.313 0.281h-3.406v6h3.406l0.313 0.281 3.281 3.281v-13.125zM18.5 12.031c0.939 1.059 1.5 2.446 1.5 3.969s-0.561 2.91-1.5 3.969l-1.438-1.438c0.578-0.694 0.938-1.559 0.938-2.531s-0.36-1.837-0.938-2.531z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/wheelchair.svg b/webapp/assets/_new/icons/svgs/wheelchair.svg
new file mode 100755
index 000000000..3854969b8
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/wheelchair.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>wheelchair</title>
+<path d="M20 3c1.645 0 3 1.355 3 3s-1.355 3-3 3-3-1.355-3-3 1.355-3 3-3zM20 5c-0.564 0-1 0.436-1 1s0.436 1 1 1 1-0.436 1-1-0.436-1-1-1zM14.531 7.781c0.404-0.046 0.828 0.057 1.188 0.25v-0.031l1.688 0.938c1.306 0.7 1.911 2.262 1.406 3.656l-1.156 3.219c0.683 0.615 1.256 1.349 1.656 2.188h1.875c0.934 0 1.77 0.648 1.969 1.563l1.313 6.094-1.938 0.438-1.344-6.094h-1.281c0.047 0.327 0.094 0.66 0.094 1 0 3.854-3.146 7-7 7s-7-3.146-7-7c0-3.514 2.617-6.417 6-6.906l1.469-4.156-2.281 0.25-2.5 3.844-1.688-1.063 2.5-3.875c0.325-0.504 0.845-0.838 1.438-0.906zM15.531 10.188l-1.438 3.906c0.647 0.102 1.267 0.295 1.844 0.563l1-2.75c0.172-0.474-0.025-0.981-0.469-1.219zM13 16c-2.773 0-5 2.227-5 5s2.227 5 5 5 5-2.227 5-5-2.227-5-5-5z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/wifi.svg b/webapp/assets/_new/icons/svgs/wifi.svg
new file mode 100755
index 000000000..0df70f686
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/wifi.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>wifi</title>
+<path d="M16 7c5.017 0 9.544 2.083 12.813 5.406l-1.406 1.406c-2.905-2.961-6.94-4.813-11.406-4.813s-8.501 1.851-11.406 4.813l-1.406-1.406c3.268-3.323 7.796-5.406 12.813-5.406zM16 12c3.639 0 6.919 1.521 9.281 3.938l-1.406 1.406c-2-2.055-4.788-3.344-7.875-3.344s-5.875 1.288-7.875 3.344l-1.406-1.406c2.362-2.418 5.642-3.938 9.281-3.938zM16 17c2.26 0 4.295 0.956 5.75 2.469l-1.406 1.406c-1.093-1.15-2.635-1.875-4.344-1.875s-3.25 0.725-4.344 1.875l-1.406-1.406c1.456-1.513 3.49-2.469 5.75-2.469zM16 22c0.884 0 1.67 0.392 2.219 1l-2.219 2.219-2.219-2.219c0.549-0.608 1.335-1 2.219-1z"></path>
+</svg>
diff --git a/webapp/assets/_new/icons/svgs/youtube-play.svg b/webapp/assets/_new/icons/svgs/youtube-play.svg
new file mode 100755
index 000000000..80370a4e6
--- /dev/null
+++ b/webapp/assets/_new/icons/svgs/youtube-play.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>youtube-play</title>
+<path d="M16 6c3.766 0 7.094 0.392 9.125 0.688 1.679 0.245 3.035 1.512 3.344 3.188 0.264 1.429 0.531 3.518 0.531 6.125s-0.268 4.697-0.531 6.125c-0.309 1.677-1.664 2.944-3.344 3.188-2.038 0.296-5.379 0.688-9.125 0.688s-7.088-0.392-9.125-0.688c-1.679-0.243-3.034-1.512-3.344-3.188-0.263-1.426-0.531-3.513-0.531-6.125s0.268-4.698 0.531-6.125c0.309-1.675 1.666-2.943 3.344-3.188 2.031-0.296 5.358-0.688 9.125-0.688zM16 8c-3.633 0-6.881 0.37-8.844 0.656-0.846 0.123-1.503 0.761-1.656 1.594-0.243 1.32-0.5 3.271-0.5 5.75s0.257 4.43 0.5 5.75c0.154 0.833 0.811 1.471 1.656 1.594 1.971 0.286 5.233 0.656 8.844 0.656s6.872-0.37 8.844-0.656c0.846-0.123 1.503-0.76 1.656-1.594 0.243-1.322 0.5-3.279 0.5-5.75s-0.256-4.429-0.5-5.75c-0.153-0.833-0.811-1.47-1.656-1.594-1.963-0.286-5.212-0.656-8.844-0.656zM13 10.281l1.5 0.844 7 4 1.5 0.875-1.5 0.875-7 4-1.5 0.844v-11.438zM15 13.719v4.563l3.969-2.281z"></path>
+</svg>

From 618e4c7a67c217b982f10d4010ff6bbc24b19d30 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 12:59:25 +0200
Subject: [PATCH 176/181] Change icons to base-buttons

---
 webapp/components/Chat/Chat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 883067666..72c8adfd4 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -36,7 +36,7 @@
           <ds-flex v-if="singleRoom">
             <ds-flex-item centered class="single-chat-bubble">
               <nuxt-link :to="{ name: 'chat' }">
-                <base-icon name="chat-bubble" />
+                <base-button icon="expand" circle size="small"/>
               </nuxt-link>
             </ds-flex-item>
             <ds-flex-item centered>
@@ -45,7 +45,7 @@
                 @click="$emit('close-single-room', true)"
               >
                 <slot name="menu-icon">
-                  <ds-icon name="close" />
+                  <base-button icon="close" circle size="small"/>
                 </slot>
               </div>
             </ds-flex-item>

From 3e1ed4f1dbe272238a21b027e94c5227a68529da Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 13:37:30 +0200
Subject: [PATCH 177/181] Change color of scroll icon color & scroll counter
 color.

---
 webapp/constants/chat.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index de391707d..70d31a835 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -77,8 +77,8 @@ const STYLE = {
       colorTag: '#0d579c',
       backgroundImage: '#ddd',
       colorNewMessages: styleData.chatNewMessageColor,
-      backgroundScrollCounter: '#0696c7',
-      colorScrollCounter: '#fff',
+      backgroundScrollCounter: styleData.chatRoomBackgroundCounterBadge, // styleData.chatRoomBackgroundCounterBadge,
+      colorScrollCounter: styleData.chatRoomColorCounterBadge, //styleData.chatRoomColorCounterBadge,
       backgroundReaction: '#eee',
       borderStyleReaction: '1px solid #eee',
       backgroundReactionHover: '#fff',

From 790ce71122c5ddf2aaaf1f13c259b253b9e5b3ee Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 13:43:51 +0200
Subject: [PATCH 178/181] Change the button style to small, change position.

---
 webapp/components/Chat/AddChatRoomByUserSearch.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index b48120603..8ab21f06f 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -2,7 +2,7 @@
   <div class="add-chat-room-by-user-search">
     <ds-flex class="headline">
       <h2 class="title">{{ $t('chat.addRoomHeadline') }}</h2>
-      <base-button class="close-button" icon="close" circle @click="closeUserSearch" />
+      <base-button class="close-button" icon="close" circle size="small" @click="closeUserSearch" />
     </ds-flex>
     <ds-space margin-bottom="small" />
     <ds-space>
@@ -62,6 +62,6 @@ export default {
   justify-content: space-between;
 }
 .ds-flex.headline .close-button {
-  margin-top: -6px;
+  margin-top: -2px;
 }
 </style>

From ad74448696eea2f5b9bb6775f86085fd0cd633eb Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 14:00:59 +0200
Subject: [PATCH 179/181] Fix linting.

---
 webapp/components/Chat/Chat.vue | 4 ++--
 webapp/constants/chat.js        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 72c8adfd4..0a1872106 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -36,7 +36,7 @@
           <ds-flex v-if="singleRoom">
             <ds-flex-item centered class="single-chat-bubble">
               <nuxt-link :to="{ name: 'chat' }">
-                <base-button icon="expand" circle size="small"/>
+                <base-button icon="expand" size="small" circle />
               </nuxt-link>
             </ds-flex-item>
             <ds-flex-item centered>
@@ -45,7 +45,7 @@
                 @click="$emit('close-single-room', true)"
               >
                 <slot name="menu-icon">
-                  <base-button icon="close" circle size="small"/>
+                  <base-button icon="close" size="small" circle />
                 </slot>
               </div>
             </ds-flex-item>
diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index 70d31a835..c278dfd62 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -77,8 +77,8 @@ const STYLE = {
       colorTag: '#0d579c',
       backgroundImage: '#ddd',
       colorNewMessages: styleData.chatNewMessageColor,
-      backgroundScrollCounter: styleData.chatRoomBackgroundCounterBadge, // styleData.chatRoomBackgroundCounterBadge,
-      colorScrollCounter: styleData.chatRoomColorCounterBadge, //styleData.chatRoomColorCounterBadge,
+      backgroundScrollCounter: styleData.chatRoomBackgroundCounterBadge,
+      colorScrollCounter: styleData.chatRoomColorCounterBadge,
       backgroundReaction: '#eee',
       borderStyleReaction: '1px solid #eee',
       backgroundReactionHover: '#fff',

From 7443c60d404c478c4cb0cff8c9e633a00aea0d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 26 Jul 2023 14:10:15 +0200
Subject: [PATCH 180/181] Fix create event typing issues

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

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 23941c879..4743a2488 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -782,9 +782,9 @@
     "viewEvent": {
       "eventEnd": "Ende",
       "eventIsOnline": "Online",
-      "eventLocationName": "Stadt - z.B. Musterstraße 1, 12345 Musterstadt",
+      "eventLocationName": "Stadt — z.B. Musterstraße 1, 12345 Musterstadt",
       "eventStart": "Beginn",
-      "eventVenue": "Veranstaltungsort - z.B. Hinterhof, 1. OG, ...",
+      "eventVenue": "Veranstaltungsort — z.B. Hinterhof, 1. OG, …",
       "title": "Veranstaltung"
     },
     "viewPost": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 972a74fe8..752e545ab 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -782,9 +782,9 @@
     "viewEvent": {
       "eventEnd": "End",
       "eventIsOnline": "Online",
-      "eventLocationName": "City - e.g. Example street 1, 12345 City",
+      "eventLocationName": "City — e.g. Example Street 1, 12345 City",
       "eventStart": "Start",
-      "eventVenue": "Venue - e.g. Backyard, 1st Floor, ...",
+      "eventVenue": "Venue — e.g. Backyard, 1st Floor, …",
       "title": "Event"
     },
     "viewPost": {

From d07dbe14a923511533c535e118bda553d667fc3a Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 26 Jul 2023 14:21:05 +0200
Subject: [PATCH 181/181] Change click event layer from div to button.

---
 webapp/components/Chat/Chat.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 0a1872106..c2e767272 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -40,12 +40,14 @@
               </nuxt-link>
             </ds-flex-item>
             <ds-flex-item centered>
-              <div
-                class="vac-svg-button vac-room-options"
-                @click="$emit('close-single-room', true)"
-              >
+              <div class="vac-svg-button vac-room-options">
                 <slot name="menu-icon">
-                  <base-button icon="close" size="small" circle />
+                  <base-button
+                    icon="close"
+                    size="small"
+                    circle
+                    @click="$emit('close-single-room', true)"
+                  />
                 </slot>
               </div>
             </ds-flex-item>