fix(modules): refactoring

yoyurec · Oct 12, 2022 · 22e96f9 · 22e96f9
1 parent 87bf518
commit 22e96f9
Show file tree

Hide file tree

Showing 27 changed files with 240 additions and 234 deletions.
diff --git a/index.html b/index.html
@@ -8,6 +8,6 @@
     </head>
     <body>
         <div id="app"></div>
-        <script src="/src/js/awesomeLinks.ts" type="module"></script>
+        <script src="/src/awesomeLinks.ts" type="module"></script>
     </body>
 </html>
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     }
   },
   "dependencies": {
-    "@logseq/libs": "0.0.8"
+    "@logseq/libs": "0.0.9"
   },
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/awesomeLinks.ts b/src/awesomeLinks.ts
@@ -0,0 +1,67 @@
+import '@logseq/libs';
+
+import {
+    globalContext,
+    doc, body, getDOMContainers,
+    pageIconsLoad, pageIconsUnload,
+    nerdFontLoad, nerdFontUnload,
+    faviconsLoad, faviconsUnload,
+    journalIconsLoad, journalIconsUnload,
+    sidebarIconsLoad, sidebarIconsUnload,
+    initLinksObserver, stopLinksObserver, runLinksObserver, settingsLoad
+} from './modules/internal';
+
+const registerPlugin = async () => {
+    setTimeout(() => {
+        if (doc.head) {
+            doc.head.insertAdjacentHTML('beforeend', `<link rel="stylesheet" id="css-awesomeLinks" href="lsp://logseq.io/${globalContext.pluginID}/dist/assets/awesomeLinks.css">`)
+        }
+    }, 500);
+}
+
+// Main logic runners
+const runStuff = async () => {
+    settingsLoad();
+    initLinksObserver();
+    getDOMContainers();
+    setTimeout(() => {
+        pageIconsLoad();
+        faviconsLoad();
+        journalIconsLoad();
+        sidebarIconsLoad();
+        nerdFontLoad();
+        if (globalContext.pluginConfig?.featureFaviconsEnabled || globalContext.pluginConfig?.featurePageIconsEnabled) {
+            runLinksObserver();
+        }
+        body.classList.add('is-awesomeLinks');
+    }, 1000)
+}
+const stopStuff = () => {
+    pageIconsUnload();
+    faviconsUnload();
+    journalIconsUnload();
+    sidebarIconsUnload();
+    nerdFontUnload();
+    stopLinksObserver();
+    body.classList.remove('is-awesomeLinks');
+}
+
+// Main logseq on ready
+const main = async () => {
+    console.log(`AwesomeIcons: plugin loaded`);
+
+    globalContext.pluginConfig = logseq.settings;
+    registerPlugin();
+
+    runStuff();
+
+    setTimeout(() => {
+        // Listen plugin unload
+        logseq.beforeunload(async () => {
+            stopStuff();
+        });
+    }, 2000)
+
+};
+
+logseq.ready(main).catch(null);
diff --git a/src/css/awesomeLinks.css b/src/css/awesomeLinks.css
diff --git a/src/js/awesomeLinks.ts b/src/js/awesomeLinks.ts
diff --git a/src/js/modules/internal.ts b/src/js/modules/internal.ts
diff --git a/src/js/modules/DOMContainers.ts → src/modules/DOMContainers.ts b/src/js/modules/DOMContainers.ts → src/modules/DOMContainers.ts
diff --git a/src/js/modules/favIcons.ts → src/modules/favicons/favIcons.ts b/src/js/modules/favIcons.ts → src/modules/favicons/favIcons.ts
@@ -1,6 +1,10 @@
-import globalContext from './globals';
-import { doc, body } from './DOMContainers';
-import { stopLinksObserver } from './internal';
+import { doc, body } from '../DOMContainers';
+import {
+    globalContext,
+    stopLinksObserver
+} from '../internal';
+
+import './favicons.css';
 
 // External links favicons
 export const setFavicons = async (extLinkList?: NodeListOf<HTMLAnchorElement>) => {

diff --git a/src/modules/favicons/favicons.css b/src/modules/favicons/favicons.css
@@ -0,0 +1,18 @@
+/*
+  >>> BEGIN: External links
+*/
+/* hide other themes icons at first */
+.is-awesomeLinks-ext .external-link::before,
+.is-awesomeLinks-ext .external-link::after {
+    display: none !important;
+}
+.is-awesomeLinks-ext .awLinks-link-icon {
+    display: inline-block;
+    width: 16px;
+    height: 16px;
+    margin: -3px 5px 0 0;
+    border-radius: 3px;
+}
+/*
+<<<< END: External links
+*/
diff --git a/src/js/modules/globals.ts → src/modules/globals.ts b/src/js/modules/globals.ts → src/modules/globals.ts
@@ -1,14 +1,12 @@
-import { logseq as PL } from '../../../package.json';
+import { logseq as PL } from '../../package.json';
 
 type globalContextType = {
     pluginID: string;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [key: string]: any;
 }
 
-const globalContext: globalContextType = {
+export const globalContext: globalContextType = {
     pluginID: PL.id,
     pluginConfig: null
 };
-
-export default globalContext;
diff --git a/src/modules/internal.ts b/src/modules/internal.ts
@@ -0,0 +1,11 @@
+export * from './globals';
+export * from './DOMContainers';
+export * from './settings/settings';
+export * from './linksObserver/linksObserver';
+export * from './pageIcons/pageIcons';
+export * from './pageIcons/queries';
+export * from './titleIcon/titleIcon';
+export * from './sidebarIcon/sidebarIcon';
+export * from './journalIcons/journalIcons';
+export * from './favicons/favIcons';
+export * from './nerdFont/nerdFont';
diff --git a/src/modules/journalIcons/journalIcons.css b/src/modules/journalIcons/journalIcons.css
@@ -0,0 +1,16 @@
+/*
+  >>> BEGIN: Journal icon
+*/
+body:not(.is-banner-active).is-awesomeLinks-journal .journal-item h1.title::before,
+body:not(.is-banner-active).is-awesomeLinks-journal .is-journals h1.title::before {
+    content: var(--awesomeLinks-journal-icon);
+    display: inline-block;
+    margin-right: 0.24em !important;
+    font-family: var(--icon-font);
+    text-align: center;
+    line-height: 1.2em;
+    width: 1.4em;
+}
+/*
+<<<< END: Journal icon
+*/