add dashbord and right colomn right page

This commit is contained in:
2022-10-27 13:10:16 -04:00
parent ff3011de69
commit 9a7d23d24d
15 changed files with 763 additions and 463 deletions
+23 -3
View File
@@ -3,7 +3,7 @@ import templates
# --==--==--==--==--==--==--==--==--==--==-- #
# SVG : Menu icon
# --==--==--==--==--==--==--==--==--==--==-- #
proc Menu_icon* (): string = tmpli html"""
proc Menu_icon*(): string = tmpli html"""
<svg class="menu-icon" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 297 297"
style="enable-background:new 0 0 297 297;" xml:space="preserve">
@@ -119,7 +119,7 @@ proc Notebooks_icon*(): string = tmpli html"""
"""
# --==--==--==--==--==--==--==--==--==--==-- #
# SVG : All tags icon
# SVG : Tags icon
# --==--==--==--==--==--==--==--==--==--==-- #
proc Tags_icon*(): string = tmpli html"""
<svg class="sidebar-icon" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"
@@ -155,6 +155,26 @@ proc Tags_icon*(): string = tmpli html"""
</svg>
"""
# --==--==--==--==--==--==--==--==--==--==-- #
# SVG : Dashbord icon
# --==--==--==--==--==--==--==--==--==--==-- #
proc Dashbord_icon*(): string = tmpli html"""
<svg class="svg-icon" viewBox="0 0 20 20">
<path fill="none" d="M7.228,11.464H1.996c-0.723,0-1.308,0.587-1.308,1.309v5.232c0,0.722,0.585,1.308,1.308,1.308h5.232
c0.723,0,1.308-0.586,1.308-1.308v-5.232C8.536,12.051,7.95,11.464,7.228,11.464z M7.228,17.351c0,0.361-0.293,0.654-0.654,0.654
H2.649c-0.361,0-0.654-0.293-0.654-0.654v-3.924c0-0.361,0.292-0.654,0.654-0.654h3.924c0.361,0,0.654,0.293,0.654,0.654V17.351z
M17.692,11.464H12.46c-0.723,0-1.308,0.587-1.308,1.309v5.232c0,0.722,0.585,1.308,1.308,1.308h5.232
c0.722,0,1.308-0.586,1.308-1.308v-5.232C19,12.051,18.414,11.464,17.692,11.464z M17.692,17.351c0,0.361-0.293,0.654-0.654,0.654
h-3.924c-0.361,0-0.654-0.293-0.654-0.654v-3.924c0-0.361,0.293-0.654,0.654-0.654h3.924c0.361,0,0.654,0.293,0.654,0.654V17.351z
M7.228,1H1.996C1.273,1,0.688,1.585,0.688,2.308V7.54c0,0.723,0.585,1.308,1.308,1.308h5.232c0.723,0,1.308-0.585,1.308-1.308
V2.308C8.536,1.585,7.95,1,7.228,1z M7.228,6.886c0,0.361-0.293,0.654-0.654,0.654H2.649c-0.361,0-0.654-0.292-0.654-0.654V2.962
c0-0.361,0.292-0.654,0.654-0.654h3.924c0.361,0,0.654,0.292,0.654,0.654V6.886z M17.692,1H12.46c-0.723,0-1.308,0.585-1.308,1.308
V7.54c0,0.723,0.585,1.308,1.308,1.308h5.232C18.414,8.848,19,8.263,19,7.54V2.308C19,1.585,18.414,1,17.692,1z M17.692,6.886
c0,0.361-0.293,0.654-0.654,0.654h-3.924c-0.361,0-0.654-0.292-0.654-0.654V2.962c0-0.361,0.293-0.654,0.654-0.654h3.924
c0.361,0,0.654,0.292,0.654,0.654V6.886z"></path>
</svg>
"""
# --==--==--==--==--==--==--==--==--==--==-- #
# SVG : Settings icon
# --==--==--==--==--==--==--==--==--==--==-- #
@@ -191,4 +211,4 @@ proc SendFeedback_icon*(): string = tmpli html"""
</path>
</g>
</svg>
"""
"""
+51 -12
View File
@@ -13,7 +13,7 @@
#
# import snippet_html
# import snippet_icons
#proc genSecret(c: var TData, columnLeftInfo: var ColomnLeftData): string =
#proc genSecret(c: var TData, columnLeftInfo: var ColomnLeftData, ColomnRightInfo: var ColomnRightData): string =
# result = ""
<!DOCTYPE html>
<html lang="en">
@@ -22,7 +22,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<title>Joplin-TheNewWeb</title>
<link rel="stylesheet" href="css/styles.css">
<link rel="stylesheet" href="css/notif-bell.css">
<script src="js/script.js" defer></script>
@@ -63,6 +63,7 @@
# var active_notes: string = ""
# var active_notebooks: string = ""
# var active_tags: string = ""
# var active_dashbord: string = ""
# var active_settings: string = ""
# var active_sendFeedBack: string = ""
# if columnLeftInfo.option == newNote:
@@ -77,6 +78,8 @@
# active_notebooks = "active"
# elif columnLeftInfo.option == tags:
# active_tags = "active"
# elif columnLeftInfo.option == dashbord:
# active_dashbord = "active"
# end if
<li class="sidebar-list-item ${active_newNote}">
@@ -145,6 +148,18 @@
<div class="hidden-sidebar">Tags</div>
</a>
</li>
<!--Dashbord dans la bar de navigation -->
<li class="sidebar-list-item ${active_dashbord}">
<a href="/secret?msg=dashbord" class="sidebar-link">
# var icon_Dashbord = Dashbord_icon()
${icon_Dashbord}
<div class="hidden-sidebar">Dashbord</div>
</a>
</li>
</ul>
</div>
<div class="bottom-sidebar">
@@ -225,14 +240,15 @@
</div>
</div>
# elif columnLeftInfo.option == notes:
<h2>Notes</h2>
<h2>Notes</h2> <h5>${columnLeftInfo.j_notes_nb}</h5>
<div class="scrollbar scrollbar-primary">
<div class="force-overflow">
<div class="ColomnLeftJoplinNotes">
# for i in columnLeftInfo.j_notes.title:
<p> ${i} </p>
# end for
</div>
<div class="force-overflow">
# for i in 0 .. (columnLeftInfo.j_notes.id.len() - 1) :
<div class="columnLeftJoplinNotes">
<a href="/secret?msg=notes&noteid=${columnLeftInfo.j_notes.id[i]}" class="sidebar-note-link">${columnLeftInfo.j_notes.title[i]}</a>
<p class="sidebar-note-date">${columnLeftInfo.j_notes.created_time[i]} </p>
</div>
# end for
</div>
</div>
# elif columnLeftInfo.option == notebooks:
@@ -254,14 +270,37 @@
# for i in columnLeftInfo.j_tags.title:
<p> ${i} </p>
# end for
</div>
</div>
</div>
# elif columnLeftInfo.option == dashbord:
<h2>Dashboard</h2>
<div class="scrollbar scrollbar-primary">
<div class="force-overflow">
<div class="ColomnLeftJoplinDashboard">
<p>DASHBORD</p>
</div>
</div>
</div>
# end if
</div>
<div class="column right" style="background-color:#bbb;">
<h2>Column 2</h2>
<p>Some text..</p>
<div class="column right" >
# if columnLeftInfo.option == newNote:
<h2>New Note !!</h2>
<p>Some text..</p>
# elif columnLeftInfo.option == notes:
# if ColomnRightInfo.j_SelectedNote.id != "":
<h2> ${ColomnRightInfo.j_SelectedNote.title}</h2>
<hr width="65%"></hr>
<br>
<p>${ColomnRightInfo.j_SelectedNote.body}</p>
# else :
<h2>Click on note to see it !!</h2>
# end if
# end if
</div>
</div>
</div>