From a214059b90ed61ea2f03d0dc19a442e2565fdd4b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 21 Dec 2022 13:48:55 +0100
Subject: [PATCH] Community Information page style

---
 frontend/src/App.vue                               |  4 ++--
 frontend/src/components/Breadcrumb/breadcrumb.vue  |  4 +++-
 .../components/Contributions/ContributionForm.vue  |  9 ++++-----
 frontend/src/components/Inputs/InputTextarea.vue   |  2 ++
 frontend/src/components/UserSettings/UserCard.vue  | 14 ++++++++++----
 frontend/src/layouts/DashboardLayout.vue           |  4 ++--
 frontend/src/locales/de.json                       |  6 +++---
 frontend/src/locales/en.json                       |  6 +++---
 frontend/src/locales/es.json                       |  1 -
 frontend/src/locales/fr.json                       |  3 +--
 frontend/src/locales/nl.json                       |  1 -
 frontend/src/locales/tr.json                       |  3 +--
 frontend/src/pages/InfoStatistic.vue               |  9 +++++----
 13 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index df5b61d77..d35a31116 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,8 +1,8 @@
 <template>
-  <div id="app" class="h-100">
+  <div id="app">
     <div :class="$route.meta.requiresAuth ? 'appContent' : ''">
       <component :is="$route.meta.requiresAuth ? 'DashboardLayout' : 'AuthLayout'" />
-      <div class="goldrand position-fixed w-100 fixed-bottom zindex1000"></div>
+      <div class="goldrand position-fixed fixed-bottom zindex1000"></div>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/Breadcrumb/breadcrumb.vue b/frontend/src/components/Breadcrumb/breadcrumb.vue
index c616fff1d..8636a7b8a 100644
--- a/frontend/src/components/Breadcrumb/breadcrumb.vue
+++ b/frontend/src/components/Breadcrumb/breadcrumb.vue
@@ -16,11 +16,13 @@
   </div>
 </template>
 <script>
+import CONFIG from '@/config'
+
 export default {
   name: 'Breadcrumb',
   computed: {
     pageTitle() {
-      const options = { name: this.$store.state.firstName }
+      const options = { name: this.$store.state.firstName, community: CONFIG.COMMUNITY_NAME }
       // eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys
       return this.$t(`pageTitle.${this.$route.meta.pageTitle}`, options)
     },
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index a61399c44..d545102ec 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -17,7 +17,7 @@
       @submit.prevent="submit"
       class="border p-3 bg-white appBoxShadow gradido-border-radius"
     >
-      <label>{{ $t('contribution.selectDate') }} {{ $t('math.asterisk') }}</label>
+      <label>{{ $t('contribution.selectDate') }}</label>
       <b-form-datepicker
         id="contribution-date"
         v-model="form.date"
@@ -43,9 +43,9 @@
           :rules="{ required: true, min: 5, max: 255 }"
         />
         <input-time
-          v-model="form.time"
-          :name="$t('form.time')"
-          :label="$t('form.time')"
+          v-model="form.hours"
+          :name="$t('form.hours')"
+          :label="$t('form.hours')"
           placeholder="0.5"
           :rules="{
             required: true,
@@ -122,7 +122,6 @@
         </b-col>
       </b-row>
     </b-form>
-    <p class="p-2">{{ $t('math.asterisk') }} {{ $t('form.mandatoryField') }}</p>
   </div>
 </template>
 <script>
diff --git a/frontend/src/components/Inputs/InputTextarea.vue b/frontend/src/components/Inputs/InputTextarea.vue
index 87ef1ae9d..908415899 100644
--- a/frontend/src/components/Inputs/InputTextarea.vue
+++ b/frontend/src/components/Inputs/InputTextarea.vue
@@ -15,6 +15,8 @@
         :placeholder="placeholder"
         :state="validated ? valid : false"
         trim
+        rows="4"
+        max-rows="4"
       ></b-form-textarea>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}
diff --git a/frontend/src/components/UserSettings/UserCard.vue b/frontend/src/components/UserSettings/UserCard.vue
index 0056dec1c..f1982987c 100755
--- a/frontend/src/components/UserSettings/UserCard.vue
+++ b/frontend/src/components/UserSettings/UserCard.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="userdata-card">
-    <b-card class="border-0">
-      <div class="justify-content-center">
+    <b-row>
+      <b-col class="centerPerMargin">
         <avatar :username="username" :color="'#fff'" :size="90"></avatar>
-      </div>
-
+      </b-col>
+    </b-row>
+    <b-card class="border-0">
       <b-container class="justify-content-center mt-md-5">
         <b-row>
           <b-col>
@@ -57,3 +58,8 @@ export default {
   },
 }
 </script>
+<style scoped>
+.centerPerMargin {
+  padding-left: 38%;
+}
+</style>
diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vue
index 735886425..cc706e2b6 100755
--- a/frontend/src/layouts/DashboardLayout.vue
+++ b/frontend/src/layouts/DashboardLayout.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-page h-100">
+  <div class="main-page">
     <div v-if="skeleton">
       <skeleton-overview />
     </div>
@@ -23,7 +23,7 @@
 
       <!-- Breadcrumb -->
       <b-row>
