Add Earthfile and update version

- Switch to CodeMirror
- Switch to Parcel Bundler
- Fix synchronisation bug
- Update dependencies

Caddyfile

@@ -0,0 +1,9 @@
+https://notes.dev.hibas123.de:443 {
+   proxy / localhost:1234/
+   tls D:\Certs\_wildcard.dev.hibas123.de.pem D:\Certs\_wildcard.dev.hibas123.de-key.pem
+}
+
+https://sf.dev.hibas123.de:443 {
+   proxy / localhost:3004/
+   tls D:\Certs\_wildcard.dev.hibas123.de.pem D:\Certs\_wildcard.dev.hibas123.de-key.pem
+}

Earthfile

@@ -0,0 +1,26 @@
+VERSION 0.7
+
+docker-multi:
+   BUILD --platform linux/amd64 --platform linux/arm64 +docker
+
+build:
+   FROM node:lts
+   WORKDIR /build
+   COPY . .
+   RUN npm config set registry https://npm.hibas123.de
+   RUN npm install
+   RUN npm run build
+   SAVE ARTIFACT dist secure_notes_files
+
+docker:
+   FROM busybox:1.36
+   WORKDIR /app
+
+   COPY --platform=linux/amd64 +build/secure_notes_files /app/
+
+
+   CMD ["busybox", "httpd", "-f", "-v", "-p", "3001", "-h", "/app"]
+
+   ARG EARTHLY_TARGET_TAG
+   ARG TAG=$EARTHLY_TARGET_TAG
+   SAVE IMAGE --push git.hibas.dev/openserver/secure_notes:$TAG

config.json

@@ -1,7 +0,0 @@
-{
-   "secure_file_server": "https://sf.dev.hibas123.de",
-   "auth_server": "https://auth.stamm.me",
-   "client_id": "cf699b12-2014-4a61-bb7d-a7e38b197350",
-   "permission": "5c1ed399dc361731340a49d4",
-   "callback_url": "https://notes.dev.hibas123.de"
-}

package.json

@@ -1,53 +1,44 @@
 {
    "name": "@hibas123/securenotes2",
-   "version": "2.0.0-alpha.1",
+   "version": "2.0.2",
    "description": "",
-   "main": "index.js",
    "scripts": {
-      "build": "webpack --mode=production",
+      "build": "parcel build src/index.html",
-      "watch": "webpack --mode=development --watch",
+      "dev": "parcel src/index.html"
-      "start": "webpack-dev-server --mode=production",
-      "start:prod": "webpack-dev-server --mode=production",
-      "start:dev": "webpack-dev-server --mode=development"
    },
    "author": "Fabian Stamm <dev@fabianstamm.de>",
    "license": "MIT",
+   "browserslist": [
+      "last 2 Chrome versions"
+   ],
    "dependencies": {
-      "@hibas123/secure-file-wrapper": "^2.5.0",
+      "@codemirror/commands": "^6.6.0",
-      "@hibas123/theme": "^1.0.6",
+      "@codemirror/lang-markdown": "^6.2.5",
-      "@hibas123/utils": "^2.1.0",
+      "@hibas123/secure-file-wrapper": "^2.5.3",
+      "@hibas123/theme": "^2.0.7",
+      "@hibas123/utils": "^2.2.18",
       "aes-js": "^3.1.2",
-      "easymde": "^2.6.1",
+      "codemirror": "^6.0.1",
-      "feather-icons": "^4.22.1",
+      "easymde": "^2.18.0",
-      "idb": "^4.0.3",
+      "feather-icons": "^4.29.2",
-      "js-sha256": "^0.9.0",
+      "idb": "^5.0.8",
+      "js-sha256": "^0.11.0",
+      "lodash": "^4.17.21",
       "lodash.clonedeep": "^4.5.0",
-      "secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
+      "parcel": "^2.12.0",
-      "uuid": "^3.3.2"
+      "preact": "^10.22.0",
+      "preact-feather": "^4.2.1",
+      "uuid": "^10.0.0"
    },
    "devDependencies": {
-      "@types/codemirror": "0.0.76",
+      "@parcel/packager-raw-url": "2.12.0",
-      "@types/lodash.clonedeep": "^4.5.6",
+      "@parcel/transformer-sass": "^2.12.0",
-      "@types/uikit": "^2.27.7",
+      "@parcel/transformer-webmanifest": "^2.12.0",
-      "@types/uuid": "^3.4.5",
+      "@types/codemirror": "5.60.15",
-      "copy-webpack-plugin": "^5.0.3",
+      "@types/lodash.clonedeep": "^4.5.9",
-      "css-loader": "^3.0.0",
+      "@types/uuid": "^10.0.0",
-      "file-loader": "^4.0.0",
+      "process": "^0.11.10",
-      "html-webpack-plugin": "^3.2.0",
+      "sass": "^1.77.6",
-      "mini-css-extract-plugin": "^0.7.0",
+      "typescript": "^5.5.2"
-      "node-sass": "^4.12.0",
-      "preact": "^8.3.1",
-      "preact-svg-loader": "^0.2.1",
-      "raw-loader": "^3.0.0",
-      "sass-loader": "^7.1.0",
-      "style-loader": "^0.23.1",
-      "ts-loader": "^6.0.4",
-      "typescript": "^3.5.2",
-      "webpack": "^4.35.2",
-      "webpack-bundle-analyzer": "^3.3.2",
-      "webpack-cli": "^3.3.5",
-      "webpack-dev-server": "^3.7.2",
-      "webpack-visualizer-plugin": "^0.1.11",
-      "worker-loader": "^2.0.0"
    }
 }

public/manifest.json

@@ -1,55 +0,0 @@
-{
-    "short_name": "Secure Notes",
-    "name": "Secure Notes",
-    "decription": "A place to store your notes securly",
-    "share_target": {
-        "action": "/share",
-        "method": "GET",
-        "enctype": "application/x-www-form-urlencoded",
-        "params": {
-            "title": "title",
-            "text": "text",
-            "url": "url"
-        }
-    },
-    "icons": [{
-            "src": "notepad16.png",
-            "sizes": "16x16",
-            "type": "image/png"
-        },
-        {
-            "src": "notepad24.png",
-            "sizes": "24x24",
-            "type": "image/png"
-        },
-        {
-            "src": "notepad32.png",
-            "sizes": "32x32",
-            "type": "image/png"
-        },
-        {
-            "src": "notepad64.png",
-            "sizes": "64x64",
-            "type": "image/png"
-        },
-        {
-            "src": "notepad128.png",
-            "sizes": "128x128",
-            "type": "image/png"
-        },
-        {
-            "src": "notepad256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        },
-        {
-            "src": "notepad512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "start_url": "/",
-    "display": "standalone",
-    "theme_color": "#1E88E5",
-    "background_color": "#ffffff"
-}

public/serviceworker.js

@@ -1,121 +0,0 @@
-function log(...params) {
-    console.log.apply(this, [...["%c[SW]: %c", "color: #f4b942;", "color:unset;"], ...params])
-}
-
-const CACHE = "offline";
-
-let precacheFiles = [
-    "/",
-    "/index.html",
-    "/main.js",
-    "/main.css",
-    "/serviceworker.js"
-]
-
-//Install stage sets up the cache-array to configure pre-cache content
-self.addEventListener('install', (evt) => {
-    log('The service worker is being installed.');
-    evt.waitUntil(precache().then(() => {
-        log('Skip waiting on install');
-    }).catch(log).then(() => self.skipWaiting()));
-});
-
-//allow sw to control of current page
-self.addEventListener('activate', (event) => {
-    log('Claiming clients for current page');
-    return self.clients.claim();
-});
-
-self.addEventListener('message', (event) => {
-    log("Clearing cache");
-    caches.delete(CACHE);
-    event.waitUntil(precache());
-});
-
-var Types;
-(function (Types) {
-    Types[Types["CACHE"] = 0] = "CACHE";
-    Types[Types["NOCACHE"] = 1] = "NOCACHE";
-    Types[Types["REFRESH"] = 2] = "REFRESH";
-    Types[Types["INDEX"] = 3] = "INDEX";
-})(Types || (Types = {}));
-
-let rules = [{
-        match: (url) => {
-            return url.indexOf("/api/") >= 0;
-        },
-        type: Types.NOCACHE
-    }, {
-        match: (url) => {
-            return url.indexOf("/share") >= 0;
-        },
-        type: Types.INDEX
-    },
-    {
-        match: () => {
-            return true;
-        },
-        type: Types.REFRESH
-    }
-]
-
-self.addEventListener('fetch', (evt) => {
-    if (evt.request.method != 'GET') return; // Dont care about POST requests
-    let rule = rules.find(rule => rule.match(evt.request.url));
-    evt.respondWith((async () => {
-        log("Cache:", Types[rule.type]);
-        switch (rule.type) {
-            case Types.CACHE:
-                return fromCache(evt.request);
-            case Types.REFRESH:
-                return refresh(evt.request).then(r => {
-                    evt.waitUntil(r.refresh.catch(_ => {}));
-                    return r.result;
-                });
-            case Types.NOCACHE:
-                return fetch(evt.request);
-            case Types.INDEX:
-                return refresh(new Request("/")).then(r => {
-                    evt.waitUntil(r.refresh.catch(_ => {}));
-                    return r.result;
-                })
-        }
-    })());
-});
-
-async function fromCache(request) {
-    let cache = await caches.open(CACHE);
-    let matching = await cache.match(request);
-    if (matching)
-        return matching
-
-    let res = await fetch(request.clone());
-    await cache.put(request, {
-        match: (url) => {
-            return url.indexOf("/version_hash") >= 0;
-        },
-        type: Types.NOCACHE
-    }, res);
-    return await cache.match(request);
-}
-
-async function refresh(request) {
-    let cache = await caches.open(CACHE);
-    let web = fetch(request.clone()).then(res => {
-        return cache.put(request, res).then(() => {
-            return cache.match(request);
-        })
-    })
-    let matching = await cache.match(request);
-
-    return {
-        result: matching ? matching : web,
-        refresh: web
-    }
-}
-
-function precache() {
-    return caches.open(CACHE).then(function (cache) {
-        return cache.addAll(precacheFiles);
-    });
-}

src/components/AddButton.tsx

@@ -1,12 +1,14 @@
 import { h } from "preact";
 import "./add_button.scss";
-import Plus from "feather-icons/dist/icons/plus.svg";
+import { Plus } from "preact-feather";
 export default function AddButton({ onClick }: { onClick: () => void }) {
-   return <button
+   return (
-      title="add button"
+      <button
-      class="fab btn-primary"
+         title="add button"
-      onClick={() => onClick()}
+         class="fab btn-primary"
-   >
+         onClick={() => onClick()}
-      <Plus width={undefined} height={undefined} />
+      >
-   </button>
+         <Plus width={undefined} height={undefined} />
+      </button>
+   );
 }

src/components/CodeMirror.scss

@@ -0,0 +1,3 @@
+.CodeMirror {
+   height: auto;
+}

src/components/CodeMirror.tsx

@@ -0,0 +1,62 @@
+import { h } from "preact";
+import { useEffect, useRef } from "preact/hooks";
+
+import { EditorView, basicSetup, } from "codemirror";
+import { EditorState, Text } from "@codemirror/state";
+import { defaultKeymap } from "@codemirror/commands"
+
+import { markdown } from "@codemirror/lang-markdown"
+// import "codemirror/lib/codemirror.css";
+// import "codemirror/theme/base16-dark.css";
+
+import "./CodeMirror.scss";
+import Theme from "../theme";
+
+interface ICodeMirrorProps {
+   value: string;
+   onChange: (value: string) => void;
+   onSave?: (value: string) => void;
+   onClose?: () => void;
+}
+
+export default function CodeMirror(props: ICodeMirrorProps) {
+   const ref = useRef<HTMLTextAreaElement>();
+   useEffect(() => {
+      const instance = new EditorView({
+         parent: ref.current,
+         extensions: [
+            basicSetup,
+            markdown(),
+
+         ],
+      })
+      // const instance = CM.(ref.current, {
+      //    value: props.value,
+      //    mode: "markdown",
+      //    lineNumbers: true,
+      //    lineWrapping: true,
+      //    theme: Theme.isDark.value ? "base16-dark" : "default",
+      //    viewportMargin: Infinity,
+      //    // extraKeys: {
+      //    //    "Ctrl-S": (cm) => {
+      //    //       const val = cm.getValue();
+      //    //       props?.onSave(val);
+      //    //    },
+      //    //    Esc: props.onClose,
+      //    // },
+      // });
+
+      const state = EditorState.create({
+         doc: Text.of([props.value ?? ""]),
+      });
+
+      instance.setState(state);
+      instance.focus();
+      state.
+
+         instance.on("change", () => props?.onChange(instance.getValue()));
+
+      return () => { };
+   }, [ref]);
+   return <textarea ref={ref}></textarea>;
+}

src/components/Footer.tsx

@@ -1,72 +1,79 @@
 import { h, Component } from "preact";
 import Notes from "../notes";
-import Refresh from "feather-icons/dist/icons/refresh-cw.svg";
+import { RefreshCw as Refresh } from "preact-feather";
 import "./footer.scss";
 import Notifications from "../notifications";
 
-export class Footer extends Component<{}, { synced: boolean, syncing: boolean }> {
+export class Footer extends Component<
-    constructor(props) {
+   {},
-        super(props);
+   { synced: boolean; syncing: boolean }
-        this.state = { synced: false, syncing: false };
+> {
-        this.onSyncedChange = this.onSyncedChange.bind(this);
+   constructor(props) {
-        this.onSyncChange = this.onSyncChange.bind(this);
+      super(props);
-    }
+      this.state = { synced: false, syncing: false };
+      this.onSyncedChange = this.onSyncedChange.bind(this);
+      this.onSyncChange = this.onSyncChange.bind(this);
+   }
 
-    async componentWillMount() {
+   async componentWillMount() {
-        Notes.syncedObservable.subscribe(this.onSyncedChange);
+      Notes.syncedObservable.subscribe(this.onSyncedChange);
-        Notes.syncObservable.subscribe(this.onSyncChange);
+      Notes.syncObservable.subscribe(this.onSyncChange);
-        this.setState({ synced: await Notes.isSynced() })
+      this.setState({ synced: await Notes.isSynced() });
-    }
+   }
 
-    componentWillUnmount() {
+   componentWillUnmount() {
-        Notes.syncedObservable.unsubscribe(this.onSyncedChange);
+      Notes.syncedObservable.unsubscribe(this.onSyncedChange);
-        Notes.syncObservable.unsubscribe(this.onSyncChange);
+      Notes.syncObservable.unsubscribe(this.onSyncChange);
-    }
+   }
 
-    onSyncChange(state: boolean) {
+   onSyncChange(state: boolean) {
-        console.log("sync", state);
+      console.log("sync", state);
-        this.setState({ syncing: state })
+      this.setState({ syncing: state });
-    }
+   }
 
-    onSyncedChange(state: boolean) {
+   onSyncedChange(state: boolean) {
-        console.log("synced", state);
+      console.log("synced", state);
-        this.setState({ synced: state })
+      this.setState({ synced: state });
-    }
+   }
 
-    onSyncClick() {
+   onSyncClick() {
-        Notes.sync().then(() => {
+      Notes.sync().then(() => {
-            Notifications.sendInfo("Finished Synchronisation");
+         Notifications.sendInfo("Finished Synchronisation");
-        })
+      });
-    }
+   }
 
-    render() {
+   render() {
-        let extrac = undefined;
+      let extrac = undefined;
-        let color;
+      let color;
-        let text;
+      let text;
-        if (this.state.syncing) {
+      if (this.state.syncing) {
-            color = "orange";
+         color = "orange";
-            text = "syncing";
+         text = "syncing";
-            extrac = "reloading"
+         extrac = "reloading";
-        } else {
+      } else {
-            if (this.state.synced) {
+         if (this.state.synced) {
-                color = "green";
+            color = "green";
-                text = "synced";
+            text = "synced";
-            } else {
+         } else {
-                color = "red";
+            color = "red";
-                text = "not synced";
+            text = "not synced";
-            }
+         }
-        }
+      }
-        return <footer class="elv-8" style="line-height: 1.1rem;">
+      return (
+         <footer class="elv-8">
             <span>
-                <span><a class={extrac} onClick={() => this.onSyncClick()} ><Refresh style="height: 1.1em; width: 1.1em;"></Refresh></a></span>
+               <span class={extrac}>
-                <span style={"margin-left: 8px; color:" + color}>{text}</span>
+                  <a onClick={() => this.onSyncClick()}>
+                     <Refresh style="height: 1em; width: 1em;"></Refresh>
+                  </a>
+               </span>
+               <span style={"margin-left: 8px; color:" + color}>{text}</span>
             </span>
             <span>
-                Welcome <b>{Notes.name}</b>
+               Welcome <b>{Notes.name}</b>
             </span>
-            <span style="color: lightgrey;">
+            <span style="color: lightgrey;">v2.0.2</span>
-                v1.4
+         </footer>
-            </span>
+      );
-        </footer>
+   }
-    }
 }

src/components/modals/Modal.tsx

@@ -1,13 +1,15 @@
 import { Observable } from "@hibas123/utils";
 import { h, Component } from "preact";
-import CloseIcon from "feather-icons/dist/icons/x.svg";
+import { X } from "preact-feather";
 
 export default abstract class Modal<T> {
    // Static
-   private static modalObservableServer = new Observable<{ modal: Modal<any>, close: boolean }>();
+   private static modalObservableServer = new Observable<{
+      modal: Modal<any>;
+      close: boolean;
+   }>();
    public static modalObservable = Modal.modalObservableServer.getPublicApi();
 
-
    protected abstract title: string;
 
    // Private
@@ -17,10 +19,8 @@ export default abstract class Modal<T> {
 
    // Protected
    protected result(value: T | null) {
-      if (this.closeOnResult)
+      if (this.closeOnResult) this.close();
-         this.close()
+      if (this.onResult) this.onResult(value);
-      if (this.onResult)
-         this.onResult(value);
    }
 
    //Public
@@ -41,7 +41,7 @@ export default abstract class Modal<T> {
    public async getResult(close = true) {
       this.closeOnResult = close;
       this.show(false);
-      return new Promise<T | null>((yes) => this.onResult = yes);
+      return new Promise<T | null>((yes) => (this.onResult = yes));
    }
 
    public close() {
@@ -50,52 +50,68 @@ export default abstract class Modal<T> {
 
    public abstract getComponent(): JSX.Element;
 
-   public static BaseModal = class BaseModal<T> extends Component<{ modal: Modal<T> }, {}> {
+   public static BaseModal = class BaseModal<T> extends Component<
+      { modal: Modal<T> },
+      {}
+   > {
       render() {
-         return <div class="modal-container" onClick={(evt) => {
+         return (
-            let path = evt.composedPath();
+            <div
-            if (!path.find(e => {
+               class="modal-container"
-               let s = (e as Element);
+               onClick={(evt) => {
-               return s.id === "ModalContent";
+                  let path = evt.composedPath();
-            })) {
+                  if (
-               this.props.modal.result(null)
+                     !path.find((e) => {
-            }
+                        let s = e as Element;
-         }} onKeyDown={evt => {
+                        return s.id === "ModalContent";
-            if (evt.keyCode === 27) {
+                     })
-               this.props.modal.result(null)
+                  ) {
-            }
+                     this.props.modal.result(null);
-         }}>
-            <div id="ModalContent" class="modal" >
-               <div class="modal-title" style="">
-                  <h3>{this.props.modal.title}</h3>
-                  {/* <div> */}
-                  {!this.props.modal.noClose ?
-                     <CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} />
-                     : undefined
                   }
-                  {/* </div> */}
+               }}
+               onKeyDown={(evt) => {
+                  if (evt.keyCode === 27) {
+                     this.props.modal.result(null);
+                  }
+               }}
+            >
+               <div id="ModalContent" class="modal">
+                  <div class="modal-title" style="">
+                     <h3>{this.props.modal.title}</h3>
+                     {/* <div> */}
+                     {!this.props.modal.noClose ? (
+                        <X
+                           onClick={() => this.props.modal.result(null)}
+                           width={undefined}
+                           height={undefined}
+                        />
+                     ) : undefined}
+                     {/* </div> */}
+                  </div>
+                  {this.props.children}
                </div>
-               {this.props.children}
             </div>
-         </div>
+         );
       }
-   }
+   };
-
 }
 
-export class ModalComponent extends Component<{}, { modal: Modal<any> | undefined, component: JSX.Element | undefined }>{
+export class ModalComponent extends Component<
+   {},
+   { modal: Modal<any> | undefined; component: JSX.Element | undefined }
+> {
    constructor(props) {
       super(props);
       this.onModal = this.onModal.bind(this);
    }
 
-   onModal({ modal, close }: { modal: Modal<any>, close: boolean }) {
+   onModal({ modal, close }: { modal: Modal<any>; close: boolean }) {
       if (!close && this.state.modal !== modal) {
-         this.setState({ modal: modal, component: modal.getComponent() })
+         this.setState({ modal: modal, component: modal.getComponent() });
-      }
+      } else {
-      else {
+         if (this.state.modal === modal && close)
-         if (this.state.modal === modal && close) // Only close if the same
+            // Only close if the same
-            this.setState({ modal: undefined, component: undefined })
+            this.setState({ modal: undefined, component: undefined });
       }
    }
 
@@ -108,8 +124,6 @@ export class ModalComponent extends Component<{}, { modal: Modal<any> | undefine
    }
 
    render() {
-      return <div>
+      return <div>{this.state.component}</div>;
-         {this.state.component}
-      </div>
    }
 }

src/components/routes/settings/Settings.tsx

@@ -2,36 +2,65 @@ import { h } from "preact";
 import { Page } from "../../../page";
 import Theme, { ThemeStates } from "../../../theme";
 import Navigation from "../../../navigation";
-import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg";
+import { ArrowLeft } from "preact-feather";
 
-export default class SettingsPage extends Page<{ state: any }, { vault: string }> {
+export default class SettingsPage extends Page<
-    componentWillMount() {
+   { state: any },
+   { vault: string }
+> {
+   componentWillMount() {}
 
-    }
+   render() {
-
+      let active = Theme.active();
-    render() {
+      return (
-        let active = Theme.active();
+         <div>
-        return <div>
             <header class="header">
-                <a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
+               <div class="header-icon-button" onClick={() => history.back()}>
-                <h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>Settings</h3>
+                  <ArrowLeft height={undefined} width={undefined} />
-                <span></span>
+               </div>
+               <span onClick={() => Navigation.setPage("/")}>Settings</span>
+               <span></span>
             </header>
             <div class="container">
-                <div className="input-group">
+               <div className="input-group">
-                    <label>Select Theme: </label>
+                  <label>Select Theme: </label>
-                    <select class="inp" onChange={(ev) => Theme.change(Number((ev.target as HTMLSelectElement).value))}>
+                  <select
-                        {Object.keys(ThemeStates)
+                     class="inp"
-                            .filter(e => Number.isNaN(Number(e)))
+                     onChange={(ev) =>
-                            .map(e => <option selected={ThemeStates[e] === active} value={ThemeStates[e]}>{e.charAt(0).toUpperCase() + e.slice(1).toLowerCase()}</option>)}
+                        Theme.change(
-                        {/* <option value={ThemeStates.AUTO}>Auto</option>
+                           Number((ev.target as HTMLSelectElement).value)
+                        )
+                     }
+                  >
+                     {Object.keys(ThemeStates)
+                        .filter((e) => Number.isNaN(Number(e)))
+                        .map((e) => (
+                           <option
+                              selected={ThemeStates[e] === active}
+                              value={ThemeStates[e]}
+                           >
+                              {e.charAt(0).toUpperCase() +
+                                 e.slice(1).toLowerCase()}
+                           </option>
+                        ))}
+                     {/* <option value={ThemeStates.AUTO}>Auto</option>
                         <option value={ThemeStates.LIGHT}>Light</option>
                         <option value={ThemeStates.DARK}>Dark</option> */}
-                    </select>
+                  </select>
-                </div>
+               </div>
-                {/* <button class="btn" onClick={() => Theme.toggle()}>Toggle Dark Mode</button> */}
+               {/* <button class="btn" onClick={() => Theme.toggle()}>Toggle Dark Mode</button> */}
-                <button class="btn" onClick={() => window.navigator.serviceWorker.controller.postMessage("message")}>Clear cache</button>
+               <button
+                  class="btn"
+                  onClick={() =>
+                     window.navigator.serviceWorker.controller.postMessage(
+                        "message"
+                     )
+                  }
+               >
+                  Clear cache
+               </button>
             </div>
-        </div >;
+         </div>
-    }
+      );
+   }
 }

src/components/routes/vault/EasyMde.tsx

@@ -0,0 +1,27 @@
+import { h } from "preact";
+
+import * as EasyMDE from "easymde";
+import "easymde/dist/easymde.min.css"
+// import "./easymde.scss"
+import { useEffect, useRef } from "preact/hooks";
+
+export default function EasyMDEPreact(props: { value: string, onChange: (value: string) => void }) {
+   const ref = useRef<HTMLTextAreaElement>();
+   useEffect(() => {
+      const mde = new EasyMDE({
+         element: ref.current,
+         initialValue: props.value
+      })
+
+      mde.codemirror.on("change", () => {
+         props.onChange(mde.value());
+      });
+
+      return () => {
+         mde.cleanup();
+      }
+   }, [ref])
+   return <div style="background: white;">
+      <textarea ref={ref}></textarea>
+   </div>
+}

src/components/routes/vault/Editor.tsx

@@ -1,51 +0,0 @@
-import { Component, h } from "preact";
-import * as EasyMDE from "easymde";
-// import "./easymde.css";
-// import "./dark.css";
-import "easymde/dist/easymde.min.css";
-// import "codemirror/theme/monokai.css";
-
-export interface EditorProps {
-    value: string;
-    valueChange: (value: string) => void;
-    save: () => void;
-    exit: () => void;
-}
-
-export default class Editor extends Component<EditorProps, {}> {
-    element: HTMLInputElement;
-    easymde: EasyMDE;
-
-    componentDidMount() {
-        if (this.easymde)
-            this.easymde.toTextArea();
-
-        this.easymde = new EasyMDE({
-            element: this.element,
-            initialValue: this.props.value,
-            autofocus: true,
-            spellChecker: false
-            // theme: "monokai"
-            // autoDownloadFontAwesome: true
-        })
-
-        this.easymde.codemirror.on("change", () => {
-            this.props.valueChange(this.easymde.value());
-        });
-
-        this.easymde.codemirror.addKeyMap({
-            "Ctrl-S": () => this.props.save(),
-            "Esc": () => this.props.exit()
-        })
-    }
-
-    shouldComponentUpdate(props: EditorProps) {
-        if (this.easymde.value() !== props.value)
-            this.easymde.value(props.value);
-        return false;
-    }
-
-    render() {
-        return <textarea ref={ta => this.element = ta}></textarea>
-    }
-}

src/components/routes/vault/Entry.1.tsx.old

@@ -1,188 +0,0 @@
-import { h, Component } from "preact"
-import { IVault, ViewNote } from "../../../notes";
-import Trash from "feather-icons/dist/icons/trash-2.svg"
-import X from "feather-icons/dist/icons/x.svg"
-import Save from "feather-icons/dist/icons/save.svg"
-
-import Navigation from "../../../navigation";
-import { YesNoModal } from "../../modals/YesNoModal";
-import Notifications, { MessageType } from "../../../notifications";
-
-const minRows = 3;
-export default class EntryComponent extends Component<{ vault: Promise<IVault>, id: string | undefined, note: string | undefined }, { title: string, changed: boolean }> {
-   private text: string = "";
-   private vault: IVault;
-   // private lineHeight: number = 24;
-   private note: ViewNote;
-
-   private rows: number = minRows;
-
-   private skip_save: boolean = false;
-
-   private inputElm: HTMLInputElement;
-
-   constructor(props) {
-      super(props);
-      this.state = { changed: false, title: "" };
-      this.textAreaChange = this.textAreaChange.bind(this);
-      this.textAreaKeyPress = this.textAreaKeyPress.bind(this);
-   }
-
-   private toVault() {
-      history.back();
-   }
-
-   componentDidMount() {
-      this.inputElm.focus();
-   }
-
-   async componentWillMount() {
-      this.text = "";
-      this.vault = undefined;
-      this.note = undefined;
-      this.rows = minRows;
-      this.skip_save = false;
-      this.setState({ changed: false, title: "" });
-      try {
-         this.skip_save = false;
-
-         this.vault = await this.props.vault;
-         let note: ViewNote;
-         let changed = false;
-         if (this.props.id)
-            note = await this.vault.getNote(this.props.id)
-         else {
-            note = this.vault.newNote();
-            if (this.props.note) {
-               note.__value = this.props.note;
-               changed = true;
-            }
-         }
-
-         if (!note) {
-            Notifications.sendNotification("Note not found!", MessageType.ERROR);
-         } else {
-            this.note = note;
-            this.text = note.__value;
-            let rows = this.getRows(this.text);
-            if (rows !== this.rows) {
-               this.rows = rows;
-            }
-            let [title] = this.text.split("\n", 1);
-            this.setState({ title, changed })
-         }
-      } catch (err) {
-         Notifications.sendError(err);
-      }
-   }
-
-   private async save() {
-      try {
-         if (this.state.changed) {
-            this.note.__value = this.text;
-            await this.vault.saveNote(this.note);
-            this.setState({ changed: false })
-         }
-      } catch (err) {
-         Notifications.sendError(err);
-      }
-   }
-
-   componentWillUnmount() {
-      if (!this.skip_save)
-         this.save()
-   }
-
-   strToNr(value: string) {
-      let match = value.match(/\d/g)
-      return Number(match.join(""))
-   }
-
-   getRows(value: string) {
-      const lines = (value.match(/\r?\n/g) || '').length + 1
-      return Math.max(lines + 1, minRows);
-   }
-
-   textAreaChange(evt: KeyboardEvent) {
-      if (evt.keyCode === 17 || evt.keyCode === 27) return; //No character, so not relevant for this function
-      if (!this.state.changed && this.textAreaKeyPress(evt)) this.setState({ changed: true })
-
-      let target = (evt.target as HTMLTextAreaElement)
-      let value = target.value;
-
-      this.text = value;
-
-      let [title] = value.split("\n", 1);
-      if (title !== this.state.title)
-         this.setState({ title });
-
-      let rows = this.getRows(value);
-      if (rows !== this.rows) {
-         target.rows = rows;
-         this.rows = rows;
-      }
-   }
-
-   async exitHandler() {
-      if (this.state.changed) {
-         let modal = new YesNoModal("Really want to quit?");
-         let res = await modal.getResult();
-         if (res === true) {
-            this.skip_save = true;
-            this.toVault();
-         }
-      } else
-         this.toVault()
-   }
-
-   textAreaKeyPress(evt: KeyboardEvent) {
-      console.log(evt);
-      if ((evt.keyCode === 83 || evt.keyCode === 13) && evt.ctrlKey) {
-         evt.preventDefault()
-         this.save();
-         return false;
-      }
-      else if (evt.keyCode === 27) {
-         evt.preventDefault();
-         this.exitHandler();
-         return false;
-      }
-      return true;
-   }
-
-   render() {
-      const save_handler = async () => {
-         await this.save()
-         Navigation.setPage("/vault", { id: this.vault.id }, { entry: "false" }, true);
-         this.toVault()
-      }
-
-      const delete_handler = async () => {
-         await this.vault.deleteNote(this.props.id);
-         this.toVault()
-      }
-
-      console.log("Rerender")
-
-      return <div>
-         <header class="header">
-            <a class="header-icon-button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
-            {this.state.changed ? <a class="header-icon-button" style="margin-left: 0.5em;" onClick={() => save_handler()}><Save height={undefined} width={undefined} /></a> : undefined}
-            <h3 style="display:inline" class="button header-title">{this.state.title}</h3>
-            <a class="header-icon-button" onClick={() => delete_handler()}><Trash height={undefined} width={undefined} /></a>
-         </header>
-         <div class="container">
-            <textarea
-               value={this.text}
-               rows={this.rows}
-               class="inp"
-               style="width:100%;"
-               onInput={this.textAreaChange}
-               onKeyDown={this.textAreaKeyPress}
-               onChange={this.textAreaChange}
-               ref={elm => this.inputElm = elm}
-            />
-         </div>
-      </div>
-   }
-}

src/components/routes/vault/Entry.tsx

@@ -1,139 +1,134 @@
-import { h, Component } from "preact"
+import { h, Component } from "preact";
 import { IVault, ViewNote } from "../../../notes";
-import Trash from "feather-icons/dist/icons/trash-2.svg"
+import { Trash2 as Trash, X, Save } from "preact-feather";
-import X from "feather-icons/dist/icons/x.svg"
-import Save from "feather-icons/dist/icons/save.svg"
 
-import Navigation from "../../../navigation";
+// import Navigation from "../../../navigation";
 import { YesNoModal } from "../../modals/YesNoModal";
 import Notifications, { MessageType } from "../../../notifications";
-import Theme from "../../../theme";
+// import CodeMirror from "../../CodeMirror";
-
-import Editor from "./Editor";
-
-const minRows = 3;
-export default class EntryComponent extends Component<{ vault: Promise<IVault>, id: string | undefined, note: string | undefined }, { title: string, changed: boolean }> {
-   private text: string = "";
-   private vault: IVault;
-   // private lineHeight: number = 24;
-   private note: ViewNote;
-
-   private skip_save: boolean = false;
 
 
-   constructor(props) {
-      super(props);
-      this.state = { changed: false, title: "" };
-   }
 
-   private toVault() {
+import { useEffect, useMemo, useState } from "preact/hooks";
-      history.back();
+import { usePromise } from "../../../hooks";
-   }
+import EasyMDEPreact from "./EasyMde";
 
-   componentDidMount() { }
+interface IEntryProps {
+   vault: IVault;
+   id?: string;
+   note?: string;
+}
 
-   async componentWillMount() {
+export default function Entry(props: IEntryProps) {
-      this.text = "";
+   const [changed, setChanged] = useState(false);
-      this.vault = undefined;
+
-      this.note = undefined;
+   const [text, setText] = useState("");
-      this.skip_save = false;
+   const title = useMemo(() => text?.split("\n", 1)[0], [text]);
-      this.setState({ changed: false, title: "" });
+
-      try {
+   const [loading, error, note] = usePromise(async () => {
-         this.vault = await this.props.vault;
+      let note: ViewNote;
-         let note: ViewNote;
+      if (props.id) {
-         let changed = false;
+         note = await props.vault.getNote(props.id);
-         if (this.props.id)
+      } else {
-            note = await this.vault.getNote(this.props.id)
+         note = props.vault.newNote();
-         else {
+         if (props.note) {
-            note = this.vault.newNote();
+            note.__value = props.note;
-            if (this.props.note) {
+            setChanged(true);
-               note.__value = this.props.note;
+         }
-               changed = true;
+      }
+
+      if (!note) {
+         Notifications.sendNotification("Note not found!", MessageType.ERROR);
+         history.back();
+      } else {
+         setText(note.__value);
+      }
+
+      return note;
+   }, [props.vault, props.id]);
+
+   if (loading) {
+      return <div>Loading entry</div>;
+   } else {
+      const save = async () => {
+         try {
+            if (changed) {
+               note.__value = text;
+               await props.vault.saveNote(note);
+               setChanged(false);
             }
+         } catch (err) {
+            Notifications.sendError(err);
          }
+      };
 
-         if (!note) {
+      const del = async () => {
-            Notifications.sendNotification("Note not found!", MessageType.ERROR);
+         await props.vault.deleteNote(props.id);
-         } else {
+         history.back();
-            this.note = note;
+      };
-            this.text = note.__value;
 
-            let [title] = this.text.split("\n", 1);
+      const close = async () => {
-            this.setState({ title, changed })
+         if (changed) {
+            let modal = new YesNoModal("Really want to quit?");
+            let res = await modal.getResult();
+            if (!res) return;
          }
-      } catch (err) {
+         history.back();
-         Notifications.sendError(err);
+      };
-      }
-   }
 
-   private async save() {
+      // TODO: Add warning on possibly unwanted exit
-      try {
+      useEffect(() => {
-         if (this.state.changed) {
+         const keyevent = (evt: KeyboardEvent) => {
-            this.note.__value = this.text;
+            if (evt.key === "s" && evt.ctrlKey) {
-            await this.vault.saveNote(this.note);
+               evt.preventDefault();
-            this.setState({ changed: false })
+               save();
-         }
+               return false;
-      } catch (err) {
+            } else if (evt.key === "Escape") {
-         Notifications.sendError(err);
+               evt.preventDefault();
-      }
+               close();
-   }
+               return false;
+            }
+            return true;
+         };
 
-   componentWillUnmount() {
+         document.addEventListener("keydown", keyevent);
-      if (!this.skip_save)
+         return () => {
-         this.save()
+            document.removeEventListener("keydown", keyevent);
-   }
+         };
+      });
 
-   private textChange(value: string) {
+      return (
-      if (!this.state.changed && value !== this.text)
+         <div>
-         this.setState({ changed: true })
+            <header class="header" style="margin-bottom: 0;">
-
+               <div class="header-icon-button" onClick={close}>
-      this.text = value;
+                  <X height={undefined} width={undefined} />
-
+               </div>
-      let [title] = value.split("\n", 1);
+               {changed && (
-      if (title !== this.state.title)
+                  <div
-         this.setState({ title });
+                     class="header-icon-button"
-   }
+                     style="margin-left: 0.5em;"
-
+                     onClick={save}
-   private async exitHandler() {
+                  >
-      if (this.state.changed) {
+                     <Save height={undefined} width={undefined} />
-         let modal = new YesNoModal("Really want to quit?");
+                  </div>
-         let res = await modal.getResult();
+               )}
-         if (res === true) {
+               <span>{title}</span>
-            this.skip_save = true;
+               <div class="header-icon-button" onClick={del}>
-            this.toVault();
+                  <Trash height={undefined} width={undefined} />
-         }
+               </div>
-      } else
+            </header>
-         this.toVault()
+            <div class="container" style="padding: 0">
-   }
+               <EasyMDEPreact
-
+                  value={text}
-   render() {
+                  onChange={(value) => {
-      const save_handler = async () => {
+                     setChanged(true);
-         await this.save()
+                     setText(value);
-         Navigation.setPage("/vault", { id: this.vault.id }, { entry: "false" }, true);
+                  }}
-         this.toVault()
+               // onSave={save}
-      }
+               // onClose={close}
-
+               />
-      const delete_handler = async () => {
+            </div>
-         await this.vault.deleteNote(this.props.id);
-         this.toVault()
-      }
-
-      console.log("Rerender")
-
-      return <div>
-         <header class="header">
-            <a class="header-icon-button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
-            {this.state.changed ? <a class="header-icon-button" style="margin-left: 0.5em;" onClick={() => save_handler()}><Save height={undefined} width={undefined} /></a> : undefined}
-            <h3 style="display:inline" class="button header-title">{this.state.title}</h3>
-            <a class="header-icon-button" onClick={() => delete_handler()}><Trash height={undefined} width={undefined} /></a>
-         </header>
-         <div class="container" style={Theme.isDark() ? "filter: invert(100%);" : ""}>
-            <Editor
-               value={this.text}
-               valueChange={value => this.textChange(value)}
-               save={() => this.save()}
-               exit={() => this.exitHandler()} />
          </div>
-      </div>
+      );
    }
 }

src/components/routes/vault/EntryList.tsx

@@ -1,24 +1,25 @@
-import { h, Component } from "preact"
+import { h, Component } from "preact";
 import Notes, { IVault, BaseNote } from "../../../notes";
 import AddButton from "../../AddButton";
 import Navigation from "../../../navigation";
-import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg"
+import { ArrowLeft, Search } from "preact-feather";
-import Search from "feather-icons/dist/icons/search.svg"
 import ContextMenu from "../../context";
 import Notifications from "../../../notifications";
 import { Observable, Lock } from "@hibas123/utils";
 
-
+export default class EntryList extends Component<
-export default class EntryList extends Component<{ vault: Promise<IVault> }, { notes: BaseNote[], context: JSX.Element | undefined }> {
+   { vault: IVault },
+   { notes: BaseNote[]; context: h.JSX.Element | undefined }
+> {
    rawNotes: BaseNote[];
 
    private searchObservableServer = new Observable<void>(1000);
    private searchObservable = this.searchObservableServer.getPublicApi();
 
    constructor(props) {
-      super(props)
+      super(props);
-      console.log("Creating new Instance of EntryList")
+      console.log("Creating new Instance of EntryList");
-      this.state = { notes: [], context: undefined }
+      this.state = { notes: [], context: undefined };
       this.onDragOver = this.onDragOver.bind(this);
       this.onDrop = this.onDrop.bind(this);
       this.reloadNotes = this.reloadNotes.bind(this);
@@ -27,14 +28,13 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
    vault: IVault;
 
    async reloadNotes(s?: boolean) {
-      if (s)
+      if (s) return;
-         return;
       this.rawNotes = await this.vault.getAllNotes();
       await this.applySearch(true);
    }
 
    async componentWillMount() {
-      this.vault = await this.props.vault;
+      this.vault = this.props.vault;
       this.reloadNotes();
       document.body.addEventListener("dragover", this.onDragOver);
       document.body.addEventListener("drop", this.onDrop);
@@ -64,59 +64,74 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
       const close = () => {
          document.documentElement.removeEventListener("click", close);
          this.setState({ context: undefined });
-      }
+      };
       document.documentElement.addEventListener("click", close);
 
-
       const shareNote = async () => {
          let nav = window.navigator as any;
          if (nav.share !== undefined) {
             let vnote = await this.vault.getNote(note._id);
-            nav.share({ title: vnote.preview.split("\n")[0], text: vnote.__value })
+            nav.share({
-               .then(() => console.log('Successful share'))
+               title: vnote.preview.split("\n")[0],
-               .catch(error => {
+               text: vnote.__value,
-                  console.error('Error sharing:', error)
+            })
-                  Notifications.sendError(error)
+               .then(() => console.log("Successful share"))
+               .catch((error) => {
+                  console.error("Error sharing:", error);
+                  Notifications.sendError(error);
                });
          } else {
-            Notifications.sendError("Sharing not possible on this device")
+            Notifications.sendError("Sharing not possible on this device");
          }
-      }
+      };
 
       const deleteNote = async () => {
-         this.vault.deleteNote(note._id).then(() => {
+         this.vault
-            Notifications.sendSuccess("Deleted")
+            .deleteNote(note._id)
-            this.rawNotes = this.rawNotes.filter(e => e._id !== note._id);
+            .then(() => {
-            this.setState({ notes: this.state.notes.filter(e => e._id !== note._id) });
+               Notifications.sendSuccess("Deleted");
-         }).catch(err => {
+               this.rawNotes = this.rawNotes.filter((e) => e._id !== note._id);
-            Notifications.sendError(err);
+               this.setState({
-         })
+                  notes: this.state.notes.filter((e) => e._id !== note._id),
-      }
+               });
+            })
+            .catch((err) => {
+               Notifications.sendError(err);
+            });
+      };
 
       const copyNote = async () => {
-         this.vault.getNote(note._id).then(note => {
+         this.vault.getNote(note._id).then((note) => {
-            const el = document.createElement('textarea');
+            const el = document.createElement("textarea");
             el.value = note.__value;
             document.body.appendChild(el);
             el.select();
-            document.execCommand('copy');
+            document.execCommand("copy");
             document.body.removeChild(el);
             Notifications.sendSuccess("Copied");
-         })
+         });
-      }
+      };
 
       let share;
       if ((window.navigator as any).share) {
-         share = <button class="btn" onClick={shareNote}>
+         share = (
-            share
+            <button class="btn" onClick={shareNote}>
-         </button>
+               share
+            </button>
+         );
       }
 
-      let context = <ContextMenu event={evt} >
+      let context = (
-         {share}
+         <ContextMenu event={evt}>
-         <button class="btn" onClick={deleteNote}>delete</button>
+            {share}
-         <button class="btn" onClick={copyNote}>copy</button>
+            <button class="btn" onClick={deleteNote}>
-      </ContextMenu>
+               delete
+            </button>
+            <button class="btn" onClick={copyNote}>
+               copy
+            </button>
+         </ContextMenu>
+      );
 
       this.setState({ context });
       return false;
@@ -131,57 +146,69 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
             if (item.kind === "file") {
                let file = item.getAsFile();
                if (file.type !== "application/json") {
-                  Notifications.sendError("Invalid File Type!!!")
+                  Notifications.sendError("Invalid File Type!!!");
                } else {
                   try {
                      let data = await new Promise<string>((yes, no) => {
-                        let fr = new FileReader()
+                        let fr = new FileReader();
                         fr.onload = (ev) => {
                            yes((ev.target as any).result);
-                        }
+                        };
                         fr.onerror = no;
                         fr.readAsText(file);
-                     })
+                     });
                      let parsed = JSON.parse(data);
                      let c = new Error("Could not parse!");
-                     let notes: { content: string, time: Date }[] = null;
+                     let notes: { content: string; time: Date }[] = null;
-                     if (Array.isArray(parsed)) { // Could be from SecureNotes 1
+                     if (Array.isArray(parsed)) {
-                        notes = parsed.map(elm => {
+                        // Could be from SecureNotes 1
-                           if (typeof elm.message !== "string" || typeof elm.time !== "string") {
+                        notes = parsed.map((elm) => {
+                           if (
+                              typeof elm.message !== "string" ||
+                              typeof elm.time !== "string"
+                           ) {
                               throw c;
                            }
 
                            return {
                               content: elm.message,
-                              time: new Date(elm.time)
+                              time: new Date(elm.time),
-                           }
+                           };
-                        })
+                        });
-                     } else if (parsed.version) { // Could be from SecureNotes 2
+                     } else if (parsed.version) {
-                        if (parsed.version === 1) { //Could be from SecureNotes 2 version 1
+                        // Could be from SecureNotes 2
-                           notes = (parsed.notes as any[]).map(elm => {
+                        if (parsed.version === 1) {
-                              if (typeof elm.content !== "string" || typeof elm.time !== "string") {
+                           //Could be from SecureNotes 2 version 1
+                           notes = (parsed.notes as any[]).map((elm) => {
+                              if (
+                                 typeof elm.content !== "string" ||
+                                 typeof elm.time !== "string"
+                              ) {
                                  throw c;
                               }
                               return {
                                  content: elm.content,
-                                 time: new Date(elm.time)
+                                 time: new Date(elm.time),
-                              }
+                              };
-                           })
+                           });
                         } else {
                            throw c;
                         }
-                     } else
+                     } else throw c;
-                        throw c;
 
-                     await Promise.all(notes.map(n => {
+                     await Promise.all(
-                        let note = this.vault.newNote();
+                        notes.map((n) => {
-                        note.__value = n.content;
+                           let note = this.vault.newNote();
-                        return this.vault.saveNote(note, n.time);
+                           note.__value = n.content;
-                     }));
+                           return this.vault.saveNote(note, n.time);
+                        })
+                     );
                      await this.reloadNotes();
-                     Notifications.sendSuccess(`Imported ${notes.length} notes!`);
+                     Notifications.sendSuccess(
+                        `Imported ${notes.length} notes!`
+                     );
                   } catch (err) {
-                     Notifications.sendError("Cannot read File!")
+                     Notifications.sendError("Cannot read File!");
                      console.error(err);
                   }
                }
@@ -198,8 +225,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
          return;
       }
 
-      if (this.searchLock.locked)
+      if (this.searchLock.locked) return;
-         return;
       const lock = await this.searchLock.getLock();
       console.time("SearchOP");
 
@@ -213,7 +239,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
             return parts.every(function (el) {
                return note.preview.toLowerCase().indexOf(el) > -1;
             });
-         }
+         };
 
          let elements: BaseNote[];
          if (!force && this.oldSearch && search.startsWith(this.oldSearch)) {
@@ -222,29 +248,32 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
             elements = [...this.rawNotes];
          }
 
-
+         await new Promise((yes) => {
-         await new Promise(yes => {
             const idle = () => {
-               window.requestIdleCallback(deadline => {
+               window.requestIdleCallback(
-                  let invTR = deadline.timeRemaining() <= 0;
+                  (deadline) => {
-                  while ((deadline.timeRemaining() > 0 || invTR) && elements.length > 0) {
+                     let invTR = deadline.timeRemaining() <= 0;
-                     let element = elements.shift();
+                     while (
-                     if (match(element)) {
+                        (deadline.timeRemaining() > 0 || invTR) &&
-                        notes.push(element);
+                        elements.length > 0
+                     ) {
+                        let element = elements.shift();
+                        if (match(element)) {
+                           notes.push(element);
+                        }
                      }
-                  }
+                     if (elements.length > 0) idle();
-                  if (elements.length > 0)
+                     else yes();
-                     idle();
+                  },
-                  else
+                  { timeout: 100 }
-                     yes();
+               );
-               }, { timeout: 100 });
+            };
-            }
             idle();
-         })
+         });
          // notes = elements.filter(note => match(note));
       }
 
-      await new Promise(yes => this.setState({ notes }, yes));
+      await new Promise((yes) => this.setState({ notes }, yes));
       this.oldSearch = search;
       lock.release();
       console.timeEnd("SearchOP");
@@ -260,38 +289,63 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
    searchInput: HTMLInputElement;
    render() {
       const open_entry = (id: string | null) => {
-         Navigation.setPage("/vault", { id: this.vault.id }, { id, entry: "true" })
+         Navigation.setPage(
-      }
+            "/vault",
+            { id: this.vault.id },
+            { id, entry: "true" }
+         );
+      };
 
-      return <div>
+      return (
-         {this.state.context}
+         <div>
-         <header class="header">
+            {this.state.context}
-            <a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
+            <header class="header">
-            <h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>{this.vault ? this.vault.name : ""}</h3>
+               <div class="header-icon-button" onClick={() => history.back()}>
-            <span></span>
+                  <ArrowLeft height={undefined} width={undefined} />
-            {/* <a class="button header_icon_button"><MoreVertival height={undefined} width={undefined} /></a> */}
+               </div>
-         </header>
+               <span onClick={() => Navigation.setPage("/")}>
-         <AddButton onClick={() => open_entry(null)} />
+                  {this.vault ? this.vault.name : ""}
-         <div class="container">
+               </span>
-            <div style="display:flex;">
+               <span></span>
-               <input class="inp" type="text" style="width: 100%; height: 40px;" onKeyUp={this.searchChanged} ref={elm => this.searchInput = elm} />
+               {/* <a class="button header_icon_button"><MoreVertival height={undefined} width={undefined} /></a> */}
-               <button class="btn btn-primary" style="padding: 5px 10px; margin: 0; height: 40px; width: 40px;">
+            </header>
-                  <Search />
+            <AddButton onClick={() => open_entry(null)} />
-               </button>
+            <div class="container">
-            </div>
+               <div style="display:flex; margin-top: .5rem;">
+                  <input
+                     class="inp"
+                     type="text"
+                     style="width: 100%; height: 40px;"
+                     onKeyUp={this.searchChanged}
+                     ref={(elm) => (this.searchInput = elm)}
+                  />
+                  <button
+                     class="btn btn-primary"
+                     style="padding: 5px 10px; margin: 0; height: 40px; width: 40px;"
+                  >
+                     <Search />
+                  </button>
+               </div>
 
-            <div class="vault-list" style="margin-top: 1rem;">
+               <div class="vault-list" style="margin-top: 1rem;">
-               {this.state.notes.map(note => {
+                  {this.state.notes.map((note) => {
-                  let [first, second] = note.preview.split("\n", 2);
+                     let [first, second] = note.preview.split("\n", 2);
-                  return <div class="card vault-vault" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
+                     return (
-                     open_entry(note._id)
+                        <div
-                  }}>
+                           class="card vault-vault"
-                     <div>{first}</div>
+                           onContextMenu={(evt) => this.onContext(evt, note)}
-                     <div>{second}</div>
+                           onClick={() => {
-                  </div>
+                              open_entry(note._id);
-               })}
+                           }}
+                        >
+                           <div>{first}</div>
+                           <div>{second}</div>
+                        </div>
+                     );
+                  })}
+               </div>
             </div>
          </div>
-      </div>;
+      );
    }
 }

src/components/routes/vault/Vault.tsx

@@ -1,47 +1,55 @@
-import { h } from "preact"
+import { h } from "preact";
 import { Page } from "../../../page";
 import Notes, { IVault, BaseNote } from "../../../notes";
 import Navigation from "../../../navigation";
 import EntryComponent from "./Entry";
 import EntryList from "./EntryList";
 
-import "./vault.scss"
+import "./vault.scss";
-
+import { useState } from "preact/hooks";
+import { usePromise } from "../../../hooks";
 
 export interface VaultProps {
    state: { id: string };
-   hidden: { entry: string, id: string, note: string };
+   hidden: { entry: string; id: string; note: string };
 }
 
-export default class VaultPage extends Page<VaultProps, { entries: BaseNote[] }> {
+export default function VaultPage(props: VaultProps) {
-   vault: Promise<IVault>
+   console.log("Vault page");
-   constructor(props: VaultProps) {
+   const [loading, error, vault] = usePromise(
-      super(props);
+      () =>
-      this.state = { entries: [] };
+         Notes.getVault(
-   }
+            this.props.state.id,
+            Notes.getVaultKey(this.props.state.id)
+         ),
+      [props.state.id]
+   );
 
-   async componentWillMount() {
+   if (vault) {
-      this.vault = Notes.getVault(this.props.state.id, Notes.getVaultKey(this.props.state.id))
+      window.debug.activeVault = vault;
-      this.vault.then(vlt => {
+      window.debug.createNotes = (cnt = 10) => {
-         window.debug.activeVault = vlt;
+         for (let i = 0; i < cnt; i++) {
-         window.debug.createNotes = (cnt = 10) => {
+            let nt = vault.newNote();
-            for (let i = 0; i < cnt; i++) {
+            nt.__value = `Random Note ${i}\ With some Content ${i}`;
-               let nt = vlt.newNote();
+            vault.saveNote(nt);
-               nt.__value = `Random Note ${i}\ With some Content ${i}`;
-               vlt.saveNote(nt);
-            }
          }
-      })
+      };
-      this.vault.catch(err => {
-         Navigation.setPage("/")
-      });
    }
 
-   render() {
+   if (loading) return <div>Loading Vault</div>;
-      if (this.props.hidden && this.props.hidden.entry === "true") {
+   // Maybe return loading animation or so
-         return <EntryComponent vault={this.vault} id={this.props.hidden.id} note={this.props.hidden.note} />
+   else if (error) return <div>{error.message}</div>;
+   else {
+      if (props.hidden?.entry) {
+         return (
+            <EntryComponent
+               vault={vault}
+               id={props.hidden.id}
+               note={props.hidden.note}
+            />
+         );
       } else {
-         return <EntryList vault={this.vault} />
+         return <EntryList vault={vault} />;
       }
    }
 }

src/components/routes/vault/dark.css

@@ -1,858 +0,0 @@
-/* SimpleMDE Theme Dark v0.0.0 https://github.com/xcatliu/simplemde-theme-dark#readme */
-
-@charset "UTF-8";
-
-.CodeMirror-gutter-filler,
-.CodeMirror-scrollbar-filler {
-    background-color: #fff
-}
-
-.CodeMirror-gutters {
-    border-right: 1px solid #ddd;
-    background-color: #f7f7f7;
-    white-space: nowrap
-}
-
-.CodeMirror-linenumber {
-    padding: 0 3px 0 5px;
-    min-width: 20px;
-    text-align: right;
-    color: #999;
-    white-space: nowrap
-}
-
-.CodeMirror-guttermarker {
-    color: #000
-}
-
-.CodeMirror-guttermarker-subtle {
-    color: #999
-}
-
-.CodeMirror-cursor {
-    border-left: 1px solid #000;
-    border-right: none;
-    width: 0
-}
-
-.CodeMirror div.CodeMirror-secondarycursor {
-    border-left: 1px solid silver
-}
-
-.cm-fat-cursor .CodeMirror-cursor {
-    width: auto;
-    border: 0 !important;
-    background: #7e7
-}
-
-.cm-fat-cursor div.CodeMirror-cursors {
-    z-index: 1
-}
-
-.cm-animate-fat-cursor {
-    width: auto;
-    border: 0;
-    -webkit-animation: blink 1.06s steps(1) infinite;
-    animation: blink 1.06s steps(1) infinite;
-    background-color: #7e7
-}
-
-@-webkit-keyframes blink {
-    50% {
-        background-color: transparent
-    }
-}
-
-@keyframes blink {
-    50% {
-        background-color: transparent
-    }
-}
-
-.cm-tab {
-    display: inline-block;
-    text-decoration: inherit
-}
-
-.CodeMirror-rulers {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: -50px;
-    bottom: -20px;
-    overflow: hidden
-}
-
-.CodeMirror-ruler {
-    border-left: 1px solid #ccc;
-    top: 0;
-    bottom: 0;
-    position: absolute
-}
-
-.CodeMirror,
-.CodeMirror-scroll {
-    position: relative;
-    min-height: 300px
-}
-
-.cm-s-default .cm-header {
-    color: #00f
-}
-
-.cm-s-default .cm-quote {
-    color: #090
-}
-
-.cm-negative {
-    color: #d44
-}
-
-.cm-positive {
-    color: #292
-}
-
-.cm-header,
-.cm-strong {
-    font-weight: 700
-}
-
-.cm-em {
-    font-style: italic
-}
-
-.cm-link {
-    text-decoration: underline
-}
-
-.CodeMirror .CodeMirror-code .cm-strikethrough,
-.cm-strikethrough {
-    text-decoration: line-through
-}
-
-.cm-s-default .cm-keyword {
-    color: #708
-}
-
-.cm-s-default .cm-atom {
-    color: #219
-}
-
-.cm-s-default .cm-number {
-    color: #164
-}
-
-.cm-s-default .cm-def {
-    color: #00f
-}
-
-.cm-s-default .cm-variable-2 {
-    color: #05a
-}
-
-.cm-s-default .cm-variable-3 {
-    color: #085
-}
-
-.cm-s-default .cm-comment {
-    color: #a50
-}
-
-.cm-s-default .cm-string {
-    color: #a11
-}
-
-.cm-s-default .cm-string-2 {
-    color: #f50
-}
-
-.cm-s-default .cm-meta,
-.cm-s-default .cm-qualifier {
-    color: #555
-}
-
-.cm-s-default .cm-builtin {
-    color: #30a
-}
-
-.cm-s-default .cm-bracket {
-    color: #997
-}
-
-.cm-s-default .cm-tag {
-    color: #170
-}
-
-.cm-s-default .cm-attribute {
-    color: #00c
-}
-
-.cm-s-default .cm-hr {
-    color: #999
-}
-
-.cm-s-default .cm-link {
-    color: #00c
-}
-
-.cm-invalidchar,
-.cm-s-default .cm-error {
-    color: red
-}
-
-.CodeMirror-composing {
-    border-bottom: 2px solid
-}
-
-div.CodeMirror span.CodeMirror-matchingbracket {
-    color: #0f0
-}
-
-div.CodeMirror span.CodeMirror-nonmatchingbracket {
-    color: #f22
-}
-
-.CodeMirror-matchingtag {
-    background: rgba(255, 150, 0, .3)
-}
-
-.CodeMirror-activeline-background {
-    background: #e8f2ff
-}
-
-.CodeMirror {
-    position: relative;
-    overflow: hidden;
-    background: #fff
-}
-
-.CodeMirror-scroll {
-    overflow: scroll !important;
-    height: 100%;
-    outline: 0;
-    position: relative
-}
-
-.CodeMirror-sizer {
-    position: relative;
-    border-right: 30px solid transparent
-}
-
-.CodeMirror-gutter-filler,
-.CodeMirror-hscrollbar,
-.CodeMirror-scrollbar-filler,
-.CodeMirror-vscrollbar {
-    position: absolute;
-    z-index: 6;
-    display: none
-}
-
-.CodeMirror-vscrollbar {
-    right: 0;
-    top: 0;
-    overflow-x: hidden;
-    overflow-y: scroll
-}
-
-.CodeMirror-hscrollbar {
-    bottom: 0;
-    left: 0;
-    overflow-y: hidden;
-    overflow-x: scroll
-}
-
-.CodeMirror-scrollbar-filler {
-    right: 0;
-    bottom: 0
-}
-
-.CodeMirror-gutter-filler {
-    left: 0;
-    bottom: 0
-}
-
-.CodeMirror-gutters {
-    position: absolute;
-    left: 0;
-    top: 0;
-    min-height: 100%;
-    z-index: 3
-}
-
-.CodeMirror-gutter {
-    white-space: normal;
-    height: 100%;
-    display: inline-block;
-    vertical-align: top;
-    margin-bottom: -30px
-}
-
-.CodeMirror-gutter-wrapper {
-    position: absolute;
-    z-index: 4;
-    background: 0 0 !important;
-    border: none !important;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-
-.CodeMirror-gutter-background {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    z-index: 4
-}
-
-.CodeMirror-gutter-elt {
-    position: absolute;
-    cursor: default;
-    z-index: 4
-}
-
-.CodeMirror-lines {
-    cursor: text;
-    min-height: 1px
-}
-
-.CodeMirror pre {
-    border-radius: 0;
-    border-width: 0;
-    background: 0 0;
-    font-family: inherit;
-    font-size: inherit;
-    margin: 0;
-    white-space: pre;
-    word-wrap: normal;
-    line-height: inherit;
-    color: inherit;
-    z-index: 2;
-    position: relative;
-    overflow: visible;
-    -webkit-tap-highlight-color: transparent;
-    -webkit-font-variant-ligatures: contextual;
-    font-variant-ligatures: contextual
-}
-
-.CodeMirror-wrap pre {
-    word-wrap: break-word;
-    white-space: pre-wrap;
-    word-break: normal
-}
-
-.CodeMirror-linebackground {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    z-index: 0
-}
-
-.CodeMirror-linewidget {
-    position: relative;
-    z-index: 2;
-    overflow: auto
-}
-
-.CodeMirror-code {
-    outline: 0
-}
-
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber,
-.CodeMirror-scroll,
-.CodeMirror-sizer {
-    box-sizing: content-box
-}
-
-.CodeMirror-measure {
-    position: absolute;
-    width: 100%;
-    height: 0;
-    overflow: hidden;
-    visibility: hidden
-}
-
-.CodeMirror-cursor {
-    position: absolute;
-    pointer-events: none
-}
-
-.CodeMirror-measure pre {
-    position: static
-}
-
-div.CodeMirror-cursors {
-    visibility: hidden;
-    position: relative;
-    z-index: 3
-}
-
-.CodeMirror-focused div.CodeMirror-cursors,
-div.CodeMirror-dragcursors {
-    visibility: visible
-}
-
-.CodeMirror-selected {
-    background: #d9d9d9
-}
-
-.CodeMirror-focused .CodeMirror-selected {
-    background: #d7d4f0
-}
-
-.CodeMirror-crosshair {
-    cursor: crosshair
-}
-
-.CodeMirror-line::selection,
-.CodeMirror-line>span::selection,
-.CodeMirror-line>span>span::selection {
-    background: #d7d4f0
-}
-
-.CodeMirror-line::-moz-selection,
-.CodeMirror-line>span::-moz-selection,
-.CodeMirror-line>span>span::-moz-selection {
-    background: #d7d4f0
-}
-
-.cm-searching {
-    background: #ffa;
-    background: rgba(255, 255, 0, .4)
-}
-
-.cm-force-border {
-    padding-right: .1px
-}
-
-@media print {
-    .CodeMirror div.CodeMirror-cursors {
-        visibility: hidden
-    }
-}
-
-.cm-tab-wrap-hack:after {
-    content: ''
-}
-
-span.CodeMirror-selectedtext {
-    background: 0 0
-}
-
-.CodeMirror {
-    background-color: #444;
-    border: 1px solid #555;
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-    color: #aaa;
-    font-family: inherit;
-    font-size: 18px;
-    height: auto;
-    line-height: 1.5;
-    padding: 14px;
-    z-index: 1
-}
-
-.CodeMirror-scroll {
-    margin-bottom: -32px;
-    margin-right: -32px;
-    padding-bottom: 32px
-}
-
-.CodeMirror-fullscreen {
-    background-color: #444;
-    border: 0;
-    border-top: 1px solid #555;
-    bottom: 0;
-    height: auto;
-    left: 0;
-    position: fixed !important;
-    right: 0;
-    top: 58px;
-    z-index: 9
-}
-
-.CodeMirror-sided {
-    width: 50% !important
-}
-
-.CodeMirror .CodeMirror-placeholder {
-    color: #777
-}
-
-.CodeMirror-cursor {
-    border-left-color: #aaa
-}
-
-.CodeMirror pre,
-.CodeMirror-lines {
-    padding: 0
-}
-
-.CodeMirror-focused .CodeMirror-selected,
-.CodeMirror-line::-moz-selection,
-.CodeMirror-line>span::-moz-selection,
-.CodeMirror-line>span>span::-moz-selection,
-.CodeMirror-selected {
-    background-color: rgba(255, 255, 255, .1)
-}
-
-.CodeMirror-focused .CodeMirror-selected,
-.CodeMirror-line::selection,
-.CodeMirror-line>span::selection,
-.CodeMirror-line>span>span::selection,
-.CodeMirror-selected {
-    background-color: rgba(255, 255, 255, .1)
-}
-
-.CodeMirror .CodeMirror-code .cm-attribute,
-.CodeMirror .CodeMirror-code .cm-tag {
-    color: #95bf40
-}
-
-.CodeMirror .CodeMirror-code .cm-string {
-    color: #777
-}
-
-.CodeMirror .CodeMirror-code .cm-link {
-    color: #ffd500
-}
-
-.CodeMirror .CodeMirror-code .cm-formatting-code,
-.CodeMirror .CodeMirror-code .cm-formatting-code-block,
-.CodeMirror .CodeMirror-code .cm-formatting-em,
-.CodeMirror .CodeMirror-code .cm-formatting-header,
-.CodeMirror .CodeMirror-code .cm-formatting-strikethrough,
-.CodeMirror .CodeMirror-code .cm-formatting-strong,
-.CodeMirror .CodeMirror-code .cm-hr,
-.CodeMirror .CodeMirror-code .cm-quote,
-.CodeMirror .CodeMirror-code .cm-url {
-    color: #777
-}
-
-.CodeMirror .CodeMirror-code .cm-header-1,
-.CodeMirror .CodeMirror-code .cm-header-2,
-.CodeMirror .CodeMirror-code .cm-header-3,
-.CodeMirror .CodeMirror-code .cm-header-4,
-.CodeMirror .CodeMirror-code .cm-header-5,
-.CodeMirror .CodeMirror-code .cm-header-6 {
-    line-height: 2
-}
-
-.CodeMirror .CodeMirror-code .cm-header-1 {
-    font-size: 32px
-}
-
-.CodeMirror .CodeMirror-code .cm-header-2 {
-    font-size: 26px
-}
-
-.CodeMirror .CodeMirror-code .cm-header-3 {
-    font-size: 24px
-}
-
-.CodeMirror .CodeMirror-code .cm-header-4 {
-    font-size: 22px
-}
-
-.CodeMirror .CodeMirror-code .cm-header-5 {
-    font-size: 20px
-}
-
-.CodeMirror .CodeMirror-code .cm-header-6 {
-    font-size: 18px
-}
-
-.CodeMirror .CodeMirror-code .cm-header,
-.CodeMirror .CodeMirror-code .cm-strong {
-    font-weight: 600
-}
-
-.CodeMirror .CodeMirror-code .cm-comment {
-    background-color: rgba(255, 255, 255, .05);
-    font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-    font-size: 14px;
-    padding: 6px 0 4px
-}
-
-.CodeMirror .CodeMirror-code span.CodeMirror-selectedtext.cm-comment {
-    background-color: rgba(255, 255, 255, .05)
-}
-
-.editor-preview {
-    height: 100%;
-    left: 0;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    z-index: 2
-}
-
-.editor-preview-side {
-    border: 0;
-    border-left: 1px solid #555;
-    border-top: 1px solid #555;
-    bottom: 0;
-    position: fixed;
-    right: 0;
-    top: 58px;
-    width: 50%;
-    z-index: 9
-}
-
-.editor-preview,
-.editor-preview-side {
-    background-color: #444;
-    box-sizing: border-box;
-    color: #aaa;
-    display: none;
-    font-family: inherit;
-    font-size: 18px;
-    line-height: 1.5;
-    overflow: auto;
-    padding: 0 14px 14px
-}
-
-.editor-preview pre,
-.editor-preview-side pre {
-    background-color: rgba(255, 255, 255, .05);
-    font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-    font-size: 14px;
-    line-height: 1.2;
-    margin-top: 14px;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-    padding: 14px
-}
-
-.editor-preview pre code,
-.editor-preview-side pre code {
-    background-color: transparent;
-    font-size: 14px;
-    padding: 0
-}
-
-.editor-preview-active,
-.editor-preview-active-side {
-    display: block
-}
-
-.editor-preview table,
-.editor-preview-side table {
-    background-color: #444;
-    border: 0;
-    border-collapse: collapse;
-    border-spacing: 0;
-    width: 100%
-}
-
-.editor-preview table caption,
-.editor-preview-side table caption {
-    caption-side: bottom;
-    color: #777;
-    padding: 7px;
-    text-align: left
-}
-
-.editor-preview table td,
-.editor-preview table th,
-.editor-preview-side table td,
-.editor-preview-side table th {
-    border: 0;
-    border-bottom: 1px solid #555;
-    padding: 7px;
-    text-align: left
-}
-
-.editor-preview table th,
-.editor-preview-side table th {
-    background-color: rgba(255, 255, 255, .05);
-    font-weight: 600
-}
-
-.editor-preview audio:not([controls]),
-.editor-preview-side audio:not([controls]) {
-    display: none;
-    height: 0
-}
-
-.editor-preview img,
-.editor-preview-side img {
-    max-width: 100%;
-    vertical-align: middle
-}
-
-.editor-preview audio,
-.editor-preview video,
-.editor-preview-side audio,
-.editor-preview-side video {
-    width: 100%
-}
-
-.editor-toolbar {
-    background-color: #444;
-    border: 1px solid #555;
-    border-bottom: 0;
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-    font-size: 18px;
-    padding: 0 14px;
-    position: relative;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none
-}
-
-.editor-toolbar::after,
-.editor-toolbar::before {
-    content: ' ';
-    display: block;
-    height: 1px
-}
-
-.editor-toolbar::before {
-    margin-bottom: 7px
-}
-
-.editor-toolbar::after {
-    margin-top: 7px
-}
-
-.editor-toolbar a {
-    border: 1px solid transparent;
-    border-radius: 3px;
-    color: #777 !important;
-    cursor: pointer;
-    display: inline-block;
-    font-size: 80%;
-    height: 30px;
-    margin: 0;
-    text-align: center;
-    text-decoration: none !important;
-    width: 30px
-}
-
-.editor-toolbar a.active,
-.editor-toolbar a:hover {
-    border-color: #555;
-    color: #aaa !important
-}
-
-.editor-toolbar a::before {
-    line-height: 30px
-}
-
-.editor-toolbar a.fa-header-x::after {
-    bottom: -.25em;
-    font-family: inherit;
-    font-size: 80%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline
-}
-
-.editor-toolbar a.fa-header-1::after {
-    content: "1"
-}
-
-.editor-toolbar a.fa-header-2::after {
-    content: "2"
-}
-
-.editor-toolbar a.fa-header-3::after {
-    content: "3"
-}
-
-.editor-toolbar a.fa-header-bigger::after {
-    content: "▲"
-}
-
-.editor-toolbar a.fa-header-smaller::after {
-    content: "▼"
-}
-
-.editor-toolbar i.separator {
-    border-right: 1px solid #555;
-    color: transparent;
-    display: inline-block;
-    margin: 0 7px;
-    text-indent: -10px;
-    width: 0
-}
-
-.editor-toolbar:hover a {
-    color: #aaa !important
-}
-
-.editor-toolbar.fullscreen {
-    background-color: #444;
-    border: 0;
-    box-sizing: border-box;
-    height: 58px;
-    left: 0;
-    overflow-x: auto;
-    overflow-y: hidden;
-    padding-bottom: 14px;
-    padding-top: 14px;
-    position: fixed;
-    top: 0;
-    white-space: nowrap;
-    width: 100%;
-    z-index: 9
-}
-
-.editor-toolbar.fullscreen::after,
-.editor-toolbar.fullscreen::before {
-    height: 58px;
-    left: 0;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    top: 0;
-    width: 20px
-}
-
-@media only screen and (max-width:700px) {
-    .editor-toolbar a.no-mobile {
-        display: none
-    }
-}
-
-.editor-toolbar.disabled-for-preview a:not(.no-disable) {
-    background-color: #444;
-    border-color: transparent;
-    pointer-events: none;
-    text-shadow: inherit
-}
-
-.editor-statusbar {
-    color: #777;
-    font-family: inherit;
-    font-size: 80%;
-    padding: 7px 14px;
-    text-align: right
-}
-
-.editor-statusbar span {
-    display: inline-block;
-    margin-left: 1em
-}
-
-.editor-statusbar .lines::before {
-    content: 'lines: '
-}
-
-.editor-statusbar .words::before {
-    content: 'words: '
-}
-
-.editor-statusbar .characters::before {
-    content: 'characters: '
-}
-
-/*# sourceMappingURL=simplemde-theme-dark.min.css.map */

src/components/routes/vault/easymde.css

@@ -1,321 +0,0 @@
-.CodeMirror {
-    box-sizing: border-box;
-    height: auto;
-    border: 1px solid #ddd;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    padding: 10px;
-    font: inherit;
-    z-index: 1;
-    word-wrap: break-word;
-}
-
-.CodeMirror-scroll {
-    cursor: text;
-}
-
-.CodeMirror-fullscreen {
-    background: #fff;
-    position: fixed !important;
-    top: 50px;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    height: auto;
-    z-index: 9;
-    border-right: none !important;
-    border-bottom-right-radius: 0 !important;
-}
-
-.CodeMirror-sided {
-    width: 50% !important;
-}
-
-.CodeMirror-placeholder {
-    opacity: .5;
-}
-
-.CodeMirror-focused .CodeMirror-selected {
-    background: #d9d9d9;
-}
-
-.editor-toolbar {
-    position: relative;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-    padding: 0 10px;
-    border-top: 1px solid #bbb;
-    border-left: 1px solid #bbb;
-    border-right: 1px solid #bbb;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-}
-
-.editor-toolbar:after,
-.editor-toolbar:before {
-    display: block;
-    content: ' ';
-    height: 1px;
-}
-
-.editor-toolbar:before {
-    margin-bottom: 8px
-}
-
-.editor-toolbar:after {
-    margin-top: 8px
-}
-
-.editor-toolbar.fullscreen {
-    width: 100%;
-    height: 50px;
-    overflow-x: auto;
-    overflow-y: hidden;
-    white-space: nowrap;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    box-sizing: border-box;
-    background: #fff;
-    border: 0;
-    position: fixed;
-    top: 0;
-    left: 0;
-    opacity: 1;
-    z-index: 9;
-}
-
-.editor-toolbar.fullscreen::before {
-    width: 20px;
-    height: 50px;
-    background: -moz-linear-gradient(left, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%);
-    background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 1)), color-stop(100%, rgba(255, 255, 255, 0)));
-    background: -webkit-linear-gradient(left, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%);
-    background: -o-linear-gradient(left, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%);
-    background: -ms-linear-gradient(left, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%);
-    background: linear-gradient(to right, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%);
-    position: fixed;
-    top: 0;
-    left: 0;
-    margin: 0;
-    padding: 0;
-}
-
-.editor-toolbar.fullscreen::after {
-    width: 20px;
-    height: 50px;
-    background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
-    background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(100%, rgba(255, 255, 255, 1)));
-    background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
-    background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
-    background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
-    background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
-    position: fixed;
-    top: 0;
-    right: 0;
-    margin: 0;
-    padding: 0;
-}
-
-.editor-toolbar button {
-    background: transparent;
-    display: inline-block;
-    text-align: center;
-    text-decoration: none !important;
-    width: 30px;
-    height: 30px;
-    margin: 0;
-    padding: 0;
-    border: 1px solid transparent;
-    border-radius: 3px;
-    cursor: pointer;
-}
-
-.editor-toolbar button.active,
-.editor-toolbar button:hover {
-    background: #fcfcfc;
-    border-color: #95a5a6;
-}
-
-.editor-toolbar i.separator {
-    display: inline-block;
-    width: 0;
-    border-left: 1px solid #d9d9d9;
-    border-right: 1px solid #fff;
-    color: transparent;
-    text-indent: -10px;
-    margin: 0 6px;
-}
-
-.editor-toolbar button:after {
-    font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
-    font-size: 65%;
-    vertical-align: text-bottom;
-    position: relative;
-    top: 2px;
-}
-
-.editor-toolbar button.heading-1:after {
-    content: "1";
-}
-
-.editor-toolbar button.heading-2:after {
-    content: "2";
-}
-
-.editor-toolbar button.heading-3:after {
-    content: "3";
-}
-
-.editor-toolbar button.heading-bigger:after {
-    content: "▲";
-}
-
-.editor-toolbar button.heading-smaller:after {
-    content: "▼";
-}
-
-.editor-toolbar.disabled-for-preview button:not(.no-disable) {
-    opacity: .6;
-    pointer-events: none;
-}
-
-@media only screen and (max-width: 700px) {
-    .editor-toolbar i.no-mobile {
-        display: none;
-    }
-}
-
-.editor-statusbar {
-    padding: 8px 10px;
-    font-size: 12px;
-    color: #959694;
-    text-align: right;
-}
-
-.editor-statusbar span {
-    display: inline-block;
-    min-width: 4em;
-    margin-left: 1em;
-}
-
-.editor-statusbar .lines:before {
-    content: 'lines: '
-}
-
-.editor-statusbar .words:before {
-    content: 'words: '
-}
-
-.editor-statusbar .characters:before {
-    content: 'characters: '
-}
-
-.editor-preview {
-    padding: 10px;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-    background: #fafafa;
-    z-index: 7;
-    overflow: auto;
-    display: none;
-    box-sizing: border-box;
-}
-
-.editor-preview-side {
-    padding: 10px;
-    position: fixed;
-    bottom: 0;
-    width: 50%;
-    top: 50px;
-    right: 0;
-    background: #fafafa;
-    z-index: 9;
-    overflow: auto;
-    display: none;
-    box-sizing: border-box;
-    border: 1px solid #ddd;
-    word-wrap: break-word;
-}
-
-.editor-preview-active-side {
-    display: block
-}
-
-.editor-preview-active {
-    display: block
-}
-
-.editor-preview>p,
-.editor-preview-side>p {
-    margin-top: 0
-}
-
-.editor-preview pre,
-.editor-preview-side pre {
-    background: #eee;
-    margin-bottom: 10px;
-}
-
-.editor-preview table td,
-.editor-preview table th,
-.editor-preview-side table td,
-.editor-preview-side table th {
-    border: 1px solid #ddd;
-    padding: 5px;
-}
-
-.cm-s-easymde .cm-tag {
-    color: #63a35c;
-}
-
-.cm-s-easymde .cm-attribute {
-    color: #795da3;
-}
-
-.cm-s-easymde .cm-string {
-    color: #183691;
-}
-
-.cm-s-easymde .cm-header-1 {
-    font-size: 200%;
-    line-height: 200%;
-}
-
-.cm-s-easymde .cm-header-2 {
-    font-size: 160%;
-    line-height: 160%;
-}
-
-.cm-s-easymde .cm-header-3 {
-    font-size: 125%;
-    line-height: 125%;
-}
-
-.cm-s-easymde .cm-header-4 {
-    font-size: 110%;
-    line-height: 110%;
-}
-
-.cm-s-easymde .cm-comment {
-    background: rgba(0, 0, 0, .05);
-    border-radius: 2px;
-}
-
-.cm-s-easymde .cm-link {
-    color: #7f8c8d;
-}
-
-.cm-s-easymde .cm-url {
-    color: #aab2b3;
-}
-
-.cm-s-easymde .cm-quote {
-    color: #7f8c8d;
-    font-style: italic;
-}

src/components/routes/vaults/Vaults.tsx

@@ -1,10 +1,8 @@
-import { h } from "preact"
+import { h } from "preact";
 import { Page } from "../../../page";
 import Notes, { VaultList } from "../../../notes";
-import "./vaults.scss"
+import "./vaults.scss";
-import Lock from "feather-icons/dist/icons/lock.svg";
+import { Lock, Unlock, Settings } from "preact-feather";
-import Unlock from "feather-icons/dist/icons/unlock.svg";
-import Settings from "feather-icons/dist/icons/settings.svg"
 import Navigation from "../../../navigation";
 import { InputModal } from "../../modals/InputModal";
 import { YesNoModal } from "../../modals/YesNoModal";
@@ -18,7 +16,14 @@ export interface VaultsProps {
    onSelected?: (vaultid: string) => void;
 }
 
-export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, modal: JSX.Element | undefined, context: JSX.Element | undefined }> {
+export default class VaultsPage extends Page<
+   VaultsProps,
+   {
+      vaults: VaultList;
+      modal: h.JSX.Element | undefined;
+      context: h.JSX.Element | undefined;
+   }
+> {
    constructor(props: VaultsProps) {
       super(props);
       this.state = { vaults: [], modal: undefined, context: undefined };
@@ -26,15 +31,14 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
    }
 
    updateVaults(s?: boolean) {
-      if (s)
+      if (s) return;
-         return;
+      return new Promise<void>((yes) => {
-      return new Promise(yes => {
+         Notes.getVaults().then((vaults) => this.setState({ vaults }, yes));
-         Notes.getVaults().then(vaults => this.setState({ vaults }, yes))
+      });
-      })
    }
 
    componentWillMount() {
-      this.updateVaults()
+      this.updateVaults();
       Notes.syncObservable.subscribe(this.updateVaults);
    }
 
@@ -42,15 +46,19 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       Notes.syncObservable.unsubscribe(this.updateVaults);
    }
 
-   async getKey(vault: { name: string, id: string }, permanent = true) {
+   async getKey(vault: { name: string; id: string }, permanent = true) {
-      let inp_mod = new InputModal("Enter password for " + vault.name, "Password", "password");
+      let inp_mod = new InputModal(
+         "Enter password for " + vault.name,
+         "Password",
+         "password"
+      );
       let key = undefined;
       while (true) {
          // inp_mod.show();
          let value = await inp_mod.getResult(false);
          if (value === null) {
-            console.log("Value is null")
+            console.log("Value is null");
-            inp_mod.close()
+            inp_mod.close();
             return false;
          } else {
             key = Notes.passwordToKey(value);
@@ -58,11 +66,11 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
                await Notes.getVault(vault.id, key);
                break;
             } catch (err) {
-               Notifications.sendError("Invalid password!")
+               Notifications.sendError("Invalid password!");
             }
          }
       }
-      inp_mod.close()
+      inp_mod.close();
 
       let perm = false;
       if (permanent) {
@@ -79,27 +87,24 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       return true;
    }
 
-   async openVault(vault: { name: string, encrypted: boolean, id: string }) {
+   async openVault(vault: { name: string; encrypted: boolean; id: string }) {
       const action = () => {
          if (this.props.selectVault) {
             this.props.onSelected(vault.id);
          } else {
-            Navigation.setPage("/vault", { id: vault.id })
+            Navigation.setPage("/vault", { id: vault.id });
          }
-      }
+      };
 
       if (vault.encrypted) {
          let key = Notes.getVaultKey(vault.id);
-         if (key)
+         if (key) action();
-            action()
          else {
-            if (await this.getKey(vault))
+            if (await this.getKey(vault)) action();
-               action();
          }
       } else {
-         action()
+         action();
       }
-
    }
 
    async addButtonClick() {
@@ -113,122 +118,177 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
       let password;
       if (encrypted) {
-         let password_modal = new InputModal("Enter new password", "Password", "password");
+         let password_modal = new InputModal(
+            "Enter new password",
+            "Password",
+            "password"
+         );
          password = await password_modal.getResult();
          if (password === null) return;
       }
 
       let key;
       if (password) {
-         key = Notes.passwordToKey(password)
+         key = Notes.passwordToKey(password);
       }
-      await Notes.createVault(name, key)
+      await Notes.createVault(name, key);
       this.updateVaults();
    }
 
-   onContext(evt: MouseEvent, vault: { name: string, encrypted: boolean, id: string }) {
+   onContext(
+      evt: MouseEvent,
+      vault: { name: string; encrypted: boolean; id: string }
+   ) {
       evt.preventDefault();
       evt.stopPropagation();
 
       const close = () => {
          document.documentElement.removeEventListener("click", close);
          this.setState({ context: undefined });
-      }
+      };
       document.documentElement.addEventListener("click", close);
 
-      let deleteb = <button class="btn" onClick={async () => {
+      let deleteb = (
-         let delete_modal = new YesNoModal("Delete Vault? Cannot be undone!");
+         <button
-         let result = await delete_modal.getResult();
+            class="btn"
-         if (result) {
+            onClick={async () => {
-            Notes.deleteVault(vault.id).then(() => {
+               let delete_modal = new YesNoModal(
-               this.updateVaults();
+                  "Delete Vault? Cannot be undone!"
-            }).catch(err => {
+               );
-               Notifications.sendError("Error deleting vault!")
+               let result = await delete_modal.getResult();
-               console.error(err);
+               if (result) {
-            })
+                  Notes.deleteVault(vault.id)
-         }
+                     .then(() => {
-      }}>
+                        this.updateVaults();
-         delete
+                     })
-      </button>;
+                     .catch((err) => {
+                        Notifications.sendError("Error deleting vault!");
+                        console.error(err);
+                     });
+               }
+            }}
+         >
+            delete
+         </button>
+      );
 
       let delete_key;
       if (Notes.getVaultKey(vault.id)) {
-         delete_key = <button class="btn" onClick={() => {
+         delete_key = (
-            Notes.forgetVaultKey(vault.id);
+            <button
-            Notifications.sendSuccess("Forgot password!")
+               class="btn"
-         }}>
+               onClick={() => {
-            forget password
+                  Notes.forgetVaultKey(vault.id);
-         </button>;
+                  Notifications.sendSuccess("Forgot password!");
+               }}
+            >
+               forget password
+            </button>
+         );
       }
 
-      let exportb = <button class="btn" onClick={async () => {
+      let exportb = (
-         let key: Uint8Array;
+         <button
-         if (vault.encrypted) {
+            class="btn"
-            await this.getKey(vault, false)
+            onClick={async () => {
-            key = Notes.getVaultKey(vault.id);
+               let key: Uint8Array;
-         }
+               if (vault.encrypted) {
-         let note_vault = await Notes.getVault(vault.id, key);
+                  await this.getKey(vault, false);
-         let base_notes = await note_vault.getAllNotes();
+                  key = Notes.getVaultKey(vault.id);
-         let notes = await Promise.all(base_notes.map(e => {
-            return note_vault.getNote(e._id);
-         }));
-
-         let result =
-         {
-            version: 1,
-            notes: notes.map(e => {
-               return {
-                  content: e.__value,
-                  time: e.time
                }
-            })
+               let note_vault = await Notes.getVault(vault.id, key);
-         }
+               let base_notes = await note_vault.getAllNotes();
+               let notes = await Promise.all(
+                  base_notes.map((e) => {
+                     return note_vault.getNote(e._id);
+                  })
+               );
 
-         var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(result, undefined, 3));
+               let result = {
-         var downloadAnchorNode = document.createElement('a');
+                  version: 1,
-         downloadAnchorNode.setAttribute("href", dataStr);
+                  notes: notes.map((e) => {
-         downloadAnchorNode.setAttribute("download", "notes_export_" + vault.name + ".json");
+                     return {
-         document.body.appendChild(downloadAnchorNode); // required for firefox
+                        content: e.__value,
-         downloadAnchorNode.click();
+                        time: e.time,
-         downloadAnchorNode.remove();
+                     };
-      }}>
+                  }),
-         export
+               };
-      </button>;
 
-      let context = <ContextMenu event={evt} >
+               var dataStr =
-         {deleteb}
+                  "data:text/json;charset=utf-8," +
-         {delete_key}
+                  encodeURIComponent(JSON.stringify(result, undefined, 3));
-         {exportb}
+               var downloadAnchorNode = document.createElement("a");
-      </ContextMenu>
+               downloadAnchorNode.setAttribute("href", dataStr);
+               downloadAnchorNode.setAttribute(
+                  "download",
+                  "notes_export_" + vault.name + ".json"
+               );
+               document.body.appendChild(downloadAnchorNode); // required for firefox
+               downloadAnchorNode.click();
+               downloadAnchorNode.remove();
+            }}
+         >
+            export
+         </button>
+      );
+
+      let context = (
+         <ContextMenu event={evt}>
+            {deleteb}
+            {delete_key}
+            {exportb}
+         </ContextMenu>
+      );
 
       this.setState({ context });
       return false;
    }
 
    render() {
-      let elms = this.state.vaults.map(vault => {
+      console.log({ vaults: this.state.vaults })
-         return <li class="vaults_vault" onClick={() => this.openVault(vault)} onContextMenu={(evt) => this.onContext(evt, vault)}>
+      let elms = this.state.vaults.map((vault) => {
-            {vault.encrypted ? <Lock height={undefined} width={undefined} /> : <Unlock height={undefined} width={undefined} />}
+         return (
-            <span>
+            <li
-               {vault.name}
+               class="vaults_vault"
-            </span>
+               onClick={() => this.openVault(vault)}
-         </li>
+               onContextMenu={(evt) => this.onContext(evt, vault)}
-      })
+            >
+               {vault.encrypted ? (
+                  <Lock height={undefined} width={undefined} />
+               ) : (
+                  <Unlock height={undefined} width={undefined} />
+               )}
+               <span>{vault.name}</span>
+            </li>
+         );
+      });
 
-      return <div style={{ marginTop: "-12px", paddingTop: "12px" }} >
+      return (
-         {/* {this.state.modal} */}
+         <div style={{ marginTop: "-12px", paddingTop: "12px" }}>
-         {this.state.context}
+            {/* {this.state.modal} */}
-         <header class="header">
+            {this.state.context}
-            <span></span>
+            <header class="header">
-            <h3 style="display:inline" onClick={() => Navigation.setPage("/")}>{this.props.selectVault ? "Select Vault for share" : "Your vaults:"}</h3>
+               <span></span>
-            <a class="header-icon-button" onClick={() => Navigation.setPage("/settings")}><Settings height={undefined} width={undefined} /></a>
+               <span
-         </header>
+                  style="display:inline"
-         <AddButton onClick={() => this.addButtonClick()} />
+                  onClick={() => Navigation.setPage("/")}
-         <div class="container">
+               >
-            <ul class="list list-divider list-clickable">
+                  {this.props.selectVault
-               {elms}
+                     ? "Select Vault for share"
-            </ul>
+                     : "Your vaults:"}
+               </span>
+               <div
+                  class="header-icon-button"
+                  onClick={() => Navigation.setPage("/settings")}
+               >
+                  <Settings height={undefined} width={undefined} />
+               </div>
+            </header>
+            <AddButton onClick={() => this.addButtonClick()} />
+            <div class="container">
+               <ul class="list list-divider list-clickable">{elms}</ul>
+            </div>
          </div>
-      </div>
+      );
    }
 }

src/hooks.ts

@@ -0,0 +1,23 @@
+import { useEffect, useMemo, useState } from "preact/hooks";
+
+export function usePromise<T>(promiseFnc: () => Promise<T>, params: any[]) {
+   const promise = useMemo(promiseFnc, params);
+   const [loading, setLoading] = useState(true);
+   const [error, setError] = useState(undefined);
+   const [value, setValue] = useState(undefined);
+
+   useEffect(() => {
+      let canceled = false;
+
+      promise
+         .then((res) => setValue(res))
+         .catch((err) => setError(err))
+         .finally(() => setLoading(false));
+
+      return () => {
+         canceled = true;
+      };
+   }, [promise]);
+
+   return [loading, error, value];
+}

src/index.html

@@ -4,58 +4,36 @@
 <head>
    <title>SecureNotes</title>
    <meta charset="utf8" />
-   <meta name="Description" content="Notes app">
+   <meta name="Description" content="Notes app" />
    <meta name="viewport" content="width=device-width,initial-scale=1" />
-   <link rel="manifest" href="/manifest.json">
+   <link rel="manifest" href="./manifest.webmanifest" />
    <!-- <link rel="shortcut icon" href="/public/icon-72x72.png"> -->
 
    <!-- Add to home screen for Safari on iOS -->
-   <meta name="apple-mobile-web-app-capable" content="yes">
+   <meta name="apple-mobile-web-app-capable" content="yes" />
-   <meta name="apple-mobile-web-app-status-bar-style" content="black">
+   <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-   <meta name="apple-mobile-web-app-title" content="Secure Notes">
+   <meta name="apple-mobile-web-app-title" content="Secure Notes" />
 
+   <!-- sizes="180x180" -->
+   <!-- href="/public/apple-touch-icon.png" -->
 
-   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+   <link rel="apple-touch-icon" sizes="256x256" href="./public/notepad256.png" />
-   <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1E88E5">
+   <!-- <link
-   <script src="encoding.js"></script>
+         rel="mask-icon"
-   <meta name="msapplication-TileColor" content="#1E88E5">
+         href="/public/safari-pinned-tab.svg"
-   <meta name="theme-color" content="#1E88E5">
+         color="#1E88E5"
+      /> -->
+   <meta name="msapplication-TileColor" content="#1E88E5" />
+   <meta name="theme-color" content="#1E88E5" />
 </head>
 
 <body>
-   <noscript>
+   <noscript> You have to enable JavaScript to use this site! </noscript>
-      You have to enable JavaScript to use this site!
-   </noscript>
    <div id="app"></div>
    <script>
-      // // Check that service workers are registered
+      window.debug = {}
-      // if ('serviceWorker' in navigator) {
-      //    // Use the window load event to keep the page load performant
-      //    window.addEventListener('load', () => {
-      //       navigator.serviceWorker.register('/public/serviceworker.js');
-      //    });
-      // }
-      if (navigator.serviceWorker.controller) {
-         if (localStorage.getItem("debug")) {
-            console.warn("Debuggung and service worker found, make shure to clear cache!");
-         }
-         console.log('active service worker found, no need to register')
-      } else {
-         if (localStorage.getItem("debug")) {
-            console.warn("Disabling Service Worker in debug mode!")
-         } else {
-            // Register the ServiceWorker
-            navigator.serviceWorker.register('/serviceworker.js', {
-               scope: '/'
-            }).then(function (reg) {
-               console.log('Service worker has been registered for scope:' + reg.scope);
-               navigator.serviceWorker.controller.addEventListener("cleared_cache", evt => {
-                  console.log(evt);
-               })
-            });
-         }
-      }
    </script>
+   <script src="index.tsx" type="module"></script>
 </body>
 
 </html>

src/index.scss

@@ -1,59 +1,17 @@
 @import "./vars.scss";
 
+body {
+   overscroll-behavior-y: contain;
+}
 
-// html {
+header {
-//    min-height: 100%;
+   justify-content: space-between;
-//    display: flex;
+}
-// }
-
-// $header-margin: .5em;
-// $header-icon-size: calc(1.5rem * 1);
-// $header-icon-size: 100%;
-
-// header {
-//    display: flex;
-//    justify-content: space-between;
-//    margin-bottom: $header-margin;
-//    align-content: center;
-//    padding: 0.75em;
-//    border-bottom: solid var(--border-color) 1px;
-//    background-color: var(--primary);
-
-//    >* {
-//       margin: 0;
-//       color: white;
-//       background: var(--primary);
-//    }
-
-//    >.header-title {
-//       overflow: hidden;
-//       text-overflow: ellipsis;
-//       text-overflow: ellipsis;
-//       white-space: nowrap;
-//       overflow: hidden;
-//       flex-grow: 1;
-//       margin: 0 1em;
-//    }
-
-//    .header-icon-button {
-//       display: block;
-//       margin-top: auto;
-//       margin-bottom: auto;
-//       min-width: $header-icon-size;
-
-//       >svg {
-//          height: $header-icon-size;
-//          width: $header-icon-size;
-//       }
-//    }
-
-// }
 
 .def-shadow {
    box-shadow: 0px 5px 8px 2px rgba(66, 66, 66, 0.53);
 }
 
-
 .ccontainer {
    margin: 0 1rem;
    max-width: 100%;

src/index.tsx

@@ -1,36 +1,3 @@
-declare global {
-   interface Window {
-      requestIdleCallback: (callback: (deadline: { didTimeout: boolean, timeRemaining: () => number }) => void, options?: { timeout: number }) => number | NodeJS.Timeout;
-      cancelIdleCallback: (id: number | NodeJS.Timeout) => void;
-      debug: any;
-   }
-
-   //    namespace JSX {
-   //       interface IntrinsicElements {
-   //          "wired-button": HTMLAttributes;
-   //          "wired-card": HTMLAttributes;
-   //          "wired-checkbox": HTMLAttributes;
-   //          "wired-combo": HTMLAttributes;
-   //          "wired-fab": HTMLAttributes;
-   //          "wired-icon-button": HTMLAttributes;
-   //          "wired-input": HTMLAttributes;
-   //          "wired-item": HTMLAttributes;
-   //          "wired-lib": HTMLAttributes;
-   //          "wired-listbox": HTMLAttributes;
-   //          "wired-progress": HTMLAttributes;
-   //          "wired-radio-group": HTMLAttributes;
-   //          "wired-radio": HTMLAttributes;
-   //          "wired-slider": HTMLAttributes;
-   //          "wired-spinner": HTMLAttributes;
-   //          "wired-tabs": HTMLAttributes;
-   //          "wired-textarea": HTMLAttributes;
-   //          "wired-toggle": HTMLAttributes;
-   //          "wired-tooltip": HTMLAttributes;
-
-   //       }
-   //    }
-}
-declare const window: Window;
 
 window.requestIdleCallback =
    window.requestIdleCallback ||
@@ -42,7 +9,7 @@ window.requestIdleCallback =
             didTimeout: false,
             timeRemaining: function () {
                return Math.max(0, 50 - (Date.now() - start));
-            }
+            },
          });
       }, 1);
    };
@@ -53,78 +20,113 @@ window.cancelIdleCallback =
       clearTimeout(id as any);
    };
 
-// console.log(window.requestIdleCallback);
+console.log(window.requestIdleCallback);
 
 window.debug = {};
 
-
+import { h, render } from "preact";
-
+import App from "./components/App";
-
 import "@hibas123/theme/out/base.css";
-import { h, render } from 'preact';
-import App from './components/App';
-import DemoPage from './components/demo';
-import Error404Page from './components/routes/404';
-import SettingsPage from './components/routes/settings/Settings';
-import SharePage from './components/routes/share/Share';
-import VaultPage from './components/routes/vault/Vault';
-import VaultsPage from './components/routes/vaults/Vaults';
 import "./index.scss";
-import Navigation from './navigation';
+import Navigation from "./navigation";
+import VaultsPage from "./components/routes/vaults/Vaults";
+import { Page } from "./page";
+
 import Notes from "./notes";
-import Notifications from './notifications';
+import DemoPage from "./components/demo";
-import { Page } from './page';
+import VaultPage from "./components/routes/vault/Vault";
-
+import SharePage from "./components/routes/share/Share";
-
+import Notifications from "./notifications";
+import Error404Page from "./components/routes/404";
+import SettingsPage from "./components/routes/settings/Settings";
 window.debug.notes = Notes;
 
+import Theme from "./theme";
 
-// import Theme from "./theme";
+console.log("Dark mode:", Theme.active);
-
 
 (async () => {
    // Initialize notes provider
    if (Notes.loginRequired()) {
-      let url = new URL(location.href)
+      let url = new URL(location.href);
       let code = url.searchParams.get("code");
 
       if (code) {
-         let err = await Notes.getToken(code)
+         let err = await Notes.getToken(code);
          if (err) {
-            Notifications.sendError("Login failed: " + err)
+            Notifications.sendError("Login failed: " + err);
-            return Notes.login()
+            return Notes.login();
          } else {
-            window.history.replaceState(null, document.title, "/" + window.location.hash);
+            window.history.replaceState(
+               null,
+               document.title,
+               "/" + window.location.hash
+            );
          }
       } else {
-         return Notes.login()
+         return Notes.login();
       }
    }
 
    await Notes.start();
 
    if (window.navigator.storage && navigator.storage.persist) {
-      navigator.storage.persisted()
+      navigator.storage
-         .then(has => has ? true : navigator.storage.persist())
+         .persisted()
-         .then(is => {
+         .then((has) => (has ? true : navigator.storage.persist()))
+         .then((is) => {
             console.log("Persistant Storage:", is);
-         })
+         });
    }
 
    Navigation.default = VaultsPage as typeof Page;
-   Navigation.addPage("/vault", VaultPage as typeof Page)
+   Navigation.addPage("/vault", VaultPage as any as typeof Page);
-   Navigation.addPage("/demo", DemoPage as typeof Page)
+   Navigation.addPage("/demo", DemoPage as typeof Page);
-   Navigation.addPage("/share", SharePage as typeof Page)
+   Navigation.addPage("/share", SharePage as typeof Page);
-   Navigation.addPage("/settings", SettingsPage as typeof Page)
+   Navigation.addPage("/settings", SettingsPage as typeof Page);
    Navigation.addPage("/404", Error404Page);
    const trad = window.location.pathname;
    if (trad && trad !== "/" && trad !== "") {
       let p: any = {};
-      new URL(window.location.href).searchParams.forEach((val, key) => p[key] = val);
+      new URL(window.location.href).searchParams.forEach(
+         (val, key) => (p[key] = val)
+      );
       Navigation.setPage(trad, p, undefined, true);
       // window.location.href = "/#/" + trad;
    }
    Navigation.start();
 
-   render(<App />, document.body, document.getElementById('app'));
+   render(<App />, document.body, document.getElementById("app"));
-})()
+})();
+
+
+if (navigator.serviceWorker.controller) {
+   if (localStorage.getItem("debug")) {
+      console.warn(
+         "Debuggung and service worker found, make shure to clear cache!"
+      );
+   }
+   console.log("active service worker found, no need to register");
+} else {
+   if (localStorage.getItem("debug")) {
+      console.warn("Disabling Service Worker in debug mode!");
+   } else {
+      // Register the ServiceWorker
+      navigator.serviceWorker
+         .register(new URL("serviceworker.js", import.meta.url), {
+            scope: "/",
+         })
+         .then(function (reg) {
+            console.log(
+               "Service worker has been registered for scope:" +
+               reg.scope
+            );
+            navigator.serviceWorker.controller.addEventListener(
+               "cleared_cache",
+               (evt) => {
+                  console.log(evt);
+               }
+            );
+         });
+   }
+}

src/manifest.webmanifest

@@ -0,0 +1,56 @@
+{
+   "short_name": "Secure Notes",
+   "name": "Secure Notes",
+   "decription": "A place to store your notes securly",
+   "share_target": {
+      "action": "/share",
+      "method": "GET",
+      "enctype": "application/x-www-form-urlencoded",
+      "params": {
+         "title": "title",
+         "text": "text",
+         "url": "url"
+      }
+   },
+   "icons": [
+      {
+         "src": "public/notepad16.png",
+         "sizes": "16x16",
+         "type": "image/png"
+      },
+      {
+         "src": "public/notepad24.png",
+         "sizes": "24x24",
+         "type": "image/png"
+      },
+      {
+         "src": "public/notepad32.png",
+         "sizes": "32x32",
+         "type": "image/png"
+      },
+      {
+         "src": "public/notepad64.png",
+         "sizes": "64x64",
+         "type": "image/png"
+      },
+      {
+         "src": "public/notepad128.png",
+         "sizes": "128x128",
+         "type": "image/png"
+      },
+      {
+         "src": "public/notepad256.png",
+         "sizes": "256x256",
+         "type": "image/png"
+      },
+      {
+         "src": "public/notepad512.png",
+         "sizes": "512x512",
+         "type": "image/png"
+      }
+   ],
+   "start_url": "/",
+   "display": "standalone",
+   "theme_color": "#1E88E5",
+   "background_color": "#ffffff"
+}

src/notes.ts

@@ -3,12 +3,12 @@ import { Lock, Observable } from "@hibas123/utils";
 import * as aesjs from "aes-js";
 import { IDBPTransaction } from "idb";
 import { sha256 } from "js-sha256";
-import * as uuidv4 from "uuid/v4";
+import { v4 as uuidv4 } from "uuid";
 import * as config from "../config.json";
 import * as b64 from "./helper/base64";
 import IDB from "./helper/indexeddb";
 import Notifications, { MessageType } from "./notifications";
-
+import { cloneDeep } from "lodash";
 
 export class HttpError extends Error {
    constructor(public status: number, public statusText: string) {
@@ -38,15 +38,13 @@ export interface ViewNote extends BaseNote {
    __value: string;
 }
 
-import clonedeep = require("lodash.clonedeep");
-
 const Encoder = new TextEncoder();
 const Decoder = new TextDecoder();
 
 enum OpLogType {
    CREATE,
    CHANGE,
-   DELETE
+   DELETE,
 }
 
 interface OpLog {
@@ -59,8 +57,8 @@ interface OpLog {
     * The value
     */
    values: {
-      value: Uint8Array,
+      value: Uint8Array;
-      preview: Uint8Array
+      preview: Uint8Array;
    };
 
    /**
@@ -69,41 +67,43 @@ interface OpLog {
    date: Date;
 }
 
-export type VaultList = { name: string, encrypted: boolean, id: string }[];
+export type VaultList = { name: string; encrypted: boolean; id: string }[];
 
 export interface IVault {
    name: string;
    id: string;
    encrypted: boolean;
    getAllNotes(): Promise<BaseNote[]>;
-   searchNote(term: string): Promise<BaseNote[]>
+   searchNote(term: string): Promise<BaseNote[]>;
    newNote(): ViewNote;
    saveNote(note: ViewNote, date?: Date): Promise<void>;
    getNote(id: string): Promise<ViewNote>;
    deleteNote(id: string): Promise<void>;
 }
 
-const awaitTimeout = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
+const awaitTimeout = (ms: number) =>
+   new Promise<void>((resolve) => setTimeout(resolve, ms));
 
 class NotesProvider {
-   private notesObservableServer = new Observable<Note>()
+   private notesObservableServer = new Observable<Note>();
-   public notesObservable = this.notesObservableServer.getPublicApi()
+   public notesObservable = this.notesObservableServer.getPublicApi();
 
-   private syncObservableServer = new Observable<boolean>()
+   private syncObservableServer = new Observable<boolean>();
    /**
     * Will send false once finished and true on start
     */
-   public syncObservable = this.syncObservableServer.getPublicApi()
+   public syncObservable = this.syncObservableServer.getPublicApi();
 
    private database = new IDB("notes", ["notes", "oplog"]);
    private noteDB = this.database.getStore<DBNote>("notes");
-   private oplogDB = this.database.getStore<{ id: string, logs: OpLog[] }>("oplog");
+   private oplogDB = this.database.getStore<{ id: string; logs: OpLog[] }>(
+      "oplog"
+   );
 
    private vaultKeys = new Map<string, Uint8Array>();
 
-
    public apiLock = new Lock();
-   public apiLockRls = this.apiLock.getLock()
+   public apiLockRls = this.apiLock.getLock();
 
    private syncLock = new Lock();
 
@@ -115,7 +115,7 @@ class NotesProvider {
    public syncedObservable = this.syncedObservableServer.getPublicApi();
 
    public async isSynced() {
-      return (await this.oplogDB.getAll()).length <= 0
+      return (await this.oplogDB.getAll()).length <= 0;
    }
 
    private _name;
@@ -128,11 +128,16 @@ class NotesProvider {
    }
 
    login() {
-      window.location.href = `${config.auth_server}/auth?client_id=${config.client_id}&scope=${config.permission}&redirect_uri=${encodeURIComponent(config.callback_url)}&response_type=code`
+      window.location.href = `${config.auth_server}/auth?client_id=${config.client_id
+         }&scope=${config.permission}&redirect_uri=${encodeURIComponent(
+            config.callback_url
+         )}&response_type=code`;
    }
 
    async getToken(code: string) {
-      let req = await fetch(`${config.auth_server}/api/oauth/refresh?grant_type=authorization_code&client_id=${config.client_id}&code=${code}`);
+      let req = await fetch(
+         `${config.auth_server}/api/oauth/refresh?grant_type=authorization_code&client_id=${config.client_id}&code=${code}`
+      );
       let res = await req.json();
       if (!res.error) {
          localStorage.setItem("refreshtoken", res.token);
@@ -140,9 +145,9 @@ class NotesProvider {
          this._name = res.profile.name;
          let kb = this.passwordToKey(res.profile.enc_key);
          localStorage.setItem("enc_key", b64.encode(kb));
-         this.generalEncryption = kb
+         this.generalEncryption = kb;
       } else {
-         return "Invalid Code"
+         return "Invalid Code";
       }
    }
 
@@ -155,11 +160,11 @@ class NotesProvider {
          } catch (err) {
             callback(err, null);
          }
-      })
+      });
 
       let key = localStorage.getItem("enc_key");
       if (key) {
-         this.generalEncryption = b64.decode(key)
+         this.generalEncryption = b64.decode(key);
       }
       this._name = localStorage.getItem("name");
    }
@@ -168,34 +173,42 @@ class NotesProvider {
       const next = () => {
          setTimeout(() => {
             this.sync().then(next);
-         }, 30000)
+         }, 30000);
-      }
+      };
-      this.syncedObservableServer.send((await this.oplogDB.getAll()).length <= 0);
+      this.syncedObservableServer.send(
-      let prs = this.apiLockRls.then(lock => lock.release());
+         (await this.oplogDB.getAll()).length <= 0
-      prs.then(() => awaitTimeout(2000)).then(() => this.sync()).then(() => next());
+      );
+      let prs = this.apiLockRls.then((lock) => lock.release());
+      prs.then(() => awaitTimeout(2000))
+         .then(() => this.sync())
+         .then(() => next());
       return prs;
    }
 
    private async getJWT() {
-      let lock = await this.apiLock.getLock()
+      let lock = await this.apiLock.getLock();
       try {
          console.log("Getting JWT");
-         let req = await fetch(config.auth_server + "/api/oauth/jwt?refreshtoken=" + localStorage.getItem("refreshtoken"));
+         let req = await fetch(
+            config.auth_server +
+            "/api/oauth/jwt?refreshtoken=" +
+            localStorage.getItem("refreshtoken")
+         );
          if (req.status !== 200) {
             Notifications.sendNotification("offline", MessageType.INFO);
-            throw new Error("Offline")
+            throw new Error("Offline");
          }
          let res = await req.json();
          if (res.error) {
-            console.log("Refresh token invalid, forward to login")
+            console.log("Refresh token invalid, forward to login");
             localStorage.removeItem("refreshtoken");
-            this.login()
+            this.login();
-            throw new Error("Need login!")
+            throw new Error("Need login!");
          } else {
-            return res.token
+            return res.token;
          }
       } finally {
-         lock.release()
+         lock.release();
       }
    }
 
@@ -205,29 +218,38 @@ class NotesProvider {
    }
 
    async sync() {
-      const lock = await this.syncLock.getLock()
+      const lock = await this.syncLock.getLock();
       const log = (...message: any[]) => {
-         console.log("[SYNC]: ", ...message)
+         console.log("[SYNC]: ", ...message);
-      }
+      };
 
       this.syncObservableServer.send(true);
-      log("Start")
+      log("Start");
       try {
          log("Fetching");
-         let [remotes, locals, oplogs] = await Promise.all([this._secureFile.list(), this.noteDB.getAll(), this.oplogDB.getAll()]);
+         let [remotes, locals, oplogs] = await Promise.all([
+            this._secureFile.list(),
+            this.noteDB.getAll(),
+            this.oplogDB.getAll(),
+         ]);
          log("Fetched");
          // Create sync pairs (remote & local)
          log("Building pairs");
-         let pairs: { local: DBNote, remote: IFile, id: string, oplog: OpLog[] }[] = [];
+         let pairs: {
-         remotes.map(r => {
+            local: DBNote;
-            let lIdx = locals.findIndex(e => e._id === r._id);
+            remote: IFile;
+            id: string;
+            oplog: OpLog[];
+         }[] = [];
+         remotes.map((r) => {
+            let lIdx = locals.findIndex((e) => e._id === r._id);
             let l: DBNote = undefined;
             if (lIdx >= 0) {
                l = locals[lIdx];
                locals.splice(lIdx, 1);
             }
 
-            let oIdx = oplogs.findIndex(e => e.id === r._id);
+            let oIdx = oplogs.findIndex((e) => e.id === r._id);
             let oplog: OpLog[];
             if (oIdx >= 0) {
                oplog = oplogs[oIdx].logs;
@@ -238,12 +260,12 @@ class NotesProvider {
                remote: r,
                local: l,
                oplog,
-               id: r._id
+               id: r._id,
-            })
+            });
-         })
+         });
 
-         locals.forEach(l => {
+         locals.forEach((l) => {
-            let oIdx = oplogs.findIndex(e => e.id === l._id);
+            let oIdx = oplogs.findIndex((e) => e.id === l._id);
             let oplog: OpLog[] = undefined;
             if (oIdx >= 0) {
                oplog = oplogs[oIdx].logs;
@@ -255,20 +277,20 @@ class NotesProvider {
                remote: undefined,
                local: l,
                oplog,
-               id: l._id
+               id: l._id,
-            })
+            });
-         })
+         });
 
-         oplogs.forEach(oplog => {
+         oplogs.forEach((oplog) => {
             if (!oplog) return;
             if (oplog.logs.length > 0)
                pairs.push({
                   remote: undefined,
                   local: undefined,
                   oplog: oplog.logs,
-                  id: oplog.id
+                  id: oplog.id,
-               })
+               });
-         })
+         });
 
          log("Pairs builded");
 
