evan/deemixer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'login-testing' of RemixDev/deemix into master

Browse Source
This commit is contained in:
RemixDev 2020-04-12 07:17:25 +00:00 committed by Gogs
commit 64b98c7ac7
3 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/index.html
View File

@ -152,7 +152,10 @@ <h1>Home</h1>
<div id="charts_tab" class="main_tabcontent"><h1>Charts</h1></div> <div id="charts_tab" class="main_tabcontent"><h1>Charts</h1></div>
<div id="favorites_tab" class="main_tabcontent"><h1>Favorites</h1></div> <div id="favorites_tab" class="main_tabcontent"><h1>Favorites</h1></div>
<div id="analyzer_tab" class="main_tabcontent"><h1>Link Analyzer</h1></div> <div id="analyzer_tab" class="main_tabcontent"><h1>Link Analyzer</h1></div>
<div id="settings_tab" class="main_tabcontent"><h1>Settings</h1></div> <div id="settings_tab" class="main_tabcontent">
<h1>Settings</h1>
<button type="button" name="button" onclick="openLoginPrompt()">Login with Email and Password</button>
</div>
<div id="about_tab" class="main_tabcontent"><h1>About</h1></div> <div id="about_tab" class="main_tabcontent"><h1>About</h1></div>
</div></section> </div></section>
</div> </div>

1
public/js/app.js
View File

@ -1,5 +1,4 @@
// Debug messages for socketio // Debug messages for socketio
socket.emit("init");
socket.on("message", function(msg){ socket.on("message", function(msg){
console.log(msg) console.log(msg)
}) })

59
public/js/init.js
View File

@ -6,8 +6,23 @@ main_selected=""
toastsWithId = {} toastsWithId = {}
function toast(msg, icon=null, dismiss=true, id=null){ function toast(msg, icon=null, dismiss=true, id=null){
if (id && $(`div.toastify[toast_id=${id}]`).length) if (toastsWithId[id]){
return toastObj = toastsWithId[id]
toastDOM = $(`div.toastify[toast_id=${id}]`)
if (msg){
toastDOM.find(".toast-message").html(msg)
}
if (icon){
if (icon=='loading')
icon = `<div class="circle-loader"></div>`
else
icon = `<i class="material-icons">${icon}</i>`
toastDOM.find(".toast-icon").html(icon)
}
if (dismiss !== null && dismiss){
setTimeout(function(){ toastObj.hideToast() }, 3000);
}
}else{
if (icon == null) if (icon == null)
icon = "" icon = ""
else if (icon=='loading') else if (icon=='loading')
@ -24,6 +39,7 @@ function toast(msg, icon=null, dismiss=true, id=null){
toastsWithId[id] = toastObj toastsWithId[id] = toastObj
$(toastObj.toastElement).attr('toast_id', id) $(toastObj.toastElement).attr('toast_id', id)
} }
}
} }
socket.on("toast", (data)=>{ socket.on("toast", (data)=>{
@ -31,23 +47,28 @@ socket.on("toast", (data)=>{
}) })
socket.on("updateToast", (data)=>{ socket.on("updateToast", (data)=>{
if (toastsWithId[data.id]){ toast(data.msg, data.icon || null, data.dismiss !== undefined ? data.dismiss : true, data.id || null)
toastObj = toastsWithId[data.id] })
toastDOM = $(`div.toastify[toast_id=${data.id}]`)
if (data.msg){ function openLoginPrompt(){
toastDOM.find(".toast-message").html(data.msg) socket.emit("loginpage")
} }
if (data.icon){
if (data.icon=='loading') socket.emit("init");
icon = `<div class="circle-loader"></div>` if (localStorage.getItem("arl")){
else socket.emit("login", localStorage.getItem("arl"));
icon = `<i class="material-icons">${data.icon}</i>` }
toastDOM.find(".toast-icon").html(icon)
} socket.on("logging_in", function(){
if (data.dismiss !== null && data.dismiss){ toast("Logging in", "loading", false, "login-toast")
setTimeout(function(){ toastObj.hideToast() }, 3000); })
}
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{ }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")
} }
}) })