-        <b-col cols="12" offset-lg="2">
+        <b-col cols="10" offset-lg="2">
           <breadcrumb />
         </b-col>
       </b-row>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6706623d1..195c11aa0 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -124,7 +124,6 @@
     "from": "Von",
     "generate_now": "Jetzt generieren",
     "lastname": "Nachname",
-    "mandatoryField": "Pflichtfeld",
     "memo": "Nachricht",
     "message": "Nachricht",
     "new_balance": "Neuer Kontostand nach Bestätigung",
@@ -146,7 +145,7 @@
     "send_transaction_success": "Deine Transaktion wurde erfolgreich ausgeführt",
     "sorry": "Entschuldigung",
     "thx": "Danke",
-    "time": "Zeit",
+    "hours": "Stunden",
     "to": "bis",
     "to1": "an",
     "validation": {
@@ -331,13 +330,14 @@
   },
   "via_link": "über einen Link",
   "welcome": "Willkommen in der Gemeinschaft",
+  "communityInfo":"Gemeinschaft Information",
   "pageTitle": {
     "overview":"Willkommen {name}",
     "send":"Sende Gradidos",
     "transactions":"Deine Transaktionen",
     "gdt":"Deine GDT Transaktionen",
     "community":"Meine Gemeinschaft",
-    "information":"Gemeinschaft Info",
+    "information":"{community}",
     "settings":"Einstellungen"
   }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d3e42f179..5fb0a23ba 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -124,7 +124,6 @@
     "from": "from",
     "generate_now": "Generate now",
     "lastname": "Lastname",
-    "mandatoryField": "mandatory field",
     "memo": "Message",
     "message": "Message",
     "new_balance": "Account balance after confirmation",
@@ -146,7 +145,7 @@
     "send_transaction_success": "Your transaction was successfully completed",
     "sorry": "Sorry",
     "thx": "Thank you",
-    "time": "Time",
+    "hours": "Horas",
     "to": "to",
     "to1": "to",
     "validation": {
@@ -331,13 +330,14 @@
   },
   "via_link": "via Link",
   "welcome": "Welcome to the community",
+  "communityInfo":"Community Information",
   "pageTitle": {
     "overview": "Welcome {name}",
     "send": "Send Gradidos",
     "transactions": "Your transactions",
     "gdt": "Your GDT transactions",
     "community": "My community",
-    "information": "Community Info",
+    "information":"{community}",
     "settings": "Settings"
   }
 }
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index a3c618f7c..324427ef8 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -122,7 +122,6 @@
     "from": "De",
     "generate_now": "crear ahora",
     "lastname": "Apellido",
-    "mandatoryField": "campo obligatorio",
     "memo": "Mensaje",
     "message": "Noticia",
     "new_balance": "Saldo de cuenta nuevo depués de confirmación",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 9f1819e22..b6577ac20 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -122,7 +122,6 @@
     "from": "de",
     "generate_now": "Produire maintenant",
     "lastname": "Nom",
-    "mandatoryField": "champ obligatoire",
     "memo": "Note",
     "message": "Message",
     "new_balance": "Montant du solde après confirmation",
@@ -144,7 +143,7 @@
     "send_transaction_success": "Votre transaction a été effectuée avec succès",
     "sorry": "Désolé",
     "thx": "Merci",
-    "time": "Heure",
+    "hours": "Uren",
     "to": "à",
     "to1": "à",
     "validation": {
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index b8a01e2e7..244813b09 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -122,7 +122,6 @@
     "from": "Van",
     "generate_now": "Nu genereren",
     "lastname": "Achternaam",
-    "mandatoryField": "verplicht veld",
     "memo": "Memo",
     "message": "Bericht",
     "new_balance": "Nieuw banksaldo na bevestiging",
diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json
index 30778bf28..48fb44c07 100644
--- a/frontend/src/locales/tr.json
+++ b/frontend/src/locales/tr.json
@@ -115,7 +115,6 @@
     "from": "Gönderen",
     "generate_now": "Şimdi oluştur",
     "lastname": "Soyadı",
-    "mandatoryField": "Sorunlu alan",
     "memo": "Mesaj",
     "message": "Mesaj",
     "new_balance": "Onay sonrası hesap bakiyesi",
@@ -136,7 +135,7 @@
     "send_transaction_success": "İşleminiz başarıyla tamamlandı",
     "sorry": "Üzgünüz",
     "thx": "Teşekkür ederiz",
-    "time": "Zaman",
+    "hours": "Saat",
     "to": "Geçerlik",
     "to1": "Alıcı",
     "validation": {
diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index d5e16952e..aa93374f2 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="info-statistic">
     <b-container class="bg-white appBoxShadow gradido-border-radius p-4 mt--3">
-      <div class="h3">{{ $t('community.community') }}</div>
-      <div class="h1">{{ CONFIG.COMMUNITY_NAME }}</div>
-      <div>
+      <div>{{ $t('communityInfo') }}</div>
+      <div class="h3">
         {{ CONFIG.COMMUNITY_DESCRIPTION }}
       </div>
       <div>
-        {{ CONFIG.COMMUNITY_URL }}
+        <router-link :to="CONFIG.COMMUNITY_URL">
+          {{ CONFIG.COMMUNITY_URL }}
+        </router-link>
       </div>
       <hr />
       <div class="h3">{{ $t('community.openContributionLinks') }}</div>