Compare commits

..

1 Commits

Author SHA1 Message Date
Fabian
bc0a036aea Fist Commit 2021-03-03 22:44:30 +01:00
43 changed files with 11440 additions and 5570 deletions

View File

@ -1,9 +0,0 @@
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
}

View File

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

7
config.json Executable file
View File

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

8376
package-lock.json generated Executable file

File diff suppressed because it is too large Load Diff

View File

@ -1,44 +1,53 @@
{ {
"name": "@hibas123/securenotes2", "name": "@hibas123/securenotes2",
"version": "2.0.2", "version": "2.0.0-alpha.1",
"description": "", "description": "",
"main": "index.js",
"scripts": { "scripts": {
"build": "parcel build src/index.html", "build": "webpack --mode=production",
"dev": "parcel src/index.html" "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"
}, },
"author": "Fabian Stamm <dev@fabianstamm.de>", "author": "Fabian Stamm <dev@fabianstamm.de>",
"license": "MIT", "license": "MIT",
"browserslist": [
"last 2 Chrome versions"
],
"dependencies": { "dependencies": {
"@codemirror/commands": "^6.6.0", "@hibas123/secure-file-wrapper": "^2.5.0",
"@codemirror/lang-markdown": "^6.2.5", "@hibas123/theme": "^1.0.6",
"@hibas123/secure-file-wrapper": "^2.5.3", "@hibas123/utils": "^2.1.0",
"@hibas123/theme": "^2.0.7",
"@hibas123/utils": "^2.2.18",
"aes-js": "^3.1.2", "aes-js": "^3.1.2",
"codemirror": "^6.0.1", "easymde": "^2.6.1",
"easymde": "^2.18.0", "feather-icons": "^4.22.1",
"feather-icons": "^4.29.2", "idb": "^4.0.3",
"idb": "^5.0.8", "js-sha256": "^0.9.0",
"js-sha256": "^0.11.0",
"lodash": "^4.17.21",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
"parcel": "^2.12.0", "secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
"preact": "^10.22.0", "uuid": "^3.3.2"
"preact-feather": "^4.2.1",
"uuid": "^10.0.0"
}, },
"devDependencies": { "devDependencies": {
"@parcel/packager-raw-url": "2.12.0", "@types/codemirror": "0.0.76",
"@parcel/transformer-sass": "^2.12.0", "@types/lodash.clonedeep": "^4.5.6",
"@parcel/transformer-webmanifest": "^2.12.0", "@types/uikit": "^2.27.7",
"@types/codemirror": "5.60.15", "@types/uuid": "^3.4.5",
"@types/lodash.clonedeep": "^4.5.9", "copy-webpack-plugin": "^5.0.3",
"@types/uuid": "^10.0.0", "css-loader": "^3.0.0",
"process": "^0.11.10", "file-loader": "^4.0.0",
"sass": "^1.77.6", "html-webpack-plugin": "^3.2.0",
"typescript": "^5.5.2" "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"
} }
} }

File diff suppressed because it is too large Load Diff

0
src/public/favicon.ico → public/favicon.ico Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

55
public/manifest.json Executable file
View File

@ -0,0 +1,55 @@
{
"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"
}

0
src/public/notepad128.png → public/notepad128.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
src/public/notepad16.png → public/notepad16.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 562 B

0
src/public/notepad24.png → public/notepad24.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 554 B

After

Width:  |  Height:  |  Size: 554 B

0
src/public/notepad256.png → public/notepad256.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
src/public/notepad32.png → public/notepad32.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 720 B

0
src/public/notepad512.png → public/notepad512.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

0
src/public/notepad64.png → public/notepad64.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 915 B

After

Width:  |  Height:  |  Size: 915 B

121
public/serviceworker.js Normal file
View File

