From a8f721eab6af69690b8b7aa540b1e982d4c999d1 Mon Sep 17 00:00:00 2001 From: maaa Date: Wed, 16 Aug 2023 15:42:08 +0200 Subject: [PATCH] burger --- main | 4 ++ static/css/style.css | 110 ++++++++++++++++++++++++++++++++--------- static/js/main.js | 24 +-------- templates/app.html | 16 +++--- templates/login.html | 2 +- templates/main.html | 25 +++++----- templates/privacy.html | 74 +++++++++++++++++++++++++++ templates/signup.html | 2 +- 8 files changed, 192 insertions(+), 65 deletions(-) create mode 100644 templates/privacy.html diff --git a/main b/main index edb0fc1..5d08dda 100644 --- a/main +++ b/main @@ -104,6 +104,10 @@ def signup(): def login(): return render_template("login.html") +@app.route("/privacy") +def privacy(): + return render_template("privacy.html") + # API @app.route("/api/signup", methods=("GET", "POST")) def apisignup(): diff --git a/static/css/style.css b/static/css/style.css index 394afe2..c1bcebf 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css2?family=Inter&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap"); body { margin: 0; @@ -315,29 +315,73 @@ body { display: none; } +.w100 { + font-weight: 300; +} + +.w200 { + font-weight: 300; +} + +.w300 { + font-weight: 300; +} + +.w400 { + font-weight: 400; +} + +.w500 { + font-weight: 500; +} + +.w600 { + font-weight: 600; +} + +.w700 { + font-weight: 700; +} + +.w800 { + font-weight: 800; +} + +.w900 { + font-weight: 900; +} + /* main */ .mainDiv { text-align: center; } +.startDiv { + text-align: left; + margin-top: 8vh; + margin-left: 7vh; +} + .mainDiv a { - padding: 10px; - padding-left: 15px; - padding-right: 15px; + padding: 15px; + padding-left: 20px; + padding-right: 20px; + margin-right: 5px; color: white; text-decoration: none; background-color: #157efb; border-radius: 8px; - margin-left: 5px; } .mainDiv .feature { - width: 80%; - margin-left: 10%; + width: calc(100% - 20px); margin-bottom: 10px; - padding: 10px; - border-radius: 8px; + padding-left: 10px; + padding-right: 10px; + + padding-top: 15px; + padding-bottom: 15px; font-size: 17px; } @@ -350,11 +394,25 @@ body { } .mainDiv img { - margin: 10px; - box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2); + position: fixed; + right: 7vh; + top: 8vh; + border-radius: 8px; } -/* dark theme, slightly modified */ +.links { + text-align: center; + padding: 10px; +} +.links a { + margin-left: 5px; + text-decoration: none; +} +.links a:hover { + text-decoration: dashed; +} + +/* dark theme, modified */ @media (prefers-color-scheme: dark) { :root { @@ -373,24 +431,24 @@ body { body { color: white; - background-color: #030303; + background-color: #202020; } .topBar { - background-color: rgba(18, 18, 18, 0.5); - border-color: #303030; + background-color: #252525; + border-color: #414141; } .notesBar { - background-color: #030303; + background-color: #252525; border: solid; border-width: 0px; border-right-width: 1px; - border-color: #303030; + border-color: #414141; } .noteBox { - background-color: #030303; + background-color: #202020; color: white; } @@ -403,7 +461,7 @@ body { } .notesBar button { - background-color: #141414; + background-color: #202020; border: none; } @@ -412,13 +470,13 @@ body { } .optionsDiv { - background-color: var(--gray-800); + background-color: #252525; color: white; - border: 1px solid var(--gray-700); + border-color: #414141; } .optionsDiv .exit { - background-color: var(--gray-700); + background-color: #424242; color: white; } @@ -447,4 +505,12 @@ body { color: white; border: 1px solid var(--gray-600); } + + .notesBar .loadingStuff { + background: + linear-gradient(0.25turn, transparent, #3b3b3b, transparent), + linear-gradient(#2e2e2e, #2e2e2e), + radial-gradient(38px circle at 19px 19px, #202020 50%, transparent 51%), + linear-gradient(#2e2e2e, #2e2e2e); + } } \ No newline at end of file diff --git a/static/js/main.js b/static/js/main.js index e01bb63..2dc02b7 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -1,10 +1,10 @@ if (localStorage.getItem("DONOTSHARE-secretkey") === null) { - window.location.replace("/") + window.location.replace("/login") document.body.innerHTML = "Redirecting.." throw new Error(); } if (localStorage.getItem("DONOTSHARE-password") === null) { - window.location.replace("/") + window.location.replace("/login") document.body.innerHTML = "Redirecting.." throw new Error(); } @@ -33,15 +33,9 @@ let notesDiv = document.getElementById("notesDiv") let newNote = document.getElementById("newNote") let noteBox = document.getElementById("noteBox") let loadingStuff = document.getElementById("loadingStuff") -let burgerDropdown = document.getElementById("burgerDropdown") let burgerButton = document.getElementById("burgerButton") let exportNotesButton = document.getElementById("exportNotesButton") -for (let i = 0; i < 40; i++) { - notesDiv.appendChild(loadingStuff.cloneNode()) -} -loadingStuff.remove() - let selectedNote = 0 let timer let waitTime = 400 @@ -377,20 +371,6 @@ newNote.addEventListener("click", (event) => { } } }); -document.body.addEventListener("click", (event) => { - if (event.clientX > 100) { - burgerDropdown.classList.add("hidden") - } - if (event.clientY > 50) { - burgerDropdown.classList.add("hidden") - } -}); -burgerButton.addEventListener("click", (event) => { - burgerDropdown.classList.remove("hidden") - - burgerDropdown.style.left = String(event.clientX) + "px" - burgerDropdown.style.top = String(event.clientY) + "px" -}); function downloadObjectAsJson(exportObj, exportName) { var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(exportObj)); var downloadAnchorNode = document.createElement("a"); diff --git a/templates/app.html b/templates/app.html index 81ef718..5177c73 100644 --- a/templates/app.html +++ b/templates/app.html @@ -19,21 +19,17 @@
- +
- -