OpenServer/SecureNotes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: OpenServer:parcel
Branches Tags
OpenServer:master
OpenServer:retheme
OpenServer:parcel
..
compare: OpenServer:master
Branches Tags
OpenServer:master
OpenServer:retheme
OpenServer:parcel

8 Commits
parcel ... master

Author SHA1 Message Date
Fabian Stamm
df28d3c411 Add Earthfile and update version 2024-06-29 12:46:52 +02:00
Fabian Stamm
bca3049c27 Update to be compatible with new SecureFile version 2024-06-22 20:37:15 +02:00
Fabian Stamm
944e3d2f11 Remove config 2020-12-19 18:53:56 +01:00
Fabian Stamm
b00c97d100 Fix style issues 2020-11-24 22:21:21 +01:00
Fabian Stamm
73fcc340f2 Bump version 2020-11-24 22:07:06 +01:00
Fabian Stamm
86ae6acc92 Small improvements: 
- Switch to CodeMirror
- Switch to Parcel Bundler
- Fix synchronisation bug
- Update dependencies
 2020-11-24 21:59:32 +01:00
Fabian Stamm
e873ae0396 Fix bug when error on sync 2020-11-24 19:41:19 +01:00
Fabian Stamm
3c80ac3125 Fix bug with error when decoding 2020-07-10 18:54:32 +02:00
51 changed files with 6264 additions and 10708 deletions
Show Stats Expand all files Collapse all files

9
Caddyfile Normal file
View File

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

26
Earthfile Normal file
View File

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

7
config.json
View File

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

8298
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

45
package.json
View File

@ -1,8 +1,7 @@
{
"name": "@hibas123/securenotes2",
"version": "2.0.0-alpha.1",
"version": "2.0.2",
"description": "",
"main": "index.js",
"scripts": {
"build": "parcel build src/index.html",
"dev": "parcel src/index.html"
@ -13,25 +12,33 @@
"last 2 Chrome versions"
],
"dependencies": {
"@hibas123/secure-file-wrapper": "^2.5.1",
"@hibas123/theme": "^1.2.14",
"@hibas123/utils": "^2.2.3",
"@codemirror/commands": "^6.6.0",
"@codemirror/lang-markdown": "^6.2.5",
"@hibas123/secure-file-wrapper": "^2.5.3",
"@hibas123/theme": "^2.0.7",
"@hibas123/utils": "^2.2.18",
"aes-js": "^3.1.2",
"feather-icons": "^4.26.0",
"idb": "^4.0.3",
"js-sha256": "^0.9.0",
"codemirror": "^6.0.1",
"easymde": "^2.18.0",
"feather-icons": "^4.29.2",
"idb": "^5.0.8",
"js-sha256": "^0.11.0",
"lodash": "^4.17.21",
"lodash.clonedeep": "^4.5.0",
"parcel": "^1.12.4",
"uuid": "^3.4.0"
"parcel": "^2.12.0",
"preact": "^10.22.0",
"preact-feather": "^4.2.1",
"uuid": "^10.0.0"
},
"devDependencies": {
"@types/lodash.clonedeep": "^4.5.6",
"@types/uikit": "^2.27.7",
"@types/uuid": "^3.4.7",
"node-sass": "^4.13.1",
"parcel-bundler": "^1.12.4",
"preact": "^10.3.1",
"ts-loader": "^6.2.1",
"typescript": "^3.7.5"
"@parcel/packager-raw-url": "2.12.0",
"@parcel/transformer-sass": "^2.12.0",
"@parcel/transformer-webmanifest": "^2.12.0",
"@types/codemirror": "5.60.15",
"@types/lodash.clonedeep": "^4.5.9",
"@types/uuid": "^10.0.0",
"process": "^0.11.10",
"sass": "^1.77.6",
"typescript": "^5.5.2"
}
}
}

3701
pnpm-lock.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

37
src/Views/Settings/Settings.tsx
View File

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

188
src/Views/Vault/Entry.tsx
View File

@ -1,188 +0,0 @@
import { h, Component } from "preact"
import { IVault, ViewNote } from "../../notes";
import Trash from "feather-icons/dist/icons/trash-2.svg"
import X from "feather-icons/dist/icons/x.svg"
import Save from "feather-icons/dist/icons/save.svg"
import Navigation from "../../navigation";
import { YesNoModal } from "../../components/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()}><img src={X} height={undefined} width={undefined} /></a>
{this.state.changed ? <a class="header-icon-button" style="margin-left: 0.5em;" onClick={() => save_handler()}><img src={Save} height={undefined} width={undefined} /></a> : undefined}
<h3 style="display:inline" class="button header-title">{this.state.title}</h3>
<a class="header-icon-button" onClick={() => delete_handler()}><img src={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>
}
}

297
src/Views/Vault/EntryList.tsx
View File

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

47
src/Views/Vault/Vault.tsx
View File

