Restructuring

package.json

@@ -4,53 +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/utils": "^2.1.0",
+      "@hibas123/theme": "^1.2.14",
+      "@hibas123/utils": "^2.2.3",
       "aes-js": "^3.1.2",
-      "feather-icons": "^4.21.0",
+      "feather-icons": "^4.26.0",
-      "idb": "3.0.2",
+      "idb": "^4.0.3",
       "js-sha256": "^0.9.0",
-      "js-sha512": "^0.8.0",
       "lodash.clonedeep": "^4.5.0",
-      "secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
+      "parcel": "^1.12.4",
-      "uikit": "^3.1.5",
+      "uuid": "^3.4.0"
-      "uuid": "^3.3.2",
-      "workbox-precaching": "^4.3.1",
-      "workbox-routing": "^4.3.1",
-      "workbox-strategies": "^4.3.1"
    },
    "devDependencies": {
       "@types/lodash.clonedeep": "^4.5.6",
       "@types/uikit": "^2.27.7",
-      "@types/uuid": "^3.4.4",
+      "@types/uuid": "^3.4.7",
-      "@types/workbox-sw": "^4.2.0",
+      "node-sass": "^4.13.1",
-      "copy-webpack-plugin": "^5.0.3",
+      "parcel-bundler": "^1.12.4",
-      "css-loader": "^2.1.1",
+      "preact": "^10.3.1",
-      "file-loader": "^3.0.1",
+      "ts-loader": "^6.2.1",
-      "html-webpack-plugin": "^3.2.0",
+      "typescript": "^3.7.5"
-      "mini-css-extract-plugin": "^0.7.0",
-      "node-sass": "^4.12.0",
-      "preact": "^8.3.1",
-      "preact-svg-loader": "^0.2.1",
-      "sass-loader": "^7.1.0",
-      "style-loader": "^0.23.1",
-      "ts-loader": "^6.0.2",
-      "typescript": "^3.5.1",
-      "webpack": "^4.32.2",
-      "webpack-bundle-analyzer": "^3.3.2",
-      "webpack-cli": "^3.3.2",
-      "webpack-dev-server": "^3.5.1",
-      "webpack-visualizer-plugin": "^0.1.11",
-      "workbox-webpack-plugin": "^4.3.1",
-      "worker-loader": "^2.0.0"
    }
 }

src/Views/Settings/Settings.tsx

