From 4d69fb1799c794f148fb21da7bc033a58b63a21e Mon Sep 17 00:00:00 2001 From: maaa Date: Sun, 10 Mar 2024 22:04:51 +0100 Subject: [PATCH] sort notes by last edited + not hardcode HTTP requests --- main | 2 +- static/js/login.js | 6 ++++-- static/js/main.js | 26 +++++++++++++------------- static/js/signup.js | 4 +++- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/main b/main index cc18806..511e813 100644 --- a/main +++ b/main @@ -264,7 +264,7 @@ async def apilistnotes(): user = get_user(userCookie["id"]) conn = get_db_connection() - notes = conn.execute("SELECT * FROM notes WHERE creator = ? ORDER BY id DESC;", (user["id"],)).fetchall() + notes = conn.execute("SELECT * FROM notes WHERE creator = ? ORDER BY edited DESC;", (user["id"],)).fetchall() conn.close() datatemplate = [] diff --git a/static/js/login.js b/static/js/login.js index e20da4c..6820dd0 100644 --- a/static/js/login.js +++ b/static/js/login.js @@ -9,6 +9,8 @@ if (localStorage.getItem("DONOTSHARE-password") !== null) { throw new Error(); } +let remote = "" + let usernameBox = document.getElementById("usernameBox") let passwordBox = document.getElementById("passwordBox") let statusBox = document.getElementById("statusBox") @@ -109,7 +111,7 @@ signupButton.addEventListener("click", (event) => { return key }; - fetch("https://notes.hectabit.org/api/login", { + fetch(remote + "/api/login", { method: "POST", body: JSON.stringify({ username: username, @@ -133,7 +135,7 @@ signupButton.addEventListener("click", (event) => { } else if (response.status == 401) { console.log("Trying oldhash") - fetch("https://notes.hectabit.org/api/login", { + fetch(remote + "/api/login", { method: "POST", body: JSON.stringify({ username: username, diff --git a/static/js/main.js b/static/js/main.js index 0cf630f..d0a4aa1 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -13,6 +13,8 @@ if (localStorage.getItem("CACHE-username") !== null) { document.getElementById("usernameBox").innerText = localStorage.getItem("CACHE-username") } +let remote = "" + function formatBytes(a, b = 2) { if (!+a) return "0 Bytes"; const c = 0 > b ? 0 : b, d = Math.floor(Math.log(a) / Math.log(1000)); return `${parseFloat((a / Math.pow(1000, d)).toFixed(c))} ${["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"][d]}` } function truncateString(str, num) { @@ -197,7 +199,7 @@ textMinusBox.addEventListener("click", (event) => { function updateUserInfo() { - fetch("https://notes.hectabit.org/api/userinfo", { + fetch(remote + "/api/userinfo", { method: "POST", body: JSON.stringify({ secretKey: secretkey @@ -248,7 +250,7 @@ exitThing.addEventListener("click", (event) => { }); deleteMyAccountButton.addEventListener("click", (event) => { if (confirm("Are you REALLY sure that you want to delete your account? There's no going back!") == true) { - fetch("https://notes.hectabit.org/api/deleteaccount", { + fetch(remote + "/api/deleteaccount", { method: "POST", body: JSON.stringify({ secretKey: secretkey @@ -271,7 +273,7 @@ sessionManagerButton.addEventListener("click", (event) => { optionsDiv.classList.add("hidden") sessionManagerDiv.classList.remove("hidden") - fetch("https://notes.hectabit.org/api/sessions/list", { + fetch(remote + "/api/sessions/list", { method: "POST", body: JSON.stringify({ secretKey: secretkey @@ -311,7 +313,7 @@ sessionManagerButton.addEventListener("click", (event) => { } sessionRemoveButton.addEventListener("click", (event) => { - fetch("https://notes.hectabit.org/api/sessions/remove", { + fetch(remote + "/api/sessions/remove", { method: "POST", body: JSON.stringify({ secretKey: secretkey, @@ -362,7 +364,7 @@ function selectNote(nameithink) { let thingArray = Array.from(document.querySelectorAll(".noteButton")).find(el => el.id == nameithink); thingArray.classList.add("selected") - fetch("https://notes.hectabit.org/api/readnote", { + fetch(remote + "/api/readnote", { method: "POST", body: JSON.stringify({ secretKey: secretkey, @@ -400,7 +402,7 @@ function selectNote(nameithink) { let encryptedText = CryptoJS.AES.encrypt(noteBox.value, password).toString(); if (selectedNote == nameithink) { - fetch("https://notes.hectabit.org/api/editnote", { + fetch(remote + "/api/editnote", { method: "POST", body: JSON.stringify({ secretKey: secretkey, @@ -429,7 +431,7 @@ function selectNote(nameithink) { } function updateNotes() { - fetch("https://notes.hectabit.org/api/listnotes", { + fetch(remote + "/api/listnotes", { method: "POST", body: JSON.stringify({ secretKey: secretkey @@ -438,7 +440,6 @@ function updateNotes() { "Content-Type": "application/json; charset=UTF-8" } }) - .then((response) => response) .then((response) => { async function doStuff() { document.querySelectorAll(".noteButton").forEach((el) => el.remove()); @@ -463,7 +464,7 @@ function updateNotes() { noteButton.addEventListener("click", (event) => { if (event.ctrlKey) { - fetch("https://notes.hectabit.org/api/removenote", { + fetch(remote + "/api/removenote", { method: "POST", body: JSON.stringify({ secretKey: secretkey, @@ -473,7 +474,6 @@ function updateNotes() { "Content-Type": "application/json; charset=UTF-8" } }) - .then((response) => response) .then((response) => { updateNotes() }) @@ -503,7 +503,7 @@ newNote.addEventListener("click", (event) => { } let encryptedName = CryptoJS.AES.encrypt(noteName, password).toString(); - fetch("https://notes.hectabit.org/api/newnote", { + fetch(remote + "/api/newnote", { method: "POST", body: JSON.stringify({ secretKey: secretkey, @@ -539,7 +539,7 @@ function downloadObjectAsJson(exportObj, exportName) { function exportNotes() { let noteExport = [] - fetch("https://notes.hectabit.org/api/exportnotes", { + fetch(remote + "/api/exportnotes", { method: "POST", body: JSON.stringify({ secretKey: secretkey @@ -598,7 +598,7 @@ removeBox.addEventListener("click", (event) => { if (selectedNote == 0) { displayError("You need to select a note first!") } else { - fetch("https://notes.hectabit.org/api/removenote", { + fetch(remote + "/api/removenote", { method: "POST", body: JSON.stringify({ secretKey: secretkey, diff --git a/static/js/signup.js b/static/js/signup.js index 9452651..00b208e 100644 --- a/static/js/signup.js +++ b/static/js/signup.js @@ -9,6 +9,8 @@ if (localStorage.getItem("DONOTSHARE-password") !== null) { throw new Error(); } +let remote = "" + let usernameBox = document.getElementById("usernameBox") let passwordBox = document.getElementById("passwordBox") let statusBox = document.getElementById("statusBox") @@ -61,7 +63,7 @@ signupButton.addEventListener("click", (event) => { }; - fetch("https://notes.hectabit.org/api/signup", { + fetch(remote + "/api/signup", { method: "POST", body: JSON.stringify({ username: username,