@ -0,0 +1,121 @@
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);
});
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,134 +1,139 @@
import { h, Component } from "preact"; import { h, Component } from "preact"
import { IVault, ViewNote } from "../../../notes"; import { IVault, ViewNote } from "../../../notes";
import { Trash2 as Trash, X, Save } from "preact-feather"; 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 "../../modals/YesNoModal";
import Notifications, { MessageType } from "../../../notifications"; import Notifications, { MessageType } from "../../../notifications";
// import CodeMirror from "../../CodeMirror"; import Theme from "../../../theme";
import Editor from "./Editor";
const minRows = 3;
export default class EntryComponent extends Component<{ vault: Promise<IVault>, id: string | undefined, note: string | undefined }, { title: string, changed: boolean }> {
private text: string = "";
private vault: IVault;
// private lineHeight: number = 24;
private note: ViewNote;
private skip_save: boolean = false;
constructor(props) {
import { useEffect, useMemo, useState } from "preact/hooks"; super(props);
import { usePromise } from "../../../hooks"; this.state = { changed: false, title: "" };
import EasyMDEPreact from "./EasyMde";
interface IEntryProps {
vault: IVault;
id?: string;
note?: string;
}
export default function Entry(props: IEntryProps) {
const [changed, setChanged] = useState(false);
const [text, setText] = useState("");
const title = useMemo(() => text?.split("\n", 1)[0], [text]);
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);
}
}
if (!note) {
Notifications.sendNotification("Note not found!", MessageType.ERROR);
history.back();
} else {
setText(note.__value);
}
return note;
}, [props.vault, props.id]);
if (loading) {
return <div>Loading entry</div>;
} else {
const save = async () => {
try {
if (changed) {
note.__value = text;
await props.vault.saveNote(note);
setChanged(false);
}
} catch (err) {
Notifications.sendError(err);
}
};
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;
}
return true;
};
document.addEventListener("keydown", keyevent);
return () => {
document.removeEventListener("keydown", keyevent);
};
});
return (
<div>
<header class="header" style="margin-bottom: 0;">
<div class="header-icon-button" onClick={close}>
<X height={undefined} width={undefined} />
</div>
{changed && (
<div
class="header-icon-button"
style="margin-left: 0.5em;"
onClick={save}
>
<Save height={undefined} width={undefined} />
</div>
)}
<span>{title}</span>
<div class="header-icon-button" onClick={del}>
<Trash height={undefined} width={undefined} />
</div>
</header>
<div class="container" style="padding: 0">
<EasyMDEPreact
value={text}
onChange={(value) => {
setChanged(true);
setText(value);
}}
// onSave={save}
// onClose={close}
/>
</div>
</div>
);
} }
}
private toVault() {
history.back();
}
componentDidMount() { }
async componentWillMount() {
this.text = "";
this.vault = undefined;
this.note = undefined;
this.skip_save = false;
this.setState({ changed: false, title: "" });
try {
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 [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()
}
private textChange(value: string) {
if (!this.state.changed && value !== this.text)
this.setState({ changed: true })
this.text = value;
let [title] = value.split("\n", 1);
if (title !== this.state.title)
this.setState({ title });
}
private 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()
}
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" style={Theme.isDark() ? "filter: invert(100%);" : ""}>
<Editor
value={this.text}
valueChange={value => this.textChange(value)}
save={() => this.save()}
exit={() => this.exitHandler()} />
</div>
</div>
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,23 +0,0 @@
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];
}

View File

@ -4,36 +4,58 @@
<head> <head>
<title>SecureNotes</title> <title>SecureNotes</title>
<meta charset="utf8" /> <meta charset="utf8" />
<meta name="Description" content="Notes app" /> <meta name="Description" content="Notes app">
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<link rel="manifest" href="./manifest.webmanifest" /> <link rel="manifest" href="/manifest.json">
<!-- <link rel="shortcut icon" href="/public/icon-72x72.png"> --> <!-- <link rel="shortcut icon" href="/public/icon-72x72.png"> -->
<!-- Add to home screen for Safari on iOS --> <!-- Add to home screen for Safari on iOS -->
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black" /> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Secure Notes" /> <meta name="apple-mobile-web-app-title" content="Secure Notes">
<!-- sizes="180x180" -->
<!-- href="/public/apple-touch-icon.png" -->
<link rel="apple-touch-icon" sizes="256x256" href="./public/notepad256.png" /> <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<!-- <link <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1E88E5">
rel="mask-icon" <script src="encoding.js"></script>
href="/public/safari-pinned-tab.svg" <meta name="msapplication-TileColor" content="#1E88E5">
color="#1E88E5" <meta name="theme-color" content="#1E88E5">
/> -->
<meta name="msapplication-TileColor" content="#1E88E5" />
<meta name="theme-color" content="#1E88E5" />
</head> </head>
<body> <body>
<noscript> You have to enable JavaScript to use this site! </noscript> <noscript>
You have to enable JavaScript to use this site!
</noscript>
<div id="app"></div> <div id="app"></div>
<script> <script>
window.debug = {} // // 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!")
} else {
// Register the ServiceWorker
navigator.serviceWorker.register('/serviceworker.js', {
scope: '/'
}).then(function (reg) {
console.log('Service worker has been registered for scope:' + reg.scope);
navigator.serviceWorker.controller.addEventListener("cleared_cache", evt => {
console.log(evt);
})
});
}
}
</script> </script>
<script src="index.tsx" type="module"></script>
</body> </body>
</html> </html>

56
src/index.scss Normal file → Executable file
View File

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

View File

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

View File

@ -1,56 +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": "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"
}

File diff suppressed because it is too large Load Diff

View File

@ -1,130 +0,0 @@
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);
});
}

View File

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

14
src/types.d.ts vendored
View File

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

View File

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

76
webpack.config.js Executable file
View File

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