@@ -279,8 +301,8 @@ class NotesProvider {
             local_change: 0,
             local_delete: 0,
             do_nothing: 0,
-            error: 0
+            error: 0,
-         }
+         };
 
          log("Start inspection");
          for (let { local, remote, oplog, id } of pairs) {
@@ -291,13 +313,19 @@ class NotesProvider {
                      case OpLogType.CHANGE:
                         log(id, "REMOTE CHANGE");
                         stats.remote_change++;
-                        await this._secureFile.update(id, op.values.value, b64.encode(op.values.preview), op.date, old);
+                        await this._secureFile.update(
+                           id,
+                           op.values.value,
+                           b64.encode(op.values.preview),
+                           op.date,
+                           old
+                        );
                         break;
                      case OpLogType.DELETE:
                         log(id, "REMOTE DELETE");
                         stats.remote_delete++;
                         if (old) break; // if the deletion is old, just ignore
-                        await this._secureFile.delete(id)
+                        await this._secureFile.delete(id);
                         break;
                      case OpLogType.CREATE:
                         log(id, "REMOTE CREATE");
@@ -314,11 +342,11 @@ class NotesProvider {
                         break;
                   }
                }
-            }
+            };
 
             const localChange = (id: string) => {
                //TODO implement
-            }
+            };
 
             const create = async () => {
                log(id, "LOCAL CREATAE/UPDATE");
@@ -326,59 +354,64 @@ class NotesProvider {
                let value = await this._secureFile.get(id);
                let note: DBNote = {
                   _id: remote._id,
-                  folder: remote.folder,
+                  folder: remote.active.folder,
-                  preview: b64.decode(remote.active.preview),
+                  preview: b64.decode(remote.active.preview || ""),
                   time: remote.active.time,
-                  __value: new Uint8Array(value)
+                  __value: new Uint8Array(value),
-               }
+               };
                await this.noteDB.set(id, note);
                localChange(id);
-            }
+            };
 
             try {
-               // log(id, "LRO: ", !!local, !!remote, !!oplog)
                if (remote && !oplog) {
                   if (local) {
-                     let old = remote.active.time.valueOf() > local.time.valueOf();
+                     let old =
-                     if (old)
+                        remote.active.time.valueOf() > local.time.valueOf();
-                        await create()
+                     if (old) await create();
                      else {
                         stats.do_nothing++;
                         log(id, "DO NOTHING");
                      }
                   } else {
-                     await create()
+                     await create();
                   }
-               } else if (!remote && local && !oplog) { // No local changes, but remote deleted
+               } else if (!remote && local && !oplog) {
+                  // No local changes, but remote deleted
                   log("LOCAL DELETE");
                   stats.local_delete++;
                   await this.noteDB.delete(id);
                   localChange(id);
-               } else if (!remote && oplog) { // Remote does not exist, but oplog, just apply all changes including possible delete
+               } else if (!remote && oplog) {
-                  await apply()
+                  // Remote does not exist, but oplog, just apply all changes including possible delete
+                  await apply();
                } else if (remote && oplog) {
-                  let last = oplog[oplog.length - 1]
+                  let last = oplog[oplog.length - 1];
                   let old = remote.active.time.valueOf() > last.date.valueOf();
 
-                  if (old)
+                  if (old) await create(); // Will recreate local entry
-                     await create() // Will recreate local entry
+                  await apply(old); // Will apply changes to remote
-                  await apply(old) // Will apply changes to remote
                } else {
                   log(id, "DO NOTHING");
                   stats.do_nothing++;
                }
+               await this.oplogDB.delete(id);
             } catch (err) {
                console.error(err);
                stats.error++;
-               Notifications.sendNotification("Error syncing: " + id, MessageType.ERROR);
+               Notifications.sendNotification(
+                  "Error syncing: " + id,
+                  MessageType.ERROR
+               );
             }
-            await this.oplogDB.delete(id);
          }
          log("Stats", stats);
-         this.syncedObservableServer.send((await this.oplogDB.getAll()).length <= 0)
+         this.syncedObservableServer.send(
+            (await this.oplogDB.getAll()).length <= 0
+         );
       } finally {
-         log("Finished")
+         log("Finished");
-         lock.release()
+         lock.release();
          this.syncObservableServer.send(false);
       }
    }
@@ -408,15 +441,16 @@ class NotesProvider {
    }
 
    public getVaults(): Promise<VaultList> {
-      return this.noteDB.getAll()
+      return this.noteDB.getAll().then((notes) =>
-         .then(notes => notes
+         notes
-            .filter(e => Decoder.decode(e.preview) === "__VAULT__")
+            .filter((e) => Decoder.decode(e.preview) === "__VAULT__")
-            .map(e => {
+            .map((e) => {
                let value = e.__value;
                let encrypted = false;
                if (this.decrypt(value) !== "__BASELINE__") encrypted = true;
-               return { name: e.folder, encrypted, id: e._id }
+               return { name: e.folder, encrypted, id: e._id };
-            }));
+            })
+      );
    }
 
    public async createVault(name: string, key?: Uint8Array) {
@@ -425,35 +459,44 @@ class NotesProvider {
          _id: uuidv4(),
          folder: name,
          preview: Encoder.encode("__VAULT__"),
-         time: new Date()
+         time: new Date(),
-      }
+      };
       let tx = this.database.transaction();
       await Promise.all([
-         this.addop(vault._id, OpLogType.CREATE, {
+         this.addop(
-            value: vault.__value,
+            vault._id,
-            preview: vault.preview
+            OpLogType.CREATE,
-         }, vault.time, tx),
+            {
-         this.noteDB.set(vault._id, vault)
+               value: vault.__value,
+               preview: vault.preview,
+            },
+            vault.time,
+            tx
+         ),
+         this.noteDB.set(vault._id, vault),
       ]);
    }
 
    public async getVault(vault_id: string, key?: Uint8Array): Promise<IVault> {
       let vault = await this.noteDB.get(vault_id);
       if (!vault) throw new Error("Vault not found!");
-      if (this.decrypt(vault.__value, key) !== "__BASELINE__") throw new Error("Invalid password!");
+      if (this.decrypt(vault.__value, key) !== "__BASELINE__")
-      return new NotesProvider.Vault(vault, key)
+         throw new Error("Invalid password!");
+      return new NotesProvider.Vault(vault, key);
    }
 
    public async deleteVault(vault_id: string) {
       let vault = await this.noteDB.get(vault_id);
       if (!vault) throw new Error("Vault not found!");
       let v = new NotesProvider.Vault(vault);
-      await Promise.all((await v.getAllNotes()).map(note => this.delete(note._id)));
+      await Promise.all(
+         (await v.getAllNotes()).map((note) => this.delete(note._id))
+      );
       await this.delete(v.id); // This can also delete a vault
    }
 
    public passwordToKey(password: string) {
-      return new Uint8Array(sha256.arrayBuffer(password + config.client_id))
+      return new Uint8Array(sha256.arrayBuffer(password + config.client_id));
    }
 
    private _encrypt(value: Uint8Array, key?: Uint8Array): Uint8Array {
@@ -464,42 +507,48 @@ class NotesProvider {
    }
 
    private encrypt(value: string, key?: Uint8Array): Uint8Array {
-      let msg = this._encrypt(Encoder.encode(value), key)
+      let msg = this._encrypt(Encoder.encode(value), key);
-      return new Uint8Array(this._encrypt(msg, this.generalEncryption))
+      return new Uint8Array(this._encrypt(msg, this.generalEncryption));
    }
 
    private _decrypt(value: ArrayBuffer, key?: Uint8Array): Uint8Array {
       if (!key) return new Uint8Array(value);
       var aesCtr = new aesjs.ModeOfOperation.ctr(key);
       var decryptedBytes = aesCtr.decrypt(value);
-      return new Uint8Array(decryptedBytes)
+      return new Uint8Array(decryptedBytes);
    }
 
    private decrypt(value: ArrayBuffer, key?: Uint8Array): string {
-      let msg = this._decrypt(value, key)
+      let msg = this._decrypt(value, key);
-      return Decoder.decode(this._decrypt(msg, this.generalEncryption))
+      return Decoder.decode(this._decrypt(msg, this.generalEncryption));
    }
 
-   async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: IDBPTransaction<unknown, string[]>) {
+   async addop(
+      note_id: string,
+      type: OpLogType,
+      values: { value: Uint8Array; preview: Uint8Array },
+      date: Date,
+      transaction?: IDBPTransaction<unknown, string[]>
+   ) {
       let tx = transaction || this.oplogDB.transaction();
       let oplog = await this.oplogDB.get(note_id, tx);
       if (!oplog) oplog = { logs: [], id: note_id };
       oplog.logs.push({
          date: date,
          type,
-         values
+         values,
-      })
+      });
       this.syncedObservableServer.send(false);
       await this.oplogDB.set(note_id, oplog, tx);
    }
 
    async delete(id: string) {
       let lock = await this.syncLock.getLock();
-      let tx = this.database.transaction(this.oplogDB, this.noteDB)
+      let tx = this.database.transaction(this.oplogDB, this.noteDB);
       await Promise.all([
          this.addop(id, OpLogType.DELETE, null, new Date(), tx),
-         this.noteDB.delete(id, tx)
+         this.noteDB.delete(id, tx),
-      ])
+      ]);
       lock.release();
    }
 
