Skip to content

Commit d380056

Browse files
committed
Solved problem of dark theme at server
1 parent f0f5513 commit d380056

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

functions/views/desktop.ejs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
</script>
4949
<script>document.addEventListener("DOMContentLoaded",function(){window.signInEmail="<%= userEmail %>";window.currentNote="",window.editor={id:"",title:"",description:""},console.log("<%= userEmail %>"),firebase.database().ref("<%= userEmail %>").orderByChild("timestamp").on("value",function(e){var t=[];e.forEach(function(e){var o=e.key,a=e.val();t.push({childKey:o,childData:a})}),t.reverse(),window.notesData={};var o=document.getElementById("note-family");if(o.innerHTML="",noteFamilyString="",t.forEach(function(e){var t=e.childKey,o=e.childData;noteFamilyString+='<div id="'+t+'" class="note-row hoverable" onclick=doOnNoteClick(this) ><div class="note-title">'+o.title+'</div><div class="note-date">'+o.date+"</div></div>",window.notesData[t]={description:o.description,title:o.title}}),o.innerHTML=noteFamilyString,window.currentNote)try{document.getElementById(window.currentNote).classList.add("is--active"),document.getElementById(window.currentNote).classList.remove("hoverable")}catch(e){console.log("Ignore this error, comes at time of delete",e.toString)}}),addNotefunction=((e,t)=>{console.log("Add Note");var o={title:e,description:t,date:(new Date).toLocaleDateString("en-US",{month:"short",day:"numeric"}),timestamp:firebase.database.ServerValue.TIMESTAMP},a=firebase.database().ref("<%= userEmail %>").push().key;console.log(a),window.currentNote=a;var n={};return n[a]=o,firebase.database().ref("<%= userEmail %>").update(n)}),updateNotefunction=((e,t,o)=>{console.log("Update Note");var a={title:t,description:o,date:(new Date).toLocaleDateString("en-US",{month:"short",day:"numeric"}),timestamp:firebase.database.ServerValue.TIMESTAMP},n={};return n[e]=a,firebase.database().ref("<%= userEmail %>").update(n)}),deleteNotefunction=(e=>firebase.database().ref("<%= userEmail %>").child(e).remove())}),signOutFromGoogle=(()=>{saveForUnSavedChanges(),console.log("Sign Out User!");firebase.auth().signOut();var e=new XMLHttpRequest;e.addEventListener("error",function(e){console.log("Failed"),console.log(e.toString())}),e.addEventListener("load",function(e){console.log("Sign Out Success!"),location.reload()}),e.open("POST","/clear",!0),e.setRequestHeader("Content-Type","application/json"),e.send()});</script>
5050

51-
<script src="js/loadTheme.js"></script>
52-
5351
<div id="main">
5452
<div id="top-nav">
5553
<% if(theme === 'dark') { %>
@@ -141,6 +139,10 @@
141139
</div>
142140

143141
<script src="js/newdesign-before-body.js"></script>
142+
143+
<!-- To choose theme at starting added after main as not working on serve -->
144+
<script src="js/loadTheme.js"></script>
145+
144146
<!-- JQuery for resize -->
145147
<script src="js/before-body-jquery.js"></script>
146148
</body>

functions/views/login.ejs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@
238238
239239
</script>
240240

241-
<script src="js/loadTheme.js"></script>
242-
243241
<div id="main">
244242
<div id="top-nav">
245243
<% if(theme === 'dark') { %>
@@ -432,6 +430,9 @@
432430
<!-- Scripts needed to do the tasks -->
433431
<script src="js/newdesign-before-body.js"></script>
434432

433+
<!-- To choose theme at starting added after main as not working on serve -->
434+
<script src="js/loadTheme.js"></script>
435+
435436
<!-- JQuery for resize -->
436437
<script src="js/before-body-jquery.min.js"></script>
437438
</body>

public/js/loadTheme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var themeData = getCookie('themeData');
1919

2020
console.log("themeData" , themeData);
2121
if(themeData === 'dark') {
22-
$('#logo-header').html('<img src="pnotes-logo-dark.png"></img>');
2322
$('body').addClass('dark');
23+
$('#logo-header').html('<img src="pnotes-logo-dark.png"></img>');
2424
$('#dark-switcher').html('Switch to Light Mode');
2525
}

0 commit comments

Comments
 (0)