From 38b695a2f78d48f4ac419086d60828f7ca5ff676 Mon Sep 17 00:00:00 2001
From: Antoine Rochebois <antoine.rochebois@insa-lyon.fr>
Date: Mon, 15 Mar 2021 15:34:54 +0100
Subject: [PATCH] minor
---
client/src/App.vue | 12 ++++++++++--
client/src/usbNfcReader.js | 2 +-
server/server.js | 8 ++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/client/src/App.vue b/client/src/App.vue
index 25126e7..3b3598e 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,7 +1,7 @@
<template>
<div class="content page-wrapper">
<div class="content-wrapper">
- <nav class="navbar is-fixed-top">
+ <nav class="navbar is-fixed-top mb-6">
<div class="navbar-brand">
<a class="navbar-item"
><router-link to="/"><i class="fas fa-home" /> Home</router-link></a
@@ -74,7 +74,7 @@
</nav>
<transition name="fade">
- <router-view class="section"></router-view>
+ <router-view class="section container is-widescreen mt-6"></router-view>
</transition>
</div>
@@ -96,6 +96,14 @@ export default {
created() {
this.usbNfcReader = new UsbNfcReader();
},
+ mounted() {
+ let uri = "//localhost:3000/loginCheck";
+ this.axios.post(uri, {}, { withCredentials: true }).then(response => {
+ console.log(response);
+ if (response.data != "ok")
+ this.$store.commit("logout");
+ });
+ },
methods: {
logout() {
let uri = "//localhost:3000/logout";
diff --git a/client/src/usbNfcReader.js b/client/src/usbNfcReader.js
index aebbbec..5a680ca 100644
--- a/client/src/usbNfcReader.js
+++ b/client/src/usbNfcReader.js
@@ -60,7 +60,7 @@ export default class UsbNfcReader {
console.log("Reçu :" + msg);
let cmdIdentifier = msg.split('_')[0]
if (msg == "RECEIVED_GETID;") {
- console.log("yay ! bien reçu !")
+ console.log("GETID request ACK by Arduino")
} else if (cmdIdentifier == "UID" && msg.slice(-1) == ';') {
resolve(msg.split('_')[1].slice(0, -1))
} else {
diff --git a/server/server.js b/server/server.js
index ad0afc8..cd87ecf 100644
--- a/server/server.js
+++ b/server/server.js
@@ -68,6 +68,14 @@ app.post('/register', function(req, res) {
})
+app.post('/loginCheck', function(req, res) {
+ if (req.user) {
+ res.send('ok')
+ } else {
+ res.send('failed')
+ }
+})
+
//Initialisation
app.listen(port, () => {
console.log(`Example app listening at http://localhost:${port}`)
--
GitLab