From 66d8eb39ebdcd3fdf2749c0614e7f33afd572837 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 8 Dec 2017 00:59:01 +0100
Subject: [PATCH 1/4] fix: view.main (added geolocation) | upd:
 vue.emergency|vue.event (added geolocation use)

---
 view/main.js                     |  4 +++-
 view/vue/container/emergency.vue |  2 +-
 view/vue/container/event.vue     | 21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/view/main.js b/view/main.js
index 4e094b6..29a67d6 100755
--- a/view/main.js
+++ b/view/main.js
@@ -60,4 +60,6 @@ delete window._router_;
 
 /* (4) Get geolocation
 ---------------------------------------------------------*/
-navigator.geolocation && navigator.geolocation.getCurrentPosition(function(a, b){ console.log(this, a, b); }, null);
+navigator.geolocation && navigator.geolocation.getCurrentPosition(function(loc){
+	gstore.data.loc = [ loc.coords.latitude, loc.coords.longitude ];
+}, null);
diff --git a/view/vue/container/emergency.vue b/view/vue/container/emergency.vue
index 4b291b3..73687ad 100644
--- a/view/vue/container/emergency.vue
+++ b/view/vue/container/emergency.vue
@@ -55,7 +55,7 @@ export default {
 			/* (2) Prepare request */
 			var rq = {
 				message:  this.gstore.new_msg.emergency,
-				location: [1.1, 2.2],
+				location: this.gstore.loc,
 				username: this.gstore.server.session.name
 			};
 
diff --git a/view/vue/container/event.vue b/view/vue/container/event.vue
index 9c7f8ac..91fad1f 100644
--- a/view/vue/container/event.vue
+++ b/view/vue/container/event.vue
@@ -49,14 +49,27 @@ export default {
 			if( msg.trim().length == 0 )
 				return;
 
-			/* (2) Send message to WebSocket */
-			wsc_event.send(JSON.stringify({message: msg, location: [1.1, 2.2]}));
+			/* (2) Prepare request */
+			var rq = {
+				message:  this.gstore.new_msg.event,
+				location: this.gstore.loc,
+				username: this.gstore.server.session.name
+			};
 
 			/* (3) Add loader */
 			gstore.data.msg_pending.event = true;
 
-			/* (4) Empty input */
-			this.gstore.new_msg.event = '';
+			/* (4) Send request */
+			api.call("POST message/event/"+this.dep, rq, function(rs){
+
+				// {1} If error -> exit //
+				if( rs.error != 0 )
+					return;
+
+				// {2} Empty input //
+				gstore.data.new_msg.event = '';
+
+			});
 
 		},
 		bbcode: function(msg){

From 438607a1e6989e8068569ded69582066775d2047 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 2/4] 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;
             }
         }
     }

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 3/4] 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;
             }
         }
     }

From 8d62ed08e51799fd2c284d1e1de133f5149ab257 Mon Sep 17 00:00:00 2001
From: Guillaume FAUVET <g.fauvet.perso@gmail.com>
Date: Fri, 8 Dec 2017 01:25:10 +0100
Subject: [PATCH 4/4] add: public_html/image/header (missing logout icon)

---
 public_html/image/header/notif/logout.svg | 59 +++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 public_html/image/header/notif/logout.svg

diff --git a/public_html/image/header/notif/logout.svg b/public_html/image/header/notif/logout.svg
new file mode 100644
index 0000000..17ddd76
--- /dev/null
+++ b/public_html/image/header/notif/logout.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="1280"
+   viewBox="0 0 1568 1280"
+   width="1568"
+   id="svg3406"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="logout.svg">
+  <metadata
+     id="metadata3414">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3412" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1153"
+     inkscape:window-height="480"
+     id="namedview3410"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.13169643"
+     inkscape:cx="239.72881"
+     inkscape:cy="640"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3406" />
+  <path
+     d="m 640,1184 q 0,4 1,20 1,16 0.5,26.5 -0.5,10.5 -3,23.5 -2.5,13 -10,19.5 -7.5,6.5 -20.5,6.5 l -320,0 Q 169,1280 84.5,1195.5 0,1111 0,992 L 0,288 Q 0,169 84.5,84.5 169,0 288,0 l 320,0 q 13,0 22.5,9.5 9.5,9.5 9.5,22.5 0,4 1,20 1,16 0.5,26.5 -0.5,10.5 -3,23.5 -2.5,13 -10,19.5 Q 621,128 608,128 l -320,0 q -66,0 -113,47 -47,47 -47,113 l 0,704 q 0,66 47,113 47,47 113,47 l 312,0 11.5,1 11.5,3 8,5.5 7,9 2,13.5 z m 928,-544 q 0,26 -19,45 l -544,544 q -19,19 -45,19 -26,0 -45,-19 -19,-19 -19,-45 l 0,-288 -448,0 q -26,0 -45,-19 -19,-19 -19,-45 l 0,-384 q 0,-26 19,-45 19,-19 45,-19 l 448,0 0,-288 q 0,-26 19,-45 19,-19 45,-19 26,0 45,19 l 544,544 q 19,19 19,45 z"
+     id="fill-edit"
+     inkscape:connector-curvature="0" />
+</svg>