From 460ed9e5c54740c3803b086dfb51ac0d2852299f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 26 Oct 2022 10:54:00 +0200
Subject: [PATCH 1/5] add pages: settings, top storys, favorites

---
 frontend/src/components/Menu/Navbar.spec.js |  1 -
 frontend/src/components/Menu/Navbar.vue     |  4 ----
 frontend/src/components/Menu/Sidebar.vue    |  6 ------
 frontend/src/components/Menu/SidebarNew.vue | 14 ++++----------
 frontend/src/layouts/DashboardLayout.vue    | 19 +------------------
 frontend/src/pages/Favourites.vue           |  8 ++++++++
 frontend/src/pages/Settings.vue             |  8 ++++++++
 frontend/src/pages/TopStorys.vue            |  8 ++++++++
 frontend/src/routes/routes.js               | 21 +++++++++++++++++++++
 9 files changed, 50 insertions(+), 39 deletions(-)
 create mode 100644 frontend/src/pages/Favourites.vue
 create mode 100644 frontend/src/pages/Settings.vue
 create mode 100644 frontend/src/pages/TopStorys.vue

diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 0427f67ee..26722b22b 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -6,7 +6,6 @@ const localVue = global.localVue
 const propsData = {
   balance: 1234,
   visible: false,
-  elopageUri: 'https://elopage.com',
   pending: false,
 }
 
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 3acc043ac..ac58189c2 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -98,10 +98,6 @@ export default {
       type: Number,
       required: true,
     },
-    elopageUri: {
-      type: String,
-      required: false,
-    },
     pending: {
       type: Boolean,
       required: true,
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 1d0925b34..42e3b4186 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -51,12 +51,6 @@
 <script>
 export default {
   name: 'sidebar',
-  props: {
-    elopageUri: {
-      type: String,
-      required: false,
-    },
-  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/Menu/SidebarNew.vue b/frontend/src/components/Menu/SidebarNew.vue
index 3f6a5ef47..2e11b9ae9 100644
--- a/frontend/src/components/Menu/SidebarNew.vue
+++ b/frontend/src/components/Menu/SidebarNew.vue
@@ -8,11 +8,11 @@
             <b-icon icon="house" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.overview') }}</span>
           </b-nav-item>
-          <b-nav-item to="#" class="mb-3">
+          <b-nav-item to="/storys" class="mb-3">
             <b-icon icon="card-heading" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.top_stories') }}</span>
           </b-nav-item>
-          <b-nav-item to="#" class="mb-3">
+          <b-nav-item to="/favourites" class="mb-3">
             <b-icon icon="bookmark" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.favourites') }}</span>
           </b-nav-item>
@@ -29,7 +29,7 @@
             <b-icon icon="person" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.profile') }}</span>
           </b-nav-item>
-          <b-nav-item to="#" class="mb-3">
+          <b-nav-item to="/community" class="mb-3">
             <b-icon icon="people" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.members') }}</span>
           </b-nav-item>
@@ -40,7 +40,7 @@
             <b-icon icon="toggle-off" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.lightmode') }}</span>
           </b-nav-item>
-          <b-nav-item to="#" class="mb-3">
+          <b-nav-item to="/settings" class="mb-3">
             <b-icon icon="gear" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.settings') }}</span>
           </b-nav-item>
@@ -60,12 +60,6 @@
 <script>
 export default {
   name: 'sidebar',
-  props: {
-    elopageUri: {
-      type: String,
-      required: false,
-    },
-  },
 }
 </script>
 <style>
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index 4977c6d92..f6d7ad7d5 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -35,12 +35,7 @@
               @admin="admin"
               @logout="logout"
             /> -->
-            <sidebar-new
-              class="main-sidebar"
-              :elopageUri="elopageUri"
-              @admin="admin"
-              @logout="logout"
-            />
+            <sidebar-new class="main-sidebar" @admin="admin" @logout="logout" />
           </b-col>
           <b-col
             cols="12"
@@ -193,18 +188,6 @@ export default {
       this.hamburger ? (this.hamburger = false) : (this.hamburger = true)
     },
   },
-  computed: {
-    // elopageUri() {
-    //   const pId = this.$store.state.publisherId
-    //     ? this.$store.state.publisherId
-    //     : CONFIG.DEFAULT_PUBLISHER_ID
-    //   return encodeURI(
-    //     this.$store.state.hasElopage
-    //       ? `https://elopage.com/s/gradido/sign_in?locale=${this.$i18n.locale}`
-    //       : `https://elopage.com/s/gradido/basic-de/payment?locale=${this.$i18n.locale}&prid=111&pid=${pId}&firstName=${this.$store.state.firstName}&lastName=${this.$store.state.lastName}&email=${this.$store.state.email}`,
-    //   )
-    // },
-  },
 }
 </script>
 <style>
diff --git a/frontend/src/pages/Favourites.vue b/frontend/src/pages/Favourites.vue
new file mode 100644
index 000000000..7fb83b78d
--- /dev/null
+++ b/frontend/src/pages/Favourites.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>Favourites.vue</div>
+</template>
+<script>
+export default {
+  name: 'Favourites',
+}
+</script>
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
new file mode 100644
index 000000000..cadfdce63
--- /dev/null
+++ b/frontend/src/pages/Settings.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>Settings.vue</div>
+</template>
+<script>
+export default {
+  name: 'Settings',
+}
+</script>
diff --git a/frontend/src/pages/TopStorys.vue b/frontend/src/pages/TopStorys.vue
new file mode 100644
index 000000000..27b416724
--- /dev/null
+++ b/frontend/src/pages/TopStorys.vue
@@ -0,0 +1,8 @@
+<template>
+  <div>Top Storys</div>
+</template>
+<script>
+export default {
+  name: 'TopStorys',
+}
+</script>
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 5d82be5fb..0c91882b2 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -61,6 +61,27 @@ const routes = [
       requiresAuth: true,
     },
   },
