From ba7752ebe7f8a9b6746c218a168584fbf2b19ad3 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 5 Mar 2021 15:01:12 +0100
Subject: [PATCH] style and color conzepted

---
 frontend/src/App.vue                          |  7 ++
 .../src/components/SidebarPlugin/SideBar.vue  | 83 ++++---------------
 frontend/src/views/AdminOverview.vue          |  3 +-
 frontend/src/views/Dashboard.vue              |  2 +-
 frontend/src/views/KontoOverview.vue          |  2 +-
 frontend/src/views/Layout/ContentFooter.vue   |  2 +-
 frontend/src/views/Layout/DashboardLayout.vue | 67 ++++-----------
 frontend/src/views/Layout/DashboardNavbar.vue | 15 ++--
 frontend/src/views/NotFoundPage.vue           |  2 +-
 frontend/src/views/Pages/Login.vue            |  4 +-
 frontend/src/views/Pages/UserProfile.vue      |  3 -
 .../src/views/Pages/UserProfileActivity.vue   |  6 +-
 frontend/src/views/Pages/UserProfileCard.vue  |  3 -
 frontend/src/views/Pages/UserProfileEdit.vue  | 23 +----
 14 files changed, 55 insertions(+), 167 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 6e8912edb..d89ca100d 100755
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -50,7 +50,14 @@ export default {
 }
 </script>
 <style>