@@ -522,15 +571,17 @@ class NotesProvider {
       }
 
       async getAllNotes() {
-         return Notes.noteDB.getAll()
+         return Notes.noteDB.getAll().then((all) =>
-            .then(all => all.filter(e => e.folder === this.vault._id)
+            all
+               .filter((e) => e.folder === this.vault._id)
                .sort(this.sort)
-               .map<BaseNote>(e => {
+               .map<BaseNote>((e) => {
-                  let new_note = clonedeep(<Note>e) as BaseNote
+                  let new_note = cloneDeep(<Note>e) as BaseNote;
-                  delete (<any>new_note).__value
+                  delete (<any>new_note).__value;
-                  new_note.preview = this.decrypt(e.preview)
+                  new_note.preview = this.decrypt(e.preview);
                   return new_note;
-               }));
+               })
+         );
       }
 
       private sort(a: DBNote, b: DBNote) {
@@ -539,7 +590,7 @@ class NotesProvider {
 
       async searchNote(term: string) {
          let all = await this.getAllNotes();
-         return all.filter(e => e.preview.indexOf(term) >= 0)
+         return all.filter((e) => e.preview.indexOf(term) >= 0);
       }
 
       newNote(): ViewNote {
@@ -548,8 +599,8 @@ class NotesProvider {
             folder: this.vault._id,
             time: new Date(),
             __value: "",
-            preview: ""
+            preview: "",
-         }
+         };
       }
 
       async saveNote(note: ViewNote, date = new Date()) {
@@ -557,28 +608,34 @@ class NotesProvider {
          const tx = Notes.database.transaction(Notes.noteDB, Notes.oplogDB);
          let old_note = await Notes.noteDB.get(note._id, tx);
 
-         let new_note = clonedeep(<Note>note) as DBNote;
+         let new_note = cloneDeep(<Note>note) as DBNote;
-         new_note.__value = this.encrypt(note.__value)
+         new_note.__value = this.encrypt(note.__value);
          let [title, preview] = note.__value.split("\n");
          if (preview) preview = "\n" + preview;
-         else preview = ""
+         else preview = "";
-         new_note.preview = this.encrypt((title + preview).substr(0, 128))
+         new_note.preview = this.encrypt((title + preview).substr(0, 128));
          new_note.time = date;
 
          await Promise.all([
-            Notes.addop(note._id, !old_note ? OpLogType.CREATE : OpLogType.CHANGE, {
+            Notes.addop(
-               value: new_note.__value,
+               note._id,
-               preview: new_note.preview
+               !old_note ? OpLogType.CREATE : OpLogType.CHANGE,
-            }, date, tx),
+               {
-            Notes.noteDB.set(note._id, new_note, tx)
+                  value: new_note.__value,
-         ])
+                  preview: new_note.preview,
+               },
+               date,
+               tx
+            ),
+            Notes.noteDB.set(note._id, new_note, tx),
+         ]);
          lock.release();
       }
 
       async getNote(id: string): Promise<ViewNote> {
          let note = await Notes.noteDB.get(id);
          if (!note) return undefined;
-         let new_note = clonedeep(<Note>note) as ViewNote;
+         let new_note = cloneDeep(<Note>note) as ViewNote;
          new_note.__value = this.decrypt(note.__value);
          return new_note;
       }