+  {
+    path: '/storys',
+    component: () => import('@/pages/TopStorys.vue'),
+    meta: {
+      requiresAuth: true,
+    },
+  },
+  {
+    path: '/favourites',
+    component: () => import('@/pages/Favourites.vue'),
+    meta: {
+      requiresAuth: true,
+    },
+  },
+  {
+    path: '/settings',
+    component: () => import('@/pages/Settings.vue'),
+    meta: {
+      requiresAuth: true,
+    },
+  },
   {
     path: '/login/:code?',
     component: () => import('@/pages/Login.vue'),

From 172eeaeeafb5a7e7a9145fd6dd62132d20f5e9d2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 2 Nov 2022 11:41:00 +0100
Subject: [PATCH 2/5] add light and dark mode in seperate scss, add switch in
 sidebar

---
 .../assets/scss/gradido-template-dark.scss    | 19 +++++++++++
 .../src/assets/scss/gradido-template.scss     |  2 ++
 frontend/src/assets/scss/gradido.scss         |  1 +
 frontend/src/components/Menu/SidebarNew.vue   | 19 +++++++++--
 frontend/src/layouts/DashboardLayout.vue      | 32 ++++++++++++++++++-
 5 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/assets/scss/gradido-template-dark.scss

diff --git a/frontend/src/assets/scss/gradido-template-dark.scss b/frontend/src/assets/scss/gradido-template-dark.scss
new file mode 100644
index 000000000..9ccf4db5d
--- /dev/null
+++ b/frontend/src/assets/scss/gradido-template-dark.scss
@@ -0,0 +1,19 @@
+$dark: #171717;
+$mode-toggle-bg: #262626;
+
+// _dark-mode.scss
+#app {
+  &.dark-mode {
+      background-color:  black;
+      color: #fff;
+  }
+}
+
+#app a,
+.navbar-light,
+.navbar-nav,
+.nav-link {
+    &.dark-mode {
+        color: #a7ffa9;
+    }
+ }
diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index 0dba0513a..5931e287c 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -1,6 +1,8 @@
 html,
 body {
+  background-color: #fff;
   height: 100%;
+  transition: background-color .5s ease, color .5s ease;
 }
 
 .pointer {
diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss
index 7366eb466..2277cfbc6 100644
--- a/frontend/src/assets/scss/gradido.scss
+++ b/frontend/src/assets/scss/gradido.scss
@@ -52,3 +52,4 @@
 // Bootstrap-vue (2.21.1) scss
 @import "~bootstrap-vue/src/index";
 @import "gradido-template";
+@import "gradido-template-dark";
diff --git a/frontend/src/components/Menu/SidebarNew.vue b/frontend/src/components/Menu/SidebarNew.vue
index 2e11b9ae9..bc2e644ac 100644
--- a/frontend/src/components/Menu/SidebarNew.vue
+++ b/frontend/src/components/Menu/SidebarNew.vue
@@ -36,9 +36,19 @@
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">
-          <b-nav-item to="#" class="mb-3">
-            <b-icon icon="toggle-off" aria-hidden="true"></b-icon>
+          <b-nav-item
+            @click="
+              lightmode = !lightmode
+              $emit('modeToggle')
+            "
+            class="mb-3"
+          >
+            <b-icon :icon="lightmode ? 'toggle-on' : 'toggle-off'" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.lightmode') }}</span>
+            <label for="checkbox" class="switch-label">
+              <span v-if="lightmode">🌙</span>
+              <span v-else>☀️</span>
+            </label>
           </b-nav-item>
           <b-nav-item to="/settings" class="mb-3">
             <b-icon icon="gear" aria-hidden="true"></b-icon>
@@ -60,6 +70,11 @@
 <script>
 export default {
   name: 'sidebar',
+  data() {
+    return {
+      lightmode: false,
+    }
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index f6d7ad7d5..b42a890f4 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -35,7 +35,12 @@
               @admin="admin"
               @logout="logout"
             /> -->
-            <sidebar-new class="main-sidebar" @admin="admin" @logout="logout" />
+            <sidebar-new
+              class="main-sidebar"
+              @admin="admin"
+              @logout="logout"
+              @modeToggle="modeToggle"
+            />
           </b-col>
           <b-col
             cols="12"
@@ -119,6 +124,7 @@ export default {
       visible: false,
       tunneledEmail: null,
       hamburger: true,
+      darkMode: false,
     }
   },
   provide() {
@@ -187,6 +193,30 @@ export default {
       this.$refs.sideMenu.classList.toggle('d-none')
       this.hamburger ? (this.hamburger = false) : (this.hamburger = true)
     },
+    dark() {
+      document.getElementById('app').classList.add('dark-mode')
+      document.querySelector('#app a').classList.add('dark-mode')
+      this.darkMode = true
+    },
+
+    light() {
+      document.getElementById('app').classList.remove('dark-mode')
+      document.querySelector('#app a').classList.remove('dark-mode')
+      this.darkMode = false
+    },
+
+    modeToggle() {
+      if (this.darkMode || document.getElementById('app').classList.contains('dark-mode')) {
+        this.light()
+      } else {
+        this.dark()
+      }
+    },
+  },
+  computed: {
+    darkDark() {
+      return this.darkMode && 'darkmode-toggled'
+    },
   },
 }
 </script>

From a54a37be6a09e45630b5b4bf1b494481a9e64657 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 2 Nov 2022 14:02:16 +0100
Subject: [PATCH 3/5] add skeleton system

---
 frontend/src/components/Menu/SidebarNew.vue |  6 +--
 frontend/src/layouts/DashboardLayout.vue    | 54 ++++++++++++++++++++-
 frontend/src/locales/de.json                |  8 ++-
 frontend/src/locales/en.json                |  8 ++-
 frontend/src/pages/Favourites.vue           | 22 ++++++++-
 frontend/src/pages/Settings.vue             | 22 ++++++++-
 frontend/src/pages/TopStorys.vue            | 22 ++++++++-
 7 files changed, 130 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Menu/SidebarNew.vue b/frontend/src/components/Menu/SidebarNew.vue
index bc2e644ac..4039c0889 100644
--- a/frontend/src/components/Menu/SidebarNew.vue
+++ b/frontend/src/components/Menu/SidebarNew.vue
@@ -10,7 +10,7 @@
           </b-nav-item>
           <b-nav-item to="/storys" class="mb-3">
             <b-icon icon="card-heading" aria-hidden="true"></b-icon>
-            <span class="d-none d-lg-inline ml-2">{{ $t('navigation.top_stories') }}</span>
+            <span class="d-none d-lg-inline ml-2">{{ $t('navigation.topStories') }}</span>
           </b-nav-item>
           <b-nav-item to="/favourites" class="mb-3">
             <b-icon icon="bookmark" aria-hidden="true"></b-icon>
@@ -46,8 +46,8 @@
             <b-icon :icon="lightmode ? 'toggle-on' : 'toggle-off'" aria-hidden="true"></b-icon>
             <span class="d-none d-lg-inline ml-2">{{ $t('navigation.lightmode') }}</span>
             <label for="checkbox" class="switch-label">
-              <span v-if="lightmode">🌙</span>
-              <span v-else>☀️</span>
+              <span v-if="lightmode">{{ $t('navigation.moon') }}</span>
+              <span v-else>{{ $t('navigation.sun') }}</span>
             </label>
           </b-nav-item>
           <b-nav-item to="/settings" class="mb-3">
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index b42a890f4..571d54e8e 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -1,6 +1,47 @@
 <template>
-  <div class="main-page bg-default">
-    <div class="position-absolute w-100 h-100 bg-default">
+  <div class="main-page bg-default h-100">
+    <div v-if="skeleton">
+      <b-row class="text-center">
+        <b-col>
+          <b-skeleton-img no-aspect animation="wave" height="118px"></b-skeleton-img>
+        </b-col>
+        <b-col cols="6">
+          <b-skeleton animation="wave" class="mt-4 pt-5"></b-skeleton>
+        </b-col>
+        <b-col>
+          <div class="b-right m-4">
+            <b-row>
+              <b-col><b-skeleton type="avatar"></b-skeleton></b-col>
+              <b-col>
+                <b-skeleton></b-skeleton>
+                <b-skeleton></b-skeleton>
+              </b-col>
+            </b-row>
+          </div>
+        </b-col>
+      </b-row>
+      <b-row class="text-center mt-5">
+        <b-col>
+          <b-skeleton animation="wave" width="85%"></b-skeleton>
+          <b-skeleton animation="wave" width="55%"></b-skeleton>
+          <b-skeleton animation="wave" width="70%"></b-skeleton>
+        </b-col>
+        <b-col cols="6">
+          <b-skeleton animation="wave" width="85%"></b-skeleton>
+          <b-skeleton animation="wave" width="55%"></b-skeleton>
+          <b-skeleton animation="wave" width="70%"></b-skeleton>
+          <b-skeleton animation="wave" width="85%"></b-skeleton>
+          <b-skeleton animation="wave" width="55%"></b-skeleton>
+          <b-skeleton animation="wave" width="70%"></b-skeleton>
+        </b-col>
+        <b-col>
+          <b-skeleton animation="wave" width="85%"></b-skeleton>
+          <b-skeleton animation="wave" width="55%"></b-skeleton>
+          <b-skeleton animation="wave" width="70%"></b-skeleton>
+        </b-col>
+      </b-row>
+    </div>
+    <div v-else class="position-absolute w-100 h-100 bg-default">
       <!--<navbar
         class="main-navbar"
         :balance="balance"
@@ -125,6 +166,7 @@ export default {
       tunneledEmail: null,
       hamburger: true,
       darkMode: false,
+      skeleton: true,
     }
   },
   provide() {
@@ -132,6 +174,11 @@ export default {
       getTunneledEmail: () => this.tunneledEmail,
     }
   },