@@ -0,0 +1,37 @@
+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";
+
+export default class SettingsPage extends Page<{ state: any }, { vault: string }> {
+    componentWillMount() {
+
+    }
+
+    render() {
+        let active = Theme.active();
+        return <div>
+            <header class="header">
+                <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>
+            <div class="container">
+                <div className="input-group">
+                    <label>Select Theme: </label>
+                    <select class="inp" onChange={(ev) => Theme.change(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>
+                </div>
+                {/* <button class="btn" onClick={() => Theme.toggle()}>Toggle Dark Mode</button> */}
+                <button class="btn" onClick={() => window.navigator.serviceWorker.controller.postMessage("message")}>Clear cache</button>
+            </div>
+        </div >;
+    }
+}

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 }> {
@@ -165,17 +165,17 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
       console.log("Rerender")
 
       return <div>
-         <header class="uk-background-primary">
+         <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="uk-container">
+         <div class="container">
             <textarea
                value={this.text}
                rows={this.rows}
-               class="doc uk-textarea"
+               class="inp"
                style="width:100%;"
                onInput={this.textAreaChange}
                onKeyDown={this.textAreaKeyPress}

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";
 
 
@@ -84,7 +84,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
       }
 
       const deleteNote = async () => {
-         Notes.delete(note._id).then(() => {
+         this.vault.deleteNote(note._id).then(() => {
             Notifications.sendSuccess("Deleted")
             this.rawNotes = this.rawNotes.filter(e => e._id !== note._id);
             this.setState({ notes: this.state.notes.filter(e => e._id !== note._id) });
@@ -93,16 +93,29 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
          })
       }
 
+      const copyNote = async () => {
+         this.vault.getNote(note._id).then(note => {
+            const el = document.createElement('textarea');
+            el.value = note.__value;
+            document.body.appendChild(el);
+            el.select();
+            document.execCommand('copy');
+            document.body.removeChild(el);
+            Notifications.sendSuccess("Copied");
+         })
+      }
+
       let share;
       if ((window.navigator as any).share) {
-         share = <button class="uk-button" onClick={shareNote}>
+         share = <button class="btn" onClick={shareNote}>
             share
          </button>
       }
 
       let context = <ContextMenu event={evt} >
          {share}
-         <button class="uk-button" onClick={deleteNote}>delete</button>
+         <button class="btn" onClick={deleteNote}>delete</button>
+         <button class="btn" onClick={copyNote}>copy</button>
       </ContextMenu>
 
       this.setState({ context });
@@ -252,31 +265,29 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
 
       return <div>
          {this.state.context}
-         <header class="uk-background-primary">
+         <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> */}
          </header>
          <AddButton onClick={() => open_entry(null)} />
-         <div class="uk-container">
+         <div class="container">
             <div style="display:flex;">
-               <input class="uk-input" type="text" onKeyUp={this.searchChanged} ref={elm => this.searchInput = elm} />
+               <input class="inp" type="text" style="width: 100%; height: 40px;" onKeyUp={this.searchChanged} ref={elm => this.searchInput = elm} />
-               <button class="uk-button uk-button-primary" style="padding: 0 10px;">
+               <button class="btn btn-primary" style="padding: 5px 10px; margin: 0; height: 40px; width: 40px;">
-                  <Search />
+                  <img src={Search} />
                </button>
             </div>
 
-            <div class="uk-child-width-1-3@m uk-grid-small uk-grid-match" style="margin-top: 1rem;" uk-grid>
+            <div class="vault-list" style="margin-top: 1rem;">
                {this.state.notes.map(note => {
                   let [first, second] = note.preview.split("\n", 2);
-                  return <div class="" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
+                  return <div class="card vault-vault" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
                      open_entry(note._id)
                   }}>
-                     <div class="uk-card uk-card-default uk-card-body vault-vault" style="box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3)">
+                     <div>{first}</div>
-                        <div>{first}</div>
+                     <div>{second}</div>
-                        <div>{second}</div>
-                     </div>
                   </div>
                })}
             </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/Vault/vault.scss

@@ -0,0 +1,43 @@
+.container> :last-child {
+   margin-bottom: 15px !important;
+}
+
+.vault-list {
+   display: grid;
+   grid-template-columns: repeat(3, 1fr);
+   grid-gap: 1rem;
+   grid-auto-rows: auto;
+}
+
+@media screen and (max-width: 50rem) {
+   .vault-list {
+      grid-template-columns: 1fr;
+   }
+}
+
+// TODO Media Query for small screens
+
+.vault-vault {
+   overflow: hidden;
+
+   >div {
+      width: 100%;
+      font-size: 1.1rem;
+      margin-left: 1rem;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+   }
+
+   >div:nth-of-type(1) {
+      font-size: 1.3rem;
+      margin-left: 0;
+   }
+
+   >div:empty {
+      &::before {
+         content: " ";
+         white-space: pre;
+      }
+   }
+}

src/Views/Vaults/Vaults.tsx

@@ -1,15 +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 Navigation from "../../../navigation";
+import Settings from "feather-icons/dist/icons/settings.svg"
-import { InputModal } from "../../modals/InputModal";
+import Navigation from "../../navigation";
-import { YesNoModal } from "../../modals/YesNoModal";
+import { InputModal } from "../../components/modals/InputModal";
-import AddButton from "../../AddButton";
+import { YesNoModal } from "../../components/modals/YesNoModal";
-import ContextMenu from "../../context";
+import AddButton from "../../components/AddButton";
-import Notifications from "../../../notifications";
+import ContextMenu from "../../components/context";
+import Notifications from "../../notifications";
 
 export interface VaultsProps {
    state: any;
@@ -135,14 +136,14 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       }
       document.documentElement.addEventListener("click", close);
 