@@ -586,10 +643,10 @@ class NotesProvider {
       deleteNote(id: string) {
          return Notes.delete(id);
       }
-   }
+   };
 }
 
-const Notes = new NotesProvider()
+const Notes = new NotesProvider();
 export default Notes;
 
-(<any>window).api = Notes
+(<any>window).api = Notes;

src/serviceworker.js

@@ -0,0 +1,130 @@
+function log(...params) {
+   console.log.apply(this, [
+      ...["%c[SW]: %c", "color: #f4b942;", "color:unset;"],
+      ...params,
+   ]);
+}
+
+const CACHE = "offline";
+
+let precacheFiles = ["/", "/index.html"];
+
+//Install stage sets up the cache-array to configure pre-cache content
+self.addEventListener("install", (evt) => {
+   log("The service worker is being installed.");
+   evt.waitUntil(
+      precache()
+         .then(() => {
+            log("Skip waiting on install");
+         })
+         .catch(log)
+         .then(() => self.skipWaiting())
+   );
+});
+
+//allow sw to control of current page
+self.addEventListener("activate", (event) => {
+   log("Claiming clients for current page");
+   return self.clients.claim();
+});
+
+self.addEventListener("message", (event) => {
+   log("Clearing cache");
+   caches.delete(CACHE);
+   event.waitUntil(precache());
+});
+
+var Types;
+(function (Types) {
+   Types[(Types["CACHE"] = 0)] = "CACHE";
+   Types[(Types["NOCACHE"] = 1)] = "NOCACHE";
+   Types[(Types["REFRESH"] = 2)] = "REFRESH";
+   Types[(Types["INDEX"] = 3)] = "INDEX";
+})(Types || (Types = {}));
+
+let rules = [
+   {
+      match: (url) => {
+         return url.indexOf("/api/") >= 0;
+      },
+      type: Types.NOCACHE,
+   },
+   {
+      match: (url) => {
+         return url.indexOf("/share") >= 0;
+      },
+      type: Types.INDEX,
+   },
+   {
+      match: () => {
+         return true;
+      },
+      type: Types.REFRESH,
+   },
+];
+
+self.addEventListener("fetch", (evt) => {
+   if (evt.request.method != "GET") return; // Dont care about POST requests
+   let rule = rules.find((rule) => rule.match(evt.request.url));
+   evt.respondWith(
+      (async () => {
+         log("Cache:", Types[rule.type]);
+         switch (rule.type) {
+            case Types.CACHE:
+               return fromCache(evt.request);
+            case Types.REFRESH:
+               return refresh(evt.request).then((r) => {
+                  evt.waitUntil(r.refresh.catch((_) => {}));
+                  return r.result;
+               });
+            case Types.NOCACHE:
+               return fetch(evt.request);
+            case Types.INDEX:
+               return refresh(new Request("/")).then((r) => {
+                  evt.waitUntil(r.refresh.catch((_) => {}));
+                  return r.result;
+               });
+         }
+      })()
+   );
+});
+
+async function fromCache(request) {
+   let cache = await caches.open(CACHE);
+   let matching = await cache.match(request);
+   if (matching) return matching;
+
+   let res = await fetch(request.clone());
+   await cache.put(
+      request,
+      {
+         match: (url) => {
+            return url.indexOf("/version_hash") >= 0;
+         },
+         type: Types.NOCACHE,
+      },
+      res
+   );
+   return await cache.match(request);
+}
+
+async function refresh(request) {
+   let cache = await caches.open(CACHE);
+   let web = fetch(request.clone()).then((res) => {
+      return cache.put(request, res).then(() => {
+         return cache.match(request);
+      });
+   });
+   let matching = await cache.match(request);
+
+   return {
+      result: matching ? matching : web,
+      refresh: web,
+   };
+}
+
+function precache() {
+   return caches.open(CACHE).then(function (cache) {
+      return cache.addAll(precacheFiles);
+   });
+}

