From 5981b9bc7b8dcc168be744425c28a24baa57965b Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Fri, 26 Jan 2018 22:32:44 -0500
Subject: [PATCH] new code icons, protected note icon in note tree is now
 styled using CSS filter drop shadow

---
 public/images/icons/code-folder.png     | Bin 0 -> 339 bytes
 public/images/icons/code.png            | Bin 0 -> 245 bytes
 public/images/icons/file-shaded.png     | Bin 314 -> 0 bytes
 public/images/icons/folder-shaded.png   | Bin 342 -> 0 bytes
 public/javascripts/note_tree.js         |   4 ++++
 public/javascripts/protected_session.js |   5 +++++
 public/stylesheets/style.css            |  14 +++++++++-----
 routes/api/tree.js                      |   3 ++-
 services/tree.js                        |   1 -
 9 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 public/images/icons/code-folder.png
 create mode 100644 public/images/icons/code.png
 delete mode 100644 public/images/icons/file-shaded.png
 delete mode 100644 public/images/icons/folder-shaded.png

diff --git a/public/images/icons/code-folder.png b/public/images/icons/code-folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a33cd909ae5013d2fa093d93533255755ae8c2c
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHiQ;G?Sj*&r-`SpwI(P7sn8b(`zqo^kNPaV7>78_S-is
z;%lc&`RB?ZA-$T_`tPEerrw0i)WxwmYj}PzZ@h3yUO<FrqvXTXn-BB~XC1#YbLabe
zl4d<?E82G)C=1(t^lLl|XZw!B3Wv)JI~VJ5W!+hDMCpT2|BZvir|+<@`!FGZWycAr
zeT98DXZ5r1IL<gH@n&(k>zON=zK1#0BJDVRoO3TOOOV<3UD|u@LzBbP40k&jbRApe
z8Y;Rq&~L&YXA@nS?GY<>MZMT{M6}6j(xUcPpT75`di*{l@?Mtn+lS8OE!QpXdh@e>
g-tcAHN7g!qvlES$?K3|T0`x0`r>mdKI;Vst00m2q5&!@I

literal 0
HcmV?d00001

diff --git a/public/images/icons/code.png b/public/images/icons/code.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a8c722ddb6217356653633abb267bb2989318e3
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHiQ;G?TuB{*}2PqnbQj978Nl-@Uk-_mG1C%LR2KKNCjQ
z1ojYyyE_$i7#Twn9vbC1a;vx}%{|}HvFG7Ack9h(ingr~`ptE8$_|(QWTw^1VSSz4
zB|DO)9++<Nu=DQrM{7>1%`0>Kv0$;lPTOnU^``&(3TAf*6dY5&et3pw*q_hR?Xo5}
i7W+!vDeRbId6v7{O1}7&Kx!+{H4L7velF{r5}E)FsaSFV

literal 0
HcmV?d00001

diff --git a/public/images/icons/file-shaded.png b/public/images/icons/file-shaded.png
deleted file mode 100644
index 3dd43563a00e2d1ff67b00848f95a8ccf97cf063..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHi<nCo{LTVeY|GK%wKFE{-7<r{7*S%xZEJV13{}QN+{l
zfxN-ggyejw*;_1ou8L^}=XOL?u^o)EaZ+g2*y*rg!(<1O+#H@Y$KwBgv6GlF^X~Tw
z9%I$rJDj&&U%j}0sql-3>gs7bY+STde{%IJwse1S?)fMgUvZdu-{tQ`lj0L6K7PmP
z+fz7Ky?{r4hdcA)kR?F@3z{v}G9Jrrca{CJE#=1%k*$aLoH)8m%nXkyvi+aysCSNO
zH&b>9cfqE&xBfeRKVkUx`00hoO=5X|7Be1y-F|~%X0+j_&+jjs1A2+U)78&qol`;+
E07=DrDF6Tf

diff --git a/public/images/icons/folder-shaded.png b/public/images/icons/folder-shaded.png
deleted file mode 100644
index c8eccd7a58995637a009e9c15c0519dbe9fdf1bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 342
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHi<nCo`MTUwL+ApwMGa7sn8b(@QTKdNDhS9Qzor#%S7f
zcF_&jOB~y>v?E?>uKC7wS}tjQf^r3;?v<cu!8NR`TZ5XGMx<^$c}Og>{LY@Vw#v_c
zpFiGft|PJcW>tsqnrlVVE%KRJavn-OzV*|}Z{uY)i3D-)$Z4^y0$v)YjYM1xkFd%;
zf3dHy?RJA*$fK<J%U;ULNy*7QW?Sqyd8>-2TID?dXHV1k_&12}3fcE;+kLhh9WM{X
zf4s%|q1m)1@doRL9)Fd<uNgDWO?}an6tz_?EM&L!+r$?2JCBtoZS1VgVc+wRL;t@-
hYr4$i+Kcz!h%YxcQuWr~=@0ZSgQu&X%Q~loCIF%AhTZ@G