+  created() {
+    setTimeout(() => {
+      this.skeleton = false
+    }, 1500)
+  },
   methods: {
     async logout() {
       this.$apollo
@@ -221,6 +268,9 @@ export default {
 }
 </script>
 <style>
+.b-right {
+  text-align: -webkit-right;
+}
 .content-gradido {
   display: inline-flex;
   width: 100%;
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 78632dee4..08780e4de 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -239,9 +239,13 @@
     "send": "Senden",
     "settings": "Einstellung",
     "support": "Support",
-    "top_stories": "Top Stories",
-    "transactions": "Transaktionen"
+    "topStories": "Top Stories",
+    "transactions": "Transaktionen",
+    "moon":"🌙",
+    "sun":"☀️"
   },
+  "favourites": "Favouriten",
+  "topStorys":"Beiträge",
   "qrCode": "QR Code",
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 8451d7eae..5dfada32a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -239,9 +239,13 @@
     "send": "Send",
     "settings": "Settings",
     "support": "Support",
-    "top_stories": "Top Stories",
-    "transactions": "Transactions"
+    "topStories": "Top Stories",
+    "transactions": "Transactions",
+    "moon":"🌙",
+    "sun":"☀️"
   },
+  "favourites": "Favourites",
+  "topStorys":"Top Storys",
   "qrCode": "QR Code",
   "send_gdd": "GDD send",
   "send_per_link": "GDD send via link",
diff --git a/frontend/src/pages/Favourites.vue b/frontend/src/pages/Favourites.vue
index 7fb83b78d..483dd7fe4 100644
--- a/frontend/src/pages/Favourites.vue
+++ b/frontend/src/pages/Favourites.vue
@@ -1,8 +1,28 @@
 <template>
-  <div>Favourites.vue</div>
+  <div>
+    <b-card v-if="skeleton">
+      {{ $t('favourites') }}
+      <b-skeleton animation="wave" width="85%"></b-skeleton>
+      <b-skeleton animation="wave" width="55%"></b-skeleton>
+      <b-skeleton animation="wave" width="70%"></b-skeleton>
+    </b-card>
+    <b-card v-else>
+      {{ $t('favourites') }}
+    </b-card>
+  </div>
 </template>
 <script>
 export default {
   name: 'Favourites',
+  data() {
+    return {
+      skeleton: true,
+    }
+  },
+  created() {
+    setTimeout(() => {
+      this.skeleton = false
+    }, 1500)
+  },
 }
 </script>
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index cadfdce63..8699f5e7c 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -1,8 +1,28 @@
 <template>
-  <div>Settings.vue</div>
+  <div>
+    <b-card v-if="skeleton">
+      {{ $t('navigation.settings') }}
+      <b-skeleton animation="wave" width="85%"></b-skeleton>
+      <b-skeleton animation="wave" width="55%"></b-skeleton>
+      <b-skeleton animation="wave" width="70%"></b-skeleton>
+    </b-card>
+    <b-card v-else>
+      {{ $t('navigation.settings') }}
+    </b-card>
+  </div>
 </template>
 <script>
 export default {
   name: 'Settings',
+  data() {
+    return {
+      skeleton: true,
+    }
+  },
+  created() {
+    setTimeout(() => {
+      this.skeleton = false
+    }, 1500)
+  },
 }
 </script>
diff --git a/frontend/src/pages/TopStorys.vue b/frontend/src/pages/TopStorys.vue
index 27b416724..290b7ee99 100644
--- a/frontend/src/pages/TopStorys.vue
+++ b/frontend/src/pages/TopStorys.vue
@@ -1,8 +1,28 @@
 <template>
-  <div>Top Storys</div>
+  <div>
+    <b-card v-if="skeleton">
+      {{ $t('navigation.topStories') }}
+      <b-skeleton animation="wave" width="85%"></b-skeleton>
+      <b-skeleton animation="wave" width="55%"></b-skeleton>
+      <b-skeleton animation="wave" width="70%"></b-skeleton>
+    </b-card>
+    <b-card v-else>
+      {{ $t('navigation.topStories') }}
+    </b-card>
+  </div>
 </template>
 <script>
 export default {
   name: 'TopStorys',
+  data() {
+    return {
+      skeleton: true,
+    }
+  },
+  created() {
+    setTimeout(() => {
+      this.skeleton = false
+    }, 1500)
+  },
 }
 </script>

From 63fb6f3cd2764dfb3d6fe6f22fbff20150396949 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 2 Nov 2022 14:04:49 +0100
Subject: [PATCH 4/5] delete unused locales

---
 frontend/src/locales/de.json | 5 ++---
 frontend/src/locales/en.json | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 08780e4de..9aedfb4a6 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -241,11 +241,10 @@
     "support": "Support",
     "topStories": "Top Stories",
     "transactions": "Transaktionen",
-    "moon":"🌙",
-    "sun":"☀️"
+    "moon": "🌙",
+    "sun": "☀️"
   },
   "favourites": "Favouriten",