src/theme.ts

@@ -1,52 +1,61 @@
-const light = require("!!raw-loader!@hibas123/theme/out/light.css").default;
+import { AwaitStore, Observable } from "@hibas123/utils";
-const dark = require("!!raw-loader!@hibas123/theme/out/dark.css").default;
+import { readFileSync } from "fs";
+
+const light = readFileSync(
+   "node_modules/@hibas123/theme/out/light.css",
+   "utf-8"
+);
+const dark = readFileSync("node_modules/@hibas123/theme/out/dark.css", "utf-8");
 
 export enum ThemeStates {
-    AUTO,
+   AUTO,
-    LIGHT,
+   LIGHT,
-    DARK
+   DARK,
 }
 
 let themeConfig: ThemeStates = Number(localStorage.getItem("theme"));
-if (Number.isNaN(themeConfig))
+if (Number.isNaN(themeConfig)) themeConfig = ThemeStates.AUTO;
-    themeConfig = ThemeStates.AUTO;
 
 let isDark = false;
 let mediaIsDark = false;
 
 if (window.matchMedia) {
-    const mediaq = matchMedia("(prefers-color-scheme: dark)");
+   const mediaq = matchMedia("(prefers-color-scheme: dark)");
-    mediaIsDark = mediaq.matches;
+   mediaIsDark = mediaq.matches;
-    mediaq.onchange = ev => {
+   mediaq.onchange = (ev) => {
-        mediaIsDark = ev.matches;
+      mediaIsDark = ev.matches;
-        apply();
+      apply();
-    }
+   };
+   console.log(mediaq);
 }
 