+    .btn {
+          background-color: #5A7B02;
+    border-color: #5e72e4;
+    }
+     a, .copyright{
+        color: #5A7B02;
     
+    }
     gradido-global-color-text{color:  #3D443B }
     gradido-global-color-accent{color:  #047006 }
     gradido-global-color-6e0a9c9e{color:  #000 } 
diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue
index ef9ae553a..734976777 100755
--- a/frontend/src/components/SidebarPlugin/SideBar.vue
+++ b/frontend/src/components/SidebarPlugin/SideBar.vue
@@ -1,5 +1,5 @@
 <template>
-    <nav class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-white" id="sidenav-main">
+    <nav class="navbar navbar-vertical fixed-left navbar-expand-md navbar-light bg-transparent" id="sidenav-main">
         <div class="container-fluid">
 
             <!--Toggler-->
@@ -12,17 +12,7 @@
 
             <slot name="mobile-right">
                 <ul class="nav align-items-center d-md-none">
-                    <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
-                        <a slot="title-container" class="nav-link nav-link-icon" href="#" role="button"
-                           aria-haspopup="true" aria-expanded="false">
-                            <i class="ni ni-bell-55"></i>
-                        </a>
-
-                        <a class="dropdown-item" href="#">Action</a>
-                        <a class="dropdown-item" href="#">Another action</a>
-                        <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="#">Something else here</a>
-                    </base-dropdown>
+                
                     <base-dropdown class="nav-item" menu-on-right tag="li" title-tag="a">
                         <a slot="title-container" class="nav-link" href="#" role="button">
                             <div class="media align-items-center">
@@ -31,32 +21,29 @@
                               </span>
                             </div>
                         </a>
-
-                        <div class=" dropdown-header noti-title">
-                            <h6 class="text-overflow m-0">{{ $t('welcome')  }}</h6>
-                        </div>
-                        <router-link to="/KontoOverview" class="dropdown-item">
+ 
+                        <router-link to="/KontoOverview" class="dropdown-item text-lg text-muted">
                             <i class="ni ni-single-02"></i>
                             <span>{{ $t('site.overview.account_overview')}}</span>
                         </router-link>
-                        <router-link to="/profile" class="dropdown-item">
+                        <router-link to="/profile" class="dropdown-item  text-lg text-muted">
                             <i class="ni ni-single-02"></i>
                             <span>{{ $t('site.navbar.my-profil')}}</span>
                         </router-link>
-                        <router-link to="/profileedit" class="dropdown-item">
+                        <router-link to="/profileedit" class="dropdown-item  text-lg text-muted">
                             <i class="ni ni-settings-gear-65"></i>
                             <span>{{ $t('site.navbar.settings') }}</span>
                         </router-link>
-                        <router-link to="/activity" class="dropdown-item">
+                        <router-link to="/activity" class="dropdown-item  text-lg text-muted">
                             <i class="ni ni-calendar-grid-58"></i>
                             <span>{{ $t('site.navbar.activity') }}</span>
                         </router-link>
-                        <router-link to="/profile" class="dropdown-item">
-                            <i class="ni ni-support-16"></i>
-                            <span>{{ $t('site.navbar.support') }}</span>
-                        </router-link>
-                        <div class="dropdown-divider"></div>
                        
+                        <div class="dropdown-divider"></div>
+                        <router-link @click="logout" class="dropdown-item  text-lg text-muted">
+                            <i class="ni ni-support-16"></i>
+                            <span>{{ $t('logout') }}</span>
+                        </router-link>
                     </base-dropdown>
                 </ul>
             </slot>
@@ -80,50 +67,14 @@
                     <slot name="links">
                     </slot>
                 </ul>
-                <!--Divider-->
+              
                 <hr class="my-3">
-                <!--Heading-->
-                <h6 class="navbar-heading text-muted">{{ $t('site.sidebar.community') }}</h6>
-                <!--Navigation-->
+     
                 <ul class="navbar-nav mb-md-3">
-                    <li class="nav-item">
-                        <a class="nav-link"
-                           href="https://gradido.net/de/">
-                            Gradido.net
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link"
-                           href="https://elopage.com/s/gradido/sign_in">
-                           {{ $t('site.sidebar.members_area') }}
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link"
-                           href="https://gradido.net/de/memberships/">
-                           {{ $t('site.sidebar.membership') }}
-                        </a>
-                    </li>
-                </ul>
-                 <!--Divider-->
-                <hr class="my-3">
-                  <!--Heading-->
-                <h6 class="navbar-heading text-muted">{{ $t('language') }}</h6>
-                <!--Navigation-->
-                <ul class="navbar-nav mb-md-3">
-                    <li class="nav-item">
-                        <div class="nav-link"  @click.prevent="setLocale('en')">
-                         {{ $t('languages.en') }}</div>
-                    </li>
-                    <li class="nav-item">                       
-                        <a class="nav-link" href="#!"  @click.prevent="setLocale('de')">
-                           {{ $t('languages.de') }} 
-                         </a>
-                    </li>
+                   
                      <li class="nav-item"> 
-
-                        <hr class="my-3">
-                        <a class="nav-link" href="#!"  @click="logout">
+ 
+                        <a class="nav-link text-lg bg-light" href="#!"  @click="logout">
                         {{ $t('logout') }}
                         </a>
                      </li>
diff --git a/frontend/src/views/AdminOverview.vue b/frontend/src/views/AdminOverview.vue
index 888df8380..7c7124eab 100644
--- a/frontend/src/views/AdminOverview.vue
+++ b/frontend/src/views/AdminOverview.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <base-header class="pb-6 pb-8 pt-5 pt-md-8 bg-gradient-success">
-      <!-- Card stats -->
+    <base-header class="pb-6 pb-8 pt-5 pt-md-8">
       <b-row>
         <b-col xl="3" md="6">
           <stats-card :title="$t('admin.site.overview.creation')"
diff --git a/frontend/src/views/Dashboard.vue b/frontend/src/views/Dashboard.vue
index b52871131..d7313896d 100644
--- a/frontend/src/views/Dashboard.vue
+++ b/frontend/src/views/Dashboard.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
 
-    <base-header class="pb-6 pb-8 pt-5 pt-md-8 bg-gradient-success">
+    <base-header class="pb-6 pb-8 pt-5 pt-md-8">
       <!-- Card stats -->
       <b-row>
         <b-col xl="3" md="6">
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/KontoOverview.vue
index 23af21cee..777c665c4 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/KontoOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <base-header class="pb-6 pb-8 pt-5 pt-md-8 bg-gradient-success">
+    <base-header class="pb-6 pb-8 pt-5 pt-md-8 bg-transparent">
       <gdd-status />        
       <br>
       <gdd-sent />
diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue
index 5a73f4cb4..a413121b3 100755
--- a/frontend/src/views/Layout/ContentFooter.vue
+++ b/frontend/src/views/Layout/ContentFooter.vue
@@ -1,5 +1,5 @@
 <template>
-  <footer class="footer px-4">
+  <footer class="footer px-4 bg-transparent">
     <b-row align-v="center" class="justify-content-lg-between">
       <b-col lg="6">
         <div class="copyright text-center text-lg-left text-muted">
diff --git a/frontend/src/views/Layout/DashboardLayout.vue b/frontend/src/views/Layout/DashboardLayout.vue
index a33537c49..1bba74762 100755
--- a/frontend/src/views/Layout/DashboardLayout.vue
+++ b/frontend/src/views/Layout/DashboardLayout.vue
@@ -2,62 +2,25 @@
   <div class="wrapper">
     <notifications></notifications>
     <side-bar>
-      <template slot="links">
-        <sidebar-item
-          :link="{
-            name: 'Kontoübersicht',
-            path: 'KontoOverview',
-            icon: 'ni ni-tv-2 text-primary',
-          }"
-        >
-        </sidebar-item> 
-        <sidebar-item
-              :link="{
-                name: 'Profil',
-                path: '/profile',
-                icon: 'ni ni-single-02 text-yellow'
-                }">
-        </sidebar-item>
-        <sidebar-item
-              :link="{
-                name: 'Settings',
-                path: '/profileedit',
-                icon: 'ni ni-single-02 text-yellow'
-                }">
-        </sidebar-item>
-        <sidebar-item
-              :link="{
-                name: 'Activity',
-                path: '/activity',
-                icon: 'ni ni-single-02 text-yellow'
-                }">
-        </sidebar-item>
-         <b-nav-item href="#!" @click="logout">
-              <i class="ni ni-palette"></i>
-              <b-nav-text class="p-0">Logout</b-nav-text>
+      <template slot="links" >
+       
+         <b-nav-item href="#!" to="/KontoOverview">
+               
+              <b-nav-text class="p-0 text-lg text-muted">Senden</b-nav-text>
           </b-nav-item>
