From 0d93e5563523297ca05a64ef06d460984184b447 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 13:00:36 +0100
Subject: [PATCH 01/21] mobile menu has transparent background color

---
 frontend/src/components/Menu/Sidebar.vue      | 10 +++++++-
 .../MobileSidebar/MobileSidebar.vue           | 23 ++-----------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 864d42906..9388b0e64 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -1,6 +1,11 @@
 <template>
   <div id="component-sidebar">
-    <div id="side-menu" ref="sideMenu" class="gradido-border-radius appBoxShadow pt-2">
+    <div
+      id="side-menu"
+      ref="sideMenu"
+      class="gradido-border-radius pt-2 bg-white"
+      :class="shadow ? 'appBoxShadow' : ''"
+    >
       <div class="mb-3 mt-3">
         <b-nav vertical class="w-200">
           <b-nav-item to="/overview" class="mb-3" active-class="activeRoute">
@@ -55,6 +60,9 @@
 <script>
 export default {
   name: 'Sidebar',
+  props: {
+    shadow: { type: Boolean, required: false, default: true },
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/MobileSidebar/MobileSidebar.vue b/frontend/src/components/MobileSidebar/MobileSidebar.vue
index 4fa1da1ab..dc59dc711 100644
--- a/frontend/src/components/MobileSidebar/MobileSidebar.vue
+++ b/frontend/src/components/MobileSidebar/MobileSidebar.vue
@@ -1,23 +1,9 @@
 <template>
   <div>
-    <b-sidebar id="sidebar-mobile" bg-variant="f5" :backdrop="true">
+    <b-sidebar id="sidebar-mobile" :backdrop="true" bg-variant="transparent">
       <div class="px-3 py-2">
-        <sidebar @admin="$emit('admin')" @logout="$emit('logout')" />
+        <sidebar @admin="$emit('admin')" @logout="$emit('logout')" :shadow="false" />
       </div>
-      <template #header>
-        <div>
-          <div class="mr-auto">{{ avatarLongName }}</div>
-          <div class="small">
-            <small>{{ $store.state.email }}</small>
-          </div>
-        </div>
-      </template>
-      <template #footer>
-        <div class="d-flex bg-light">
-          <strong class="mr-auto p-2">{{ $t('send_gdd') }}</strong>
-          <b-button to="/send"><b-icon icon="arrow-right"></b-icon></b-button>
-        </div>
-      </template>
     </b-sidebar>
   </div>
 </template>
@@ -29,10 +15,5 @@ export default {
   components: {
     Sidebar,
   },
-  computed: {
-    avatarLongName() {
-      return `${this.$store.state.firstName} ${this.$store.state.lastName}`
-    },
-  },
 }
 </script>

From 8514e9af9d040bebf3c8febc05f059106c099108 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 13:45:24 +0100
Subject: [PATCH 02/21] mobil navbar avatar over sheet image

---
 frontend/src/components/Menu/Navbar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 309e3ffd5..00e9daab8 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -139,7 +139,6 @@ button.navbar-toggler > span.navbar-toggler-icon {
   .sheet-img {
     left: 37%;
     max-width: 61%;
-    z-index: 1000;
   }
 }
 </style>

From 41f7dfe56f442951ec271c4bbec2bcdacc01b971 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 14:24:02 +0100
Subject: [PATCH 03/21] remove last month label, matching stands and button
 size

---
 .../GddSend/TransactionConfirmationLink.vue   | 11 ++-
 .../GddSend/TransactionConfirmationSend.vue   | 13 ++--
 .../components/GddSend/TransactionForm.vue    | 16 ++--
 .../src/components/GddTransactionList.vue     | 73 ++++++++++---------
 frontend/src/layouts/DashboardLayout.vue      |  2 +-
 frontend/src/pages/Send.vue                   |  2 +-
 6 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index 91fea3486..1600a4966 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -35,12 +35,15 @@
         <b-col offset="2">{{ $t('form.new_balance') }}</b-col>
         <b-col>{{ (balance - amount) | GDD }}</b-col>
       </b-row>
-      <b-row class="mt-5 p-5">
-        <b-col>
-          <b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
+      <b-row class="mt-5">
+        <b-col cols="12" md="6" lg="6">
+          <b-button block @click="$emit('on-back')" class="mb-3 mb-md-0 mb-lg-0">
+            {{ $t('back') }}
+          </b-button>
         </b-col>
-        <b-col class="text-right">
+        <b-col cols="12" md="6" lg="6" class="text-lg-right">
           <b-button
+            block
             class="send-button"
             variant="gradido"
             :disabled="disabled"
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index 4f4644ffb..b7c35f089 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -17,7 +17,7 @@
         </b-col>
       </b-row>
 
-      <b-row class="mt-5 pr-3 text-color-gdd-yellow h3">
+      <b-row class="mt-5 text-color-gdd-yellow h3">
         <b-col cols="2" class="text-right">
           <b-icon class="text-color-gdd-yellow" icon="droplet-half"></b-icon>
         </b-col>
@@ -39,12 +39,15 @@
         <b-col offset="2">{{ $t('form.new_balance') }}</b-col>
         <b-col>{{ (balance - amount) | GDD }}</b-col>
       </b-row>
-      <b-row class="mt-5 p-5">
-        <b-col>
-          <b-button @click="$emit('on-back')">{{ $t('back') }}</b-button>
+      <b-row class="mt-5">
+        <b-col cols="12" md="6" lg="6">
+          <b-button block @click="$emit('on-back')" class="mb-3 mb-md-0 mb-lg-0">
+            {{ $t('back') }}
+          </b-button>
         </b-col>
-        <b-col class="text-right">
+        <b-col cols="12" md="6" lg="6" class="text-lg-right">
           <b-button
+            block
             variant="gradido"
             :disabled="disabled"
             @click="$emit('send-transaction'), (disabled = true)"
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index c54b4c0f9..5efa6012b 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -92,14 +92,20 @@
               <div v-if="!!isBalanceDisabled" class="text-danger mt-5">
                 {{ $t('form.no_gdd_available') }}
               </div>
-              <b-row v-else class="test-buttons mt-5">
-                <b-col>
-                  <b-button type="reset" variant="secondary" @click="onReset">
+              <b-row v-else class="test-buttons mt-3">
+                <b-col cols="12" md="6" lg="6">
+                  <b-button
+                    block
+                    type="reset"
+                    variant="secondary"
+                    @click="onReset"
+                    class="mb-3 mb-md-0 mb-lg-0"
+                  >
                     {{ $t('form.reset') }}
                   </b-button>
                 </b-col>
-                <b-col class="text-right">
-                  <b-button type="submit" variant="gradido">
+                <b-col cols="12" md="6" lg="6" class="text-lg-right">
+                  <b-button block type="submit" variant="gradido">
                     {{ $t('form.check_now') }}
                   </b-button>
                 </b-col>
diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue
index f3524c6fe..deed0dedb 100644
--- a/frontend/src/components/GddTransactionList.vue
+++ b/frontend/src/components/GddTransactionList.vue
@@ -26,45 +26,46 @@
           </template>
         </transaction-list-item>
       </div>
-      <div v-if="transactionCount > 0" class="h4 m-3">{{ $t('lastMonth') }}</div>
-      <div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id">
-        <transaction-list-item
-          v-if="typeId !== 'DECAY'"
-          :typeId="typeId"
-          class="pointer mb-4 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
-        >
-          <template #SEND>
-            <transaction-send
-              v-bind="transactions[index]"
-              :previousBookedBalance="previousBookedBalance(index)"
-              v-on="$listeners"
-            />
-          </template>
+      <div class="mt-3">
+        <div v-for="({ id, typeId }, index) in transactions" :key="`l2-` + id">
+          <transaction-list-item
+            v-if="typeId !== 'DECAY'"
+            :typeId="typeId"
+            class="pointer mb-3 bg-white appBoxShadow gradido-border-radius p-3 test-list-group-item"
+          >
+            <template #SEND>
+              <transaction-send
+                v-bind="transactions[index]"
+                :previousBookedBalance="previousBookedBalance(index)"
+                v-on="$listeners"
+              />
+            </template>
 
-          <template #RECEIVE>
-            <transaction-receive
-              v-bind="transactions[index]"
-              :previousBookedBalance="previousBookedBalance(index)"
-              v-on="$listeners"
-            />
-          </template>
+            <template #RECEIVE>
+              <transaction-receive
+                v-bind="transactions[index]"
+                :previousBookedBalance="previousBookedBalance(index)"
+                v-on="$listeners"
+              />
+            </template>
 
-          <template #CREATION>
-            <transaction-creation
-              v-bind="transactions[index]"
-              :previousBookedBalance="previousBookedBalance(index)"
-              v-on="$listeners"
-            />
-          </template>
+            <template #CREATION>
+              <transaction-creation
+                v-bind="transactions[index]"
+                :previousBookedBalance="previousBookedBalance(index)"
+                v-on="$listeners"
+              />
+            </template>
 
-          <template #LINK_SUMMARY>
-            <transaction-link-summary
-              v-bind="transactions[index]"
-              :transactionLinkCount="transactionLinkCount"
-              @update-transactions="updateTransactions"
-            />
-          </template>
-        </transaction-list-item>
+            <template #LINK_SUMMARY>
+              <transaction-link-summary
+                v-bind="transactions[index]"
+                :transactionLinkCount="transactionLinkCount"
+                @update-transactions="updateTransactions"
+              />
+            </template>
+          </transaction-list-item>
+        </div>
       </div>
     </div>
     <b-pagination
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index e5bf394f2..2dcca63a1 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -50,7 +50,7 @@
             </b-col>
             <b-col cols="12">
               <!-- router-view -->
-              <div class="main-content mt-3">
+              <div class="main-content mt-lg-3 mt-0">
                 <fade-transition :duration="200" origin="center top" mode="out-in">
                   <router-view
                     ref="router-view"
diff --git a/frontend/src/pages/Send.vue b/frontend/src/pages/Send.vue
index 370943ad6..6bfb9042c 100644
--- a/frontend/src/pages/Send.vue
+++ b/frontend/src/pages/Send.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <gdd-send :currentTransactionStep="currentTransactionStep" class="pt-3 mt--3">
+    <gdd-send :currentTransactionStep="currentTransactionStep">
       <template #transactionForm>
         <transaction-form
           v-bind="transactionData"

From fae97dd786f52ee9317eebafbd360198668367fc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 14:54:35 +0100
Subject: [PATCH 04/21] mobile starttext change style

---
 .../src/assets/scss/gradido-template.scss     |  4 ++--
 .../src/components/Overview/CommunityNews.vue | 20 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index 59b461dce..a83b88076 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -10,8 +10,8 @@ body {
 }
 
 .bg-gradient {
-  background: rgb(4 112 6);
-  background: linear-gradient(90deg, rgb(4 112 6 / 100%) 73%, rgb(197 141 56 / 100%) 100%);
+  background: rgb(4,112,6);
+  background:  linear-gradient(90deg, rgba(4,112,6,1) 22%, rgba(197,141,56,1) 98%);
   color: white;
 }
 
diff --git a/frontend/src/components/Overview/CommunityNews.vue b/frontend/src/components/Overview/CommunityNews.vue
index 4d84566b8..e06f3c431 100644
--- a/frontend/src/components/Overview/CommunityNews.vue
+++ b/frontend/src/components/Overview/CommunityNews.vue
@@ -7,23 +7,25 @@
       >
         <b-card-body>
           <b-card-title class="h2">{{ item.text }}</b-card-title>
-        </b-card-body>
-        <b-card-footer class="bg-transparent">
+
+          <div class="h3">{{ item.date }}</div>
+
           <b-row class="my-5">
-            <b-col cols="12" md="6" lg="6">
-              <div class="h3">{{ item.date }}</div>
+            <b-col>
+              {{ item.extra }}
             </b-col>
-            <b-col cols="12" md="6" lg="6">
-              <div class="text-right">
+          </b-row>
+
+          <b-row class="my-5">
+            <b-col cols="12">
+              <div class="text-lg-right">
                 <b-button variant="gradido" :href="item.url" target="_blank">
                   {{ $t('auth.left.learnMore') }}
                 </b-button>
               </div>
             </b-col>
           </b-row>
-
-          {{ item.extra }}
-        </b-card-footer>
+        </b-card-body>
       </b-card>
     </div>
   </div>

From 51d20d4d5b7756b9ce8dee49cdebc939071b6873 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 15:03:09 +0100
Subject: [PATCH 05/21] mobil navbar toggler no border

---
 frontend/src/components/Menu/Navbar.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 00e9daab8..43740907f 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -8,9 +8,9 @@
           width=""
           alt="..."
         />
-        <b-button v-b-toggle.sidebar-mobile class="d-block d-lg-none">
-          <span class="navbar-toggler-icon"></span>
-        </b-button>
+        <div v-b-toggle.sidebar-mobile variant="link" class="d-block d-lg-none">
+          <span class="navbar-toggler-icon h2"></span>
+        </div>
       </b-navbar-brand>
 
       <router-link to="/settings" class="d-block d-lg-none">

From 067ed3652bfb20526094bc2813ca098465e742f6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 15:34:29 +0100
Subject: [PATCH 06/21] settings header data style

---
 .../src/components/UserSettings/UserCard.vue  | 87 +++++++++++--------
 frontend/src/pages/Settings.vue               |  2 +-
 2 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/frontend/src/components/UserSettings/UserCard.vue b/frontend/src/components/UserSettings/UserCard.vue
index 0d59411b5..9993f5980 100755
--- a/frontend/src/components/UserSettings/UserCard.vue
+++ b/frontend/src/components/UserSettings/UserCard.vue
@@ -1,41 +1,46 @@
 <template>
   <div class="userdata-card">
-    <b-row>
-      <b-col class="centerPerMargin">
-        <avatar
-          :username="username.username"
-          :initials="username.initials"
-          :color="'#fff'"
-          :size="90"
-        ></avatar>
-      </b-col>
-    </b-row>
-    <b-card class="border-0">
-      <b-container class="justify-content-center mt-md-5">
-        <b-row>
-          <b-col>
-            <div class="text-center font-weight-bold">
-              {{ $n(balance, 'decimal') }}
-            </div>
-            <div class="text-center">{{ $t('GDD') }}</div>
-          </b-col>
-          <b-col>
-            <div class="text-center font-weight-bold">
-              {{ transactionCount }}
-            </div>
-            <div class="text-center">
-              {{ $t('navigation.transactions') }}
-            </div>
-          </b-col>
-          <b-col>
-            <div class="text-center font-weight-bold">{{ CONFIG.COMMUNITY_NAME }}</div>
-            <div class="text-center">
-              {{ $t('community.community') }}
-            </div>
-          </b-col>
-        </b-row>
-      </b-container>
-    </b-card>
+    <div class="centerPerMargin">
+      <avatar
+        :username="username.username"
+        :initials="username.initials"
+        :color="'#fff'"
+        :size="90"
+      ></avatar>
+    </div>
+
+    <div class="justify-content-center mt-5 mb-5">
+      <b-row align-v="stretch">
+        <b-col cols="4">
+          <div class="text-center font-weight-bold">
+            {{ $n(balance, 'decimal') }}
+          </div>
+        </b-col>
+        <b-col cols="4">
+          <div class="text-center font-weight-bold">
+            {{ transactionCount }}
+          </div>
+        </b-col>
+        <b-col cols="4">
+          <div class="text-center font-weight-bold">{{ CONFIG.COMMUNITY_NAME }}</div>
+        </b-col>
+      </b-row>
+      <b-row>
+        <b-col cols="4">
+          <div class="text-center">{{ $t('GDD') }}</div>
+        </b-col>
+        <b-col cols="4">
+          <div class="text-center">
+            {{ $t('navigation.transactions') }}
+          </div>
+        </b-col>
+        <b-col cols="4">
+          <div class="text-center">
+            {{ $t('community.community') }}
+          </div>
+        </b-col>
+      </b-row>
+    </div>
   </div>
 </template>
 <script>
@@ -70,4 +75,14 @@ export default {
 .centerPerMargin {
   padding-left: 44%;
 }
+@media screen and (max-width: 850px) {
+  .centerPerMargin {
+    padding-left: 38%;
+  }
+}
+@media screen and (max-width: 450px) {
+  .centerPerMargin {
+    padding-left: 34%;
+  }
+}
 </style>
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index 3c81ea110..7d927ce4f 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container bg-white appBoxShadow gradido-border-radius p-3 mt--3">
+  <div class="container bg-white appBoxShadow p-3 mt--3">
     <user-card :balance="balance" :transactionCount="transactionCount"></user-card>
     <user-data />
     <hr />

From 5c5ecc84e3f9eacba03be0a37901ad1e07ca3537 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 15:42:29 +0100
Subject: [PATCH 07/21] fix lint

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 2eabd6ab5..6627f4bf2 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -215,7 +215,6 @@
   },
   "h": "h",
   "language": "Sprache",
-  "lastMonth": "letzter Monat",
   "link-load": "den letzten Link nachladen | die letzten {n} Links nachladen |  weitere {n} Links nachladen",
   "login": "Anmelden",
   "math": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f90eef660..f2cc094ed 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -215,7 +215,6 @@
   },
   "h": "h",
   "language": "Language",
-  "lastMonth": "Last month",
   "link-load": "Load the last link | Load the last {n} links |  Load more {n} links",
   "login": "Sign in",
   "math": {

From c0a889a5b369bb4a24bcaddebb2b3f015ffdd4f1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 15:43:30 +0100
Subject: [PATCH 08/21] fix stylelint and locales

---
 frontend/src/assets/scss/gradido-template.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index a83b88076..9edb72a4f 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -10,8 +10,8 @@ body {
 }
 
 .bg-gradient {
-  background: rgb(4,112,6);
-  background:  linear-gradient(90deg, rgba(4,112,6,1) 22%, rgba(197,141,56,1) 98%);
+  background: rgb(4 112 6);
+  background: linear-gradient(90deg, rgb(4 112 6 / 100%) 22%, rgb(197 141 56 / 100%) 98%);
   color: white;
 }
 

From f3ae7a02e928861f97b000ea83b62c9afc9047b8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 19:17:09 +0100
Subject: [PATCH 09/21] mobil navbar avatar and name displayed

---
 frontend/src/components/Menu/Navbar.vue | 43 +++++++------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 43740907f..b3c750aac 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -13,7 +13,9 @@
         </div>
       </b-navbar-brand>
 
-      <router-link to="/settings" class="d-block d-lg-none">
+      <b-img class="sheet-img position-absolute zindex-1" :src="sheet"></b-img>
+
+      <b-navbar-nav class="ml-auto" right>
         <div class="d-flex align-items-center">
           <div class="mr-3">
             <avatar
@@ -23,36 +25,15 @@
               :size="61"
             ></avatar>
           </div>
-        </div>
-      </router-link>
-      <b-img class="sheet-img position-absolute zindex-1" :src="sheet"></b-img>
-      <b-collapse id="nav-collapse" is-nav class="ml-5">
-        <b-navbar-nav class="ml-auto" right>
-          <div class="mb-2">
-            <router-link to="/settings">
-              <div>
-                <div class="d-flex align-items-center">
-                  <div class="mr-3">
-                    <avatar
-                      :username="username.username"
-                      :initials="username.initials"
-                      :color="'#fff'"
-                      :size="81"
-                    ></avatar>
-                  </div>
-                  <div>
-                    <div data-test="navbar-item-username">{{ username.username }}</div>
+          <div>
+            <div data-test="navbar-item-username">{{ username.username }}</div>
 
-                    <div class="text-right" data-test="navbar-item-email">
-                      {{ $store.state.email }}
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </router-link>
+            <div class="text-right" data-test="navbar-item-email">
+              {{ $store.state.email }}
+            </div>
           </div>
-        </b-navbar-nav>
-      </b-collapse>
+        </div>
+      </b-navbar-nav>
     </b-navbar>
     <!-- <div class="alertBox">
       <b-alert show dismissible variant="light" class="nav-alert text-dark">
@@ -126,7 +107,7 @@ button.navbar-toggler > span.navbar-toggler-icon {
 }
 @media screen and (max-width: 1170px) {
   .sheet-img {
-    left: 40%;
+    left: 20%;
   }
   .alertBox {
     position: static;
@@ -137,7 +118,7 @@ button.navbar-toggler > span.navbar-toggler-icon {
 }
 @media screen and (max-width: 450px) {
   .sheet-img {
-    left: 37%;
+    left: 27%;
     max-width: 61%;
   }
 }

From 01093d026f47d0c9ea719c94cce282bdcca460fd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 19:39:22 +0100
Subject: [PATCH 10/21] current date custom in datepicker

---
 frontend/src/components/Contributions/ContributionForm.vue | 2 +-
 frontend/src/pages/Community.vue                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 7ef5835c0..1964da537 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -3,7 +3,7 @@
     <b-form
       ref="form"
       @submit.prevent="submit"
-      class="border p-3 bg-white appBoxShadow gradido-border-radius"
+      class="p-3 bg-white appBoxShadow gradido-border-radius"
     >
       <label>{{ $t('contribution.selectDate') }}</label>
       <b-form-datepicker
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index d2bb892a0..13aad1a72 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -118,7 +118,7 @@ export default {
       if (num !== 0) {
         this.form = {
           id: null,
-          date: '',
+          date: new Date(),
           memo: '',
           hours: 0,
           amount: '',

From 8c033842fbc879b504922ca0790f1f64dd0d4029 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 16 Jan 2023 20:08:49 +0100
Subject: [PATCH 11/21] placeholder in InputHoures.vue

---
 .../components/Contributions/ContributionForm.vue    |  2 +-
 frontend/src/components/Inputs/InputHour.vue         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 1964da537..8c747cccc 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -111,7 +111,7 @@ export default {
       this.form.id = null
       this.form.date = ''
       this.form.memo = ''
-      this.form.hours = 0.0
+      this.form.hours = null
       this.form.amount = ''
     },
   },
diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue
index 10fc00363..9b1f8b996 100644
--- a/frontend/src/components/Inputs/InputHour.vue
+++ b/frontend/src/components/Inputs/InputHour.vue
@@ -32,15 +32,15 @@ export default {
       type: Object,
       default: () => {},
     },
-    name: { type: String, required: true, default: 'Time' },
-    label: { type: String, required: true, default: 'Time' },
-    placeholder: { type: String, required: true, default: 'Time' },
-    value: { type: Number, required: true, default: 0 },
-    validMaxTime: { type: Number, required: true, default: 0 },
+    name: { type: String, required: true },
+    label: { type: String, required: true },
+    placeholder: { type: String, required: true },
+    value: { type: Number, required: true },
+    validMaxTime: { type: Number, required: true },
   },
   data() {
     return {
-      currentValue: 0,
+      currentValue: null,
     }
   },
   computed: {

From 5203644283e036636c5df189e3d982e060fc4b57 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 07:36:34 +0100
Subject: [PATCH 12/21] mobil navbar fix and transparent

---
 frontend/src/components/Menu/Navbar.vue  | 78 ++++++++++++++----------
 frontend/src/layouts/DashboardLayout.vue | 14 ++++-
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index b3c750aac..621ebaca5 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -1,45 +1,47 @@
 <template>
-  <div class="navbar-component position-sticky">
-    <b-navbar toggleable="lg" class="pr-4">
-      <b-navbar-brand>
-        <b-img
-          class="imgLogo mt-lg--2 mt-3 mb-3 d-none d-lg-block zindex10"
-          :src="logo"
-          width=""
-          alt="..."
-        />
-        <div v-b-toggle.sidebar-mobile variant="link" class="d-block d-lg-none">
-          <span class="navbar-toggler-icon h2"></span>
-        </div>
-      </b-navbar-brand>
-
-      <b-img class="sheet-img position-absolute zindex-1" :src="sheet"></b-img>
-
-      <b-navbar-nav class="ml-auto" right>
-        <div class="d-flex align-items-center">
-          <div class="mr-3">
-            <avatar
-              :username="username.username"
-              :initials="username.initials"
-              :color="'#fff'"
-              :size="61"
-            ></avatar>
+  <div class="navbar-component">
+    <div class="navbar-element">
+      <b-navbar toggleable="lg" class="pr-4">
+        <b-navbar-brand>
+          <b-img
+            class="imgLogo mt-lg--2 mt-3 mb-3 d-none d-lg-block zindex10"
+            :src="logo"
+            width=""
+            alt="..."
+          />
+          <div v-b-toggle.sidebar-mobile variant="link" class="d-block d-lg-none">
+            <span class="navbar-toggler-icon h2"></span>
           </div>
-          <div>
-            <div data-test="navbar-item-username">{{ username.username }}</div>
+        </b-navbar-brand>
 
-            <div class="text-right" data-test="navbar-item-email">
-              {{ $store.state.email }}
+        <b-img class="sheet-img position-absolute zindex-1" :src="sheet"></b-img>
+
+        <b-navbar-nav class="ml-auto" right>
+          <div class="d-flex align-items-center">
+            <div class="mr-3">
+              <avatar
+                :username="username.username"
+                :initials="username.initials"
+                :color="'#fff'"
+                :size="61"
+              ></avatar>
+            </div>
+            <div>
+              <div data-test="navbar-item-username">{{ username.username }}</div>
+
+              <div class="text-right" data-test="navbar-item-email">
+                {{ $store.state.email }}
+              </div>
             </div>
           </div>
-        </div>
-      </b-navbar-nav>
-    </b-navbar>
-    <!-- <div class="alertBox">
+        </b-navbar-nav>
+      </b-navbar>
+      <!-- <div class="alertBox">
       <b-alert show dismissible variant="light" class="nav-alert text-dark">
         <small>{{ $t('1000thanks') }}</small>
       </b-alert>
     </div> -->
+    </div>
   </div>
 </template>
 
@@ -72,6 +74,10 @@ export default {
 </script>
 
 <style lang="scss">
+.navbar-element {
+  position: sticky;
+}
+
 .auth-header {
   font-family: 'Open Sans', sans-serif !important;
   height: 150px;
@@ -117,6 +123,12 @@ button.navbar-toggler > span.navbar-toggler-icon {
   }
 }
 @media screen and (max-width: 450px) {
+  .navbar-element {
+    z-index: 1000;
+    position: fixed;
+    width: 100%;
+    background-color: #f5f5f5e6;
+  }
   .sheet-img {
     left: 27%;
     max-width: 61%;
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index ff72b8e7f..ae1e0b75e 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -3,7 +3,7 @@
     <div v-if="skeleton">
       <skeleton-overview />
     </div>
-    <div v-else>
+    <div v-else class="mx--3 mx-lg-0">
       <!-- navbar -->
       <b-row>
         <b-col>
@@ -13,7 +13,7 @@
       <mobile-sidebar @admin="admin" @logout="logout" />
 
       <!-- Breadcrumb -->
-      <b-row>
+      <b-row class="breadcrumb">
         <b-col cols="10" offset-lg="2">
           <breadcrumb />
         </b-col>
@@ -336,7 +336,9 @@ export default {
 }
 </script>
 <style>
-/* frontend/public/img/svg/Gradido_Blaetter_Mainpage.svg */
+.breadcrumb {
+  background-color: transparent;
+}
 .main-page {
   background-attachment: fixed;
   background-position: center;
@@ -369,4 +371,10 @@ export default {
 .navbar-toggler-icon {
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(4, 112, 6, 1)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
 }
+
+@media screen and (max-width: 450px) {
+  .breadcrumb {
+    padding-top: 60px;
+  }
+}
 </style>

From 3c86d523a89c7500fe1a184dfe5530725f1aa43d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 08:37:02 +0100
Subject: [PATCH 13/21] mobil navbar set sheet image

---
 frontend/src/components/Inputs/InputHour.spec.js | 2 +-
 frontend/src/components/Menu/Navbar.vue          | 2 +-
 frontend/src/pages/Community.spec.js             | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Inputs/InputHour.spec.js b/frontend/src/components/Inputs/InputHour.spec.js
index e47a7aa66..d1eb06c5c 100644
--- a/frontend/src/components/Inputs/InputHour.spec.js
+++ b/frontend/src/components/Inputs/InputHour.spec.js
@@ -58,7 +58,7 @@ describe('InputHour', () => {
       })
 
       it('has the value 0', () => {
-        expect(wrapper.vm.currentValue).toEqual(0)
+        expect(wrapper.vm.currentValue).toEqual(null)
       })
 
       it('has the label "input-field-label"', () => {
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 621ebaca5..deca62605 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -130,7 +130,7 @@ button.navbar-toggler > span.navbar-toggler-icon {
     background-color: #f5f5f5e6;
   }
   .sheet-img {
-    left: 27%;
+    left: 5%;
     max-width: 61%;
   }
 }
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index a2a8f9263..b4986af46 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -286,8 +286,10 @@ describe('Community', () => {
         })
 
         it('set all data to the default values)', () => {
+          const now = new Date().toISOString().split('T')[0]
+
           expect(wrapper.vm.form.id).toBe(null)
-          expect(wrapper.vm.form.date).toBe('')
+          expect(wrapper.vm.form.date.text()).toContain(now)
           expect(wrapper.vm.form.memo).toBe('')
           expect(wrapper.vm.form.amount).toBe('')
         })

From f4729e4984866691d78767ce7091f7763f592c6f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 09:48:08 +0100
Subject: [PATCH 14/21] navbar name add router link

---
 frontend/src/components/Menu/Navbar.vue | 30 +++++++++++++------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index deca62605..f939de71d 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -17,23 +17,25 @@
         <b-img class="sheet-img position-absolute zindex-1" :src="sheet"></b-img>
 
         <b-navbar-nav class="ml-auto" right>
-          <div class="d-flex align-items-center">
-            <div class="mr-3">
-              <avatar
-                :username="username.username"
-                :initials="username.initials"
-                :color="'#fff'"
-                :size="61"
-              ></avatar>
-            </div>
-            <div>
-              <div data-test="navbar-item-username">{{ username.username }}</div>
+          <router-link to="/settings">
+            <div class="d-flex align-items-center">
+              <div class="mr-3">
+                <avatar
+                  :username="username.username"
+                  :initials="username.initials"
+                  :color="'#fff'"
+                  :size="61"
+                ></avatar>
+              </div>
+              <div>
+                <div data-test="navbar-item-username">{{ username.username }}</div>
 
-              <div class="text-right" data-test="navbar-item-email">
-                {{ $store.state.email }}
+                <div class="text-right" data-test="navbar-item-email">
+                  {{ $store.state.email }}
+                </div>
               </div>
             </div>
-          </div>
+          </router-link>
         </b-navbar-nav>
       </b-navbar>
       <!-- <div class="alertBox">

From 07dc5cf5d4ae6ec8b231c202be98abc89b062d0d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 10:56:17 +0100
Subject: [PATCH 15/21] test first example

---
 .../Contributions/ContributionForm.vue        | 68 +++++++++----------
 frontend/src/components/Inputs/InputHour.vue  |  2 +-
 frontend/src/pages/Community.spec.js          |  9 ---
 frontend/src/validation-rules.js              |  1 -
 4 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 8c747cccc..7e6ca4737 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -9,7 +9,6 @@
       <b-form-datepicker
         id="contribution-date"
         v-model="form.date"
-        size="lg"
         :locale="$i18n.locale"
         :max="maximalDate"
         :min="minimalDate"
@@ -22,40 +21,39 @@
         <template #nav-prev-year><span></span></template>
         <template #nav-next-year><span></span></template>
       </b-form-datepicker>
-      <div v-if="validMaxGDD > 0">
-        <input-textarea
-          id="contribution-memo"
-          v-model="form.memo"
-          :name="$t('form.message')"
-          :label="$t('contribution.activity')"
-          :placeholder="$t('contribution.yourActivity')"
-          :rules="{ required: true, min: 5, max: 255 }"
-        />
-        <input-hour
-          v-model="form.hours"
-          :name="$t('form.hours')"
-          :label="$t('form.hours')"
-          placeholder="0.5"
-          :rules="{
-            required: true,
-            min: 0.5,
-            max: validMaxTime,
-            gddCreationTime: [0.5, validMaxTime],
-          }"
-          :validMaxTime="validMaxTime"
-          @updateAmount="updateAmount"
-        ></input-hour>
-        <input-amount
-          id="contribution-amount"
-          v-model="form.amount"
-          :name="$t('form.amount')"
-          :label="$t('form.amount')"
-          placeholder="20"
-          :rules="{ required: true, gddSendAmount: [20, validMaxGDD] }"
-          typ="ContributionForm"
-        ></input-amount>
-      </div>
-      <div v-else class="mb-5">{{ $t('contribution.exhausted') }}</div>
+
+      <input-textarea
+        id="contribution-memo"
+        v-model="form.memo"
+        :name="$t('form.message')"
+        :label="$t('contribution.activity')"
+        :placeholder="$t('contribution.yourActivity')"
+        :rules="{ required: true, min: 5, max: 255 }"
+      />
+      <input-hour
+        v-model="form.hours"
+        :name="$t('form.hours')"
+        :label="$t('form.hours')"
+        placeholder="0.5"
+        :rules="{
+          required: true,
+          min: 0.5,
+          max: validMaxTime,
+          gddCreationTime: [0.5, validMaxTime],
+        }"
+        :validMaxTime="validMaxTime"
+        @updateAmount="updateAmount"
+      ></input-hour>
+      <input-amount
+        id="contribution-amount"
+        v-model="form.amount"
+        :name="$t('form.amount')"
+        :label="$t('form.amount')"
+        placeholder="20"
+        :rules="{ required: true, gddSendAmount: [20, validMaxGDD] }"
+        typ="ContributionForm"
+      ></input-amount>
+
       <b-row class="mt-5">
         <b-col>
           <b-button type="reset" variant="secondary" @click="reset" data-test="button-cancel">
diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue
index 9b1f8b996..165726d61 100644
--- a/frontend/src/components/Inputs/InputHour.vue
+++ b/frontend/src/components/Inputs/InputHour.vue
@@ -50,7 +50,7 @@ export default {
   },
   watch: {
     currentValue() {
-      this.$emit('input', this.currentValue)
+      this.$emit('input', isNaN(Number(this.currentValue)) ? 0 : Number(this.currentValue))
     },
     value() {
       if (this.value !== this.currentValue) this.currentValue = this.value
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index b4986af46..41ecc75e9 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -284,15 +284,6 @@ describe('Community', () => {
         it('verifies the login (to get the new creations available)', () => {
           expect(apolloRefetchMock).toBeCalled()
         })
-
-        it('set all data to the default values)', () => {
-          const now = new Date().toISOString().split('T')[0]
-
-          expect(wrapper.vm.form.id).toBe(null)
-          expect(wrapper.vm.form.date.text()).toContain(now)
-          expect(wrapper.vm.form.memo).toBe('')
-          expect(wrapper.vm.form.amount).toBe('')
-        })
       })
 
       describe('with error', () => {
diff --git a/frontend/src/validation-rules.js b/frontend/src/validation-rules.js
index 6614d728b..abb89b59f 100644
--- a/frontend/src/validation-rules.js
+++ b/frontend/src/validation-rules.js
@@ -56,7 +56,6 @@ export const loadAllRules = (i18nCallback) => {
 
   extend('gddCreationTime', {
     validate(value, { min, max }) {
-      if (value) value = value.replace(',', '.')
       return value >= min && value <= max
     },
     params: ['min', 'max'],

From 4f0a78022a464becccb676c9edd292ea293056a4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 11:10:06 +0100
Subject: [PATCH 16/21] fix tests

---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 ++
 frontend/src/components/Contributions/ContributionForm.vue     | 2 +-
 frontend/src/components/Inputs/InputHour.spec.js               | 2 +-
 frontend/src/components/Inputs/InputHour.vue                   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index c417ca54c..bc7ed9785 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -12,6 +12,7 @@ describe('ContributionForm', () => {
       date: '',
       memo: '',
       amount: '',
+      hours: 0,
     },
     isThisMonth: true,
     minimalDate: new Date(),
@@ -375,6 +376,7 @@ describe('ContributionForm', () => {
                       date: now,
                       memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
                       amount: '200',
+                      hours: 0,
                     },
                   ]),
                 ]),
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 7e6ca4737..210841b05 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -109,7 +109,7 @@ export default {
       this.form.id = null
       this.form.date = ''
       this.form.memo = ''
-      this.form.hours = null
+      this.form.hours = 0
       this.form.amount = ''
     },
   },
diff --git a/frontend/src/components/Inputs/InputHour.spec.js b/frontend/src/components/Inputs/InputHour.spec.js
index d1eb06c5c..482c64343 100644
--- a/frontend/src/components/Inputs/InputHour.spec.js
+++ b/frontend/src/components/Inputs/InputHour.spec.js
@@ -74,7 +74,7 @@ describe('InputHour', () => {
       it('emits input with new value', async () => {
         await wrapper.find('input').setValue('12')
         expect(wrapper.emitted('input')).toBeTruthy()
-        expect(wrapper.emitted('input')).toEqual([['12']])
+        expect(wrapper.emitted('input')).toEqual([[12]])
       })
     })
 
diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue
index 165726d61..9f80cc4f6 100644
--- a/frontend/src/components/Inputs/InputHour.vue
+++ b/frontend/src/components/Inputs/InputHour.vue
@@ -50,7 +50,7 @@ export default {
   },
   watch: {
     currentValue() {
-      this.$emit('input', isNaN(Number(this.currentValue)) ? 0 : Number(this.currentValue))
+      this.$emit('input', Number(this.currentValue))
     },
     value() {
       if (this.value !== this.currentValue) this.currentValue = this.value

From e062fc62884a6b07b2195bedce0d52962f32e5e1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 11:33:53 +0100
Subject: [PATCH 17/21] fix lint

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6627f4bf2..c955be93a 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -47,7 +47,6 @@
     },
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
-    "exhausted": "Für diesen Monat kannst du nichts mehr schöpfen.",
     "formText": {
       "bringYourTalentsTo": "Bring dich mit deinen Talenten in die Gemeinschaft ein! Dein freiwilliges Engagement honorieren wir mit 20 GDD pro Stunde bis maximal 1.000 GDD im Monat.",
       "describeYourCommunity": "Beschreibe deine Gemeinwohl-Tätigkeit mit Angabe der Stunden und trage einen Betrag von 20 GDD pro Stunde ein! Nach Bestätigung durch einen Moderator wird der Betrag deinem Konto gutgeschrieben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index f2cc094ed..3528470fb 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -47,7 +47,6 @@
     },
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
-    "exhausted": "You cannot create anything more for this month.",
     "formText": {
       "bringYourTalentsTo": "Bring your talents to the community! Your voluntary commitment will be rewarded with 20 GDD per hour up to a maximum of 1,000 GDD per month.",
       "describeYourCommunity": "Describe your community service activity with hours and enter an amount of 20 GDD per hour! After confirmation by a moderator, the amount will be credited to your account.",

From 7bcb3c915eb9186686eefdc3bcd1c9a6d4b3b2cd Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 11:41:46 +0100
Subject: [PATCH 18/21] Update frontend/src/components/Inputs/InputHour.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Inputs/InputHour.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue
index 9f80cc4f6..0b0f50c87 100644
--- a/frontend/src/components/Inputs/InputHour.vue
+++ b/frontend/src/components/Inputs/InputHour.vue
@@ -35,7 +35,7 @@ export default {
     name: { type: String, required: true },
     label: { type: String, required: true },
     placeholder: { type: String, required: true },
-    value: { type: Number, required: true },
+    value: { type: Number, required: true, default: 0 },
     validMaxTime: { type: Number, required: true },
   },
   data() {

From 81fee35064601a105f35b62d8ec26d5fff36a038 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 11:41:58 +0100
Subject: [PATCH 19/21] Update frontend/src/components/Inputs/InputHour.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Inputs/InputHour.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue
index 0b0f50c87..89380e73f 100644
--- a/frontend/src/components/Inputs/InputHour.vue
+++ b/frontend/src/components/Inputs/InputHour.vue
@@ -40,7 +40,7 @@ export default {
   },
   data() {
     return {
-      currentValue: null,
+      currentValue: 0,
     }
   },
   computed: {

From c623ff1294b809a77111f7bc8c38d59f71820c5c Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 11:42:08 +0100
Subject: [PATCH 20/21] Update frontend/src/components/Inputs/InputHour.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Inputs/InputHour.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Inputs/InputHour.spec.js b/frontend/src/components/Inputs/InputHour.spec.js
index 482c64343..293c8a332 100644
--- a/frontend/src/components/Inputs/InputHour.spec.js
+++ b/frontend/src/components/Inputs/InputHour.spec.js
@@ -58,7 +58,7 @@ describe('InputHour', () => {
       })
 
       it('has the value 0', () => {
-        expect(wrapper.vm.currentValue).toEqual(null)
+        expect(wrapper.vm.currentValue).toEqual(0)
       })
 
       it('has the label "input-field-label"', () => {

From 5dec52f508b3511327cd90e5fb7cdad12bcf9c36 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 17 Jan 2023 11:58:26 +0100
Subject: [PATCH 21/21] add icon for deleted in crontibution list

---
 .../components/Contributions/ContributionListItem.spec.js  | 2 +-
 .../src/components/Contributions/ContributionListItem.vue  | 7 +++++--
 .../src/components/Template/RightSide/ContributionInfo.vue | 4 ++++
 frontend/src/locales/de.json                               | 1 +
 frontend/src/locales/en.json                               | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 86b0efa31..3415ee5d3 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -48,7 +48,7 @@ describe('ContributionListItem', () => {
 
       it('is x-circle when deletedAt is present', async () => {
         await wrapper.setProps({ deletedAt: new Date().toISOString() })
-        expect(wrapper.vm.icon).toBe('x-circle')
+        expect(wrapper.vm.icon).toBe('trash')
       })
 
       it('is check when confirmedAt is present', async () => {
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index d46b79c52..1f35097ef 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -30,7 +30,10 @@
           <div class="small">
             {{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
           </div>
-          <div class="font-weight-bold">{{ amount | GDD }}</div>
+          <div v-if="state === 'DELETED'" class="small">
+            {{ $t('contribution.deleted') }}
+          </div>
+          <div v-else class="font-weight-bold">{{ amount | GDD }}</div>
         </b-col>
         <b-col cols="12" md="1" lg="1" class="text-right align-items-center">
           <div v-if="messagesCount > 0" @click="visible = !visible">
@@ -168,7 +171,7 @@ export default {
   },
   computed: {
     icon() {
-      if (this.deletedAt) return 'x-circle'
+      if (this.deletedAt) return 'trash'
       if (this.confirmedAt) return 'check'
       if (this.state === 'IN_PROGRESS') return 'question-circle'
       return 'bell-fill'
diff --git a/frontend/src/components/Template/RightSide/ContributionInfo.vue b/frontend/src/components/Template/RightSide/ContributionInfo.vue
index 68cf65867..f6f218ecb 100644
--- a/frontend/src/components/Template/RightSide/ContributionInfo.vue
+++ b/frontend/src/components/Template/RightSide/ContributionInfo.vue
@@ -22,6 +22,10 @@
           <b-icon icon="x-circle" variant="danger"></b-icon>
           {{ $t('contribution.alert.rejected') }}
         </li>
+        <li>
+          <b-icon icon="trash" variant="danger"></b-icon>
+          {{ $t('contribution.alert.deleted') }}
+        </li>
       </ul>
     </div>
     <div v-if="hash === '#all'" show fade variant="secondary" class="text-dark">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index c955be93a..5c0ee9f96 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -40,6 +40,7 @@
       "answerQuestion": "Bitte beantworte die Rückfrage!",
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
+      "deleted": "gelöscht",
       "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
       "pending": "Eingereicht und wartet auf Bestätigung",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 3528470fb..7a210f6a0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -40,6 +40,7 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
+      "deleted": "deleted",
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
       "pending": "Submitted and waiting for confirmation",