dragonwocky/notion-enhancer
1
0
Fork 0
mirror of https://github.com/notion-enhancer/notion-enhancer.git synced 2025-04-11 15:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: minor refactoring

Browse Source
This commit is contained in:
dragonwocky 2024-01-20 18:32:42 +11:00
parent 69eb2866d5
commit 68b73246fb
Signed by: dragonwocky
GPG Key ID: D408552AAEF956CB
28 changed files with 37 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/assets/colour-x128.png → src/_assets/colour-x128.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
src/assets/colour-x16.png → src/_assets/colour-x16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 595 B

0
src/assets/colour-x256.png → src/_assets/colour-x256.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

0
src/assets/colour-x32.png → src/_assets/colour-x32.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
src/assets/colour-x48.png → src/_assets/colour-x48.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
src/assets/colour-x512.png → src/_assets/colour-x512.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

0
src/assets/colour-x64.png → src/_assets/colour-x64.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

5
src/assets/icons.svg.js → src/_assets/icons.svg.js
View File

File diff suppressed because one or more lines are too long

0
src/shared/events.js → src/_common/events.js
View File

7
src/shared/markup.js → src/_common/markup.js
View File

@ -6,8 +6,6 @@
"use strict"; "use strict";
// jump to
const { twind, htm, lucide } = globalThis, const { twind, htm, lucide } = globalThis,
{ iconColour, iconMonochrome } = globalThis.__enhancerApi; { iconColour, iconMonochrome } = globalThis.__enhancerApi;
@ -83,7 +81,10 @@ const encodeSvg = (svg) =>
// complex markup, e.g. `<i class="i-bookmark" />` // complex markup, e.g. `<i class="i-bookmark" />`
twind.install({ twind.install({
darkMode: "class", darkMode: "class",
rules: [[/^i-((?:\w|-)+)(?:\?(mask|bg|auto))?$/, presetIcons]], rules: [
["text-(wrap|nowrap|balance|pretty)", "textWrap"],
[/^i-((?:\w|-)+)(?:\?(mask|bg|auto))?$/, presetIcons],
],
variants: [ variants: [
// https://github.com/tw-in-js/twind/blob/main/packages/preset-ext/src/variants.ts // https://github.com/tw-in-js/twind/blob/main/packages/preset-ext/src/variants.ts
[ [

0
src/archive/notion.js → src/_common/notion.js
View File

0
src/shared/registry.js → src/_common/registry.js
View File

0
src/shared/system.js → src/_common/system.js
View File

0
src/vendor/coloris.min.css → src/_vendor/coloris.min.css vendored
View File

0
src/vendor/coloris.min.js → src/_vendor/coloris.min.js vendored
View File

0
src/vendor/content-types.min.js → src/_vendor/content-types.min.js vendored
View File

0
src/vendor/htm.min.js → src/_vendor/htm.min.js vendored
View File

0
src/vendor/lucide.min.js → src/_vendor/lucide.min.js vendored
View File

0
src/vendor/twind.min.js → src/_vendor/twind.min.js vendored
View File

1
src/core/client.mjs
View File

@ -183,7 +183,6 @@ const insertPanel = async (api, db) => {
appendToDom(); appendToDom();
useState(["panelOpen"], ([panelOpen]) => { useState(["panelOpen"], ([panelOpen]) => {
console.log(panelOpen);
if (panelOpen) $panelTopbarBtn.setAttribute("data-active", true); if (panelOpen) $panelTopbarBtn.setAttribute("data-active", true);
else $panelTopbarBtn.removeAttribute("data-active"); else $panelTopbarBtn.removeAttribute("data-active");
}); });

4
src/core/menu/index.html
View File

@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>notion-enhancer menu</title> <title>notion-enhancer menu</title>
<link rel="stylesheet" href="./menu.css" /> <link rel="stylesheet" href="./menu.css" />
<link rel="stylesheet" href="../../vendor/coloris.min.css" /> <link rel="stylesheet" href="../../_vendor/coloris.min.css" />
<script src="../../vendor/coloris.min.js" type="module"></script> <script src="../../_vendor/coloris.min.js" type="module"></script>
<script src="./menu.mjs" type="module" defer></script> <script src="./menu.mjs" type="module" defer></script>
</head> </head>
<body> <body>

13
src/core/menu/islands/Input.mjs
View File

@ -105,11 +105,10 @@ function Input({
class="h-full w-full pb-px text-[14px] leading-[1.2] class="h-full w-full pb-px text-[14px] leading-[1.2]
${variant === "lg" ? "pl-[12px] pr-[40px]" : "pl-[8px] pr-[32px]"} ${variant === "lg" ? "pl-[12px] pr-[40px]" : "pl-[8px] pr-[32px]"}
appearance-none bg-transparent ${type === "file" ? "hidden" : ""} appearance-none bg-transparent ${type === "file" ? "hidden" : ""}
${type === "hotkey" ? "text-[color:var(--theme--fg-secondary)]" : ""}
${type === "color" ${type === "color"
? "font-medium" ? "font-medium"
: type === "hotkey" : "border-(& [color:var(--theme--fg-border)])"}"
? "text-[color:var(--theme--fg-secondary)] border-(& [color:var(--theme--fg-border)])"
: ""}"
data-coloris=${type === "color"} data-coloris=${type === "color"}
...${props} ...${props}
/>`, />`,
@ -170,9 +169,11 @@ function Input({
<label <label
tabindex="0" tabindex="0"
class="flex items-center cursor-pointer select-none class="flex items-center cursor-pointer select-none
h-[28px] px-[8px] bg-[color:var(--theme--bg-secondary)] px-[8px] bg-[color:var(--theme--bg-secondary)]
text-([14px] [color:var(--theme--fg-secondary)]) rounded-[4px] h-[28px] rounded-[4px] transition duration-[20ms]
transition duration-[20ms] hover:bg-[color:var(--theme--bg-hover)]" text-([14px] [color:var(--theme--fg-secondary)])
border-(& [color:var(--theme--fg-border)])
hover:bg-[color:var(--theme--bg-hover)]"
onkeydown=${(event) => { onkeydown=${(event) => {
if ([" ", "Enter"].includes(event.key)) { if ([" ", "Enter"].includes(event.key)) {
event.preventDefault(); event.preventDefault();

2
src/core/menu/islands/Select.mjs
View File

@ -69,7 +69,7 @@ function Select({
return { return {
...opt, ...opt,
$option: html`<${Option} ...${{ ...opt, _get, _set }} />`, $option: html`<${Option} ...${{ ...opt, _get, _set }} />`,
$value: html`<div class="inline-flex items-center gap-[6px]"> $value: html`<div class="inline-flex text-nowrap items-center gap-[6px]">
<!-- swap icon/value order for correct display when dir="rtl" --> <!-- swap icon/value order for correct display when dir="rtl" -->
<span>${opt.value}</span>${opt.$icon?.cloneNode(true) ?? ""} <span>${opt.value}</span>${opt.$icon?.cloneNode(true) ?? ""}
</div>`, </div>`,

2
src/core/menu/menu.mjs
View File

@ -185,7 +185,7 @@ const renderMenu = async () => {
const importApi = () => { const importApi = () => {
return (_apiImport ??= (async () => { return (_apiImport ??= (async () => {
const api = globalThis.__enhancerApi; const api = globalThis.__enhancerApi;
if (typeof api === "undefined") await import("../../shared/system.js"); if (typeof api === "undefined") await import("../../_common/system.js");
await import("../../load.mjs").then((i) => i.default); await import("../../load.mjs").then((i) => i.default);
})()); })());
}, },

9
src/core/notionConfig.cjs
View File

@ -1,9 +0,0 @@
/**
* notion-enhancer
* (c) 2023 dragonwocky <thedragonring.bod@gmail.com> (https://dragonwocky.me/)
* (https://notion-enhancer.github.io/) under the MIT license
*/
module.exports = async (api, db, __exports, __eval) => {
if (await db.get("developerMode")) __exports.default.env = "development";
};

17
src/init.js
View File

@ -14,8 +14,8 @@ const isElectron = () => {
}; };
if (isElectron()) { if (isElectron()) {
require("./shared/system.js"); require("./_common/system.js");
require("./shared/registry.js"); require("./_common/registry.js");
const { enhancerUrl } = globalThis.__enhancerApi, const { enhancerUrl } = globalThis.__enhancerApi,
{ getMods, isEnabled, modDatabase } = globalThis.__enhancerApi; { getMods, isEnabled, modDatabase } = globalThis.__enhancerApi;
@ -24,15 +24,12 @@ if (isElectron()) {
module.exports = async (target, __exports, __eval) => { module.exports = async (target, __exports, __eval) => {
if (target === mainScript) require("./worker.js"); if (target === mainScript) require("./worker.js");
if (target === rendererScript) { if (target === rendererScript) {
// expose globalThis.__enhancerApi to scripts // expose globalThis.__enhancerApi to scripts
const { contextBridge } = require("electron"); const { contextBridge } = require("electron"),
contextBridge.exposeInMainWorld( __getEnhancerApi = () => globalThis.__enhancerApi;
"__getEnhancerApi", contextBridge.exposeInMainWorld("__getEnhancerApi", __getEnhancerApi);
() => globalThis.__enhancerApi
);
// load clientStyles, clientScripts // load clientStyles, clientScripts
document.addEventListener("readystatechange", () => { document.addEventListener("readystatechange", () => {
if (document.readyState !== "complete") return false; if (document.readyState !== "complete") return false;
@ -54,6 +51,6 @@ if (isElectron()) {
} }
}; };
} else { } else {
import(chrome.runtime.getURL("/shared/system.js")) // import(chrome.runtime.getURL("/_common/system.js")) //
.then(() => import(chrome.runtime.getURL("/load.mjs"))); .then(() => import(chrome.runtime.getURL("/load.mjs")));
} }

14
src/load.mjs
View File

@ -44,15 +44,15 @@ export default (async () => {
await Promise.all([ await Promise.all([
// i.e. if (not_menu) or (is_menu && not_electron), then import // i.e. if (not_menu) or (is_menu && not_electron), then import
!(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("assets/icons.svg.js")), !(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("_assets/icons.svg.js")),
import(enhancerUrl("vendor/twind.min.js")), import(enhancerUrl("_vendor/twind.min.js")),
import(enhancerUrl("vendor/lucide.min.js")), import(enhancerUrl("_vendor/lucide.min.js")),
import(enhancerUrl("vendor/htm.min.js")), import(enhancerUrl("_vendor/htm.min.js")),
]); ]);
await Promise.all([ await Promise.all([
!(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("shared/registry.js")), !(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("_common/registry.js")),
import(enhancerUrl("shared/events.js")), import(enhancerUrl("_common/events.js")),
import(enhancerUrl("shared/markup.js")), import(enhancerUrl("_common/markup.js")),
]); ]);
const { getMods, isEnabled, modDatabase } = globalThis.__enhancerApi; const { getMods, isEnabled, modDatabase } = globalThis.__enhancerApi;

12
src/manifest.json
View File

@ -9,12 +9,12 @@
"background": { "service_worker": "/worker.js" }, "background": { "service_worker": "/worker.js" },
"action": {}, "action": {},
"icons": { "icons": {
"16": "/assets/colour-x16.png", "16": "/_assets/colour-x16.png",
"32": "/assets/colour-x32.png", "32": "/_assets/colour-x32.png",
"48": "/assets/colour-x48.png", "48": "/_assets/colour-x48.png",
"128": "/assets/colour-x128.png", "128": "/_assets/colour-x128.png",
"256": "/assets/colour-x256.png", "256": "/_assets/colour-x256.png",
"512": "/assets/colour-x512.png" "512": "/_assets/colour-x512.png"
}, },
"permissions": [ "permissions": [
"tabs", "tabs",