-      </template>
-
-      <template slot="links-after">
-        <hr class="my-3">
-        <h6 class="navbar-heading p-0 text-muted">Community</h6>
-
-        <b-nav class="navbar-nav mb-md-3">
-          <b-nav-item
-               href="https://gradido.net/de/" target="_blank"
-               >
-              <i class="ni ni-spaceship"></i>
-              <b-nav-text class="p-0">GRADIDO.net</b-nav-text>
+         <b-nav-item href="#!" to="/profile">
+             
+              <b-nav-text class="p-0 text-lg text-muted">Profil</b-nav-text>
           </b-nav-item>
-          <b-nav-item href="https://elopage.com/s/gradido/sign_in">
-              <i class="ni ni-palette"></i>
-              <b-nav-text class="p-0">Mitgliederbereich</b-nav-text>
+         <b-nav-item href="#!" to="/profileedit">
+              
+              <b-nav-text class="p-0 text-lg text-muted">Settings</b-nav-text>
           </b-nav-item>
-          <b-nav-item href="https://gradido.net/de/memberships/">
-              <i class="ni ni-ui-04"></i>
-              <b-nav-text class="p-0">Mitgliedschaft</b-nav-text>
+         <b-nav-item href="#!" to="/activity">
+             
+              <b-nav-text class="p-0 text-lg text-muted">Activity</b-nav-text>
           </b-nav-item>
-        </b-nav>
+          
       </template>
     </side-bar>
     <div class="main-content">
diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue
index 90d730cb2..56e7b092d 100755
--- a/frontend/src/views/Layout/DashboardNavbar.vue
+++ b/frontend/src/views/Layout/DashboardNavbar.vue
@@ -15,20 +15,19 @@
       </li>
     </b-navbar-nav>
     <b-navbar-nav class="align-items-center ml-auto ml-md-0">
-        <b-form class="navbar-search form-inline mr-sm-3"
+       <!-- <b-form class="navbar-search form-inline mr-sm-3"
             :class="{'navbar-search-dark': type === 'default', 'navbar-search-light': type === 'light'}"
             id="navbar-search-main">
-        <b-form-group class="mb-0">
-          <!--
+        <b-form-group class="mb-0">         
           <b-input-group class="input-group-alternative input-group-merge">
             <b-form-input placeholder="Search" type="text"> </b-form-input>
 
             <div class="input-group-append">
               <span class="input-group-text"><i class="fas fa-search"></i></span>
             </div>
-          </b-input-group> -->
+          </b-input-group>  
         </b-form-group>
-      </b-form>
+      </b-form> -->
       <base-dropdown menu-on-right
                      class="nav-item"
                      tag="li"
@@ -41,7 +40,7 @@
                      <vue-qrcode :value="$store.state.email" />
                   </span>
             <b-media-body class="ml-2 d-none d-lg-block">
-              <span class="mb-0 text-sm  font-weight-bold">{{this.$store.state.email}}</span>
+              <span class="mb-0 text-lg  font-weight-bold">{{this.$store.state.email}}</span>
             </b-media-body>
           </b-media>
         </a>
@@ -67,10 +66,6 @@
             <i class="ni ni-calendar-grid-58"></i>
             <span>{{ $t('site.navbar.activity') }}</span>
           </b-dropdown-item>
-          <b-dropdown-item href="#!">
-            <i class="ni ni-support-16"></i>
-            <span>{{ $t('site.navbar.support') }}</span>
-          </b-dropdown-item>
           <div class="dropdown-divider"></div>
           <b-dropdown-item href="#!" @click="logout">
             <i class="ni ni-user-run"></i>