-  "topStorys":"Beiträge",
   "qrCode": "QR Code",
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5dfada32a..1d90493e9 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -241,11 +241,10 @@
     "support": "Support",
     "topStories": "Top Stories",
     "transactions": "Transactions",
-    "moon":"🌙",
-    "sun":"☀️"
+    "moon": "🌙",
+    "sun": "☀️"
   },
   "favourites": "Favourites",
-  "topStorys":"Top Storys",
   "qrCode": "QR Code",
   "send_gdd": "GDD send",
   "send_per_link": "GDD send via link",

From b35e373d3fda2ff660d9a3e413c9e4ce8e21a71d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 2 Nov 2022 14:05:12 +0100
Subject: [PATCH 5/5] fix locales

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 9aedfb4a6..31d809d48 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -94,6 +94,7 @@
     "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet.",
     "unknown-error": "Unbekannter Fehler: "
   },
+  "favourites": "Favouriten",
   "followUs": "folge uns:",
   "footer": {
     "app_version": "App version {version}",
@@ -228,23 +229,22 @@
   },
   "navigation": {
     "admin_area": "Adminbereich",
-    "favourites": "Favoriten",
-    "lightmode": "Lightmode",
     "community": "Gemeinschaft",
+    "favourites": "Favoriten",
     "info": "Information",
+    "lightmode": "Lightmode",
     "logout": "Abmelden",
     "members": "Mitglieder",
+    "moon": "🌙",
     "overview": "Übersicht",
     "profile": "Mein Profil",
     "send": "Senden",
     "settings": "Einstellung",
+    "sun": "☀️",
     "support": "Support",
     "topStories": "Top Stories",
-    "transactions": "Transaktionen",
-    "moon": "🌙",
-    "sun": "☀️"
+    "transactions": "Transaktionen"
   },
-  "favourites": "Favouriten",
   "qrCode": "QR Code",
   "send_gdd": "GDD versenden",
   "send_per_link": "GDD versenden per Link",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1d90493e9..963c65d9d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -94,6 +94,7 @@
     "session-expired": "The session was closed for security reasons.",
     "unknown-error": "Unknown error: "
   },
+  "favourites": "Favourites",
   "followUs": "follow us:",
   "footer": {
     "app_version": "App version {version}",
@@ -228,23 +229,22 @@
   },
   "navigation": {
     "admin_area": "Admin Area",
-    "favourites": "Favourites",
-    "lightmode": "Lightmode",
     "community": "Community",
+    "favourites": "Favourites",
     "info": "Information",
+    "lightmode": "Lightmode",
     "logout": "Logout",
     "members": "Members",
+    "moon": "🌙",
     "overview": "Overview",
     "profile": "My profile",
     "send": "Send",
     "settings": "Settings",
+    "sun": "☀️",
     "support": "Support",
     "topStories": "Top Stories",
-    "transactions": "Transactions",
-    "moon": "🌙",
-    "sun": "☀️"
+    "transactions": "Transactions"
   },
-  "favourites": "Favourites",
   "qrCode": "QR Code",
   "send_gdd": "GDD send",
   "send_per_link": "GDD send via link",