diff --git a/src/browser/api.js b/src/browser/api.mjs similarity index 100% rename from src/browser/api.js rename to src/browser/api.mjs diff --git a/src/browser/init.js b/src/browser/init.mjs similarity index 78% rename from src/browser/init.js rename to src/browser/init.mjs index 7cbb1ab..34f4603 100644 --- a/src/browser/init.js +++ b/src/browser/init.mjs @@ -7,7 +7,7 @@ "use strict"; (async () => { - await import("./api.js"); + await import("./api.mjs"); await import("../common/registry.js"); - await import("../common/loader.js"); + await import("../common/loader.mjs"); })(); diff --git a/src/browser/worker.js b/src/browser/worker.mjs similarity index 100% rename from src/browser/worker.js rename to src/browser/worker.mjs diff --git a/src/common/loader.js b/src/common/loader.mjs similarity index 100% rename from src/common/loader.js rename to src/common/loader.mjs diff --git a/src/core/client.js b/src/core/client.js deleted file mode 100644 index f854e80..0000000 --- a/src/core/client.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * notion-enhancer - * (c) 2022 dragonwocky (https://dragonwocky.me/) - * (https://notion-enhancer.github.io/) under the MIT license - */ - -import "../vendor/twind.min.js"; -import * as lucide from "../vendor/lucide.min.js"; -import { html } from "../vendor/htm+preact.min.js"; - -export default async () => { - // const sidebarSelector = - // ".notion-sidebar-container .notion-sidebar > div:nth-child(3) > div > div:nth-child(2)"; - // await web.whenReady([sidebarSelector]); - - console.log(lucide); - - const $sidebarLink = html`
-
-
notion-enhancer
-
-
`; - //
${await fs.getText("media/colour.svg")}
- // $sidebarLink.addEventListener("click", env.focusMenu); -}; diff --git a/src/core/client.mjs b/src/core/client.mjs new file mode 100644 index 0000000..f7e0724 --- /dev/null +++ b/src/core/client.mjs @@ -0,0 +1,122 @@ +/** + * notion-enhancer + * (c) 2022 dragonwocky (https://dragonwocky.me/) + * (https://notion-enhancer.github.io/) under the MIT license + */ + +import "../vendor/twind.min.js"; +import { html, render } from "../vendor/htm+preact.min.js"; + +export default async () => { + const append = (component, target) => { + if (typeof target === "string") target = document.querySelector(target); + const fragment = new DocumentFragment(); + render(component, fragment); + target.append(fragment); + }; + + const notionSidebar = `.notion-sidebar-container .notion-sidebar > :nth-child(3) > div > :nth-child(2)`, + openMenu = html`
{}} + style="display: flex; font-size: 14px; min-height: 27px; padding: 2px 16px; margin: 1px 0;" + > +
+ + + + + + + + +
+
notion-enhancer
+
`; + append(openMenu, notionSidebar); + + // html`
+ //
+ //
+ // + // + // + //
+ //
+ //
Settings & members
+ //
+ //
+ //
`; + // console.log(lucide); + + // const $sidebarLink = html`
+ //
+ //
notion-enhancer
+ //
+ //
`; + //
${await fs.getText("media/colour.svg")}
+ // $sidebarLink.addEventListener("click", env.focusMenu); +}; diff --git a/src/core/mod.json b/src/core/mod.json index 8f8d48d..f3e29c4 100644 --- a/src/core/mod.json +++ b/src/core/mod.json @@ -49,6 +49,6 @@ } ], "clientStyles": [], - "clientScripts": ["client.js"], + "clientScripts": ["client.mjs"], "electronScripts": [] } diff --git a/src/electron/init.cjs b/src/electron/init.cjs index f3327f4..6af93fc 100644 --- a/src/electron/init.cjs +++ b/src/electron/init.cjs @@ -25,7 +25,7 @@ module.exports = async (target, __exports, __eval) => { if (document.readyState !== "complete") return false; const $script = document.createElement("script"); $script.type = "module"; - $script.src = enhancerUrl("common/loader.js"); + $script.src = enhancerUrl("common/loader.mjs"); document.head.appendChild($script); }); } diff --git a/src/manifest.json b/src/manifest.json index 2b569be..dccdbeb 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -14,12 +14,12 @@ "512": "/media/colour-x512.png" }, "action": {}, - "background": { "service_worker": "/browser/worker.js" }, + "background": { "service_worker": "/browser/worker.mjs" }, "options_page": "/core/menu.html", "content_scripts": [ { "matches": ["*://*.notion.so/*", "https://*.notion.site/*"], - "js": ["/browser/init.js"] + "js": ["/browser/init.mjs"] } ], "web_accessible_resources": [ diff --git a/src/media/animated.gif b/src/media/animated.gif deleted file mode 100644 index 56f8300..0000000 Binary files a/src/media/animated.gif and /dev/null differ diff --git a/src/media/blackwhite-x128.png b/src/media/blackwhite-x128.png deleted file mode 100644 index bc0b657..0000000 Binary files a/src/media/blackwhite-x128.png and /dev/null differ diff --git a/src/media/blackwhite-x16.png b/src/media/blackwhite-x16.png deleted file mode 100644 index 69224de..0000000 Binary files a/src/media/blackwhite-x16.png and /dev/null differ diff --git a/src/media/blackwhite-x256.png b/src/media/blackwhite-x256.png deleted file mode 100644 index 6d288a9..0000000 Binary files a/src/media/blackwhite-x256.png and /dev/null differ diff --git a/src/media/blackwhite-x32.png b/src/media/blackwhite-x32.png deleted file mode 100644 index e8a517e..0000000 Binary files a/src/media/blackwhite-x32.png and /dev/null differ diff --git a/src/media/blackwhite-x48.png b/src/media/blackwhite-x48.png deleted file mode 100644 index bf574dc..0000000 Binary files a/src/media/blackwhite-x48.png and /dev/null differ diff --git a/src/media/blackwhite-x512.png b/src/media/blackwhite-x512.png deleted file mode 100644 index 0ecf16c..0000000 Binary files a/src/media/blackwhite-x512.png and /dev/null differ diff --git a/src/media/blackwhite.svg b/src/media/blackwhite.svg deleted file mode 100644 index 7321a08..0000000 --- a/src/media/blackwhite.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/media/colour-x128.png b/src/media/colour-x128.png old mode 100644 new mode 100755 index 4012672..dafebee Binary files a/src/media/colour-x128.png and b/src/media/colour-x128.png differ diff --git a/src/media/colour-x16.png b/src/media/colour-x16.png old mode 100644 new mode 100755 index 21be6b5..6cf53d1 Binary files a/src/media/colour-x16.png and b/src/media/colour-x16.png differ diff --git a/src/media/colour-x256.png b/src/media/colour-x256.png old mode 100644 new mode 100755 index 30c25a0..9c42ed5 Binary files a/src/media/colour-x256.png and b/src/media/colour-x256.png differ diff --git a/src/media/colour-x32.png b/src/media/colour-x32.png old mode 100644 new mode 100755 index 8e14320..530efd5 Binary files a/src/media/colour-x32.png and b/src/media/colour-x32.png differ diff --git a/src/media/colour-x48.png b/src/media/colour-x48.png old mode 100644 new mode 100755 index 1e52a45..bfed6e6 Binary files a/src/media/colour-x48.png and b/src/media/colour-x48.png differ diff --git a/src/media/colour-x512.png b/src/media/colour-x512.png old mode 100644 new mode 100755 index f3adbac..f0da292 Binary files a/src/media/colour-x512.png and b/src/media/colour-x512.png differ diff --git a/src/media/colour-x64.png b/src/media/colour-x64.png new file mode 100755 index 0000000..088ed66 Binary files /dev/null and b/src/media/colour-x64.png differ diff --git a/src/media/colour.svg b/src/media/colour.svg index 99027d9..524f2e2 100644 --- a/src/media/colour.svg +++ b/src/media/colour.svg @@ -1,64 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/media/monochrome.svg b/src/media/monochrome.svg new file mode 100644 index 0000000..1ae0b66 --- /dev/null +++ b/src/media/monochrome.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/media/promo-large.jpg b/src/media/promo-large.jpg deleted file mode 100644 index c2718ca..0000000 Binary files a/src/media/promo-large.jpg and /dev/null differ diff --git a/src/media/promo-marquee.jpg b/src/media/promo-marquee.jpg deleted file mode 100644 index 6f22df3..0000000 Binary files a/src/media/promo-marquee.jpg and /dev/null differ diff --git a/src/media/promo-small.jpg b/src/media/promo-small.jpg deleted file mode 100644 index 23062f6..0000000 Binary files a/src/media/promo-small.jpg and /dev/null differ