diff --git a/frontend/src/views/NotFoundPage.vue b/frontend/src/views/NotFoundPage.vue
index 59012497a..a72d03a26 100755
--- a/frontend/src/views/NotFoundPage.vue
+++ b/frontend/src/views/NotFoundPage.vue
@@ -390,7 +390,7 @@ anime:{
 body
 {
   background-color:#141019;
-  background: radial-gradient(at 50% -20%, #908392, #0d060e) fixed;
+  background: radial-gradient(at 50% -20%, #047006, #F5F9F7) fixed;
 }
 
 
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 10da4ea48..cf7427415 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -55,10 +55,10 @@
           </b-card>
           <b-row class="mt-3">
             <b-col cols="6">
-              <router-link to="/password" class="text-light"><small>{{ $t('site.login.forgot_pwd')}}</small></router-link>
+              <router-link to="/password" >{{ $t('site.login.forgot_pwd')}}</router-link>
             </b-col>
             <b-col cols="6" class="text-right">
-              <router-link to="/register" class="text-light"><small>{{ $t('site.login.new_wallet')}}</small></router-link>
+              <router-link to="/register">{{ $t('site.login.new_wallet')}}</router-link>
             </b-col>
           </b-row>
         </b-col>
diff --git a/frontend/src/views/Pages/UserProfile.vue b/frontend/src/views/Pages/UserProfile.vue
index 9a4683a3e..c380abc75 100755
--- a/frontend/src/views/Pages/UserProfile.vue
+++ b/frontend/src/views/Pages/UserProfile.vue
@@ -3,9 +3,6 @@
     <div class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header"
         style="min-height: 600px; background-image: url(img/theme/profile-cover.jpg); background-size: cover; background-position: center top;">
       <b-container fluid>
-        <!-- Mask -->
-        <span class="mask bg-gradient-success opacity-8"></span>
-        <!-- Header container -->
         <b-container fluid class="d-flex align-items-center">
           <b-row >
             <b-col lg="7" md="10">
diff --git a/frontend/src/views/Pages/UserProfileActivity.vue b/frontend/src/views/Pages/UserProfileActivity.vue
index 37177dca4..f7ec2c8e1 100644
--- a/frontend/src/views/Pages/UserProfileActivity.vue
+++ b/frontend/src/views/Pages/UserProfileActivity.vue
@@ -1,16 +1,12 @@
 <template>
   <div>
     <div class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header" style="max-height:200px">
-            <b-container fluid>
-        <!-- Mask -->
-        <span class="mask bg-gradient-success opacity-8"></span>
-        <!-- Header container -->
+        <b-container fluid>
         <b-container fluid class="d-flex align-items-center">
           <b-row >
             <b-col lg="7" md="10">
               <h1 class="display-2 text-white">{{this.$store.state.email}} </h1>
                
-           
             </b-col>
           </b-row>
         </b-container>
diff --git a/frontend/src/views/Pages/UserProfileCard.vue b/frontend/src/views/Pages/UserProfileCard.vue
index 75ac47a41..fa7ae82ad 100644
--- a/frontend/src/views/Pages/UserProfileCard.vue
+++ b/frontend/src/views/Pages/UserProfileCard.vue
@@ -2,9 +2,6 @@
   <div>
     <div class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header">
       <b-container fluid>
-        <!-- Mask -->
-        <span class="mask bg-gradient-success opacity-8"></span>
-        <!-- Header container -->
         <b-container fluid class="d-flex align-items-center">
           <b-row >            
           <base-button><router-link to="/profileedit"  > Edit Profil</router-link> </base-button>
diff --git a/frontend/src/views/Pages/UserProfileEdit.vue b/frontend/src/views/Pages/UserProfileEdit.vue
index 7eac3b675..5f838475d 100644
--- a/frontend/src/views/Pages/UserProfileEdit.vue
+++ b/frontend/src/views/Pages/UserProfileEdit.vue
@@ -1,18 +1,7 @@
 <template>
   <div>
     <div class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header">
-      <b-container fluid>
-        <!-- Mask -->
-        <span class="mask bg-gradient-success opacity-8"></span>
-        <!-- Header container -->
-        <b-container fluid class="d-flex align-items-center">
-          <b-row >
-           <base-button><router-link to="/profile"  > mein Profil</router-link> </base-button>
-             
-           
-          </b-row>
-        </b-container>
-      </b-container>
+    
     </div>
 
     <b-container fluid class="mt--6">
@@ -21,22 +10,16 @@
           <edit-profile-form></edit-profile-form>
         </b-col>
       </b-row>
-        <b-row>        
-        <b-col xl="12" class="order-xl-1">
-          <image-uploader-avatar> </image-uploader-avatar>
-        </b-col>
-      </b-row>
     </b-container>
   </div>
 </template>
 <script>
   import EditProfileForm from './UserProfile/EditProfileForm.vue';
-  import ImageUploaderAvatar from './UserProfile/ImageUploaderAvatar.vue';
+
 
   export default {
     components: {
-      EditProfileForm,
-      ImageUploaderAvatar
+      EditProfileForm
     }
   };
 </script>