Small improvements:
- Switch to CodeMirror - Switch to Parcel Bundler - Fix synchronisation bug - Update dependencies
This commit is contained in:
Fabian Stamm
parent
e873ae0396
commit
86ae6acc92
|
|
@ -0,0 +1,9 @@
|
|||
https://notes.dev.hibas123.de:443 {
|
||||
proxy / localhost:1234/
|
||||
tls D:\Certs\_wildcard.dev.hibas123.de.pem D:\Certs\_wildcard.dev.hibas123.de-key.pem
|
||||
}
|
||||
|
||||
https://sf.dev.hibas123.de:443 {
|
||||
proxy / localhost:3004/
|
||||
tls D:\Certs\_wildcard.dev.hibas123.de.pem D:\Certs\_wildcard.dev.hibas123.de-key.pem
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
48
package.json
48
package.json
|
|
@ -4,48 +4,34 @@
|
|||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"build": "webpack --mode=production",
|
||||
"watch": "webpack --mode=development --watch",
|
||||
"start": "webpack-dev-server --mode=production",
|
||||
"start:prod": "webpack-dev-server --mode=production",
|
||||
"start:dev": "webpack-dev-server --mode=development"
|
||||
"build": "parcel build src/index.html",
|
||||
"dev": "parcel src/index.html"
|
||||
},
|
||||
"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/utils": "^2.1.0",
|
||||
"@hibas123/utils": "^2.2.17",
|
||||
"aes-js": "^3.1.2",
|
||||
"feather-icons": "^4.22.1",
|
||||
"idb": "^4.0.3",
|
||||
"codemirror": "^5.58.3",
|
||||
"feather-icons": "^4.28.0",
|
||||
"idb": "^5.0.7",
|
||||
"js-sha256": "^0.9.0",
|
||||
"lodash.clonedeep": "^4.5.0",
|
||||
"parcel": "^1.12.4",
|
||||
"preact": "^10.5.7",
|
||||
"preact-feather": "^4.1.0",
|
||||
"secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
|
||||
"uuid": "^3.3.2"
|
||||
"uuid": "^8.3.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/codemirror": "0.0.99",
|
||||
"@types/lodash.clonedeep": "^4.5.6",
|
||||
"@types/uikit": "^2.27.7",
|
||||
"@types/uuid": "^3.4.5",
|
||||
"copy-webpack-plugin": "^5.0.3",
|
||||
"css-loader": "^3.0.0",
|
||||
"file-loader": "^4.0.0",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"mini-css-extract-plugin": "^0.7.0",
|
||||
"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"
|
||||
"@types/uuid": "^8.3.0",
|
||||
"typescript": "^4.1.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
{
|
||||
"short_name": "Secure Notes",
|
||||
"name": "Secure Notes",
|
||||
"decription": "A place to store your notes securly",
|
||||
"share_target": {
|
||||
"action": "/share",
|
||||
"method": "GET",
|
||||
"enctype": "application/x-www-form-urlencoded",
|
||||
"params": {
|
||||
"title": "title",
|
||||
"text": "text",
|
||||
"url": "url"
|
||||
}
|
||||
},
|
||||
"icons": [{
|
||||
"src": "notepad16.png",
|
||||
"sizes": "16x16",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "notepad24.png",
|
||||
"sizes": "24x24",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "notepad32.png",
|
||||
"sizes": "32x32",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "notepad64.png",
|
||||
"sizes": "64x64",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "notepad128.png",
|
||||
"sizes": "128x128",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "notepad256.png",
|
||||
"sizes": "256x256",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "notepad512.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
}
|
||||
],
|
||||
"start_url": "/",
|
||||
"display": "standalone",
|
||||
"theme_color": "#1E88E5",
|
||||
"background_color": "#ffffff"
|
||||
}
|
||||
|
|
@ -1,121 +0,0 @@
|
|||
function log(...params) {
|
||||
console.log.apply(this, [...["%c[SW]: %c", "color: #f4b942;", "color:unset;"], ...params])
|
||||
}
|
||||
|
||||
const CACHE = "offline";
|
||||
|
||||
let precacheFiles = [
|
||||
"/",
|
||||
"/index.html",
|
||||
"/main.js",
|
||||
"/main.css",
|
||||
"/serviceworker.js"
|
||||
]
|
||||
|
||||
//Install stage sets up the cache-array to configure pre-cache content
|
||||
self.addEventListener('install', (evt) => {
|
||||
log('The service worker is being installed.');
|
||||
evt.waitUntil(precache().then(() => {
|
||||
log('Skip waiting on install');
|
||||
}).catch(log).then(() => self.skipWaiting()));
|
||||
});
|
||||
|
||||
//allow sw to control of current page
|
||||
self.addEventListener('activate', (event) => {
|
||||
log('Claiming clients for current page');
|
||||
return self.clients.claim();
|
||||
});
|
||||
|
||||
self.addEventListener('message', (event) => {
|
||||
log("Clearing cache");
|
||||
caches.delete(CACHE);
|
||||
event.waitUntil(precache());
|
||||
});
|
||||
|
||||
var Types;
|
||||
(function (Types) {
|
||||
Types[Types["CACHE"] = 0] = "CACHE";
|
||||
Types[Types["NOCACHE"] = 1] = "NOCACHE";
|
||||
Types[Types["REFRESH"] = 2] = "REFRESH";
|
||||
Types[Types["INDEX"] = 3] = "INDEX";
|
||||
})(Types || (Types = {}));
|
||||
|
||||
let rules = [{
|
||||
match: (url) => {
|
||||
return url.indexOf("/api/") >= 0;
|
||||
},
|
||||
type: Types.NOCACHE
|
||||
}, {
|
||||
match: (url) => {
|
||||
return url.indexOf("/share") >= 0;
|
||||
},
|
||||
type: Types.INDEX
|
||||
},
|
||||
{
|
||||
match: () => {
|
||||
return true;
|
||||
},
|
||||
type: Types.REFRESH
|
||||
}
|
||||
]
|
||||
|
||||
self.addEventListener('fetch', (evt) => {
|
||||
if (evt.request.method != 'GET') return; // Dont care about POST requests
|
||||
let rule = rules.find(rule => rule.match(evt.request.url));
|
||||
evt.respondWith((async () => {
|
||||
log("Cache:", Types[rule.type]);
|
||||
switch (rule.type) {
|
||||
case Types.CACHE:
|
||||
return fromCache(evt.request);
|
||||
case Types.REFRESH:
|
||||
return refresh(evt.request).then(r => {
|
||||
evt.waitUntil(r.refresh.catch(_ => {}));
|
||||
return r.result;
|
||||
});
|
||||
case Types.NOCACHE:
|
||||
return fetch(evt.request);
|
||||
case Types.INDEX:
|
||||
return refresh(new Request("/")).then(r => {
|
||||
evt.waitUntil(r.refresh.catch(_ => {}));
|
||||
return r.result;
|
||||
})
|
||||
}
|
||||
})());
|
||||
});
|
||||
|
||||
async function fromCache(request) {
|
||||
let cache = await caches.open(CACHE);
|
||||
let matching = await cache.match(request);
|
||||
if (matching)
|
||||
return matching
|
||||
|
||||
let res = await fetch(request.clone());
|
||||
await cache.put(request, {
|
||||
match: (url) => {
|
||||
return url.indexOf("/version_hash") >= 0;
|
||||
},
|
||||
type: Types.NOCACHE
|
||||
}, res);
|
||||
return await cache.match(request);
|
||||
}
|
||||
|
||||
async function refresh(request) {
|
||||
let cache = await caches.open(CACHE);
|
||||
let web = fetch(request.clone()).then(res => {
|
||||
return cache.put(request, res).then(() => {
|
||||
return cache.match(request);
|
||||
})
|
||||
})
|
||||
let matching = await cache.match(request);
|
||||
|
||||
return {
|
||||
result: matching ? matching : web,
|
||||
refresh: web
|
||||
}
|
||||
}
|
||||
|
||||
function precache() {
|
||||
return caches.open(CACHE).then(function (cache) {
|
||||
return cache.addAll(precacheFiles);
|
||||
});
|
||||
}
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
import { h } from "preact";
|
||||
import "./add_button.scss";
|
||||
import Plus from "feather-icons/dist/icons/plus.svg";
|
||||
import { Plus } from "preact-feather";
|
||||
export default function AddButton({ onClick }: { onClick: () => void }) {
|
||||
return <button
|
||||
title="add button"
|
||||
class="fab btn-primary"
|
||||
onClick={() => onClick()}
|
||||
>
|
||||
<Plus width={undefined} height={undefined} />
|
||||
</button>
|
||||
}
|
||||
return (
|
||||
<button
|
||||
title="add button"
|
||||
class="fab btn-primary"
|
||||
onClick={() => onClick()}
|
||||
>
|
||||
<Plus width={undefined} height={undefined} />
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
.CodeMirror {
|
||||
height: auto;
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
import { h } from "preact";
|
||||
import { useEffect, useRef } from "preact/hooks";
|
||||
|
||||
import * as CM from "codemirror";
|
||||
import "codemirror/lib/codemirror.css";
|
||||
import "codemirror/theme/base16-dark.css";
|
||||
|
||||
import "./CodeMirror.scss";
|
||||
import Theme from "../theme";
|
||||
|
||||
interface ICodeMirrorProps {
|
||||
value: string;
|
||||
onChange: (value: string) => void;
|
||||
onSave?: (value: string) => void;
|
||||
onClose?: () => void;
|
||||
}
|
||||
|
||||
export default function CodeMirror(props: ICodeMirrorProps) {
|
||||
const ref = useRef<HTMLTextAreaElement>();
|
||||
useEffect(() => {
|
||||
const instance = CM.fromTextArea(ref.current, {
|
||||
value: props.value,
|
||||
mode: "markdown",
|
||||
lineNumbers: true,
|
||||
lineWrapping: true,
|
||||
theme: Theme.isDark.value ? "base16-dark" : "default",
|
||||
viewportMargin: Infinity,
|
||||
// extraKeys: {
|
||||
// "Ctrl-S": (cm) => {
|
||||
// const val = cm.getValue();
|
||||
// props?.onSave(val);
|
||||
// },
|
||||
// Esc: props.onClose,
|
||||
// },
|
||||
});
|
||||
|
||||
if (props.value) instance.setValue(props.value);
|
||||
|
||||
instance.on("change", () => props?.onChange(instance.getValue()));
|
||||
|
||||
return () => {};
|
||||
}, [ref]);
|
||||
return <textarea ref={ref}></textarea>;
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import { h, Component } from "preact";
|
||||
import Notes from "../notes";
|
||||
import Refresh from "feather-icons/dist/icons/refresh-cw.svg";
|
||||
import { RefreshCw as Refresh } from "preact-feather";
|
||||
import "./footer.scss";
|
||||
import Notifications from "../notifications";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
import { Observable } from "@hibas123/utils";
|
||||
import { h, Component } from "preact";
|
||||
import CloseIcon from "feather-icons/dist/icons/x.svg";
|
||||
import { X } from "preact-feather";
|
||||
|
||||
export default abstract class Modal<T> {
|
||||
// Static
|
||||
private static modalObservableServer = new Observable<{ modal: Modal<any>, close: boolean }>();
|
||||
private static modalObservableServer = new Observable<{
|
||||
modal: Modal<any>;
|
||||
close: boolean;
|
||||
}>();
|
||||
public static modalObservable = Modal.modalObservableServer.getPublicApi();
|
||||
|
||||
|
||||
protected abstract title: string;
|
||||
|
||||
// Private
|
||||
|
|
@ -17,10 +19,8 @@ export default abstract class Modal<T> {
|
|||
|
||||
// Protected
|
||||
protected result(value: T | null) {
|
||||
if (this.closeOnResult)
|
||||
this.close()
|
||||
if (this.onResult)
|
||||
this.onResult(value);
|
||||
if (this.closeOnResult) this.close();
|
||||
if (this.onResult) this.onResult(value);
|
||||
}
|
||||
|
||||
//Public
|
||||
|
|
@ -35,13 +35,13 @@ export default abstract class Modal<T> {
|
|||
|
||||
/**
|
||||
* Shows the modal and waits for result.
|
||||
*
|
||||
*
|
||||
* Call close when successful
|
||||
*/
|
||||
public async getResult(close = true) {
|
||||
this.closeOnResult = close;
|
||||
this.show(false);
|
||||
return new Promise<T | null>((yes) => this.onResult = yes);
|
||||
return new Promise<T | null>((yes) => (this.onResult = yes));
|
||||
}
|
||||
|
||||
public close() {
|
||||
|
|
@ -50,52 +50,68 @@ export default abstract class Modal<T> {
|
|||
|
||||
public abstract getComponent(): JSX.Element;
|
||||
|
||||
public static BaseModal = class BaseModal<T> extends Component<{ modal: Modal<T> }, {}> {
|
||||
public static BaseModal = class BaseModal<T> extends Component<
|
||||
{ modal: Modal<T> },
|
||||
{}
|
||||
> {
|
||||
render() {
|
||||
return <div class="modal-container" onClick={(evt) => {
|
||||
let path = evt.composedPath();
|
||||
if (!path.find(e => {
|
||||
let s = (e as Element);
|
||||
return s.id === "ModalContent";
|
||||
})) {
|
||||
this.props.modal.result(null)
|
||||
}
|
||||
}} onKeyDown={evt => {
|
||||
if (evt.keyCode === 27) {
|
||||
this.props.modal.result(null)
|
||||
}
|
||||
}}>
|
||||
<div id="ModalContent" class="modal" >
|
||||
<div class="modal-title" style="">
|
||||
<h3>{this.props.modal.title}</h3>
|
||||
{/* <div> */}
|
||||
{!this.props.modal.noClose ?
|
||||
<CloseIcon onClick={() => this.props.modal.result(null)} width={undefined} height={undefined} />
|
||||
: undefined
|
||||
return (
|
||||
<div
|
||||
class="modal-container"
|
||||
onClick={(evt) => {
|
||||
let path = evt.composedPath();
|
||||
if (
|
||||
!path.find((e) => {
|
||||
let s = e as Element;
|
||||
return s.id === "ModalContent";
|
||||
})
|
||||
) {
|
||||
this.props.modal.result(null);
|
||||
}
|
||||
{/* </div> */}
|
||||
}}
|
||||
onKeyDown={(evt) => {
|
||||
if (evt.keyCode === 27) {
|
||||
this.props.modal.result(null);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div id="ModalContent" class="modal">
|
||||
<div class="modal-title" style="">
|
||||
<h3>{this.props.modal.title}</h3>
|
||||
{/* <div> */}
|
||||
{!this.props.modal.noClose ? (
|
||||
<X
|
||||
onClick={() => this.props.modal.result(null)}
|
||||
width={undefined}
|
||||
height={undefined}
|
||||
/>
|
||||
) : undefined}
|
||||
{/* </div> */}
|
||||
</div>
|
||||
{this.props.children}
|
||||
</div>
|
||||
{this.props.children}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
export class ModalComponent extends Component<{}, { modal: Modal<any> | undefined, component: JSX.Element | undefined }>{
|
||||
export class ModalComponent extends Component<
|
||||
{},
|
||||
{ modal: Modal<any> | undefined; component: JSX.Element | undefined }
|
||||
> {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.onModal = this.onModal.bind(this);
|
||||
}
|
||||
|
||||
onModal({ modal, close }: { modal: Modal<any>, close: boolean }) {
|
||||
onModal({ modal, close }: { modal: Modal<any>; close: boolean }) {
|
||||
if (!close && this.state.modal !== modal) {
|
||||
this.setState({ modal: modal, component: modal.getComponent() })
|
||||
}
|
||||
else {
|
||||
if (this.state.modal === modal && close) // Only close if the same
|
||||
this.setState({ modal: undefined, component: undefined })
|
||||
this.setState({ modal: modal, component: modal.getComponent() });
|
||||
} else {
|
||||
if (this.state.modal === modal && close)
|
||||
// Only close if the same
|
||||
this.setState({ modal: undefined, component: undefined });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -108,8 +124,6 @@ export class ModalComponent extends Component<{}, { modal: Modal<any> | undefine
|
|||
}
|
||||
|
||||
render() {
|
||||
return <div>
|
||||
{this.state.component}
|
||||
</div>
|
||||
return <div>{this.state.component}</div>;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,36 +2,71 @@ import { h } from "preact";
|
|||
import { Page } from "../../../page";
|
||||
import Theme, { ThemeStates } from "../../../theme";
|
||||
import Navigation from "../../../navigation";
|
||||
import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg";
|
||||
import { ArrowLeft } from "preact-feather";
|
||||
|
||||
export default class SettingsPage extends Page<{ state: any }, { vault: string }> {
|
||||
componentWillMount() {
|
||||
export default class SettingsPage extends Page<
|
||||
{ state: any },
|
||||
{ vault: string }
|
||||
> {
|
||||
componentWillMount() {}
|
||||
|
||||
}
|
||||
|
||||
render() {
|
||||
let active = Theme.active();
|
||||
return <div>
|
||||
render() {
|
||||
let active = Theme.active();
|
||||
return (
|
||||
<div>
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
|
||||
<h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>Settings</h3>
|
||||
<span></span>
|
||||
<a class="header-icon-button" onClick={() => history.back()}>
|
||||
<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>
|
||||
<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>
|
||||
</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 >;
|
||||
}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,209 @@
|
|||
import { h, Component } from "preact";
|
||||
import { IVault, ViewNote } from "../../../notes";
|
||||
import { Trash2 as Trash, X, Save } from "preact-feather";
|
||||
|
||||
import Navigation from "../../../navigation";
|
||||
import { YesNoModal } from "../../modals/YesNoModal";
|
||||
import Notifications, { MessageType } from "../../../notifications";
|
||||
|
||||
const minRows = 3;
|
||||
export default class EntryComponent extends Component<
|
||||
{ vault: Promise<IVault>; id: string | undefined; note: string | undefined },
|
||||
{ title: string; changed: boolean }
|
||||
> {
|
||||
private text: string = "";
|
||||
private vault: IVault;
|
||||
// private lineHeight: number = 24;
|
||||
private note: ViewNote;
|
||||
|
||||
private rows: number = minRows;
|
||||
|
||||
private skip_save: boolean = false;
|
||||
|
||||
private inputElm: HTMLInputElement;
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = { changed: false, title: "" };
|
||||
this.textAreaChange = this.textAreaChange.bind(this);
|
||||
this.textAreaKeyPress = this.textAreaKeyPress.bind(this);
|
||||
}
|
||||
|
||||
private toVault() {
|
||||
history.back();
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.inputElm.focus();
|
||||
}
|
||||
|
||||
async componentWillMount() {
|
||||
this.text = "";
|
||||
this.vault = undefined;
|
||||
this.note = undefined;
|
||||
this.rows = minRows;
|
||||
this.skip_save = false;
|
||||
this.setState({ changed: false, title: "" });
|
||||
try {
|
||||
this.skip_save = false;
|
||||
|
||||
this.vault = await this.props.vault;
|
||||
let note: ViewNote;
|
||||
let changed = false;
|
||||
if (this.props.id) note = await this.vault.getNote(this.props.id);
|
||||
else {
|
||||
note = this.vault.newNote();
|
||||
if (this.props.note) {
|
||||
note.__value = this.props.note;
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!note) {
|
||||
Notifications.sendNotification(
|
||||
"Note not found!",
|
||||
MessageType.ERROR
|
||||
);
|
||||
} else {
|
||||
this.note = note;
|
||||
this.text = note.__value;
|
||||
let rows = this.getRows(this.text);
|
||||
if (rows !== this.rows) {
|
||||
this.rows = rows;
|
||||
}
|
||||
let [title] = this.text.split("\n", 1);
|
||||
this.setState({ title, changed });
|
||||
}
|
||||
} catch (err) {
|
||||
Notifications.sendError(err);
|
||||
}
|
||||
}
|
||||
|
||||
private async save() {
|
||||
try {
|
||||
if (this.state.changed) {
|
||||
this.note.__value = this.text;
|
||||
await this.vault.saveNote(this.note);
|
||||
this.setState({ changed: false });
|
||||
}
|
||||
} catch (err) {
|
||||
Notifications.sendError(err);
|
||||
}
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
if (!this.skip_save) this.save();
|
||||
}
|
||||
|
||||
strToNr(value: string) {
|
||||
let match = value.match(/\d/g);
|
||||
return Number(match.join(""));
|
||||
}
|
||||
|
||||
getRows(value: string) {
|
||||
const lines = (value.match(/\r?\n/g) || "").length + 1;
|
||||
return Math.max(lines + 1, minRows);
|
||||
}
|
||||
|
||||
textAreaChange(evt: KeyboardEvent) {
|
||||
if (evt.keyCode === 17 || evt.keyCode === 27) return; //No character, so not relevant for this function
|
||||
if (!this.state.changed && this.textAreaKeyPress(evt))
|
||||
this.setState({ changed: true });
|
||||
|
||||
let target = evt.target as HTMLTextAreaElement;
|
||||
let value = target.value;
|
||||
|
||||
this.text = value;
|
||||
|
||||
let [title] = value.split("\n", 1);
|
||||
if (title !== this.state.title) this.setState({ title });
|
||||
|
||||
let rows = this.getRows(value);
|
||||
if (rows !== this.rows) {
|
||||
target.rows = rows;
|
||||
this.rows = rows;
|
||||
}
|
||||
}
|
||||
|
||||
async exitHandler() {
|
||||
if (this.state.changed) {
|
||||
let modal = new YesNoModal("Really want to quit?");
|
||||
let res = await modal.getResult();
|
||||
if (res === true) {
|
||||
this.skip_save = true;
|
||||
this.toVault();
|
||||
}
|
||||
} else this.toVault();
|
||||
}
|
||||
|
||||
textAreaKeyPress(evt: KeyboardEvent) {
|
||||
console.log(evt);
|
||||
if ((evt.keyCode === 83 || evt.keyCode === 13) && evt.ctrlKey) {
|
||||
evt.preventDefault();
|
||||
this.save();
|
||||
return false;
|
||||
} else if (evt.keyCode === 27) {
|
||||
evt.preventDefault();
|
||||
this.exitHandler();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
render() {
|
||||
const save_handler = async () => {
|
||||
await this.save();
|
||||
Navigation.setPage(
|
||||
"/vault",
|
||||
{ id: this.vault.id },
|
||||
{ entry: "false" },
|
||||
true
|
||||
);
|
||||
this.toVault();
|
||||
};
|
||||
|
||||
const delete_handler = async () => {
|
||||
await this.vault.deleteNote(this.props.id);
|
||||
this.toVault();
|
||||
};
|
||||
|
||||
console.log("Rerender");
|
||||
|
||||
return (
|
||||
<div>
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => this.exitHandler()}>
|
||||
<X height={undefined} width={undefined} />
|
||||
</a>
|
||||
{this.state.changed ? (
|
||||
<a
|
||||
class="header-icon-button"
|
||||
style="margin-left: 0.5em;"
|
||||
onClick={() => save_handler()}
|
||||
>
|
||||
<Save height={undefined} width={undefined} />
|
||||
</a>
|
||||
) : undefined}
|
||||
<h3 style="display:inline" class="button header-title">
|
||||
{this.state.title}
|
||||
</h3>
|
||||
<a class="header-icon-button" onClick={() => delete_handler()}>
|
||||
<Trash height={undefined} width={undefined} />
|
||||
</a>
|
||||
</header>
|
||||
<div class="container">
|
||||
<textarea
|
||||
value={this.text}
|
||||
rows={this.rows}
|
||||
class="inp"
|
||||
style="width:100%;"
|
||||
onInput={this.textAreaChange}
|
||||
onKeyDown={this.textAreaKeyPress}
|
||||
onChange={this.textAreaChange}
|
||||
ref={(elm) => (this.inputElm = elm)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,188 +1,132 @@
|
|||
import { h, Component } from "preact"
|
||||
import { h, Component } from "preact";
|
||||
import { IVault, ViewNote } from "../../../notes";
|
||||
import Trash from "feather-icons/dist/icons/trash-2.svg"
|
||||
import X from "feather-icons/dist/icons/x.svg"
|
||||
import Save from "feather-icons/dist/icons/save.svg"
|
||||
import { Trash2 as Trash, X, Save } from "preact-feather";
|
||||
|
||||
import Navigation from "../../../navigation";
|
||||
import { YesNoModal } from "../../modals/YesNoModal";
|
||||
import Notifications, { MessageType } from "../../../notifications";
|
||||
import CodeMirror from "../../CodeMirror";
|
||||
import { useEffect, useMemo, useState } from "preact/hooks";
|
||||
import { usePromise } from "../../../hooks";
|
||||
|
||||
const minRows = 3;
|
||||
export default class EntryComponent extends Component<{ vault: Promise<IVault>, id: string | undefined, note: string | undefined }, { title: string, changed: boolean }> {
|
||||
private text: string = "";
|
||||
private vault: IVault;
|
||||
// private lineHeight: number = 24;
|
||||
private note: ViewNote;
|
||||
interface IEntryProps {
|
||||
vault: IVault;
|
||||
id?: string;
|
||||
note?: string;
|
||||
}
|
||||
|
||||
private rows: number = minRows;
|
||||
export default function Entry(props: IEntryProps) {
|
||||
const [changed, setChanged] = useState(false);
|
||||
|
||||
private skip_save: boolean = false;
|
||||
const [text, setText] = useState("");
|
||||
const title = useMemo(() => text?.split("\n", 1)[0], [text]);
|
||||
|
||||
private inputElm: HTMLInputElement;
|
||||
const [loading, error, note] = usePromise(async () => {
|
||||
let note: ViewNote;
|
||||
if (props.id) {
|
||||
note = await props.vault.getNote(props.id);
|
||||
} else {
|
||||
note = props.vault.newNote();
|
||||
if (props.note) {
|
||||
note.__value = props.note;
|
||||
setChanged(true);
|
||||
}
|
||||
}
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = { changed: false, title: "" };
|
||||
this.textAreaChange = this.textAreaChange.bind(this);
|
||||
this.textAreaKeyPress = this.textAreaKeyPress.bind(this);
|
||||
}
|
||||
if (!note) {
|
||||
Notifications.sendNotification("Note not found!", MessageType.ERROR);
|
||||
history.back();
|
||||
} else {
|
||||
setText(note.__value);
|
||||
}
|
||||
|
||||
private toVault() {
|
||||
history.back();
|
||||
}
|
||||
return note;
|
||||
}, [props.vault, props.id]);
|
||||
|
||||
componentDidMount() {
|
||||
this.inputElm.focus();
|
||||
}
|
||||
|
||||
async componentWillMount() {
|
||||
this.text = "";
|
||||
this.vault = undefined;
|
||||
this.note = undefined;
|
||||
this.rows = minRows;
|
||||
this.skip_save = false;
|
||||
this.setState({ changed: false, title: "" });
|
||||
try {
|
||||
this.skip_save = false;
|
||||
|
||||
this.vault = await this.props.vault;
|
||||
let note: ViewNote;
|
||||
let changed = false;
|
||||
if (this.props.id)
|
||||
note = await this.vault.getNote(this.props.id)
|
||||
else {
|
||||
note = this.vault.newNote();
|
||||
if (this.props.note) {
|
||||
note.__value = this.props.note;
|
||||
changed = true;
|
||||
if (loading) {
|
||||
return <div>Loading entry</div>;
|
||||
} else {
|
||||
const save = async () => {
|
||||
try {
|
||||
if (changed) {
|
||||
note.__value = text;
|
||||
await props.vault.saveNote(note);
|
||||
setChanged(false);
|
||||
}
|
||||
} catch (err) {
|
||||
Notifications.sendError(err);
|
||||
}
|
||||
};
|
||||
|
||||
if (!note) {
|
||||
Notifications.sendNotification("Note not found!", MessageType.ERROR);
|
||||
} else {
|
||||
this.note = note;
|
||||
this.text = note.__value;
|
||||
let rows = this.getRows(this.text);
|
||||
if (rows !== this.rows) {
|
||||
this.rows = rows;
|
||||
const del = async () => {
|
||||
await props.vault.deleteNote(props.id);
|
||||
history.back();
|
||||
};
|
||||
|
||||
const close = async () => {
|
||||
if (changed) {
|
||||
let modal = new YesNoModal("Really want to quit?");
|
||||
let res = await modal.getResult();
|
||||
if (!res) return;
|
||||
}
|
||||
history.back();
|
||||
};
|
||||
|
||||
// TODO: Add warning on possibly unwanted exit
|
||||
useEffect(() => {
|
||||
const keyevent = (evt: KeyboardEvent) => {
|
||||
if (evt.key === "s" && evt.ctrlKey) {
|
||||
evt.preventDefault();
|
||||
save();
|
||||
return false;
|
||||
} else if (evt.key === "Escape") {
|
||||
evt.preventDefault();
|
||||
close();
|
||||
return false;
|
||||
}
|
||||
let [title] = this.text.split("\n", 1);
|
||||
this.setState({ title, changed })
|
||||
}
|
||||
} catch (err) {
|
||||
Notifications.sendError(err);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
private async save() {
|
||||
try {
|
||||
if (this.state.changed) {
|
||||
this.note.__value = this.text;
|
||||
await this.vault.saveNote(this.note);
|
||||
this.setState({ changed: false })
|
||||
}
|
||||
} catch (err) {
|
||||
Notifications.sendError(err);
|
||||
}
|
||||
}
|
||||
document.addEventListener("keydown", keyevent);
|
||||
return () => {
|
||||
document.removeEventListener("keydown", keyevent);
|
||||
};
|
||||
});
|
||||
|
||||
componentWillUnmount() {
|
||||
if (!this.skip_save)
|
||||
this.save()
|
||||
}
|
||||
|
||||
strToNr(value: string) {
|
||||
let match = value.match(/\d/g)
|
||||
return Number(match.join(""))
|
||||
}
|
||||
|
||||
getRows(value: string) {
|
||||
const lines = (value.match(/\r?\n/g) || '').length + 1
|
||||
return Math.max(lines + 1, minRows);
|
||||
}
|
||||
|
||||
textAreaChange(evt: KeyboardEvent) {
|
||||
if (evt.keyCode === 17 || evt.keyCode === 27) return; //No character, so not relevant for this function
|
||||
if (!this.state.changed && this.textAreaKeyPress(evt)) this.setState({ changed: true })
|
||||
|
||||
let target = (evt.target as HTMLTextAreaElement)
|
||||
let value = target.value;
|
||||
|
||||
this.text = value;
|
||||
|
||||
let [title] = value.split("\n", 1);
|
||||
if (title !== this.state.title)
|
||||
this.setState({ title });
|
||||
|
||||
let rows = this.getRows(value);
|
||||
if (rows !== this.rows) {
|
||||
target.rows = rows;
|
||||
this.rows = rows;
|
||||
}
|
||||
}
|
||||
|
||||
async exitHandler() {
|
||||
if (this.state.changed) {
|
||||
let modal = new YesNoModal("Really want to quit?");
|
||||
let res = await modal.getResult();
|
||||
if (res === true) {
|
||||
this.skip_save = true;
|
||||
this.toVault();
|
||||
}
|
||||
} else
|
||||
this.toVault()
|
||||
}
|
||||
|
||||
textAreaKeyPress(evt: KeyboardEvent) {
|
||||
console.log(evt);
|
||||
if ((evt.keyCode === 83 || evt.keyCode === 13) && evt.ctrlKey) {
|
||||
evt.preventDefault()
|
||||
this.save();
|
||||
return false;
|
||||
}
|
||||
else if (evt.keyCode === 27) {
|
||||
evt.preventDefault();
|
||||
this.exitHandler();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
render() {
|
||||
const save_handler = async () => {
|
||||
await this.save()
|
||||
Navigation.setPage("/vault", { id: this.vault.id }, { entry: "false" }, true);
|
||||
this.toVault()
|
||||
}
|
||||
|
||||
const delete_handler = async () => {
|
||||
await this.vault.deleteNote(this.props.id);
|
||||
this.toVault()
|
||||
}
|
||||
|
||||
console.log("Rerender")
|
||||
|
||||
return <div>
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
|
||||
{this.state.changed ? <a class="header-icon-button" style="margin-left: 0.5em;" onClick={() => save_handler()}><Save height={undefined} width={undefined} /></a> : undefined}
|
||||
<h3 style="display:inline" class="button header-title">{this.state.title}</h3>
|
||||
<a class="header-icon-button" onClick={() => delete_handler()}><Trash height={undefined} width={undefined} /></a>
|
||||
</header>
|
||||
<div class="container">
|
||||
<textarea
|
||||
value={this.text}
|
||||
rows={this.rows}
|
||||
class="inp"
|
||||
style="width:100%;"
|
||||
onInput={this.textAreaChange}
|
||||
onKeyDown={this.textAreaKeyPress}
|
||||
onChange={this.textAreaChange}
|
||||
ref={elm => this.inputElm = elm}
|
||||
/>
|
||||
return (
|
||||
<div>
|
||||
<header class="header" style="margin-bottom: 0;">
|
||||
<a class="header-icon-button" onClick={close}>
|
||||
<X height={undefined} width={undefined} />
|
||||
</a>
|
||||
{changed && (
|
||||
<a
|
||||
class="header-icon-button"
|
||||
style="margin-left: 0.5em;"
|
||||
onClick={save}
|
||||
>
|
||||
<Save height={undefined} width={undefined} />
|
||||
</a>
|
||||
)}
|
||||
<h3 style="display:inline" class="button header-title">
|
||||
{title}
|
||||
</h3>
|
||||
<a class="header-icon-button" onClick={del}>
|
||||
<Trash height={undefined} width={undefined} />
|
||||
</a>
|
||||
</header>
|
||||
<div class="container" style="padding: 0">
|
||||
<CodeMirror
|
||||
value={text}
|
||||
onChange={(value) => {
|
||||
setChanged(true);
|
||||
setText(value);
|
||||
}}
|
||||
// onSave={save}
|
||||
// onClose={close}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,25 @@
|
|||
import { h, Component } from "preact"
|
||||
import { h, Component } from "preact";
|
||||
import Notes, { IVault, BaseNote } from "../../../notes";
|
||||
import AddButton from "../../AddButton";
|
||||
import Navigation from "../../../navigation";
|
||||
import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg"
|
||||
import Search from "feather-icons/dist/icons/search.svg"
|
||||
import { ArrowLeft, Search } from "preact-feather";
|
||||
import ContextMenu from "../../context";
|
||||
import Notifications from "../../../notifications";
|
||||
import { Observable, Lock } from "@hibas123/utils";
|
||||
|
||||
|
||||
export default class EntryList extends Component<{ vault: Promise<IVault> }, { notes: BaseNote[], context: JSX.Element | undefined }> {
|
||||
export default class EntryList extends Component<
|
||||
{ vault: IVault },
|
||||
{ notes: BaseNote[]; context: h.JSX.Element | undefined }
|
||||
> {
|
||||
rawNotes: BaseNote[];
|
||||
|
||||
private searchObservableServer = new Observable<void>(1000);
|
||||
private searchObservable = this.searchObservableServer.getPublicApi();
|
||||
|
||||
constructor(props) {
|
||||
super(props)
|
||||
console.log("Creating new Instance of EntryList")
|
||||
this.state = { notes: [], context: undefined }
|
||||
super(props);
|
||||
console.log("Creating new Instance of EntryList");
|
||||
this.state = { notes: [], context: undefined };
|
||||
this.onDragOver = this.onDragOver.bind(this);
|
||||
this.onDrop = this.onDrop.bind(this);
|
||||
this.reloadNotes = this.reloadNotes.bind(this);
|
||||
|
|
@ -27,14 +28,13 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
vault: IVault;
|
||||
|
||||
async reloadNotes(s?: boolean) {
|
||||
if (s)
|
||||
return;
|
||||
if (s) return;
|
||||
this.rawNotes = await this.vault.getAllNotes();
|
||||
await this.applySearch(true);
|
||||
}
|
||||
|
||||
async componentWillMount() {
|
||||
this.vault = await this.props.vault;
|
||||
this.vault = this.props.vault;
|
||||
this.reloadNotes();
|
||||
document.body.addEventListener("dragover", this.onDragOver);
|
||||
document.body.addEventListener("drop", this.onDrop);
|
||||
|
|
@ -64,59 +64,74 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
const close = () => {
|
||||
document.documentElement.removeEventListener("click", close);
|
||||
this.setState({ context: undefined });
|
||||
}
|
||||
};
|
||||
document.documentElement.addEventListener("click", close);
|
||||
|
||||
|
||||
const shareNote = async () => {
|
||||
let nav = window.navigator as any;
|
||||
if (nav.share !== undefined) {
|
||||
let vnote = await this.vault.getNote(note._id);
|
||||
nav.share({ title: vnote.preview.split("\n")[0], text: vnote.__value })
|
||||
.then(() => console.log('Successful share'))
|
||||
.catch(error => {
|
||||
console.error('Error sharing:', error)
|
||||
Notifications.sendError(error)
|
||||
nav.share({
|
||||
title: vnote.preview.split("\n")[0],
|
||||
text: vnote.__value,
|
||||
})
|
||||
.then(() => console.log("Successful share"))
|
||||
.catch((error) => {
|
||||
console.error("Error sharing:", error);
|
||||
Notifications.sendError(error);
|
||||
});
|
||||
} else {
|
||||
Notifications.sendError("Sharing not possible on this device")
|
||||
Notifications.sendError("Sharing not possible on this device");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const deleteNote = async () => {
|
||||
this.vault.deleteNote(note._id).then(() => {
|
||||
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) });
|
||||
}).catch(err => {
|
||||
Notifications.sendError(err);
|
||||
})
|
||||
}
|
||||
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),
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
Notifications.sendError(err);
|
||||
});
|
||||
};
|
||||
|
||||
const copyNote = async () => {
|
||||
this.vault.getNote(note._id).then(note => {
|
||||
const el = document.createElement('textarea');
|
||||
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.execCommand("copy");
|
||||
document.body.removeChild(el);
|
||||
Notifications.sendSuccess("Copied");
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
let share;
|
||||
if ((window.navigator as any).share) {
|
||||
share = <button class="btn" onClick={shareNote}>
|
||||
share
|
||||
</button>
|
||||
share = (
|
||||
<button class="btn" onClick={shareNote}>
|
||||
share
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
let context = <ContextMenu event={evt} >
|
||||
{share}
|
||||
<button class="btn" onClick={deleteNote}>delete</button>
|
||||
<button class="btn" onClick={copyNote}>copy</button>
|
||||
</ContextMenu>
|
||||
let context = (
|
||||
<ContextMenu event={evt}>
|
||||
{share}
|
||||
<button class="btn" onClick={deleteNote}>
|
||||
delete
|
||||
</button>
|
||||
<button class="btn" onClick={copyNote}>
|
||||
copy
|
||||
</button>
|
||||
</ContextMenu>
|
||||
);
|
||||
|
||||
this.setState({ context });
|
||||
return false;
|
||||
|
|
@ -131,57 +146,69 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
if (item.kind === "file") {
|
||||
let file = item.getAsFile();
|
||||
if (file.type !== "application/json") {
|
||||
Notifications.sendError("Invalid File Type!!!")
|
||||
Notifications.sendError("Invalid File Type!!!");
|
||||
} else {
|
||||
try {
|
||||
let data = await new Promise<string>((yes, no) => {
|
||||
let fr = new FileReader()
|
||||
let fr = new FileReader();
|
||||
fr.onload = (ev) => {
|
||||
yes((ev.target as any).result);
|
||||
}
|
||||
};
|
||||
fr.onerror = no;
|
||||
fr.readAsText(file);
|
||||
})
|
||||
});
|
||||
let parsed = JSON.parse(data);
|
||||
let c = new Error("Could not parse!");
|
||||
let notes: { content: string, time: Date }[] = null;
|
||||
if (Array.isArray(parsed)) { // Could be from SecureNotes 1
|
||||
notes = parsed.map(elm => {
|
||||
if (typeof elm.message !== "string" || typeof elm.time !== "string") {
|
||||
let notes: { content: string; time: Date }[] = null;
|
||||
if (Array.isArray(parsed)) {
|
||||
// Could be from SecureNotes 1
|
||||
notes = parsed.map((elm) => {
|
||||
if (
|
||||
typeof elm.message !== "string" ||
|
||||
typeof elm.time !== "string"
|
||||
) {
|
||||
throw c;
|
||||
}
|
||||
|
||||
return {
|
||||
content: elm.message,
|
||||
time: new Date(elm.time)
|
||||
}
|
||||
})
|
||||
} else if (parsed.version) { // Could be from SecureNotes 2
|
||||
if (parsed.version === 1) { //Could be from SecureNotes 2 version 1
|
||||
notes = (parsed.notes as any[]).map(elm => {
|
||||
if (typeof elm.content !== "string" || typeof elm.time !== "string") {
|
||||
time: new Date(elm.time),
|
||||
};
|
||||
});
|
||||
} else if (parsed.version) {
|
||||
// Could be from SecureNotes 2
|
||||
if (parsed.version === 1) {
|
||||
//Could be from SecureNotes 2 version 1
|
||||
notes = (parsed.notes as any[]).map((elm) => {
|
||||
if (
|
||||
typeof elm.content !== "string" ||
|
||||
typeof elm.time !== "string"
|
||||
) {
|
||||
throw c;
|
||||
}
|
||||
return {
|
||||
content: elm.content,
|
||||
time: new Date(elm.time)
|
||||
}
|
||||
})
|
||||
time: new Date(elm.time),
|
||||
};
|
||||
});
|
||||
} else {
|
||||
throw c;
|
||||
}
|
||||
} else
|
||||
throw c;
|
||||
} else throw c;
|
||||
|
||||
await Promise.all(notes.map(n => {
|
||||
let note = this.vault.newNote();
|
||||
note.__value = n.content;
|
||||
return this.vault.saveNote(note, n.time);
|
||||
}));
|
||||
await Promise.all(
|
||||
notes.map((n) => {
|
||||
let note = this.vault.newNote();
|
||||
note.__value = n.content;
|
||||
return this.vault.saveNote(note, n.time);
|
||||
})
|
||||
);
|
||||
await this.reloadNotes();
|
||||
Notifications.sendSuccess(`Imported ${notes.length} notes!`);
|
||||
Notifications.sendSuccess(
|
||||
`Imported ${notes.length} notes!`
|
||||
);
|
||||
} catch (err) {
|
||||
Notifications.sendError("Cannot read File!")
|
||||
Notifications.sendError("Cannot read File!");
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
|
|
@ -198,8 +225,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
return;
|
||||
}
|
||||
|
||||
if (this.searchLock.locked)
|
||||
return;
|
||||
if (this.searchLock.locked) return;
|
||||
const lock = await this.searchLock.getLock();
|
||||
console.time("SearchOP");
|
||||
|
||||
|
|
@ -213,7 +239,7 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
return parts.every(function (el) {
|
||||
return note.preview.toLowerCase().indexOf(el) > -1;
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
let elements: BaseNote[];
|
||||
if (!force && this.oldSearch && search.startsWith(this.oldSearch)) {
|
||||
|
|
@ -222,29 +248,32 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
elements = [...this.rawNotes];
|
||||
}
|
||||
|
||||
|
||||
await new Promise(yes => {
|
||||
await new Promise((yes) => {
|
||||
const idle = () => {
|
||||
window.requestIdleCallback(deadline => {
|
||||
let invTR = deadline.timeRemaining() <= 0;
|
||||
while ((deadline.timeRemaining() > 0 || invTR) && elements.length > 0) {
|
||||
let element = elements.shift();
|
||||
if (match(element)) {
|
||||
notes.push(element);
|
||||
window.requestIdleCallback(
|
||||
(deadline) => {
|
||||
let invTR = deadline.timeRemaining() <= 0;
|
||||
while (
|
||||
(deadline.timeRemaining() > 0 || invTR) &&
|
||||
elements.length > 0
|
||||
) {
|
||||
let element = elements.shift();
|
||||
if (match(element)) {
|
||||
notes.push(element);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (elements.length > 0)
|
||||
idle();
|
||||
else
|
||||
yes();
|
||||
}, { timeout: 100 });
|
||||
}
|
||||
if (elements.length > 0) idle();
|
||||
else yes();
|
||||
},
|
||||
{ timeout: 100 }
|
||||
);
|
||||
};
|
||||
idle();
|
||||
})
|
||||
});
|
||||
// notes = elements.filter(note => match(note));
|
||||
}
|
||||
|
||||
await new Promise(yes => this.setState({ notes }, yes));
|
||||
await new Promise((yes) => this.setState({ notes }, yes));
|
||||
this.oldSearch = search;
|
||||
lock.release();
|
||||
console.timeEnd("SearchOP");
|
||||
|
|
@ -260,38 +289,67 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
|||
searchInput: HTMLInputElement;
|
||||
render() {
|
||||
const open_entry = (id: string | null) => {
|
||||
Navigation.setPage("/vault", { id: this.vault.id }, { id, entry: "true" })
|
||||
}
|
||||
Navigation.setPage(
|
||||
"/vault",
|
||||
{ id: this.vault.id },
|
||||
{ id, entry: "true" }
|
||||
);
|
||||
};
|
||||
|
||||
return <div>
|
||||
{this.state.context}
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => history.back()}><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="container">
|
||||
<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 />
|
||||
</button>
|
||||
</div>
|
||||
return (
|
||||
<div>
|
||||
{this.state.context}
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => history.back()}>
|
||||
<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="container">
|
||||
<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 />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="vault-list" style="margin-top: 1rem;">
|
||||
{this.state.notes.map(note => {
|
||||
let [first, second] = note.preview.split("\n", 2);
|
||||
return <div class="card vault-vault" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
|
||||
open_entry(note._id)
|
||||
}}>
|
||||
<div>{first}</div>
|
||||
<div>{second}</div>
|
||||
</div>
|
||||
})}
|
||||
<div class="vault-list" style="margin-top: 1rem;">
|
||||
{this.state.notes.map((note) => {
|
||||
let [first, second] = note.preview.split("\n", 2);
|
||||
return (
|
||||
<div
|
||||
class="card vault-vault"
|
||||
onContextMenu={(evt) => this.onContext(evt, note)}
|
||||
onClick={() => {
|
||||
open_entry(note._id);
|
||||
}}
|
||||
>
|
||||
<div>{first}</div>
|
||||
<div>{second}</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>;
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,47 +1,55 @@
|
|||
import { h } from "preact"
|
||||
import { h } from "preact";
|
||||
import { Page } from "../../../page";
|
||||
import Notes, { IVault, BaseNote } from "../../../notes";
|
||||
import Navigation from "../../../navigation";
|
||||
import EntryComponent from "./Entry";
|
||||
import EntryList from "./EntryList";
|
||||
|
||||
import "./vault.scss"
|
||||
|
||||
import "./vault.scss";
|
||||
import { useState } from "preact/hooks";
|
||||
import { usePromise } from "../../../hooks";
|
||||
|
||||
export interface VaultProps {
|
||||
state: { id: string };
|
||||
hidden: { entry: string, id: string, note: string };
|
||||
hidden: { entry: string; id: string; note: string };
|
||||
}
|
||||
|
||||
export default class VaultPage extends Page<VaultProps, { entries: BaseNote[] }> {
|
||||
vault: Promise<IVault>
|
||||
constructor(props: VaultProps) {
|
||||
super(props);
|
||||
this.state = { entries: [] };
|
||||
}
|
||||
export default function VaultPage(props: VaultProps) {
|
||||
console.log("Vault page");
|
||||
const [loading, error, vault] = usePromise(
|
||||
() =>
|
||||
Notes.getVault(
|
||||
this.props.state.id,
|
||||
Notes.getVaultKey(this.props.state.id)
|
||||
),
|
||||
[props.state.id]
|
||||
);
|
||||
|
||||
async componentWillMount() {
|
||||
this.vault = Notes.getVault(this.props.state.id, Notes.getVaultKey(this.props.state.id))
|
||||
this.vault.then(vlt => {
|
||||
window.debug.activeVault = vlt;
|
||||
window.debug.createNotes = (cnt = 10) => {
|
||||
for (let i = 0; i < cnt; i++) {
|
||||
let nt = vlt.newNote();
|
||||
nt.__value = `Random Note ${i}\ With some Content ${i}`;
|
||||
vlt.saveNote(nt);
|
||||
}
|
||||
if (vault) {
|
||||
window.debug.activeVault = vault;
|
||||
window.debug.createNotes = (cnt = 10) => {
|
||||
for (let i = 0; i < cnt; i++) {
|
||||
let nt = vault.newNote();
|
||||
nt.__value = `Random Note ${i}\ With some Content ${i}`;
|
||||
vault.saveNote(nt);
|
||||
}
|
||||
})
|
||||
this.vault.catch(err => {
|
||||
Navigation.setPage("/")
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.props.hidden && this.props.hidden.entry === "true") {
|
||||
return <EntryComponent vault={this.vault} id={this.props.hidden.id} note={this.props.hidden.note} />
|
||||
if (loading) return <div>Loading Vault</div>;
|
||||
// Maybe return loading animation or so
|
||||
else if (error) return <div>{error.message}</div>;
|
||||
else {
|
||||
if (props.hidden?.entry) {
|
||||
return (
|
||||
<EntryComponent
|
||||
vault={vault}
|
||||
id={props.hidden.id}
|
||||
note={props.hidden.note}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
return <EntryList vault={this.vault} />
|
||||
return <EntryList vault={vault} />;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
import { h } from "preact"
|
||||
import { h } from "preact";
|
||||
import { Page } from "../../../page";
|
||||
import Notes, { VaultList } from "../../../notes";
|
||||
import "./vaults.scss"
|
||||
import 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 "./vaults.scss";
|
||||
import { Lock, Unlock, Settings } from "preact-feather";
|
||||
import Navigation from "../../../navigation";
|
||||
import { InputModal } from "../../modals/InputModal";
|
||||
import { YesNoModal } from "../../modals/YesNoModal";
|
||||
|
|
@ -18,7 +16,14 @@ export interface VaultsProps {
|
|||
onSelected?: (vaultid: string) => void;
|
||||
}
|
||||
|
||||
export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, modal: JSX.Element | undefined, context: JSX.Element | undefined }> {
|
||||
export default class VaultsPage extends Page<
|
||||
VaultsProps,
|
||||
{
|
||||
vaults: VaultList;
|
||||
modal: h.JSX.Element | undefined;
|
||||
context: h.JSX.Element | undefined;
|
||||
}
|
||||
> {
|
||||
constructor(props: VaultsProps) {
|
||||
super(props);
|
||||
this.state = { vaults: [], modal: undefined, context: undefined };
|
||||
|
|
@ -26,15 +31,14 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
|||
}
|
||||
|
||||
updateVaults(s?: boolean) {
|
||||
if (s)
|
||||
return;
|
||||
return new Promise(yes => {
|
||||
Notes.getVaults().then(vaults => this.setState({ vaults }, yes))
|
||||
})
|
||||
if (s) return;
|
||||
return new Promise((yes) => {
|
||||
Notes.getVaults().then((vaults) => this.setState({ vaults }, yes));
|
||||
});
|
||||
}
|
||||
|
||||
componentWillMount() {
|
||||
this.updateVaults()
|
||||
this.updateVaults();
|
||||
Notes.syncObservable.subscribe(this.updateVaults);
|
||||
}
|
||||
|
||||
|
|
@ -42,15 +46,19 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
|||
Notes.syncObservable.unsubscribe(this.updateVaults);
|
||||
}
|
||||
|
||||
async getKey(vault: { name: string, id: string }, permanent = true) {
|
||||
let inp_mod = new InputModal("Enter password for " + vault.name, "Password", "password");
|
||||
async getKey(vault: { name: string; id: string }, permanent = true) {
|
||||
let inp_mod = new InputModal(
|
||||
"Enter password for " + vault.name,
|
||||
"Password",
|
||||
"password"
|
||||
);
|
||||
let key = undefined;
|
||||
while (true) {
|
||||
// inp_mod.show();
|
||||
let value = await inp_mod.getResult(false);
|
||||
if (value === null) {
|
||||
console.log("Value is null")
|
||||
inp_mod.close()
|
||||
console.log("Value is null");
|
||||
inp_mod.close();
|
||||
return false;
|
||||
} else {
|
||||
key = Notes.passwordToKey(value);
|
||||
|
|
@ -58,11 +66,11 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
|||
await Notes.getVault(vault.id, key);
|
||||
break;
|
||||
} catch (err) {
|
||||
Notifications.sendError("Invalid password!")
|
||||
Notifications.sendError("Invalid password!");
|
||||
}
|
||||
}
|
||||
}
|
||||
inp_mod.close()
|
||||
inp_mod.close();
|
||||
|
||||
let perm = false;
|
||||
if (permanent) {
|
||||
|
|
@ -79,27 +87,24 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
|||
return true;
|
||||
}
|
||||
|
||||
async openVault(vault: { name: string, encrypted: boolean, id: string }) {
|
||||
async openVault(vault: { name: string; encrypted: boolean; id: string }) {
|
||||
const action = () => {
|
||||
if (this.props.selectVault) {
|
||||
this.props.onSelected(vault.id);
|
||||
} else {
|
||||
Navigation.setPage("/vault", { id: vault.id })
|
||||
Navigation.setPage("/vault", { id: vault.id });
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
if (vault.encrypted) {
|
||||
let key = Notes.getVaultKey(vault.id);
|
||||
if (key)
|
||||
action()
|
||||
if (key) action();
|
||||
else {
|
||||
if (await this.getKey(vault))
|
||||
action();
|
||||
if (await this.getKey(vault)) action();
|
||||
}
|
||||
} else {
|
||||
action()
|
||||
action();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async addButtonClick() {
|
||||
|
|
@ -113,122 +118,176 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
|||
|
||||
let password;
|
||||
if (encrypted) {
|
||||
let password_modal = new InputModal("Enter new password", "Password", "password");
|
||||
let password_modal = new InputModal(
|
||||
"Enter new password",
|
||||
"Password",
|
||||
"password"
|
||||
);
|
||||
password = await password_modal.getResult();
|
||||
if (password === null) return;
|
||||
}
|
||||
|
||||
let key;
|
||||
if (password) {
|
||||
key = Notes.passwordToKey(password)
|
||||
key = Notes.passwordToKey(password);
|
||||
}
|
||||
await Notes.createVault(name, key)
|
||||
await Notes.createVault(name, key);
|
||||
this.updateVaults();
|
||||
}
|
||||
|
||||
onContext(evt: MouseEvent, vault: { name: string, encrypted: boolean, id: string }) {
|
||||
onContext(
|
||||
evt: MouseEvent,
|
||||
vault: { name: string; encrypted: boolean; id: string }
|
||||
) {
|
||||
evt.preventDefault();
|
||||
evt.stopPropagation();
|
||||
|
||||
const close = () => {
|
||||
document.documentElement.removeEventListener("click", close);
|
||||
this.setState({ context: undefined });
|
||||
}
|
||||
};
|
||||
document.documentElement.addEventListener("click", close);
|
||||
|
||||
let deleteb = <button class="btn" onClick={async () => {
|
||||
let 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!")
|
||||
console.error(err);
|
||||
})
|
||||
}
|
||||
}}>
|
||||
delete
|
||||
</button>;
|
||||
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!");
|
||||
console.error(err);
|
||||
});
|
||||
}
|
||||
}}
|
||||
>
|
||||
delete
|
||||
</button>
|
||||
);
|
||||
|
||||
let delete_key;
|
||||
if (Notes.getVaultKey(vault.id)) {
|
||||
delete_key = <button class="btn" onClick={() => {
|
||||
Notes.forgetVaultKey(vault.id);
|
||||
Notifications.sendSuccess("Forgot password!")
|
||||
}}>
|
||||
forget password
|
||||
</button>;
|
||||
delete_key = (
|
||||
<button
|
||||
class="btn"
|
||||
onClick={() => {
|
||||
Notes.forgetVaultKey(vault.id);
|
||||
Notifications.sendSuccess("Forgot password!");
|
||||
}}
|
||||
>
|
||||
forget password
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
let exportb = <button class="btn" onClick={async () => {
|
||||
let key: Uint8Array;
|
||||
if (vault.encrypted) {
|
||||
await this.getKey(vault, false)
|
||||
key = Notes.getVaultKey(vault.id);
|
||||
}
|
||||
let note_vault = await Notes.getVault(vault.id, key);
|
||||
let base_notes = await note_vault.getAllNotes();
|
||||
let notes = await Promise.all(base_notes.map(e => {
|
||||
return note_vault.getNote(e._id);
|
||||
}));
|
||||
|
||||
let result =
|
||||
{
|
||||
version: 1,
|
||||
notes: notes.map(e => {
|
||||
return {
|
||||
content: e.__value,
|
||||
time: e.time
|
||||
let exportb = (
|
||||
<button
|
||||
class="btn"
|
||||
onClick={async () => {
|
||||
let key: Uint8Array;
|
||||
if (vault.encrypted) {
|
||||
await this.getKey(vault, false);
|
||||
key = Notes.getVaultKey(vault.id);
|
||||
}
|
||||
})
|
||||
}
|
||||
let note_vault = await Notes.getVault(vault.id, key);
|
||||
let base_notes = await note_vault.getAllNotes();
|
||||
let notes = await Promise.all(
|
||||
base_notes.map((e) => {
|
||||
return note_vault.getNote(e._id);
|
||||
})
|
||||
);
|
||||
|
||||
var dataStr = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(result, undefined, 3));
|
||||
var downloadAnchorNode = document.createElement('a');
|
||||
downloadAnchorNode.setAttribute("href", dataStr);
|
||||
downloadAnchorNode.setAttribute("download", "notes_export_" + vault.name + ".json");
|
||||
document.body.appendChild(downloadAnchorNode); // required for firefox
|
||||
downloadAnchorNode.click();
|
||||
downloadAnchorNode.remove();
|
||||
}}>
|
||||
export
|
||||
</button>;
|
||||
let result = {
|
||||
version: 1,
|
||||
notes: notes.map((e) => {
|
||||
return {
|
||||
content: e.__value,
|
||||
time: e.time,
|
||||
};
|
||||
}),
|
||||
};
|
||||
|
||||
let context = <ContextMenu event={evt} >
|
||||
{deleteb}
|
||||
{delete_key}
|
||||
{exportb}
|
||||
</ContextMenu>
|
||||
var dataStr =
|
||||
"data:text/json;charset=utf-8," +
|
||||
encodeURIComponent(JSON.stringify(result, undefined, 3));
|
||||
var downloadAnchorNode = document.createElement("a");
|
||||
downloadAnchorNode.setAttribute("href", dataStr);
|
||||
downloadAnchorNode.setAttribute(
|
||||
"download",
|
||||
"notes_export_" + vault.name + ".json"
|
||||
);
|
||||
document.body.appendChild(downloadAnchorNode); // required for firefox
|
||||
downloadAnchorNode.click();
|
||||
downloadAnchorNode.remove();
|
||||
}}
|
||||
>
|
||||
export
|
||||
</button>
|
||||
);
|
||||
|
||||
let context = (
|
||||
<ContextMenu event={evt}>
|
||||
{deleteb}
|
||||
{delete_key}
|
||||
{exportb}
|
||||
</ContextMenu>
|
||||
);
|
||||
|
||||
this.setState({ context });
|
||||
return false;
|
||||
}
|
||||
|
||||
render() {
|
||||
let elms = this.state.vaults.map(vault => {
|
||||
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} />}
|
||||
<span>
|
||||
{vault.name}
|
||||
</span>
|
||||
</li>
|
||||
})
|
||||
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} />
|
||||
)}
|
||||
<span>{vault.name}</span>
|
||||
</li>
|
||||
);
|
||||
});
|
||||
|
||||
return <div style={{ marginTop: "-12px", paddingTop: "12px" }} >
|
||||
{/* {this.state.modal} */}
|
||||
{this.state.context}
|
||||
<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>
|
||||
</header>
|
||||
<AddButton onClick={() => this.addButtonClick()} />
|
||||
<div class="container">
|
||||
<ul class="list list-divider list-clickable">
|
||||
{elms}
|
||||
</ul>
|
||||
return (
|
||||
<div style={{ marginTop: "-12px", paddingTop: "12px" }}>
|
||||
{/* {this.state.modal} */}
|
||||
{this.state.context}
|
||||
<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>
|
||||
</header>
|
||||
<AddButton onClick={() => this.addButtonClick()} />
|
||||
<div class="container">
|
||||
<ul class="list list-divider list-clickable">{elms}</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
import { useEffect, useMemo, useState } from "preact/hooks";
|
||||
|
||||
export function usePromise<T>(promiseFnc: () => Promise<T>, params: any[]) {
|
||||
const promise = useMemo(promiseFnc, params);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState(undefined);
|
||||
const [value, setValue] = useState(undefined);
|
||||
|
||||
useEffect(() => {
|
||||
let canceled = false;
|
||||
|
||||
promise
|
||||
.then((res) => setValue(res))
|
||||
.catch((err) => setError(err))
|
||||
.finally(() => setLoading(false));
|
||||
|
||||
return () => {
|
||||
canceled = true;
|
||||
};
|
||||
}, [promise]);
|
||||
|
||||
return [loading, error, value];
|
||||
}
|
||||
115
src/index.html
115
src/index.html
|
|
@ -1,61 +1,70 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>SecureNotes</title>
|
||||
<meta charset="utf8" />
|
||||
<meta name="Description" content="Notes app" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
||||
<link rel="manifest" href="./manifest.webmanifest" />
|
||||
<!-- <link rel="shortcut icon" href="/public/icon-72x72.png"> -->
|
||||
|
||||
<head>
|
||||
<title>SecureNotes</title>
|
||||
<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="shortcut icon" href="/public/icon-72x72.png"> -->
|
||||
<!-- Add to home screen for Safari on iOS -->
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
||||
<meta name="apple-mobile-web-app-title" content="Secure Notes" />
|
||||
|
||||
<!-- Add to home screen for Safari on iOS -->
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||
<meta name="apple-mobile-web-app-title" content="Secure Notes">
|
||||
<!-- sizes="180x180" -->
|
||||
<!-- href="/public/apple-touch-icon.png" -->
|
||||
|
||||
<link
|
||||
rel="apple-touch-icon"
|
||||
sizes="256x256"
|
||||
href="/public/notepad256.png"
|
||||
/>
|
||||
<!-- <link
|
||||
rel="mask-icon"
|
||||
href="/public/safari-pinned-tab.svg"
|
||||
color="#1E88E5"
|
||||
/> -->
|
||||
<meta name="msapplication-TileColor" content="#1E88E5" />
|
||||
<meta name="theme-color" content="#1E88E5" />
|
||||
</head>
|
||||
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
|
||||
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1E88E5">
|
||||
<script src="encoding.js"></script>
|
||||
<meta name="msapplication-TileColor" content="#1E88E5">
|
||||
<meta name="theme-color" content="#1E88E5">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<noscript>
|
||||
You have to enable JavaScript to use this site!
|
||||
</noscript>
|
||||
<div id="app"></div>
|
||||
<script>
|
||||
// // Check that service workers are registered
|
||||
// if ('serviceWorker' in navigator) {
|
||||
// // Use the window load event to keep the page load performant
|
||||
// window.addEventListener('load', () => {
|
||||
// navigator.serviceWorker.register('/public/serviceworker.js');
|
||||
// });
|
||||
// }
|
||||
if (navigator.serviceWorker.controller) {
|
||||
if (localStorage.getItem("debug")) {
|
||||
console.warn("Debuggung and service worker found, make shure to clear cache!");
|
||||
}
|
||||
console.log('active service worker found, no need to register')
|
||||
} else {
|
||||
if (localStorage.getItem("debug")) {
|
||||
console.warn("Disabling Service Worker in debug mode!")
|
||||
<body>
|
||||
<noscript> You have to enable JavaScript to use this site! </noscript>
|
||||
<div id="app"></div>
|
||||
<script>
|
||||
if (navigator.serviceWorker.controller) {
|
||||
if (localStorage.getItem("debug")) {
|
||||
console.warn(
|
||||
"Debuggung and service worker found, make shure to clear cache!"
|
||||
);
|
||||
}
|
||||
console.log("active service worker found, no need to register");
|
||||
} else {
|
||||
// Register the ServiceWorker
|
||||
navigator.serviceWorker.register('/serviceworker.js', {
|
||||
scope: '/'
|
||||
}).then(function (reg) {
|
||||
console.log('Service worker has been registered for scope:' + reg.scope);
|
||||
navigator.serviceWorker.controller.addEventListener("cleared_cache", evt => {
|
||||
console.log(evt);
|
||||
})
|
||||
});
|
||||
if (localStorage.getItem("debug")) {
|
||||
console.warn("Disabling Service Worker in debug mode!");
|
||||
} else {
|
||||
// Register the ServiceWorker
|
||||
navigator.serviceWorker
|
||||
.register("serviceworker.js", {
|
||||
scope: "/",
|
||||
})
|
||||
.then(function (reg) {
|
||||
console.log(
|
||||
"Service worker has been registered for scope:" +
|
||||
reg.scope
|
||||
);
|
||||
navigator.serviceWorker.controller.addEventListener(
|
||||
"cleared_cache",
|
||||
(evt) => {
|
||||
console.log(evt);
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</script>
|
||||
<script src="index.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
{
|
||||
"short_name": "Secure Notes",
|
||||
"name": "Secure Notes",
|
||||
"decription": "A place to store your notes securly",
|
||||
"share_target": {
|
||||
"action": "/share",
|
||||
"method": "GET",
|
||||
"enctype": "application/x-www-form-urlencoded",
|
||||
"params": {
|
||||
"title": "title",
|
||||
"text": "text",
|
||||
"url": "url"
|
||||
}
|
||||
},
|
||||
"icons": [
|
||||
{
|
||||
"src": "public/notepad16.png",
|
||||
"sizes": "16x16",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "public/notepad24.png",
|
||||
"sizes": "24x24",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "public/notepad32.png",
|
||||
"sizes": "32x32",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "public/notepad64.png",
|
||||
"sizes": "64x64",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "public/notepad128.png",
|
||||
"sizes": "128x128",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "public/notepad256.png",
|
||||
"sizes": "256x256",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "public/notepad512.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
}
|
||||
],
|
||||
"start_url": "/",
|
||||
"display": "standalone",
|
||||
"theme_color": "#1E88E5",
|
||||
"background_color": "#ffffff"
|
||||
}
|
||||
|
|
@ -366,7 +366,6 @@ class NotesProvider {
|
|||
};
|
||||
|
||||
try {
|
||||
// log(id, "LRO: ", !!local, !!remote, !!oplog)
|
||||
if (remote && !oplog) {
|
||||
if (local) {
|
||||
let old =
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 562 B After Width: | Height: | Size: 562 B |
|
Before Width: | Height: | Size: 554 B After Width: | Height: | Size: 554 B |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 720 B After Width: | Height: | Size: 720 B |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 915 B After Width: | Height: | Size: 915 B |
|
|
@ -0,0 +1,130 @@
|
|||
function log(...params) {
|
||||
console.log.apply(this, [
|
||||
...["%c[SW]: %c", "color: #f4b942;", "color:unset;"],
|
||||
...params,
|
||||
]);
|
||||
}
|
||||
|
||||
const CACHE = "offline";
|
||||
|
||||
let precacheFiles = ["/", "/index.html"];
|
||||
|
||||
//Install stage sets up the cache-array to configure pre-cache content
|
||||
self.addEventListener("install", (evt) => {
|
||||
log("The service worker is being installed.");
|
||||
evt.waitUntil(
|
||||
precache()
|
||||
.then(() => {
|
||||
log("Skip waiting on install");
|
||||
})
|
||||
.catch(log)
|
||||
.then(() => self.skipWaiting())
|
||||
);
|
||||
});
|
||||
|
||||
//allow sw to control of current page
|
||||
self.addEventListener("activate", (event) => {
|
||||
log("Claiming clients for current page");
|
||||
return self.clients.claim();
|
||||
});
|
||||
|
||||
self.addEventListener("message", (event) => {
|
||||
log("Clearing cache");
|
||||
caches.delete(CACHE);
|
||||
event.waitUntil(precache());
|
||||
});
|
||||
|
||||
var Types;
|
||||
(function (Types) {
|
||||
Types[(Types["CACHE"] = 0)] = "CACHE";
|
||||
Types[(Types["NOCACHE"] = 1)] = "NOCACHE";
|
||||
Types[(Types["REFRESH"] = 2)] = "REFRESH";
|
||||
Types[(Types["INDEX"] = 3)] = "INDEX";
|
||||
})(Types || (Types = {}));
|
||||
|
||||
let rules = [
|
||||
{
|
||||
match: (url) => {
|
||||
return url.indexOf("/api/") >= 0;
|
||||
},
|
||||
type: Types.NOCACHE,
|
||||
},
|
||||
{
|
||||
match: (url) => {
|
||||
return url.indexOf("/share") >= 0;
|
||||
},
|
||||
type: Types.INDEX,
|
||||
},
|
||||
{
|
||||
match: () => {
|
||||
return true;
|
||||
},
|
||||
type: Types.REFRESH,
|
||||
},
|
||||
];
|
||||
|
||||
self.addEventListener("fetch", (evt) => {
|
||||
if (evt.request.method != "GET") return; // Dont care about POST requests
|
||||
let rule = rules.find((rule) => rule.match(evt.request.url));
|
||||
evt.respondWith(
|
||||
(async () => {
|
||||
log("Cache:", Types[rule.type]);
|
||||
switch (rule.type) {
|
||||
case Types.CACHE:
|
||||
return fromCache(evt.request);
|
||||
case Types.REFRESH:
|
||||
return refresh(evt.request).then((r) => {
|
||||
evt.waitUntil(r.refresh.catch((_) => {}));
|
||||
return r.result;
|
||||
});
|
||||
case Types.NOCACHE:
|
||||
return fetch(evt.request);
|
||||
case Types.INDEX:
|
||||
return refresh(new Request("/")).then((r) => {
|
||||
evt.waitUntil(r.refresh.catch((_) => {}));
|
||||
return r.result;
|
||||
});
|
||||
}
|
||||
})()
|
||||
);
|
||||
});
|
||||
|
||||
async function fromCache(request) {
|
||||
let cache = await caches.open(CACHE);
|
||||
let matching = await cache.match(request);
|
||||
if (matching) return matching;
|
||||
|
||||
let res = await fetch(request.clone());
|
||||
await cache.put(
|
||||
request,
|
||||
{
|
||||
match: (url) => {
|
||||
return url.indexOf("/version_hash") >= 0;
|
||||
},
|
||||
type: Types.NOCACHE,
|
||||
},
|
||||
res
|
||||
);
|
||||
return await cache.match(request);
|
||||
}
|
||||
|
||||
async function refresh(request) {
|
||||
let cache = await caches.open(CACHE);
|
||||
let web = fetch(request.clone()).then((res) => {
|
||||
return cache.put(request, res).then(() => {
|
||||
return cache.match(request);
|
||||
});
|
||||
});
|
||||
let matching = await cache.match(request);
|
||||
|
||||
return {
|
||||
result: matching ? matching : web,
|
||||
refresh: web,
|
||||
};
|
||||
}
|
||||
|
||||
function precache() {
|
||||
return caches.open(CACHE).then(function (cache) {
|
||||
return cache.addAll(precacheFiles);
|
||||
});
|
||||
}
|
||||
69
src/theme.ts
69
src/theme.ts
|
|
@ -1,52 +1,61 @@
|
|||
const light = require("!!raw-loader!@hibas123/theme/out/light.css").default;
|
||||
const dark = require("!!raw-loader!@hibas123/theme/out/dark.css").default;
|
||||
import { AwaitStore, Observable } from "@hibas123/utils";
|
||||
import { readFileSync } from "fs";
|
||||
|
||||
const light = readFileSync(
|
||||
"node_modules/@hibas123/theme/out/light.css",
|
||||
"utf-8"
|
||||
);
|
||||
const dark = readFileSync("node_modules/@hibas123/theme/out/dark.css", "utf-8");
|
||||
|
||||
export enum ThemeStates {
|
||||
AUTO,
|
||||
LIGHT,
|
||||
DARK
|
||||
AUTO,
|
||||
LIGHT,
|
||||
DARK,
|
||||
}
|
||||
|
||||
let themeConfig: ThemeStates = Number(localStorage.getItem("theme"));
|
||||
if (Number.isNaN(themeConfig))
|
||||
themeConfig = ThemeStates.AUTO;
|
||||
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);
|
||||
const mediaq = matchMedia("(prefers-color-scheme: dark)");
|
||||
mediaIsDark = mediaq.matches;
|
||||
mediaq.onchange = (ev) => {
|
||||
mediaIsDark = ev.matches;
|
||||
apply();
|
||||
};
|
||||
console.log(mediaq);
|
||||
}
|
||||
|
||||
const DarkModeStore = new AwaitStore<boolean>(isDark);
|
||||
|
||||
let styleElm: HTMLStyleElement;
|
||||
function apply(force?: boolean) {
|
||||
let shouldDark = themeConfig === ThemeStates.AUTO ? mediaIsDark : themeConfig === ThemeStates.DARK;
|
||||
if (force || shouldDark !== isDark) {
|
||||
if (styleElm) styleElm.remove();
|
||||
styleElm = document.createElement("style");
|
||||
document.head.appendChild(styleElm);
|
||||
styleElm.innerHTML = shouldDark ? dark : light;
|
||||
isDark = shouldDark;
|
||||
}
|
||||
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;
|
||||
DarkModeStore.send(isDark);
|
||||
}
|
||||
}
|
||||
apply(true);
|
||||
|
||||
|
||||
function change(state: ThemeStates) {
|
||||
themeConfig = state;
|
||||
localStorage.setItem("theme", String(themeConfig));
|
||||
apply();
|
||||
themeConfig = state;
|
||||
localStorage.setItem("theme", String(themeConfig));
|
||||
apply();
|
||||
}
|
||||
|
||||
export default {
|
||||
active: () => themeConfig,
|
||||
change: (state: ThemeStates) => change(state)
|
||||
}
|
||||
|
||||
active: () => themeConfig,
|
||||
change: (state: ThemeStates) => change(state),
|
||||
isDark: DarkModeStore,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,3 @@
|
|||
declare module "*.svg" {
|
||||
const SVG: (props: {
|
||||
width?: number | undefined
|
||||
height?: number | undefined
|
||||
onClick?: (evt: MouseEvent) => void;
|
||||
style?: string;
|
||||
}) => JSX.Element;
|
||||
export default SVG;
|
||||
}
|
||||
|
||||
interface Window {
|
||||
debug: any;
|
||||
}
|
||||
debug: any;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue