From 1a78ceadcbc0e53c7ee3e660e7cae5088f14a937 Mon Sep 17 00:00:00 2001 From: RemixDev Date: Sat, 11 Apr 2020 21:55:12 +0200 Subject: [PATCH] Testing login feature on app --- public/index.html | 5 ++- public/js/app.js | 1 - public/js/init.js | 89 +++++++++++++++++++++++++++++------------------ 3 files changed, 59 insertions(+), 36 deletions(-) diff --git a/public/index.html b/public/index.html index e1b9111..128834b 100644 --- a/public/index.html +++ b/public/index.html @@ -152,7 +152,10 @@

Home

Charts

Favorites

Link Analyzer

-

Settings

+
+

Settings

+ +

About

diff --git a/public/js/app.js b/public/js/app.js index 2234e11..6a95b72 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -1,5 +1,4 @@ // Debug messages for socketio -socket.emit("init"); socket.on("message", function(msg){ console.log(msg) }) diff --git a/public/js/init.js b/public/js/init.js index 3306134..c8d2cd2 100644 --- a/public/js/init.js +++ b/public/js/init.js @@ -6,23 +6,39 @@ main_selected="" toastsWithId = {} function toast(msg, icon=null, dismiss=true, id=null){ - if (id && $(`div.toastify[toast_id=${id}]`).length) - return - if (icon == null) - icon = "" - else if (icon=='loading') - icon = `
` - else - icon = `${icon}` - toastObj = Toastify({ - text: `${icon}${msg}`, - duration: dismiss ? 3000 : 0, - gravity: 'bottom', - position: 'left' - }).showToast() - if (id){ - toastsWithId[id] = toastObj - $(toastObj.toastElement).attr('toast_id', id) + if (toastsWithId[id]){ + toastObj = toastsWithId[id] + toastDOM = $(`div.toastify[toast_id=${id}]`) + if (msg){ + toastDOM.find(".toast-message").html(msg) + } + if (icon){ + if (icon=='loading') + icon = `
` + else + icon = `${icon}` + toastDOM.find(".toast-icon").html(icon) + } + if (dismiss !== null && dismiss){ + setTimeout(function(){ toastObj.hideToast() }, 3000); + } + }else{ + if (icon == null) + icon = "" + else if (icon=='loading') + icon = `
` + else + icon = `${icon}` + toastObj = Toastify({ + text: `${icon}${msg}`, + duration: dismiss ? 3000 : 0, + gravity: 'bottom', + position: 'left' + }).showToast() + if (id){ + toastsWithId[id] = toastObj + $(toastObj.toastElement).attr('toast_id', id) + } } } @@ -31,23 +47,28 @@ socket.on("toast", (data)=>{ }) socket.on("updateToast", (data)=>{ - if (toastsWithId[data.id]){ - toastObj = toastsWithId[data.id] - toastDOM = $(`div.toastify[toast_id=${data.id}]`) - if (data.msg){ - toastDOM.find(".toast-message").html(data.msg) - } - if (data.icon){ - if (data.icon=='loading') - icon = `
` - else - icon = `${data.icon}` - toastDOM.find(".toast-icon").html(icon) - } - if (data.dismiss !== null && data.dismiss){ - setTimeout(function(){ toastObj.hideToast() }, 3000); - } + toast(data.msg, data.icon || null, data.dismiss !== undefined ? data.dismiss : true, data.id || null) +}) + +function openLoginPrompt(){ + socket.emit("loginpage") +} + +socket.emit("init"); +if (localStorage.getItem("arl")){ + socket.emit("login", localStorage.getItem("arl")); +} + +socket.on("logging_in", function(){ + toast("Logging in", "loading", false, "login-toast") +}) + +socket.on("logged_in", function(data){ + if (data.status != 0){ + console.log(data) + toast("Logged in", "done", true, "login-toast") + if (data.arl && data.status == 1) localStorage.setItem("arl", data.arl) }else{ - toast(data.msg, data.icon || null, data.dismiss !== null ? data.dismiss : true, data.id || null) + toast("Couldn't log in", "close", true, "login-toast") } })