+const DarkModeStore = new AwaitStore<boolean>(isDark);
 
 let styleElm: HTMLStyleElement;
 function apply(force?: boolean) {
-    let shouldDark = themeConfig === ThemeStates.AUTO ? mediaIsDark : themeConfig === ThemeStates.DARK;
+   let shouldDark =
-    if (force || shouldDark !== isDark) {
+      themeConfig === ThemeStates.AUTO
-        if (styleElm) styleElm.remove();
+         ? mediaIsDark
-        styleElm = document.createElement("style");
+         : themeConfig === ThemeStates.DARK;
-        document.head.appendChild(styleElm);
+   if (force || shouldDark !== isDark) {
-        styleElm.innerHTML = shouldDark ? dark : light;
+      if (styleElm) styleElm.remove();
-        isDark = shouldDark;
+      styleElm = document.createElement("style");
-    }
+      document.head.appendChild(styleElm);
+      styleElm.innerHTML = shouldDark ? dark : light;
+      isDark = shouldDark;
+      DarkModeStore.send(isDark);
+   }
 }
 apply(true);
 
-
 function change(state: ThemeStates) {
-    themeConfig = state;
+   themeConfig = state;
-    localStorage.setItem("theme", String(themeConfig));
+   localStorage.setItem("theme", String(themeConfig));
-    apply();
+   apply();
 }
 
 export default {
-    active: () => themeConfig,
+   active: () => themeConfig,
-    change: (state: ThemeStates) => change(state),
+   change: (state: ThemeStates) => change(state),
-    isDark: () => isDark
+   isDark: DarkModeStore,
-}
+};
-

src/types.d.ts

@@ -1,13 +1,3 @@
-declare module "*.svg" {
-    const SVG: (props: {
-        width?: number | undefined
-        height?: number | undefined
-        onClick?: (evt: MouseEvent) => void;
-        style?: string;
-    }) => JSX.Element;
-    export default SVG;
-}
-
 interface Window {
-    debug: any;
+   debug: any;
 }

tsconfig.json

@@ -1,23 +1,15 @@
 {
-   "compilerOptions": {
+  "compilerOptions": {
-      "outDir": "./public",
+    "outDir": "./public",
-      "target": "es6",
+    "target": "ES2022",
-      "module": "commonjs",
+    "module": "commonjs",
-      "noImplicitAny": false,
+    "noImplicitAny": false,
-      "removeComments": true,
+    "removeComments": true,
-      "sourceMap": true,
+    "sourceMap": true,
-      "jsx": "react",
+    "jsx": "react",
-      "jsxFactory": "h",
+    "jsxFactory": "h",
-      "lib": [
+    "lib": ["es2015", "dom", "esnext"],
-         "es2015",
+    "resolveJsonModule": true
-         "dom",
+  },
-         "esnext"
+  "include": ["./src/types.d.ts", "./src/**/*.tsx", "./src/**/*.ts"]
-      ],
-      "resolveJsonModule": true
-   },
-   "include": [
-      "./src/types.d.ts",
-      "./src/**/*.tsx",
-      "./src/**/*.ts"
-   ]
 }

webpack.config.js

@@ -1,76 +0,0 @@
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const Visualizer = require('webpack-visualizer-plugin');
-const path = require("path");
-const fs = require("fs");
-const config = require("./config.json");
-const url = require("url");
-
-module.exports = {
-   devServer: {
-      host: "0.0.0.0", // Defaults to `localhost`
-      open: false, // Open the page in browser,
-      contentBase: path.join(__dirname, 'dist'),
-      disableHostCheck: true,
-      headers: {
-         "Access-Control-Allow-Origin": "*"
-      },
-      watchOptions: {
-         aggregateTimeout: 300,
-         poll: 500
-      },
-      public: url.parse(config.callback_url).hostname
-   },
-   plugins: [
-      new CopyWebpackPlugin([{
-         from: "public"
-      }]),
-      new HtmlWebpackPlugin({
-         title: 'SecureNotes',
-         template: "./src/index.html"
-      }),
-      new MiniCssExtractPlugin({
-         filename: "[name].css",
-         chunkFilename: "[id].css"
-      }),
-      new BundleAnalyzerPlugin({
-         analyzerMode: "static",
-         openAnalyzer: false
-      }),
-      new Visualizer(),
-   ],
-   entry: {
-      main: "./src/index.tsx"
-   },
-   // Enable sourcemaps for debugging webpack's output.
-   devtool: "eval",
-   resolve: {
-      // Add '.ts' and '.tsx' as resolvable extensions.
-      extensions: [".webpack.js", ".web.js", ".ts", ".tsx", ".js", ".mjs"]
-   },
-   module: {
-      rules: [{
-            test: /\.tsx?$/,
-            use: 'ts-loader',
-            exclude: /node_modules/
-         }, {
-            test: /\.(png|jpg)$/,
-            loader: "file-loader",
-         }, {
-            test: /\.(scss|css)$/,
-            use: [
-               "style-loader", // creates style nodes from JS strings
-               MiniCssExtractPlugin.loader,
-               "css-loader", // translates CSS into CommonJS
-               "sass-loader" // compiles Sass to CSS, using Node Sass by default
-            ]
-         },
-         {
-            test: /\.svg$/,
-            use: ['preact-svg-loader'],
-         }
-      ]
-   }
-};