Restructuring

package.json

@@ -4,48 +4,34 @@
    "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",
+      "@hibas123/secure-file-wrapper": "^2.5.1",
-      "@hibas123/theme": "^1.0.5",
+      "@hibas123/theme": "^1.2.14",
-      "@hibas123/utils": "^2.1.0",
+      "@hibas123/utils": "^2.2.3",
       "aes-js": "^3.1.2",
-      "feather-icons": "^4.22.1",
+      "feather-icons": "^4.26.0",
       "idb": "^4.0.3",
       "js-sha256": "^0.9.0",
       "lodash.clonedeep": "^4.5.0",
-      "secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
+      "parcel": "^1.12.4",
-      "uuid": "^3.3.2"
+      "uuid": "^3.4.0"
    },
    "devDependencies": {
       "@types/lodash.clonedeep": "^4.5.6",
       "@types/uikit": "^2.27.7",
-      "@types/uuid": "^3.4.5",
+      "@types/uuid": "^3.4.7",
-      "copy-webpack-plugin": "^5.0.3",
+      "node-sass": "^4.13.1",
-      "css-loader": "^3.0.0",
+      "parcel-bundler": "^1.12.4",
-      "file-loader": "^4.0.0",
+      "preact": "^10.3.1",
-      "html-webpack-plugin": "^3.2.0",
+      "ts-loader": "^6.2.1",
-      "mini-css-extract-plugin": "^0.7.0",
+      "typescript": "^3.7.5"
-      "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"
    }
 }

src/Views/Settings/Settings.tsx

@@ -1,7 +1,7 @@
 import { h } from "preact";
