Merge branch 'master' of https://github.com/gradido/gradido

frontend/src/components/SidebarPlugin/SideBar.vue

@@ -58,7 +58,7 @@
         <hr class="my-3" />
         <ul class="navbar-nav mb-md-3">
           <li class="nav-item">
-            <a class="nav-link text-lg" @click="logout">
+            <a class="nav-link text-lg pointer" @click="logout">
               {{ $t('logout') }}
             </a>
           </li>
@@ -107,3 +107,8 @@ export default {
   },
 }
 </script>
+<style>
+.pointer {
+  cursor: pointer;
+}
+</style>

frontend/src/views/KontoOverview/GddSend.vue

@@ -2,18 +2,18 @@
   <div>
     <b-row v-show="row_form">
       <b-col xl="12" md="12">
-        <b-alert variant="warning" show dismissible v-html="$t('form.attention')"></b-alert>
+        <b-alert show dismissible variant="warning" class="text-center">
+          <span class="alert-text" v-html="$t('form.attention')"></span>
+        </b-alert>
         <b-card class="p-0 p-md-3" style="background-color: #ebebeba3 !important">
           <b-alert show variant="secondary">
             <span class="alert-text" v-html="$t('form.scann_code')"></span>
             <b-col v-show="!scan" lg="12" class="text-right">
-              <img src="/img/icons/gradido/qr-scan-pure.png" height="50" @click="scan = true" />
+              <a @click="toggle" class="nav-link">
+                <img src="/img/icons/gradido/qr-scan-pure.png" height="50" />
+              </a>
             </b-col>
-            <b-alert v-show="scan" show variant="warning">
+
-              <span class="alert-text" @click="scan = false">
-                <strong>{{ $t('form.cancel') }}</strong>
-              </span>
-            </b-alert>
             <div v-if="scan">
               <!-- <b-row>                                          
                     <qrcode-capture @detect="onDetect"  capture="user" ></qrcode-capture>                     
@@ -31,6 +31,11 @@
                 </b-row>
               </b-container>
             </div>
+            <b-alert v-show="scan" show variant="primary" class="pointer text-center">
+              <span class="alert-text" @click="toggle">
+                <strong>{{ $t('form.cancel') }}</strong>
+              </span>
+            </b-alert>
           </b-alert>
 
           <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
@@ -223,6 +228,9 @@ export default {
   },
   computed: {},
   methods: {
+    toggle() {
+      this.scan = !this.scan
+    },
     async onDecode(decodedString) {
       //console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
       const arr = JSON.parse(decodedString)
@@ -274,6 +282,12 @@ export default {
 }
 </script>
 <style>
+.pointer {
+  cursor: pointer;
+}
+.pointer:hover {
+  background-color: #3c4d69;
+}
 video {
   max-height: 665px;
   max-width: 665px;

frontend/src/views/KontoOverview/GddTable.vue

@@ -73,14 +73,11 @@
         </b-collapse>
       </b-list-group-item>
       <b-list-group-item v-show="this.$route.path == '/overview'">
-        <b-alert
+        <b-alert v-if="count < 5" show variant="secondary">
-          v-if="count < 5"
+          <span class="alert-text" v-html="$t('transaction.show_part', { count: count })"></span>
-          show
+        </b-alert>
-          variant="secondary"
-          v-html="$t('transaction.show_part', { count: count })"
-        ></b-alert>
         <router-link
-          else
+          v-else
           to="/transactions"
           v-html="$t('transaction.show_all', { count: count })"
         ></router-link>

frontend/src/views/Layout/DashboardNavbar.vue

@@ -10,7 +10,7 @@
       <li class="nav-item d-sm-none"></li>
     </b-navbar-nav>
     <b-navbar-nav class="align-items-center ml-auto ml-md-0">
-      <a class="pr-1" slot="title-container">
+      <a class="pr-1 nav-link" slot="title-container pointer">
         <b-media no-body class="align-items-center">
           <span class="pb-2 text-lg font-weight-bold">
             {{ $store.state.email }}
@@ -41,3 +41,8 @@ export default {
   },
 }
 </script>
+<style>
+.pointer {
+  cursor: pointer;
+}
+</style>

login_server/src/cpp/JSONInterface/JsonUnsecureLogin.cpp

@@ -79,6 +79,8 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
 		USER_DISABLED
 	*/
 	auto user_state = session->loadUser(email, password);
+	auto user_model = session->getNewUser()->getModel();
+	Poco::JSON::Array infos;
 	
 	switch (user_state) {
 	case USER_EMPTY:
@@ -98,6 +100,10 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
 		result->set("state", "disabled");
 		result->set("msg", "user is disabled");
 		break;
+	case USER_NO_GROUP: 
+		user_model->setGroupId(1);
+		user_model->updateIntoDB("group_id", 1);
+		infos.add("set user.group_id to default group_id = 1");
 	case USER_NO_PRIVATE_KEY:
 	case USER_COMPLETE:
 	case USER_EMAIL_NOT_ACTIVATED:
@@ -105,7 +111,14 @@ Poco::JSON::Object* JsonUnsecureLogin::handle(Poco::Dynamic::Var params)
 		result->set("user", session->getNewUser()->getJson());
 		result->set("session_id", session->getHandle());
 		session->setClientIp(mClientIP);
+		if(infos.size() > 0) {
+			result->set("info", infos);
+		}
 		return result;
+	default: 
+		result->set("state", "error");
+		result->set("msg", "unknown user state");
+		result->set("details", USER_NO_GROUP);
 	}
 	
 	sm->releaseSession(session);