From dbdc578ea3beee4b43a3042b9d6f29cf737e3b24 Mon Sep 17 00:00:00 2001
From: Guillaume FAUVET <g.fauvet.perso@gmail.com>
Date: Fri, 8 Dec 2017 01:22:03 +0100
Subject: [PATCH] upd: build.router.controller (add _SERVER.session.connected)
 upd: public_html.header = (add icon logout) upd: public_html.signup-form (add
 backlink to login) upd: view.vue.header = (change icon if connected or not)
 upd: view.vue.signup-form = (add backling to login)

---
 build/router/controller/js.php  |  3 ++-
 public_html/css/header.css      |  2 ++
 public_html/css/signup-form.css |  7 +++++++
 view/vue/header.vue             | 15 +++++++++++++--
 view/vue/signup-form.vue        | 16 +++++++++++++++-
 5 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/build/router/controller/js.php b/build/router/controller/js.php
index 263b708..a4fc5b5 100644
--- a/build/router/controller/js.php
+++ b/build/router/controller/js.php
@@ -26,7 +26,8 @@
 			echo "window._SERVER = ".json_encode([
 
 				'session' => [
-					'name' => $_SESSION['NAME']
+					'name' => $_SESSION['NAME'],
+                    'connected' => count($_SESSION['ADMIN']) + count($_SESSION['USER']) > 0
 				]
 
 			])."\n";
diff --git a/public_html/css/header.css b/public_html/css/header.css
index 11191b4..7120d70 100644
--- a/public_html/css/header.css
+++ b/public_html/css/header.css
@@ -116,6 +116,7 @@
 #header-notif .hnotif.search{    background-image: url('/image/header/notif/search.svg@aaaaaa');    }
 #header-notif .hnotif.menu{      background-image: url('/image/header/notif/menu.svg@aaaaaa');      }
 #header-notif .hnotif.login{	 background-image: url('/image/header/notif/login.svg@aaaaaa');		}
+#header-notif .hnotif.logout{	 background-image: url('/image/header/notif/logout.svg@aaaaaa');	}
 
 /* HOVER */
 #header-notif .hnotif:hover{
@@ -129,6 +130,7 @@
 #header-notif .hnotif.search:hover{    background-image: url('/image/header/notif/search.svg@ae51da');    }
 #header-notif .hnotif.menu:hover{      background-image: url('/image/header/notif/menu.svg@4a8ad8');      }
 #header-notif .hnotif.login:hover{	 background-image: url('/image/header/notif/login.svg@660088');		  }
+#header-notif .hnotif.logout:hover{	 background-image: url('/image/header/notif/logout.svg@660088');	  }
 
 
 
diff --git a/public_html/css/signup-form.css b/public_html/css/signup-form.css
index f6e01ac..be66aab 100644
--- a/public_html/css/signup-form.css
+++ b/public_html/css/signup-form.css
@@ -106,4 +106,11 @@
 	border-style: solid;
 	border-width: 1px;
 	outline: none;
+}
+
+#SIGNUP-FORM > .body > form > #membre{
+	font-size: 0.8em;
+	color: #006eff;
+	text-decoration: underline;
+	margin-top: 8px;
 }
\ No newline at end of file
diff --git a/view/vue/header.vue b/view/vue/header.vue
index c20ef36..3d872fe 100644
--- a/view/vue/header.vue
+++ b/view/vue/header.vue
@@ -13,7 +13,8 @@
 		<!-- Header Notif -->
 		<div id='header-notif'>
 			<div v-for='(notif, link) in gstore.notif' @click='show_notif(link)' :class='"hnotif " + notif.class' :data-count='notif.count'></div>
-			<div @click='show_login()' class='hnotif login'></div>
+			<div v-if='!is_connected' @click='show_login()' class='hnotif login'></div>
+			<div v-if='is_connected' @click='logout()' class='hnotif logout'></div>
 		</div>
 
 	</div>
@@ -24,7 +25,12 @@
 <script>
 export default {
 	name: 'HEADER',
-	data(){ return { gstore: gstore.data }; },
+	data(){
+	    return {
+	        gstore:			gstore.data,
+			is_connected:	_SERVER.session.connected
+	    };
+	},
 	methods: {
 		show_notif(uri){
 			this.gstore.func.nav(this.$router, uri);
@@ -32,6 +38,11 @@ export default {
 		show_login() {
             this.gstore.signupform = false;
             this.gstore.loginform = !this.gstore.loginform;
+		},
+		logout() {
+		    api.call('DELETE user/logout', null, function() {
+		        document.location = '';
+			});
 		}
 	}
 }
diff --git a/view/vue/signup-form.vue b/view/vue/signup-form.vue
index 5ff120e..784d080 100644
--- a/view/vue/signup-form.vue
+++ b/view/vue/signup-form.vue
@@ -19,6 +19,7 @@
                 <input v-model='password_val' type='password' id='password'>
                 <p v-if='err_username || err_mail || err_unknow' id='msg-err'>{{ err_message }}</p>
                 <button id='btn-create-account'>Créer mon compte</button>
+                <p @click='redirect_login' id='membre'>Déjà membre ? Connectez-vous !</p>
             </form>
         </div>
 
@@ -72,9 +73,22 @@
                     }
                     /* (2) Close the sign up form authentication */
                     else {
-                        document.location = '';
+                        this.infobox._display('Inscription terminée ! Connexion en cours ...', 'info', 3000);
+
+                        let request = {
+                            username: this.username_val,
+                            password: this.password_val
+                        };
+
+                        api.call("POST user/login", request, function (response) {
+                            document.location = '';
+                        });
                     }
                 }.bind(this));
+            },
+            redirect_login() {
+                this.gstore.signupform = false;
+                this.gstore.loginform = true;
             }
         }
     }