-      let deleteb = <button class="uk-button" onClick={async () => {
+      let deleteb = <button class="btn" onClick={async () => {
          let delete_modal = new YesNoModal("Delete Vault? Cannot be undone!");
          let result = await delete_modal.getResult();
          if (result) {
             Notes.deleteVault(vault.id).then(() => {
                this.updateVaults();
             }).catch(err => {
-               Notifications.sendError("error deleting vault!")
+               Notifications.sendError("Error deleting vault!")
                console.error(err);
             })
          }
@@ -152,15 +153,15 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
       let delete_key;
       if (Notes.getVaultKey(vault.id)) {
-         delete_key = <button class="uk-button" onClick={() => {
+         delete_key = <button class="btn" onClick={() => {
             Notes.forgetVaultKey(vault.id);
-            Notifications.sendSuccess("Forgot key!")
+            Notifications.sendSuccess("Forgot password!")
          }}>
             forget password
          </button>;
       }
 
-      let exportb = <button class="uk-button" onClick={async () => {
+      let exportb = <button class="btn" onClick={async () => {
          let key: Uint8Array;
          if (vault.encrypted) {
             await this.getKey(vault, false)
@@ -205,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>
@@ -217,14 +222,17 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       return <div style={{ marginTop: "-12px", paddingTop: "12px" }} >
          {/* {this.state.modal} */}
          {this.state.context}
-         <header class="uk-background-primary">
+         <header class="header">
             <span></span>
             <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")}>
+               <img src={Settings} />
+               {/* <Settings height={undefined} width={undefined} /> */}
+            </a>
          </header>
          <AddButton onClick={() => this.addButtonClick()} />
-         <div class="uk-container">
+         <div class="container">
-            <ul class="uk-list uk-list-divider">
+            <ul class="list list-divider list-clickable">
                {elms}
             </ul>
          </div>

src/Views/Vaults/vaults.scss

@@ -0,0 +1,19 @@
+.vaults_vault {
+   display: flex;
+   padding: 0.5rem;
+   margin-top: 0 !important;
+   align-items: flex-end;
+   justify-content: start;
+
+   >span {
+      font-size: 1.5rem;
+      line-height: 1.5rem;
+   }
+
+   >svg {
+      display: inline-block;
+      height: 1.5em;
+      width: 1.5em;
+      margin-right: 1rem;
+   }
+}

src/components/AddButton.tsx

@@ -3,10 +3,12 @@ import "./add_button.scss";
 import Plus from "feather-icons/dist/icons/plus.svg";
 export default function AddButton({ onClick }: { onClick: () => void }) {
    return <button
-      title={"add button"}
+      title="add button"
-      class="add-button-button uk-button-primary uk-border-circle def-shadow"
+      class="fab btn-primary"
       onClick={() => onClick()}
    >
-      <Plus width={undefined} height={undefined} />
+      <img src={Plus} />
    </button>
 }
+
+// <Plus width={undefined} height={undefined} />

src/components/Footer.tsx

@@ -56,16 +56,21 @@ export class Footer extends Component<{}, { synced: boolean, syncing: boolean }>
                 text = "not synced";
             }
         }
-        return <footer class="uk-background-default def-shadow">
+        return <footer class="elv-8">
             <span>
-                <span class={extrac} ><a onClick={() => this.onSyncClick()} ><Refresh style="height: 1em; width: 1em;"></Refresh></a></span>
+                <span class={extrac} >
+                    <a onClick={() => this.onSyncClick()} >
+                        <img src={Refresh} style="height: 1em; width: 1em;" />
+                        {/* <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>
             </span>
             <span style="color: lightgrey;">
-                v1.2
+                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"
 
@@ -26,7 +26,7 @@ export class Router extends Component<{}, { next?: JSX.Element, current: JSX.Ele
    render() {
       let overlay;
       if (this.state.next) {
-         overlay = <div class="transition_container transition_slidein uk-background-default" key={this.state.next.key} ref={(elm: HTMLDivElement) => {
+         overlay = <div class="transition_container transition_slidein background-default" key={this.state.next.key} ref={(elm: HTMLDivElement) => {
             let lst = () => {
                if (this.state.next)
                   this.setState({ current: this.state.next, next: undefined }, () => {
@@ -43,7 +43,7 @@ export class Router extends Component<{}, { next?: JSX.Element, current: JSX.Ele
          </div>
       }
       return <div style="position: relative; overflow-x: hidden; width: 100vw; height: calc(100vh - 2rem);">
-         <div class="transition_container uk-background-default" key={this.state.current.key} ref={elm => this.mounted = elm}>
+         <div class="transition_container background-default" key={this.state.current.key} ref={elm => this.mounted = elm}>
             {this.state.current}
          </div>
          {overlay}

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/footer.scss

@@ -16,7 +16,7 @@
 }
 
 footer {
-    z-index: 128;
+    // z-index: 128;
     position: fixed;
     bottom: 0;
     left: 0;

src/components/modals/InputModal.tsx

@@ -27,27 +27,24 @@ export class InputModal extends Modal<string> {
 
       render() {
          return <Modal.BaseModal modal={this.props.modal}>
-            <div class="uk-form-horizontal uk-margin-large">
+            <div>
-               <div class="uk-margin">
+               <div class="input-group">
-                  <label class="uk-form-label" for={this.rand}>{this.props.modal.fieldname}</label>
+                  <label for={this.rand}>{this.props.modal.fieldname}</label>
-                  <div class="uk-form-controls">
+                  <input
-                     <input
+                     id={this.rand}
-                        class="uk-input"
+                     type={this.props.modal.type}
-                        id={this.rand}
+                     placeholder={this.props.modal.fieldname}
-                        type={this.props.modal.type}
+                     autofocus
-                        placeholder={this.props.modal.fieldname}
+                     ref={elm => { this.input = elm; }}
-                        autofocus
+                     onKeyDown={evt => {
-                        ref={elm => { this.input = elm; }}
+                        if (evt.keyCode === 13) {
-                        onKeyDown={evt => {
+                           this.props.modal.result(this.input.value)
-                           if (evt.keyCode === 13) {
+                        }
-                              this.props.modal.result(this.input.value)
+                     }}
-                           }
+                  />
-                        }}
-                     />
-                  </div>
                </div>
-               <div class="uk-margin" style="text-align: right;">
+               <div class="modal-action">
-                  <button class="uk-button uk-button-primary" style="display: inline-block;" onClick={() => {
+                  <button class="btn btn-primary" onClick={() => {
                      this.props.modal.result(this.input.value);
                   }}>Enter</button>
                </div>

src/components/modals/LoadingModal.tsx

@@ -12,7 +12,7 @@ export default class LoadingModal extends Modal<undefined> {
    getComponent() {
       return <Modal.BaseModal modal={this}>
          <div style="display: flex; justify-content: center;">
-            <div style="margin: 3rem;" class="uk-spinner uk-icon">
+            <div style="margin: 3rem;" class="">
                <svg width="90" height="90" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" data-svg="spinner"><circle fill="none" stroke="#000" cx="15" cy="15" r="14" style="stroke-width: 0.333333px;"></circle></svg>
             </div>
          </div>

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> {
@@ -65,12 +65,13 @@ export default abstract class Modal<T> {
                this.props.modal.result(null)
             }
          }}>
-            <div id="ModalContent" class="uk-card uk-card-body uk-card-body" >
+            <div id="ModalContent" class="modal" >
-               <div class="modal-title uk-card-title" style="">
+               <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} />
+                     <img src={CloseIcon} onClick={() => this.props.modal.result(null)} />
+                     // <CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} />
                      : undefined
                   }
                   {/* </div> */}

src/components/modals/YesNoModal.tsx

@@ -28,15 +28,13 @@ export class YesNoModal extends Modal<boolean> {
 
       render() {
          return <Modal.BaseModal modal={this.props.modal}>
-            <div class="uk-margin-large">
+            <div class="modal-action">
-               <div style="text-align: right;">
+               <button class="btn-primary" onClick={() => {
-                  <button class="uk-button uk-button-primary uk-margin-right" style="display: inline-block;" onClick={() => {
+                  this.props.modal.result(false);
-                     this.props.modal.result(false);
+               }}><span style="text-decoration: underline;">N</span>o</button>
-                  }}><span style="text-decoration: underline;">N</span>o</button>
+               <button class="btn-primary" onClick={() => {
-                  <button class="uk-button uk-button-primary" style="display: inline-block;" onClick={() => {
+                  this.props.modal.result(true);
-                     this.props.modal.result(true);
+               }}><span style="text-decoration: underline;">Y</span>es</button>
-                  }}><span style="text-decoration: underline;">Y</span>es</button>
-               </div>
             </div>
          </Modal.BaseModal>
       }

src/components/modals/modal.scss

@@ -4,24 +4,25 @@
    left: 0;
    width: 100%;
    height: 100%;
-   background: rgba(0, 0, 0, 0.8);
    z-index: 32;
+   animation: darkenBackground .2s linear;
+   background: rgba(0, 0, 0, 0.8)
 }
 
-.modal-container>.uk-card {
+@keyframes darkenBackground {
-   position: absolute;
+   from {
-   left: 0;
+      background: rgba(0, 0, 0, 0);
-   right: 0;
+   }
-   top: 10%;
+
-   width: 80%;
+   to {
-   max-width: 800px;
+      background: rgba(0, 0, 0, 0.8);
-   margin: auto;
+   }
-   background: white;
 }
 
 .modal-title {
-   display:flex; 
+   display: flex;
-   justify-content:space-between;
+   justify-content: space-between;
+
    >svg {
       height: 1em;
    }

src/components/routes/vault/vault.scss

@@ -1,46 +0,0 @@
-.uk-container> :last-child {
-   margin-bottom: 15px !important;
-}
-
-.vault-vault {
-   width: 100%;
-
-   >div {
-      width: 100%;
-      font-size: 1rem;
-      margin-left: 1rem;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-   }
-
-   >div:nth-of-type(1) {
-      font-size: 1.3rem;
-      margin-left: 0;
-   }
-
-   >div:empty {
-      &::before {
-         content: " ";
-         white-space: pre;
-      }
-   }
-}
-
-// .vault_vault {
-//    padding: 0.5rem;
-//    border-bottom: solid 1px var(--card-border-color);
-// }
-
-// .vault_vault:hover {
-//    background: var(--nav-hover-back-color);
-// }
-
-// .vault_vault>svg {
-//    height: 2rem;
-//    margin-right: 1rem;
-// }
-
-// .vault_vault:last-child {
-//    border-bottom: none;
-// }

src/components/routes/vaults/vaults.scss

@@ -1,23 +0,0 @@
-@import "../../../vars.scss";
-
-.vaults_vault {
-   padding: 0.5rem;
-   margin-top: 0 !important;
-
-   // >span {
-   //    font-size: 2rem !important;
-   // }
-
-   // &:not(:last-child) { 
-   //    border-bottom: 1px $border_color solid;
-   // }
-
-   >svg {
-      height: 2rem;
-      margin-right: 1rem;
-   }
-
-   &:hover {
-      background: $hover-background;
-   }
-}

src/helper/indexeddb.ts

@@ -1,14 +1,12 @@
 import { Lock } from "@hibas123/utils";
 
-import { DB, openDb, Transaction } from "idb";
+import { openDB, IDBPDatabase, IDBPTransaction, } from "idb";
 
 export default class IDB {
    initLock = new Lock();
-   db: DB;
+   db: IDBPDatabase;
    constructor(database: string, private stores: string[]) {
-      let lock = this.initLock.getLock();
+      this.initLock.getLock().then(async l => {
-      lock.then(async l => {
-
          let v = localStorage.getItem(database + "_version");
          let version = 0;
          if (v) version = Number(v)
@@ -21,12 +19,15 @@ export default class IDB {
          localStorage.setItem(database + "_version", version.toString());
          localStorage.setItem(database + "_stores", stores.join(","));
 
-         this.db = await openDb(database, version, db => {
+         this.db = await openDB(database, version, {
-            console.log("IndexedDB need update")
+            upgrade: (db) => {
-            stores.forEach(store => {
+               console.log("IndexedDB need update")
-               if (!db.objectStoreNames.contains(store))
+               const check = name => (<any>db.objectStoreNames as DOMStringList).contains ? (<any>db.objectStoreNames as DOMStringList).contains(name) : db.objectStoreNames.find(e => e === name);
-                  db.createObjectStore(store);
+               stores.forEach(store => {
-            })
+                  if (!check(store))
+                     db.createObjectStore(store);
+               })
+            },
          })
          console.log("Got DATABASE", this.db)
          l.release();
@@ -48,42 +49,42 @@ export default class IDB {
       return {
          name: name,
          transaction: () => {
-            return this.db.transaction(name, "readwrite")
+            return <any>this.db.transaction(name, "readwrite") as IDBPTransaction<unknown, string[]>;
          },
-         get: async (key: string, transaction?: Transaction): Promise<T> => {
+         get: async (key: string, transaction?: IDBPTransaction<unknown, string[]>): Promise<T> => {
             (await this.initLock.getLock()).release()
             return (transaction || this.db.transaction(name))
                .objectStore(name).get(key);
          },
 
-         getAll: async (transaction?: Transaction): Promise<T[]> => {
+         getAll: async (transaction?: IDBPTransaction<unknown, string[]>): Promise<T[]> => {
             (await this.initLock.getLock()).release()
             return (transaction || this.db.transaction(name))
                .objectStore(name).getAll();
          },
 
-         set: async (key: string, val: T, transaction?: Transaction) => {
+         set: async (key: string, val: T, transaction?: IDBPTransaction<unknown, string[]>) => {
             (await this.initLock.getLock()).release()
             const tx = (transaction || this.db.transaction(name, "readwrite"));
             tx.objectStore(name).put(val, key);
-            return tx.complete;
+            return tx.done;
          },
 
-         delete: async (key: string, transaction?: Transaction) => {
+         delete: async (key: string, transaction?: IDBPTransaction<unknown, string[]>) => {
             (await this.initLock.getLock()).release()
             const tx = (transaction || this.db.transaction(name, "readwrite"));
             tx.objectStore(name).delete(key);
-            return tx.complete;
+            return tx.done;
          },
 
-         clear: async (transaction?: Transaction) => {
+         clear: async (transaction?: IDBPTransaction<unknown, string[]>) => {
             (await this.initLock.getLock()).release()
             const tx = (transaction || this.db.transaction(name, "readwrite"));
             tx.objectStore(name).clear();
-            return tx.complete;
+            return tx.done;
          },
 
-         keys: async (transaction?: Transaction): Promise<string[]> => {
+         keys: async (transaction?: IDBPTransaction<unknown, string[]>): Promise<string[]> => {
             (await this.initLock.getLock()).release()
             const tx = (transaction || this.db.transaction(name));
             const keys: string[] = [];
@@ -91,13 +92,15 @@ export default class IDB {
 
             // This would be store.getAllKeys(), but it isn't supported by Edge or Safari.
             // openKeyCursor isn't supported by Safari, so we fall back
-            (store.iterateKeyCursor || store.iterateCursor).call(store, (cursor: any) => {
+            store.getAllKeys()
-               if (!cursor) return;
-               keys.push(cursor.key);
-               cursor.continue();
-            });
 
-            return tx.complete.then(() => keys);
+            // (store.iterateKeyCursor || store.iterateCursor).call(store, (cursor: any) => {
+            //    if (!cursor) return;
+            //    keys.push(cursor.key);
+            //    cursor.continue();
+            // });
+
+            return tx.done.then(() => keys);
          }
       }
    }

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

@@ -1,25 +1,16 @@
 @import "./vars.scss";
 
-* {
-   margin: 0;
-   padding: 0;
-   box-sizing: border-box;
-}
-
 body {
-   font-family: 'Roboto', sans-serif; // font-family: Verdana, Geneva, sans-serif;
+   overscroll-behavior-y: contain;
-   font-size: 18px;
-   width: 100%;
-   height: 100%;
 }
 
-html {
+// html {
-   min-height: 100%;
+//    min-height: 100%;
-   display: flex;
+//    display: flex;
-}
+// }
 
 $header-margin: .5em;
-$header-icon-size: calc(1.5rem * 1);
+// $header-icon-size: calc(1.5rem * 1);
 // $header-icon-size: 100%;
 
 header {
@@ -51,16 +42,21 @@ header {
       display: block;
       margin-top: 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 {
+  overscroll-behavior-y: contain;
+}
+
 .def-shadow {
    box-shadow: 0px 5px 8px 2px rgba(66, 66, 66, 0.53);
 }

src/index.tsx

@@ -64,22 +64,31 @@ import { h, render } from 'preact';
 import App from './components/App';
 
 
-import "uikit";
+// import "uikit";
-import "uikit/dist/css/uikit.css"
+// import "uikit/dist/css/uikit.css"
+import "@hibas123/theme/out/base.css"
+// import "@hibas123/theme/out/light.css"
+// import "@hibas123/theme/out/dark.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 './Views/Settings/Settings';
 window.debug.notes = Notes;
 
+
+import Theme from "./theme";
+
+console.log("Dark mode:", Theme.active);
+
 (async () => {
    // Initialize notes provider
    if (Notes.loginRequired()) {
@@ -90,21 +99,30 @@ window.debug.notes = Notes;
          let err = await Notes.getToken(code)
          if (err) {
             Notifications.sendError("Login failed: " + err)
-            Notes.login()
+            return Notes.login()
          } else {
             window.history.replaceState(null, document.title, "/" + window.location.hash);
          }
       } else {
-         Notes.login()
+         return Notes.login()
       }
    }
 
    await Notes.start();
 
+   if (window.navigator.storage && navigator.storage.persist) {
+      navigator.storage.persisted()
+         .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("/demo", DemoPage as typeof Page)
    Navigation.addPage("/share", SharePage as typeof Page)
+   Navigation.addPage("/settings", SettingsPage as typeof Page)
    Navigation.addPage("/404", Error404Page);
    const trad = window.location.pathname;
    if (trad && trad !== "/" && trad !== "") {

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

@@ -1,8 +1,14 @@
-import * as config from "../config.json"
-import { Lock, Observable } from "@hibas123/utils"
-
 import SecureFile, { IFile } from "@hibas123/secure-file-wrapper";
-import * as b64 from "./helper/base64"
+import { Lock, Observable } from "@hibas123/utils";
+import * as aesjs from "aes-js";
+import { IDBPTransaction } from "idb";
+import { sha256 } from "js-sha256";
+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) {
@@ -32,13 +38,8 @@ export interface ViewNote extends BaseNote {
    __value: string;
 }
 
-import * as aesjs from "aes-js";
-import { sha256 } from "js-sha256"
 import clonedeep = require("lodash.clonedeep");
-import * as uuidv4 from "uuid/v4"
+import uuid = require("uuid");
-import IDB from "./helper/indexeddb";
-import { Transaction } from "idb";
-import Notifications, { MessageType } from "./notifications";
 
 const Encoder = new TextEncoder();
 const Decoder = new TextDecoder();
@@ -81,6 +82,7 @@ export interface IVault {
    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) => new Promise<void>(resolve => setTimeout(resolve, ms));
@@ -420,6 +422,7 @@ class NotesProvider {
    }
 
    public async createVault(name: string, key?: Uint8Array) {
+      // console.log(uuidv4, uuid);
       let vault: DBNote = {
          __value: this.encrypt("__BASELINE__", key),
          _id: uuidv4(),
@@ -480,7 +483,7 @@ class NotesProvider {
       return Decoder.decode(this._decrypt(msg, this.generalEncryption))
    }
 
-   async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: Transaction) {
+   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 };

src/serviceworker.ts

@@ -27,19 +27,9 @@ self.addEventListener('activate', (event) => {
 });
 
 self.addEventListener('message', (event) => {
-    if (event.data === "clear_cache") {
+    log("Clearing cache");
-        log("Clearing cache");
+    caches.delete(CACHE);
-        caches.delete(CACHE);
+    event.waitUntil(precache());
-    }
-
-    if (event.data === "update_index") {
-        log("Updating index");
-        event.waitUntil(caches.open(CACHE).then((cache) => {
-            return cache.addAll(["/", "/index.html"]).then(() => {
-                event.ports[0].postMessage("reload");
-            });
-        }))
-    }
 });
 
 var Types;

src/theme.ts

@@ -0,0 +1,54 @@
+import { readFileSync } from "fs";
+
+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,
+    LIGHT,
+    DARK
+}
+
+let themeConfig: ThemeStates = Number(localStorage.getItem("theme"));
+if (Number.isNaN(themeConfig))
+    themeConfig = ThemeStates.AUTO;
+
+let isDark = false;
+let mediaIsDark = false;
+
+if (window.matchMedia) {
+    const mediaq = matchMedia("(prefers-color-scheme: dark)");
+    mediaIsDark = mediaq.matches;
+    mediaq.onchange = ev => {
+        mediaIsDark = ev.matches;
+        apply();
+    }
+    console.log(mediaq);
+}
+
+
+let styleElm: HTMLStyleElement;
+function apply(force?: boolean) {
+    let shouldDark = themeConfig === ThemeStates.AUTO ? mediaIsDark : themeConfig === ThemeStates.DARK;
+    if (force || shouldDark !== isDark) {
+        if (styleElm) styleElm.remove();
+        styleElm = document.createElement("style");
+        document.head.appendChild(styleElm);
+        styleElm.innerHTML = shouldDark ? dark : light;
+        isDark = shouldDark;
+    }
+}
+apply(true);
+
+
+function change(state: ThemeStates) {
+    themeConfig = state;
+    localStorage.setItem("theme", String(themeConfig));
+    apply();
+}
+
+export default {
+    active: () => themeConfig,
+    change: (state: ThemeStates) => change(state)
+}
+

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;
 }
 

src/vars.scss

@@ -1,21 +1,9 @@
 :root {
     --primary: #1E88E5;
+    --on-primary: white;
     // --mdc-theme-primary: var(--primary);
     // --mdc-theme-primary-bg: var(--mdc-theme--primary);
     // --mdc-theme-on-primary: white;
     --error: #ff2f00;
     --border-color: #ababab;
-    --default-font-size: 1.05rem;
 }
-
-.uk-button-primary {
-    background: var(--primary) !important;
-    color: white;
-}
-
-.uk-background-primary {
-    background: var(--primary) !important;
-    color: white;
-}
-
-$hover-background: #DDDDDD;

tsconfig.json

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

webpack.config.js

@@ -1,5 +1,4 @@
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const WorkboxPlugin = require("workbox-webpack-plugin");
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;