From 4b19b3451738e8163c170506748cd033950914fa Mon Sep 17 00:00:00 2001 From: Sqaaakoi Date: Thu, 12 Oct 2023 10:16:52 +1300 Subject: [PATCH 1/6] fix the build script --- build.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 432c990..c5fd8c1 100755 --- a/build.sh +++ b/build.sh @@ -8,23 +8,23 @@ rm -rf build mkdir -p build/chrome-dev cp -r src/shared/* build/chrome-dev cp -r src/chrome/* build/chrome-dev -sed -i "" "s~{{SERVER}}~$SERVER_DEV_ORIGIN~g" build/chrome-dev/api.js -sed -i "" "s~{{SERVER}}~$SERVER_DEV_HOST~g" build/chrome-dev/manifest.json +sed -i "s~{{SERVER}}~$SERVER_DEV_ORIGIN~g" build/chrome-dev/api.js +sed -i "s~{{SERVER}}~$SERVER_DEV_HOST~g" build/chrome-dev/manifest.json mkdir -p build/chrome-prod cp -r src/shared/* build/chrome-prod cp -r src/chrome/* build/chrome-prod -sed -i "" "s~{{SERVER}}~$SERVER_PROD_ORIGIN~g" build/chrome-prod/api.js -sed -i "" "s~{{SERVER}}~$SERVER_PROD_HOST~g" build/chrome-prod/manifest.json +sed -i "s~{{SERVER}}~$SERVER_PROD_ORIGIN~g" build/chrome-prod/api.js +sed -i "s~{{SERVER}}~$SERVER_PROD_HOST~g" build/chrome-prod/manifest.json mkdir -p build/firefox-dev cp -r src/shared/* build/firefox-dev cp -r src/firefox/* build/firefox-dev -sed -i "" "s~{{SERVER}}~$SERVER_DEV_ORIGIN~g" build/firefox-dev/api.js -sed -i "" "s~{{SERVER}}~$SERVER_DEV_HOST~g" build/firefox-dev/manifest.json +sed -i "s~{{SERVER}}~$SERVER_DEV_ORIGIN~g" build/firefox-dev/api.js +sed -i "s~{{SERVER}}~$SERVER_DEV_HOST~g" build/firefox-dev/manifest.json mkdir -p build/firefox-prod cp -r src/shared/* build/firefox-prod cp -r src/firefox/* build/firefox-prod -sed -i "" "s~{{SERVER}}~$SERVER_PROD_ORIGIN~g" build/firefox-prod/api.js -sed -i "" "s~{{SERVER}}~$SERVER_PROD_HOST~g" build/firefox-prod/manifest.json \ No newline at end of file +sed -i "s~{{SERVER}}~$SERVER_PROD_ORIGIN~g" build/firefox-prod/api.js +sed -i "s~{{SERVER}}~$SERVER_PROD_HOST~g" build/firefox-prod/manifest.json \ No newline at end of file From 5ce589d97f0d0b555597e5d4d3e71c3f3fa9d6cf Mon Sep 17 00:00:00 2001 From: Sqaaakoi Date: Thu, 12 Oct 2023 11:31:44 +1300 Subject: [PATCH 2/6] sidebar --- src/chrome/manifest.json | 5 +- src/firefox/manifest.json | 8 ++ src/shared/background.js | 27 ++++- src/shared/popup/sidebar.html | 216 ++++++++++++++++++++++++++++++++++ 4 files changed, 251 insertions(+), 5 deletions(-) create mode 100644 src/shared/popup/sidebar.html diff --git a/src/chrome/manifest.json b/src/chrome/manifest.json index 532eb4f..280fd46 100644 --- a/src/chrome/manifest.json +++ b/src/chrome/manifest.json @@ -6,11 +6,14 @@ "icons": { "64": "icons/64.png" }, - "permissions": ["storage"], + "permissions": ["storage", "contextMenus", "sidePanel"], "host_permissions": ["*://{{SERVER}}/*"], "action": { "default_popup": "popup/index.html" }, + "side_panel": { + "default_path": "popup/sidebar.html" + }, "content_scripts": [ { "matches": ["*://{{SERVER}}/*"], diff --git a/src/firefox/manifest.json b/src/firefox/manifest.json index 0a6a98b..bd1abc7 100644 --- a/src/firefox/manifest.json +++ b/src/firefox/manifest.json @@ -11,6 +11,14 @@ "default_popup": "popup/index.html", "default_area": "navbar" }, + "sidebar_action": { + "default_icon": { + "64": "icons/64.png" + }, + "default_title": "Sidebox", + "default_panel": "popup/sidebar.html", + "open_at_install": true + }, "content_scripts": [ { "matches": ["*://{{SERVER}}/*"], diff --git a/src/shared/background.js b/src/shared/background.js index 8e65488..c3c2edc 100644 --- a/src/shared/background.js +++ b/src/shared/background.js @@ -5,10 +5,29 @@ chrome.runtime.onMessage.addListener((request, sender) => { const params = new URL(sender.tab.url).searchParams const code = params.get("code") const state = params.get("state") - + if (code) - new API().login(code, state).then(({ token }) => { - chrome.storage.local.set({ token }) - }) + new API().login(code, state).then(({ token }) => { + chrome.storage.local.set({ token }) + }) } }) + +chrome.runtime.onInstalled.addListener(() => { + chrome.contextMenus.removeAll(); + if (chrome.sidePanel) { + chrome.contextMenus.create({ + id: "open-sidebar", + title: "Open in sidebar", + contexts: ["action"] + }) + } +}) + +if (chrome.sidePanel) { + chrome.contextMenus.onClicked.addListener((info, tab) => { + if (info.menuItemId === "open-sidebar") { + chrome.sidePanel.open({ windowId: tab.windowId }) + } + }) +} diff --git a/src/shared/popup/sidebar.html b/src/shared/popup/sidebar.html new file mode 100644 index 0000000..11760a7 --- /dev/null +++ b/src/shared/popup/sidebar.html @@ -0,0 +1,216 @@ + + + + + + + +
+
+ +
+
+ +
+
+

Sidebox

+ + +
+ +
+ +
+
+

Create a new box

+ + + +
+ + +
+
+
+
+ +
+
+
+ + +
+ + + + + +
+
+ +

+ +
+ +

Loading...

+

Nothing here yet!

+
+ +
+
+

Rename this box

+ + + +
+ + +
+
+
+ +
+
+

Delete this box?

+

+ You won't be able to regain access to this email address. Make sure + you don't have any accounts using it. +

+ +
+ + +
+
+
+
+ +
+
+
+ + +

+

+

+
+ + +
+
+ + + + From 2b8daa5653fa563e53afd4f550f34bde497b676d Mon Sep 17 00:00:00 2001 From: Sqaaakoi Date: Thu, 12 Oct 2023 12:54:49 +1300 Subject: [PATCH 3/6] "cleanup" stuff for consistent button placement --- src/shared/popup/index.html | 43 +++++++++++++++---------- src/shared/popup/scripts/util/screen.js | 5 +-- src/shared/popup/sidebar.html | 4 +-- src/shared/popup/styles/header.css | 22 +++++++++++++ src/shared/popup/styles/home.css | 15 +++++++-- src/shared/popup/styles/inbox.css | 23 ------------- src/shared/popup/styles/main.css | 27 +++++++++++++++- 7 files changed, 91 insertions(+), 48 deletions(-) create mode 100644 src/shared/popup/styles/header.css diff --git a/src/shared/popup/index.html b/src/shared/popup/index.html index c454350..50ec1a4 100644 --- a/src/shared/popup/index.html +++ b/src/shared/popup/index.html @@ -4,7 +4,7 @@ - +
@@ -15,23 +15,32 @@

Sidebox

- +
+ + +
-
+
@@ -148,7 +157,7 @@

Loading...

Nothing here yet!

-
+
diff --git a/src/shared/popup/scripts/util/screen.js b/src/shared/popup/scripts/util/screen.js index 5882085..c450af6 100644 --- a/src/shared/popup/scripts/util/screen.js +++ b/src/shared/popup/scripts/util/screen.js @@ -1,5 +1,6 @@ export const setScreen = (name) => { - document.querySelectorAll(".screen").forEach((elem) => { - elem.style.display = elem.dataset.screen === name ? "block" : "none" + document.body.dataset.screen = name; + document.body.querySelectorAll("[data-screen]").forEach((elem) => { + elem.classList[(elem.dataset.screen === name ? "add" : "remove")]("activeScreen"); }) } diff --git a/src/shared/popup/sidebar.html b/src/shared/popup/sidebar.html index 11760a7..fe1c321 100644 --- a/src/shared/popup/sidebar.html +++ b/src/shared/popup/sidebar.html @@ -31,7 +31,7 @@

Sidebox

-
+
@@ -148,7 +148,7 @@

Loading...

Nothing here yet!

-
+
diff --git a/src/shared/popup/styles/header.css b/src/shared/popup/styles/header.css new file mode 100644 index 0000000..05b1f98 --- /dev/null +++ b/src/shared/popup/styles/header.css @@ -0,0 +1,22 @@ +header .buttons { + display: flex; + justify-content: space-between; +} + +header .buttons svg { + display: block; + width: 16px; + height: 16px; +} + +header .buttonsRight { + display: flex; +} + +header .buttonsRight> :not(:last-child) { + margin-right: 8px; +} + +header .buttons .delete { + color: var(--red); +} \ No newline at end of file diff --git a/src/shared/popup/styles/home.css b/src/shared/popup/styles/home.css index 29c6633..ee86043 100644 --- a/src/shared/popup/styles/home.css +++ b/src/shared/popup/styles/home.css @@ -1,16 +1,25 @@ .homeScreen header { display: flex; - justify-content: space-between; + /* justify-content: flex-start; */ padding: 16px; padding-bottom: 4px; } .homeScreen header .title { - font-size: 20px; + font-size: 16px; font-weight: 500; + margin-right: auto; + overflow: visible; + height: 16px; + line-height: 16px; +} + +.homeScreen button { + /* align-self: flex-end; */ + vertical-align: start; } -.homeScreen .create svg { +.homeScreen button svg { display: block; width: 16px; height: 16px; diff --git a/src/shared/popup/styles/inbox.css b/src/shared/popup/styles/inbox.css index de7987f..cc8d4b1 100644 --- a/src/shared/popup/styles/inbox.css +++ b/src/shared/popup/styles/inbox.css @@ -3,29 +3,6 @@ padding-bottom: 0; } -.inboxScreen header .buttons { - display: flex; - justify-content: space-between; -} - -.inboxScreen header .buttons svg { - display: block; - width: 16px; - height: 16px; -} - -.inboxScreen header .buttonsRight { - display: flex; -} - -.inboxScreen header .buttonsRight > :not(:last-child) { - margin-right: 8px; -} - -.inboxScreen header .buttons .delete { - color: var(--red); -} - .inboxScreen .name { font-size: 20px; font-weight: 500; diff --git a/src/shared/popup/styles/main.css b/src/shared/popup/styles/main.css index de17b24..c9c63c0 100644 --- a/src/shared/popup/styles/main.css +++ b/src/shared/popup/styles/main.css @@ -1,4 +1,5 @@ @import url("./loading.css"); +@import url("./header.css"); @import url("./home.css"); @import url("./inbox.css"); @import url("./message.css"); @@ -17,6 +18,7 @@ button { padding: 0; display: block; text-align: left; + cursor: pointer; } :root { @@ -31,9 +33,32 @@ body { margin: 0; } +body.popup { + width: 256px; + height: 384px; +} + +body.popup:has(.screen.messageScreen.activeScreen) { + width: 384px; + height: 512px; +} + +body.sidebar { + height: 100%; +} + .screen { width: 100%; height: 100%; - overflow: auto; + /* overflow: auto; */ display: none; } + +.screen .scrollBox { + overflow: auto; +} + +.screen.activeScreen { + display: flex; + flex-direction: column; +} \ No newline at end of file From 297dd9ddd2098b188c1dd5e659b4b809955f3cbd Mon Sep 17 00:00:00 2001 From: Sqaaakoi Date: Thu, 12 Oct 2023 13:00:18 +1300 Subject: [PATCH 4/6] rename directory from "popup" to "app" --- src/shared/{popup => app}/index.html | 0 src/shared/{popup => app}/scripts/main.js | 0 src/shared/{popup => app}/scripts/screens/home.js | 0 src/shared/{popup => app}/scripts/screens/inbox.js | 0 src/shared/{popup => app}/scripts/screens/message.js | 0 src/shared/{popup => app}/scripts/util/address.js | 0 src/shared/{popup => app}/scripts/util/icon.js | 0 src/shared/{popup => app}/scripts/util/screen.js | 0 src/shared/{popup => app}/sidebar.html | 0 src/shared/{popup => app}/styles/header.css | 0 src/shared/{popup => app}/styles/home.css | 0 src/shared/{popup => app}/styles/inbox.css | 0 src/shared/{popup => app}/styles/loading.css | 0 src/shared/{popup => app}/styles/main.css | 0 src/shared/{popup => app}/styles/message.css | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename src/shared/{popup => app}/index.html (100%) rename src/shared/{popup => app}/scripts/main.js (100%) rename src/shared/{popup => app}/scripts/screens/home.js (100%) rename src/shared/{popup => app}/scripts/screens/inbox.js (100%) rename src/shared/{popup => app}/scripts/screens/message.js (100%) rename src/shared/{popup => app}/scripts/util/address.js (100%) rename src/shared/{popup => app}/scripts/util/icon.js (100%) rename src/shared/{popup => app}/scripts/util/screen.js (100%) rename src/shared/{popup => app}/sidebar.html (100%) rename src/shared/{popup => app}/styles/header.css (100%) rename src/shared/{popup => app}/styles/home.css (100%) rename src/shared/{popup => app}/styles/inbox.css (100%) rename src/shared/{popup => app}/styles/loading.css (100%) rename src/shared/{popup => app}/styles/main.css (100%) rename src/shared/{popup => app}/styles/message.css (100%) diff --git a/src/shared/popup/index.html b/src/shared/app/index.html similarity index 100% rename from src/shared/popup/index.html rename to src/shared/app/index.html diff --git a/src/shared/popup/scripts/main.js b/src/shared/app/scripts/main.js similarity index 100% rename from src/shared/popup/scripts/main.js rename to src/shared/app/scripts/main.js diff --git a/src/shared/popup/scripts/screens/home.js b/src/shared/app/scripts/screens/home.js similarity index 100% rename from src/shared/popup/scripts/screens/home.js rename to src/shared/app/scripts/screens/home.js diff --git a/src/shared/popup/scripts/screens/inbox.js b/src/shared/app/scripts/screens/inbox.js similarity index 100% rename from src/shared/popup/scripts/screens/inbox.js rename to src/shared/app/scripts/screens/inbox.js diff --git a/src/shared/popup/scripts/screens/message.js b/src/shared/app/scripts/screens/message.js similarity index 100% rename from src/shared/popup/scripts/screens/message.js rename to src/shared/app/scripts/screens/message.js diff --git a/src/shared/popup/scripts/util/address.js b/src/shared/app/scripts/util/address.js similarity index 100% rename from src/shared/popup/scripts/util/address.js rename to src/shared/app/scripts/util/address.js diff --git a/src/shared/popup/scripts/util/icon.js b/src/shared/app/scripts/util/icon.js similarity index 100% rename from src/shared/popup/scripts/util/icon.js rename to src/shared/app/scripts/util/icon.js diff --git a/src/shared/popup/scripts/util/screen.js b/src/shared/app/scripts/util/screen.js similarity index 100% rename from src/shared/popup/scripts/util/screen.js rename to src/shared/app/scripts/util/screen.js diff --git a/src/shared/popup/sidebar.html b/src/shared/app/sidebar.html similarity index 100% rename from src/shared/popup/sidebar.html rename to src/shared/app/sidebar.html diff --git a/src/shared/popup/styles/header.css b/src/shared/app/styles/header.css similarity index 100% rename from src/shared/popup/styles/header.css rename to src/shared/app/styles/header.css diff --git a/src/shared/popup/styles/home.css b/src/shared/app/styles/home.css similarity index 100% rename from src/shared/popup/styles/home.css rename to src/shared/app/styles/home.css diff --git a/src/shared/popup/styles/inbox.css b/src/shared/app/styles/inbox.css similarity index 100% rename from src/shared/popup/styles/inbox.css rename to src/shared/app/styles/inbox.css diff --git a/src/shared/popup/styles/loading.css b/src/shared/app/styles/loading.css similarity index 100% rename from src/shared/popup/styles/loading.css rename to src/shared/app/styles/loading.css diff --git a/src/shared/popup/styles/main.css b/src/shared/app/styles/main.css similarity index 100% rename from src/shared/popup/styles/main.css rename to src/shared/app/styles/main.css diff --git a/src/shared/popup/styles/message.css b/src/shared/app/styles/message.css similarity index 100% rename from src/shared/popup/styles/message.css rename to src/shared/app/styles/message.css From 3f5ffe186a4e07dd6d8241ca8c1fa15ba9b6b610 Mon Sep 17 00:00:00 2001 From: Sqaaakoi Date: Thu, 12 Oct 2023 13:31:24 +1300 Subject: [PATCH 5/6] update paths in manifest --- src/chrome/manifest.json | 4 ++-- src/firefox/manifest.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/manifest.json b/src/chrome/manifest.json index 280fd46..e34cc73 100644 --- a/src/chrome/manifest.json +++ b/src/chrome/manifest.json @@ -9,10 +9,10 @@ "permissions": ["storage", "contextMenus", "sidePanel"], "host_permissions": ["*://{{SERVER}}/*"], "action": { - "default_popup": "popup/index.html" + "default_popup": "app/index.html" }, "side_panel": { - "default_path": "popup/sidebar.html" + "default_path": "app/sidebar.html" }, "content_scripts": [ { diff --git a/src/firefox/manifest.json b/src/firefox/manifest.json index bd1abc7..d265cd2 100644 --- a/src/firefox/manifest.json +++ b/src/firefox/manifest.json @@ -8,7 +8,7 @@ }, "permissions": ["storage", "*://{{SERVER}}/*"], "browser_action": { - "default_popup": "popup/index.html", + "default_popup": "app/index.html", "default_area": "navbar" }, "sidebar_action": { @@ -16,7 +16,7 @@ "64": "icons/64.png" }, "default_title": "Sidebox", - "default_panel": "popup/sidebar.html", + "default_panel": "app/sidebar.html", "open_at_install": true }, "content_scripts": [ From 0323c84b6dd9ba2eb810f142f0a5ea095da5a110 Mon Sep 17 00:00:00 2001 From: Sqaaakoi Date: Mon, 16 Oct 2023 12:32:29 +1300 Subject: [PATCH 6/6] remove that button for now --- src/shared/app/index.html | 7 ------- src/shared/app/scripts/screens/message.js | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/shared/app/index.html b/src/shared/app/index.html index 50ec1a4..51db332 100644 --- a/src/shared/app/index.html +++ b/src/shared/app/index.html @@ -16,13 +16,6 @@

Sidebox

-