diff --git a/public/javascripts/note_tree.js b/public/javascripts/note_tree.js
index 52dbe1eca..7831e46e2 100644
--- a/public/javascripts/note_tree.js
+++ b/public/javascripts/note_tree.js
@@ -150,6 +150,10 @@ const noteTree = (function() {
             extraClasses.push("multiple-parents");
         }
 
+        if (note.type === 'code') {
+            extraClasses.push("code");
+        }
+
         return extraClasses.join(" ");
     }
 
diff --git a/public/javascripts/protected_session.js b/public/javascripts/protected_session.js
index 6465f1f1e..a903fecdc 100644
--- a/public/javascripts/protected_session.js
+++ b/public/javascripts/protected_session.js
@@ -4,6 +4,7 @@ const protected_session = (function() {
     const dialogEl = $("#protected-session-password-dialog");
     const passwordFormEl = $("#protected-session-password-form");
     const passwordEl = $("#protected-session-password");
+    const noteDetailWrapperEl = $("#note-detail-wrapper");
 
     let protectedSessionDeferred = null;
     let lastProtectedSessionOperationDate = null;
@@ -24,6 +25,8 @@ const protected_session = (function() {
         if (requireProtectedSession && !isProtectedSessionAvailable()) {
             protectedSessionDeferred = dfd;
 
+            noteDetailWrapperEl.hide();
+
             dialogEl.dialog({
                 modal: modal,
                 width: 400,
@@ -63,6 +66,8 @@ const protected_session = (function() {
         if (protectedSessionDeferred !== null) {
             ensureDialogIsClosed(dialogEl, passwordEl);
 
+            noteDetailWrapperEl.show();
+
             protectedSessionDeferred.resolve();
 
             protectedSessionDeferred = null;
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 9c62d9083..8ae07963e 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -30,7 +30,7 @@
     overflow: auto;
 }
 
-#note-detail-wrapper.protected {
+#note-detail-wrapper.protected, #note-detail-wrapper.protected .CodeMirror {
     background-color: #eee;
 }
 
@@ -56,14 +56,18 @@ span.fancytree-node.fancytree-folder > span.fancytree-icon {
     background-image: url("../images/icons/folder.png");
 }
 
-span.fancytree-node.protected > span.fancytree-icon {
+span.fancytree-node.code > span.fancytree-icon {
     background-position: 0 0;
-    background-image: url("../images/icons/file-shaded.png");
+    background-image: url("../images/icons/code.png");
 }
 
-span.fancytree-node.protected.fancytree-folder > span.fancytree-icon {
+span.fancytree-node.fancytree-folder.code > span.fancytree-icon {
     background-position: 0 0;
-    background-image: url("../images/icons/folder-shaded.png");
+    background-image: url("../images/icons/code-folder.png");
+}
+
+span.fancytree-node.protected > span.fancytree-icon {
+    filter: drop-shadow(2px 2px 2px black);
 }
 
 span.fancytree-node.multiple-parents .fancytree-title {
diff --git a/routes/api/tree.js b/routes/api/tree.js
index 28ec177d1..36962c90b 100644
--- a/routes/api/tree.js
+++ b/routes/api/tree.js
@@ -15,7 +15,8 @@ router.get('/', auth.checkApiAuth, wrap(async (req, res, next) => {
       SELECT 
         notes_tree.*, 
         notes.note_title, 
-        notes.is_protected
+        notes.is_protected,
+        notes.type
       FROM 
         notes_tree 
       JOIN 
diff --git a/services/tree.js b/services/tree.js
index 9a6ee257b..4daf18bc0 100644
--- a/services/tree.js
+++ b/services/tree.js
@@ -2,7 +2,6 @@
 
 const sql = require('./sql');
 const sync_table = require('./sync_table');
-const data_encryption = require('./data_encryption');
 
 async function validateParentChild(res, parentNoteId, childNoteId, noteTreeId = null) {
     const existing = await getExistingNoteTree(parentNoteId, childNoteId);