@ -1,47 +0,0 @@
import { h } from "preact"
import { Page } from "../../page";
import Notes, { IVault, BaseNote } from "../../notes";
import Navigation from "../../navigation";
import EntryComponent from "./Entry";
import EntryList from "./EntryList";
import "./vault.scss"
export interface VaultProps {
state: { id: string };
hidden: { entry: string, id: string, note: string };
}
export default class VaultPage extends Page<VaultProps, { entries: BaseNote[] }> {
vault: Promise<IVault>
constructor(props: VaultProps) {
super(props);
this.state = { entries: [] };
}
async componentWillMount() {
this.vault = Notes.getVault(this.props.state.id, Notes.getVaultKey(this.props.state.id))
this.vault.then(vlt => {
window.debug.activeVault = vlt;
window.debug.createNotes = (cnt = 10) => {
for (let i = 0; i < cnt; i++) {
let nt = vlt.newNote();
nt.__value = `Random Note ${i}\ With some Content ${i}`;
vlt.saveNote(nt);
}
}
})
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 {
return <EntryList vault={this.vault} />
}
}
}

241
src/Views/Vaults/Vaults.tsx
View File

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

20
src/components/AddButton.tsx
View File

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

3
src/components/CodeMirror.scss Normal file
View File

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

62
src/components/CodeMirror.tsx Normal file
View File

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

126
src/components/Footer.tsx
View File

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

2
src/components/Routing.tsx
View File

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

2
src/components/context.tsx
View File

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

109
src/components/modals/Modal.tsx
View File

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

0
src/Views/404/index.tsx → src/components/routes/404/index.tsx
View File

66
src/components/routes/settings/Settings.tsx Normal file
View File

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

6
src/Views/Share/Share.tsx → src/components/routes/share/Share.tsx
View File

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

27
src/components/routes/vault/EasyMde.tsx Normal file
View File

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

134
src/components/routes/vault/Entry.tsx Executable file
View File

@ -0,0 +1,134 @@
import { h, Component } from "preact";
import { IVault, ViewNote } from "../../../notes";
import { Trash2 as Trash, X, Save } from "preact-feather";
// import Navigation from "../../../navigation";
import { YesNoModal } from "../../modals/YesNoModal";
import Notifications, { MessageType } from "../../../notifications";
// import CodeMirror from "../../CodeMirror";
import { useEffect, useMemo, useState } from "preact/hooks";
import { usePromise } from "../../../hooks";
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>
);
}
}

351
src/components/routes/vault/EntryList.tsx Executable file
View File

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

55
src/components/routes/vault/Vault.tsx Executable file
View File

@ -0,0 +1,55 @@
import { h } from "preact";
import { Page } from "../../../page";
import Notes, { IVault, BaseNote } from "../../../notes";
import Navigation from "../../../navigation";
import EntryComponent from "./Entry";
import EntryList from "./EntryList";
import "./vault.scss";
import { useState } from "preact/hooks";
import { usePromise } from "../../../hooks";
export interface VaultProps {
state: { id: string };
hidden: { entry: string; id: string; note: string };
}
export default function VaultPage(props: VaultProps) {
console.log("Vault page");
const [loading, error, vault] = usePromise(
() =>
Notes.getVault(
this.props.state.id,
Notes.getVaultKey(this.props.state.id)
),
[props.state.id]
);
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>;
// Maybe return loading animation or so
else if (error) return <div>{error.message}</div>;
else {
if (props.hidden?.entry) {
return (
<EntryComponent
vault={vault}
id={props.hidden.id}
note={props.hidden.note}
/>
);
} else {
return <EntryList vault={vault} />;
}
}
}

0
src/Views/Vault/vault.scss → src/components/routes/vault/vault.scss
View File

294
src/components/routes/vaults/Vaults.tsx Normal file
View File

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

0
src/Views/Vaults/vaults.scss → src/components/routes/vaults/vaults.scss
View File

23
src/hooks.ts Normal file
View File

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

59
src/index.html
View File

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

52
src/index.scss
View File

@ -4,64 +4,14 @@ body {
overscroll-behavior-y: contain;
}
// html {
// 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;
// }
}
}
body {
overscroll-behavior-y: contain;
}
.def-shadow {
box-shadow: 0px 5px 8px 2px rgba(66, 66, 66, 0.53);
}
.ccontainer {
margin: 0 1rem;
max-width: 100%;
@ -72,4 +22,4 @@ body {
max-width: 50rem;
margin: 0 auto;
}
}
}

145
src/index.tsx
View File

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

55
src/manifest.json
View File

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

56
src/manifest.webmanifest Normal file
View File

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

2
src/navigation.ts
View File

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

1250
src/notes.ts
View File

File diff suppressed because it is too large Load Diff

727
src/encoding.js → src/public/encoding.js
View File

File diff suppressed because it is too large Load Diff

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 562 B

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 554 B

After

Width:  |  Height:  |  Size: 554 B

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 720 B

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

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

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 915 B

After

Width:  |  Height:  |  Size: 915 B

130
src/serviceworker.js Normal file
View File

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

121
src/serviceworker.ts
View File

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

67
src/theme.ts
View File

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

19
src/types.d.ts vendored
View File

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

37
tsconfig.json
View File

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

76
webpack.config.js
View File

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