-import { Page } from "../../../page";
+import { Page } from "../../page";
-import Theme, { ThemeStates } from "../../../theme";
+import Theme, { ThemeStates } from "../../theme";
-import Navigation from "../../../navigation";
+import Navigation from "../../navigation";
 import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg";
 
 export default class SettingsPage extends Page<{ state: any }, { vault: string }> {
@@ -13,7 +13,7 @@ export default class SettingsPage extends Page<{ state: any }, { vault: string }
         let active = Theme.active();
         return <div>
             <header class="header">
-                <a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
+                <a class="header-icon-button" onClick={() => history.back()}><img src={ArrowLeft} height={undefined} width={undefined} /></a>
                 <h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>Settings</h3>
                 <span></span>
             </header>

src/Views/Share/Share.tsx

@@ -1,7 +1,7 @@
 import { h } from "preact";
-import { Page } from "../../../page";
+import { Page } from "../../page";
-import VaultsPage from "../vaults/Vaults";
+import VaultsPage from "../Vaults/Vaults";
-import Navigation from "../../../navigation";
+import Navigation from "../../navigation";
 
 export default class SharePage extends Page<{ state: any }, { vault: string }> {
     text: string;

src/Views/Vault/Entry.tsx

@@ -1,12 +1,12 @@
 import { h, Component } from "preact"
-import { IVault, ViewNote } from "../../../notes";
+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 Navigation from "../../navigation";
-import { YesNoModal } from "../../modals/YesNoModal";
+import { YesNoModal } from "../../components/modals/YesNoModal";
-import Notifications, { MessageType } from "../../../notifications";
+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 }> {
@@ -166,10 +166,10 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
 
       return <div>
          <header class="header">
-            <a class="header-icon-button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
+            <a class="header-icon-button" onClick={() => this.exitHandler()}><img src={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}
+            {this.state.changed ? <a class="header-icon-button" style="margin-left: 0.5em;" onClick={() => save_handler()}><img src={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>
+            <a class="header-icon-button" onClick={() => delete_handler()}><img src={Trash} height={undefined} width={undefined} /></a>
          </header>
          <div class="container">
             <textarea

src/Views/Vault/EntryList.tsx

@@ -1,11 +1,11 @@
-import { h, Component } from "preact"
+import { h, Component, JSX } from "preact"
-import Notes, { IVault, BaseNote } from "../../../notes";
+import Notes, { IVault, BaseNote } from "../../notes";
-import AddButton from "../../AddButton";
+import AddButton from "../../components/AddButton";
-import Navigation from "../../../navigation";
+import Navigation from "../../navigation";
 import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg"
 import Search from "feather-icons/dist/icons/search.svg"
-import ContextMenu from "../../context";
+import ContextMenu from "../../components/context";
-import Notifications from "../../../notifications";
+import Notifications from "../../notifications";
 import { Observable, Lock } from "@hibas123/utils";
 
 
@@ -266,7 +266,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
       return <div>
          {this.state.context}
          <header class="header">
-            <a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
+            <a class="header-icon-button" onClick={() => history.back()}><img src={ArrowLeft} height={undefined} width={undefined} /></a>
             <h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>{this.vault ? this.vault.name : ""}</h3>
             <span></span>
             {/* <a class="button header_icon_button"><MoreVertival height={undefined} width={undefined} /></a> */}
@@ -276,7 +276,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
             <div style="display:flex;">
                <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 />
+                  <img src={Search} />
                </button>
             </div>
 

src/Views/Vault/Vault.tsx

@@ -1,7 +1,7 @@
 import { h } from "preact"
-import { Page } from "../../../page";
+import { Page } from "../../page";
-import Notes, { IVault, BaseNote } from "../../../notes";
+import Notes, { IVault, BaseNote } from "../../notes";
-import Navigation from "../../../navigation";
+import Navigation from "../../navigation";
 import EntryComponent from "./Entry";
 import EntryList from "./EntryList";
 

src/Views/Vaults/Vaults.tsx

@@ -1,16 +1,16 @@
-import { h } from "preact"
+import { h, JSX } from "preact"
-import { Page } from "../../../page";
+import { Page } from "../../page";
-import Notes, { VaultList } from "../../../notes";
+import Notes, { VaultList } from "../../notes";
 import "./vaults.scss"
 import Lock from "feather-icons/dist/icons/lock.svg";
 import Unlock from "feather-icons/dist/icons/unlock.svg";
 import Settings from "feather-icons/dist/icons/settings.svg"
-import Navigation from "../../../navigation";
+import Navigation from "../../navigation";
-import { InputModal } from "../../modals/InputModal";
+import { InputModal } from "../../components/modals/InputModal";
-import { YesNoModal } from "../../modals/YesNoModal";
+import { YesNoModal } from "../../components/modals/YesNoModal";
-import AddButton from "../../AddButton";
+import AddButton from "../../components/AddButton";
-import ContextMenu from "../../context";
+import ContextMenu from "../../components/context";
-import Notifications from "../../../notifications";
+import Notifications from "../../notifications";
 
 export interface VaultsProps {
    state: any;
@@ -206,9 +206,13 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
    }
 
    render() {
+      // <Unlock height={undefined} width={undefined} />}
+      // <Lock height={undefined} width={undefined} />
       let elms = this.state.vaults.map(vault => {
          return <li class="vaults_vault" onClick={() => this.openVault(vault)} onContextMenu={(evt) => this.onContext(evt, vault)}>
-            {vault.encrypted ? <Lock height={undefined} width={undefined} /> : <Unlock height={undefined} width={undefined} />}
+            {vault.encrypted ? <img src={Lock} /> : <img src={Unlock} />}
+
+
             <span>
                {vault.name}
             </span>
@@ -221,7 +225,10 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
          <header class="header">
             <span></span>
             <h3 style="display:inline" onClick={() => Navigation.setPage("/")}>{this.props.selectVault ? "Select Vault for share" : "Your vaults:"}</h3>
-            <a class="header-icon-button" onClick={() => Navigation.setPage("/settings")}><Settings height={undefined} width={undefined} /></a>
+            <a class="header-icon-button" onClick={() => Navigation.setPage("/settings")}>
+               <img src={Settings} />
+               {/* <Settings height={undefined} width={undefined} /> */}
+            </a>
          </header>
          <AddButton onClick={() => this.addButtonClick()} />
          <div class="container">

src/components/AddButton.tsx

@@ -7,6 +7,8 @@ export default function AddButton({ onClick }: { onClick: () => void }) {
       class="fab btn-primary"
       onClick={() => onClick()}
    >
-      <Plus width={undefined} height={undefined} />
+      <img src={Plus} />
    </button>
 }
+
+// <Plus width={undefined} height={undefined} />

src/components/Footer.tsx

@@ -4,76 +4,74 @@ import Refresh from "feather-icons/dist/icons/refresh-cw.svg";
 import "./footer.scss";
 import Notifications from "../notifications";
 
-export class Footer extends Component<
+export class Footer extends Component<{}, { synced: boolean, syncing: boolean }> {
-   {},
+    constructor(props) {
-   { synced: boolean; syncing: boolean }
+        super(props);
-> {
+        this.state = { synced: false, syncing: false };
-   constructor(props) {
+        this.onSyncedChange = this.onSyncedChange.bind(this);
-      super(props);
+        this.onSyncChange = this.onSyncChange.bind(this);
-      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 (
+        return <footer class="elv-8">
-         <footer class="elv-8">
             <span>
-               <span class={extrac}>
+                <span class={extrac} >
-                  <a onClick={() => this.onSyncClick()}>
+                    <a onClick={() => this.onSyncClick()} >
-                     <Refresh style="height: 1em; width: 1em;"></Refresh>
+                        <img src={Refresh} style="height: 1em; width: 1em;" />
-                  </a>
+                        {/* <Refresh style="height: 1em; width: 1em;"></Refresh> */}
-               </span>
+                    </a>
-               <span style={"margin-left: 8px; color:" + color}>{text}</span>
+                </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;">v1.5</span>
+            <span style="color: lightgrey;">
-         </footer>
+                v1.4
-      );
+            </span>
-   }
+        </footer>
+    }
 }

src/components/Routing.tsx

@@ -1,4 +1,4 @@
-import { h, Component } from 'preact';
+import { h, Component, JSX } from 'preact';
 import Navigation from '../navigation';
 import "./routing.scss"
 

src/components/context.tsx

@@ -1,4 +1,4 @@
-import { h } from "preact";
+import { h, JSX } from "preact";
 import "./context.scss";
 
 export default function ContextMenu({ children, event }: { children: JSX.Element | JSX.Element[], event: MouseEvent }) {

src/components/modals/Modal.tsx

@@ -1,5 +1,5 @@
 import { Observable } from "@hibas123/utils";
-import { h, Component } from "preact";
+import { h, Component, JSX } from "preact";
 import CloseIcon from "feather-icons/dist/icons/x.svg";
 
 export default abstract class Modal<T> {
@@ -70,7 +70,8 @@ export default abstract class Modal<T> {
                   <h3>{this.props.modal.title}</h3>
                   {/* <div> */}
                   {!this.props.modal.noClose ?
-                     <CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} />
+                     <img src={CloseIcon} onClick={() => this.props.modal.result(null)} />
+                     // <CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} />
                      : undefined
                   }
                   {/* </div> */}

src/index.html

@@ -6,7 +6,7 @@
    <meta charset="utf8" />
    <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.json">
    <!-- <link rel="shortcut icon" href="/public/icon-72x72.png"> -->
 
    <!-- Add to home screen for Safari on iOS -->
@@ -15,9 +15,9 @@
    <meta name="apple-mobile-web-app-title" content="Secure Notes">
 
 
-   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+   <!-- <link rel="apple-touch-icon" sizes="180x180" href="../public/apple-touch-icon.png"> -->
-   <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1E88E5">
+   <!-- <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1E88E5"> -->
-   <script src="encoding.js"></script>
+   <script src="./encoding.js"></script>
    <meta name="msapplication-TileColor" content="#1E88E5">
    <meta name="theme-color" content="#1E88E5">
 </head>
@@ -45,7 +45,7 @@
             console.warn("Disabling Service Worker in debug mode!")
          } else {
             // Register the ServiceWorker
-            navigator.serviceWorker.register('/serviceworker.js', {
+            navigator.serviceWorker.register('./serviceworker.ts', {
                scope: '/'
             }).then(function (reg) {
                console.log('Service worker has been registered for scope:' + reg.scope);
@@ -56,6 +56,7 @@
          }
       }
    </script>
+   <script src="./index.tsx"></script>
 </body>
 
 </html>

src/index.scss

@@ -9,48 +9,48 @@ body {
 //    display: flex;
 // }
 
-// $header-margin: .5em;
+$header-margin: .5em;
 // $header-icon-size: calc(1.5rem * 1);
 // $header-icon-size: 100%;
 
-// header {
+header {
-//    display: flex;
+   display: flex;
-//    justify-content: space-between;
+   justify-content: space-between;
-//    margin-bottom: $header-margin;
+   margin-bottom: $header-margin;
-//    align-content: center;
+   align-content: center;
-//    padding: 0.75em;
+   padding: 0.75em;
-//    border-bottom: solid var(--border-color) 1px;
+   border-bottom: solid var(--border-color) 1px;
-//    background-color: var(--primary);
+   background-color: var(--primary);
 
-//    >* {
+   >* {
-//       margin: 0;
+      margin: 0;
-//       color: white;
+      color: white;
-//       background: var(--primary);
+      background: var(--primary);
-//    }
+   }
 
-//    >.header-title {
+   >.header-title {
-//       overflow: hidden;
+      overflow: hidden;
-//       text-overflow: ellipsis;
+      text-overflow: ellipsis;
-//       text-overflow: ellipsis;
+      text-overflow: ellipsis;
-//       white-space: nowrap;
+      white-space: nowrap;
-//       overflow: hidden;
+      overflow: hidden;
-//       flex-grow: 1;
+      flex-grow: 1;
-//       margin: 0 1em;
+      margin: 0 1em;
-//    }
+   }
 
-//    .header-icon-button {
+   .header-icon-button {
-//       display: block;
+      display: block;
-//       margin-top: auto;
+      margin-top: auto;
-//       margin-bottom: auto;
+      margin-bottom: auto;
-//       min-width: $header-icon-size;
+      // min-width: $header-icon-size;
 
-//       >svg {
+      // >svg {
-//          height: $header-icon-size;
+      //    height: $header-icon-size;
-//          width: $header-icon-size;
+      //    width: $header-icon-size;
-//       }
+      // }
-//    }
+   }
 
-// }
+}
 
 
 body {

src/index.tsx

@@ -72,16 +72,16 @@ import "@hibas123/theme/out/base.css"
 
 import "./index.scss";
 import Navigation from './navigation';
-import VaultsPage from './components/routes/vaults/Vaults';
+import VaultsPage from './Views/Vaults/Vaults';
 import { Page } from './page';
 
 import Notes from "./notes"
 import DemoPage from './components/demo';
-import VaultPage from './components/routes/vault/Vault';
+import VaultPage from './Views/Vault/Vault';
-import SharePage from './components/routes/share/Share';
+import SharePage from './Views/Share/Share';
 import Notifications from './notifications';
-import Error404Page from './components/routes/404';
+import Error404Page from './Views/404';
-import SettingsPage from './components/routes/settings/Settings';
+import SettingsPage from './Views/Settings/Settings';
 window.debug.notes = Notes;
 
 

src/navigation.ts

@@ -1,6 +1,6 @@
 import { Observable } from "@hibas123/utils";
 import { Page, PageProps } from "./page";
-import { h, VNode } from "preact";
+import { h, VNode, JSX } from "preact";
 
 function serializQuery(obj: any) {
    var str = [];

src/notes.ts

@@ -3,12 +3,13 @@ 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 uuidv4 from "uuid/v4";
 import * as config from "../config.json";
 import * as b64 from "./helper/base64";
 import IDB from "./helper/indexeddb";
 import Notifications, { MessageType } from "./notifications";
 
+
 export class HttpError extends Error {
    constructor(public status: number, public statusText: string) {
       super(statusText);
@@ -38,6 +39,7 @@ export interface ViewNote extends BaseNote {
 }
 
 import clonedeep = require("lodash.clonedeep");
+import uuid = require("uuid");
 
 const Encoder = new TextEncoder();
 const Decoder = new TextDecoder();
@@ -45,7 +47,7 @@ const Decoder = new TextDecoder();
 enum OpLogType {
    CREATE,
    CHANGE,
-   DELETE,
+   DELETE
 }
 
 interface OpLog {
@@ -58,8 +60,8 @@ interface OpLog {
     * The value
     */
    values: {
-      value: Uint8Array;
+      value: Uint8Array,
-      preview: Uint8Array;
+      preview: Uint8Array
    };
 
    /**
@@ -68,43 +70,42 @@ 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>;
+   // type: string; //Defines type of plugin, that is required to handle this vault
 }
 
-const awaitTimeout = (ms: number) =>
+const awaitTimeout = (ms: number) => new Promise<void>(resolve => setTimeout(resolve, ms));
-   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[] }>(
+   private oplogDB = this.database.getStore<{ id: string, logs: OpLog[] }>("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();
 
@@ -116,7 +117,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;
@@ -129,17 +130,11 @@ class NotesProvider {
    }
 
    login() {
-      window.location.href = `${config.auth_server}/auth?client_id=${
+      window.location.href = `${config.auth_server}/auth?client_id=${config.client_id}&scope=${config.permission}&redirect_uri=${encodeURIComponent(config.callback_url)}&response_type=code`
-         config.client_id
-      }&scope=${config.permission}&redirect_uri=${encodeURIComponent(
-         config.callback_url
-      )}&response_type=code`;
    }
 
    async getToken(code: string) {
-      let req = await fetch(
+      let req = await fetch(`${config.auth_server}/api/oauth/refresh?grant_type=authorization_code&client_id=${config.client_id}&code=${code}`);
-         `${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);
@@ -147,9 +142,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"
       }
    }
 
@@ -162,11 +157,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");
    }
@@ -175,42 +170,34 @@ class NotesProvider {
       const next = () => {
          setTimeout(() => {
             this.sync().then(next);
-         }, 30000);
+         }, 30000)
-      };
+      }
-      this.syncedObservableServer.send(
+      this.syncedObservableServer.send((await this.oplogDB.getAll()).length <= 0);
-         (await this.oplogDB.getAll()).length <= 0
+      let prs = this.apiLockRls.then(lock => lock.release());
-      );
+      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(
+         let req = await fetch(config.auth_server + "/api/oauth/jwt?refreshtoken=" + localStorage.getItem("refreshtoken"));
-            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()
       }
    }
 
@@ -220,38 +207,29 @@ 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([
+         let [remotes, locals, oplogs] = await Promise.all([this._secureFile.list(), this.noteDB.getAll(), this.oplogDB.getAll()]);
-            this._secureFile.list(),
-            this.noteDB.getAll(),
-            this.oplogDB.getAll(),
-         ]);
          log("Fetched");
          // Create sync pairs (remote & local)
          log("Building pairs");
-         let pairs: {
+         let pairs: { local: DBNote, remote: IFile, id: string, oplog: OpLog[] }[] = [];
-            local: DBNote;
+         remotes.map(r => {
-            remote: IFile;
+            let lIdx = locals.findIndex(e => e._id === r._id);
-            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;
@@ -262,12 +240,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;
@@ -279,20 +257,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");
 
@@ -303,8 +281,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) {
@@ -315,19 +293,13 @@ class NotesProvider {
                      case OpLogType.CHANGE:
                         log(id, "REMOTE CHANGE");
                         stats.remote_change++;
-                        await this._secureFile.update(
+                        await this._secureFile.update(id, op.values.value, b64.encode(op.values.preview), op.date, old);
-                           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");
@@ -344,11 +316,11 @@ class NotesProvider {
                         break;
                   }
                }
-            };
+            }
 
             const localChange = (id: string) => {
                //TODO implement
-            };
+            }
 
             const create = async () => {
                log(id, "LOCAL CREATAE/UPDATE");
@@ -357,43 +329,42 @@ class NotesProvider {
                let note: DBNote = {
                   _id: remote._id,
                   folder: remote.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 =
+                     let old = remote.active.time.valueOf() > local.time.valueOf();
-                        remote.active.time.valueOf() > local.time.valueOf();
+                     if (old)
-                     if (old) await create();
+                        await create()
                      else {
                         stats.do_nothing++;
                         log(id, "DO NOTHING");
                      }
                   } else {
-                     await create();
+                     await create()
                   }
-               } else if (!remote && local && !oplog) {
+               } else if (!remote && local && !oplog) { // No local changes, but remote deleted
-                  // No local changes, but remote deleted
                   log("LOCAL DELETE");
                   stats.local_delete++;
                   await this.noteDB.delete(id);
                   localChange(id);
-               } else if (!remote && oplog) {
+               } else if (!remote && oplog) { // Remote does not exist, but oplog, just apply all changes including possible delete
-                  // Remote does not exist, but oplog, just apply all changes including possible delete
+                  await apply()
-                  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) await create(); // Will recreate local entry
+                  if (old)
-                  await apply(old); // Will apply changes to remote
+                     await create() // Will recreate local entry
+                  await apply(old) // Will apply changes to remote
                } else {
                   log(id, "DO NOTHING");
                   stats.do_nothing++;
@@ -401,20 +372,15 @@ class NotesProvider {
             } catch (err) {
                console.error(err);
                stats.error++;
-               Notifications.sendNotification(
+               Notifications.sendNotification("Error syncing: " + id, MessageType.ERROR);
-                  "Error syncing: " + id,
-                  MessageType.ERROR
-               );
             }
             await this.oplogDB.delete(id);
          }
          log("Stats", stats);
-         this.syncedObservableServer.send(
+         this.syncedObservableServer.send((await this.oplogDB.getAll()).length <= 0)
-            (await this.oplogDB.getAll()).length <= 0
-         );
       } finally {
-         log("Finished");
+         log("Finished")
-         lock.release();
+         lock.release()
          this.syncObservableServer.send(false);
       }
    }
@@ -444,62 +410,53 @@ class NotesProvider {
    }
 
    public getVaults(): Promise<VaultList> {
-      return this.noteDB.getAll().then((notes) =>
+      return this.noteDB.getAll()
-         notes
+         .then(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) {
+      // console.log(uuidv4, uuid);
       let vault: DBNote = {
          __value: this.encrypt("__BASELINE__", key),
          _id: uuidv4(),
          folder: name,
          preview: Encoder.encode("__VAULT__"),
-         time: new Date(),
+         time: new Date()
-      };
+      }
       let tx = this.database.transaction();
       await Promise.all([
-         this.addop(
+         this.addop(vault._id, OpLogType.CREATE, {
-            vault._id,
+            value: vault.__value,
-            OpLogType.CREATE,
+            preview: vault.preview
-            {
+         }, vault.time, tx),
-               value: vault.__value,
+         this.noteDB.set(vault._id, vault)
-               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__")
+      if (this.decrypt(vault.__value, key) !== "__BASELINE__") throw new Error("Invalid password!");
-         throw new Error("Invalid password!");
+      return new NotesProvider.Vault(vault, key)
-      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 Promise.all((await v.getAllNotes()).map(note => this.delete(note._id)));
-         (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 {
@@ -510,48 +467,42 @@ 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(
+   async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: IDBPTransaction<unknown, string[]>) {
-      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();
    }
 
@@ -574,17 +525,15 @@ class NotesProvider {
       }
 
       async getAllNotes() {
-         return Notes.noteDB.getAll().then((all) =>
+         return Notes.noteDB.getAll()
-            all
+            .then(all => all.filter(e => e.folder === this.vault._id)
-               .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) {
@@ -593,7 +542,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 {
@@ -602,8 +551,8 @@ class NotesProvider {
             folder: this.vault._id,
             time: new Date(),
             __value: "",
-            preview: "",
+            preview: ""
-         };
+         }
       }
 
       async saveNote(note: ViewNote, date = new Date()) {
@@ -612,26 +561,20 @@ class NotesProvider {
          let old_note = await Notes.noteDB.get(note._id, tx);
 
          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(
+            Notes.addop(note._id, !old_note ? OpLogType.CREATE : OpLogType.CHANGE, {
-               note._id,
+               value: new_note.__value,
-               !old_note ? OpLogType.CREATE : OpLogType.CHANGE,
+               preview: new_note.preview
-               {
+            }, date, tx),
-                  value: new_note.__value,
+            Notes.noteDB.set(note._id, new_note, tx)
-                  preview: new_note.preview,
+         ])
-               },
-               date,
-               tx
-            ),
-            Notes.noteDB.set(note._id, new_note, tx),
-         ]);
          lock.release();
       }
 
@@ -646,10 +589,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/theme.ts

@@ -1,5 +1,7 @@
-const light = require("!!raw-loader!@hibas123/theme/out/light.css").default;
+import { readFileSync } from "fs";
-const dark = require("!!raw-loader!@hibas123/theme/out/dark.css").default;
+
+const light = readFileSync("./node_modules/@hibas123/theme/out/light.css", "utf8")
+const dark = readFileSync("./node_modules/@hibas123/theme/out/dark.css", "utf8")
 
 export enum ThemeStates {
     AUTO,

src/types.d.ts

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

tsconfig.json

@@ -13,7 +13,8 @@
          "dom",
          "esnext"
       ],
-      "resolveJsonModule": true
+      "resolveJsonModule": true,
+      "esModuleInterop": true
    },
    "include": [
       "./src/types.d.ts",