Merge branch 'retheme'
This commit is contained in:
commit
db5a363bff
1252
package-lock.json
generated
1252
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
31
package.json
31
package.json
@ -14,43 +14,38 @@
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@hibas123/secure-file-wrapper": "^2.5.0",
|
||||
"@hibas123/theme": "^1.0.5",
|
||||
"@hibas123/utils": "^2.1.0",
|
||||
"aes-js": "^3.1.2",
|
||||
"feather-icons": "^4.21.0",
|
||||
"idb": "3.0.2",
|
||||
"feather-icons": "^4.22.1",
|
||||
"idb": "^4.0.3",
|
||||
"js-sha256": "^0.9.0",
|
||||
"js-sha512": "^0.8.0",
|
||||
"lodash.clonedeep": "^4.5.0",
|
||||
"secure-file-wrapper": "git+https://git.stamm.me/OpenServer/OSSecureFileWrapper.git",
|
||||
"uikit": "^3.1.5",
|
||||
"uuid": "^3.3.2",
|
||||
"workbox-precaching": "^4.3.1",
|
||||
"workbox-routing": "^4.3.1",
|
||||
"workbox-strategies": "^4.3.1"
|
||||
"uuid": "^3.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/lodash.clonedeep": "^4.5.6",
|
||||
"@types/uikit": "^2.27.7",
|
||||
"@types/uuid": "^3.4.4",
|
||||
"@types/workbox-sw": "^4.2.0",
|
||||
"@types/uuid": "^3.4.5",
|
||||
"copy-webpack-plugin": "^5.0.3",
|
||||
"css-loader": "^2.1.1",
|
||||
"file-loader": "^3.0.1",
|
||||
"css-loader": "^3.0.0",
|
||||
"file-loader": "^4.0.0",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"mini-css-extract-plugin": "^0.7.0",
|
||||
"node-sass": "^4.12.0",
|
||||
"preact": "^8.3.1",
|
||||
"preact-svg-loader": "^0.2.1",
|
||||
"raw-loader": "^3.0.0",
|
||||
"sass-loader": "^7.1.0",
|
||||
"style-loader": "^0.23.1",
|
||||
"ts-loader": "^6.0.2",
|
||||
"typescript": "^3.5.1",
|
||||
"webpack": "^4.32.2",
|
||||
"ts-loader": "^6.0.4",
|
||||
"typescript": "^3.5.2",
|
||||
"webpack": "^4.35.2",
|
||||
"webpack-bundle-analyzer": "^3.3.2",
|
||||
"webpack-cli": "^3.3.2",
|
||||
"webpack-dev-server": "^3.5.1",
|
||||
"webpack-cli": "^3.3.5",
|
||||
"webpack-dev-server": "^3.7.2",
|
||||
"webpack-visualizer-plugin": "^0.1.11",
|
||||
"workbox-webpack-plugin": "^4.3.1",
|
||||
"worker-loader": "^2.0.0"
|
||||
}
|
||||
}
|
||||
|
@ -27,19 +27,9 @@ self.addEventListener('activate', (event) => {
|
||||
});
|
||||
|
||||
self.addEventListener('message', (event) => {
|
||||
if (event.data === "clear_cache") {
|
||||
log("Clearing cache");
|
||||
caches.delete(CACHE);
|
||||
}
|
||||
|
||||
if (event.data === "update_index") {
|
||||
log("Updating index");
|
||||
event.waitUntil(caches.open(CACHE).then((cache) => {
|
||||
return cache.addAll(["/", "/index.html"]).then(() => {
|
||||
event.ports[0].postMessage("reload");
|
||||
});
|
||||
}))
|
||||
}
|
||||
log("Clearing cache");
|
||||
caches.delete(CACHE);
|
||||
event.waitUntil(precache());
|
||||
});
|
||||
|
||||
var Types;
|
||||
|
@ -3,8 +3,8 @@ import "./add_button.scss";
|
||||
import Plus from "feather-icons/dist/icons/plus.svg";
|
||||
export default function AddButton({ onClick }: { onClick: () => void }) {
|
||||
return <button
|
||||
title={"add button"}
|
||||
class="add-button-button uk-button-primary uk-border-circle def-shadow"
|
||||
title="add button"
|
||||
class="fab btn-primary"
|
||||
onClick={() => onClick()}
|
||||
>
|
||||
<Plus width={undefined} height={undefined} />
|
||||
|
@ -56,7 +56,7 @@ export class Footer extends Component<{}, { synced: boolean, syncing: boolean }>
|
||||
text = "not synced";
|
||||
}
|
||||
}
|
||||
return <footer class="uk-background-default def-shadow">
|
||||
return <footer class="elv-8">
|
||||
<span>
|
||||
<span class={extrac} ><a onClick={() => this.onSyncClick()} ><Refresh style="height: 1em; width: 1em;"></Refresh></a></span>
|
||||
<span style={"margin-left: 8px; color:" + color}>{text}</span>
|
||||
@ -65,7 +65,7 @@ export class Footer extends Component<{}, { synced: boolean, syncing: boolean }>
|
||||
Welcome <b>{Notes.name}</b>
|
||||
</span>
|
||||
<span style="color: lightgrey;">
|
||||
v1.3
|
||||
v1.4
|
||||
</span>
|
||||
</footer>
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ export class Router extends Component<{}, { next?: JSX.Element, current: JSX.Ele
|
||||
render() {
|
||||
let overlay;
|
||||
if (this.state.next) {
|
||||
overlay = <div class="transition_container transition_slidein uk-background-default" key={this.state.next.key} ref={(elm: HTMLDivElement) => {
|
||||
overlay = <div class="transition_container transition_slidein background-default" key={this.state.next.key} ref={(elm: HTMLDivElement) => {
|
||||
let lst = () => {
|
||||
if (this.state.next)
|
||||
this.setState({ current: this.state.next, next: undefined }, () => {
|
||||
@ -43,7 +43,7 @@ export class Router extends Component<{}, { next?: JSX.Element, current: JSX.Ele
|
||||
</div>
|
||||
}
|
||||
return <div style="position: relative; overflow-x: hidden; width: 100vw; height: calc(100vh - 2rem);">
|
||||
<div class="transition_container uk-background-default" key={this.state.current.key} ref={elm => this.mounted = elm}>
|
||||
<div class="transition_container background-default" key={this.state.current.key} ref={elm => this.mounted = elm}>
|
||||
{this.state.current}
|
||||
</div>
|
||||
{overlay}
|
||||
|
@ -16,7 +16,7 @@
|
||||
}
|
||||
|
||||
footer {
|
||||
z-index: 128;
|
||||
// z-index: 128;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
@ -27,27 +27,24 @@ export class InputModal extends Modal<string> {
|
||||
|
||||
render() {
|
||||
return <Modal.BaseModal modal={this.props.modal}>
|
||||
<div class="uk-form-horizontal uk-margin-large">
|
||||
<div class="uk-margin">
|
||||
<label class="uk-form-label" for={this.rand}>{this.props.modal.fieldname}</label>
|
||||
<div class="uk-form-controls">
|
||||
<input
|
||||
class="uk-input"
|
||||
id={this.rand}
|
||||
type={this.props.modal.type}
|
||||
placeholder={this.props.modal.fieldname}
|
||||
autofocus
|
||||
ref={elm => { this.input = elm; }}
|
||||
onKeyDown={evt => {
|
||||
if (evt.keyCode === 13) {
|
||||
this.props.modal.result(this.input.value)
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<div class="input-group">
|
||||
<label for={this.rand}>{this.props.modal.fieldname}</label>
|
||||
<input
|
||||
id={this.rand}
|
||||
type={this.props.modal.type}
|
||||
placeholder={this.props.modal.fieldname}
|
||||
autofocus
|
||||
ref={elm => { this.input = elm; }}
|
||||
onKeyDown={evt => {
|
||||
if (evt.keyCode === 13) {
|
||||
this.props.modal.result(this.input.value)
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div class="uk-margin" style="text-align: right;">
|
||||
<button class="uk-button uk-button-primary" style="display: inline-block;" onClick={() => {
|
||||
<div class="modal-action">
|
||||
<button class="btn btn-primary" onClick={() => {
|
||||
this.props.modal.result(this.input.value);
|
||||
}}>Enter</button>
|
||||
</div>
|
||||
|
@ -12,7 +12,7 @@ export default class LoadingModal extends Modal<undefined> {
|
||||
getComponent() {
|
||||
return <Modal.BaseModal modal={this}>
|
||||
<div style="display: flex; justify-content: center;">
|
||||
<div style="margin: 3rem;" class="uk-spinner uk-icon">
|
||||
<div style="margin: 3rem;" class="">
|
||||
<svg width="90" height="90" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" data-svg="spinner"><circle fill="none" stroke="#000" cx="15" cy="15" r="14" style="stroke-width: 0.333333px;"></circle></svg>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -65,8 +65,8 @@ export default abstract class Modal<T> {
|
||||
this.props.modal.result(null)
|
||||
}
|
||||
}}>
|
||||
<div id="ModalContent" class="uk-card uk-card-body uk-card-body" >
|
||||
<div class="modal-title uk-card-title" style="">
|
||||
<div id="ModalContent" class="modal" >
|
||||
<div class="modal-title" style="">
|
||||
<h3>{this.props.modal.title}</h3>
|
||||
{/* <div> */}
|
||||
{!this.props.modal.noClose ?
|
||||
|
@ -28,15 +28,13 @@ export class YesNoModal extends Modal<boolean> {
|
||||
|
||||
render() {
|
||||
return <Modal.BaseModal modal={this.props.modal}>
|
||||
<div class="uk-margin-large">
|
||||
<div style="text-align: right;">
|
||||
<button class="uk-button uk-button-primary uk-margin-right" style="display: inline-block;" onClick={() => {
|
||||
this.props.modal.result(false);
|
||||
}}><span style="text-decoration: underline;">N</span>o</button>
|
||||
<button class="uk-button uk-button-primary" style="display: inline-block;" onClick={() => {
|
||||
this.props.modal.result(true);
|
||||
}}><span style="text-decoration: underline;">Y</span>es</button>
|
||||
</div>
|
||||
<div class="modal-action">
|
||||
<button class="btn-primary" onClick={() => {
|
||||
this.props.modal.result(false);
|
||||
}}><span style="text-decoration: underline;">N</span>o</button>
|
||||
<button class="btn-primary" onClick={() => {
|
||||
this.props.modal.result(true);
|
||||
}}><span style="text-decoration: underline;">Y</span>es</button>
|
||||
</div>
|
||||
</Modal.BaseModal>
|
||||
}
|
||||
|
@ -4,24 +4,25 @@
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(0, 0, 0, 0.8);
|
||||
z-index: 32;
|
||||
animation: darkenBackground .2s linear;
|
||||
background: rgba(0, 0, 0, 0.8)
|
||||
}
|
||||
|
||||
.modal-container>.uk-card {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 10%;
|
||||
width: 80%;
|
||||
max-width: 800px;
|
||||
margin: auto;
|
||||
background: white;
|
||||
@keyframes darkenBackground {
|
||||
from {
|
||||
background: rgba(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
to {
|
||||
background: rgba(0, 0, 0, 0.8);
|
||||
}
|
||||
}
|
||||
|
||||
.modal-title {
|
||||
display:flex;
|
||||
justify-content:space-between;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
>svg {
|
||||
height: 1em;
|
||||
}
|
||||
|
37
src/components/routes/settings/Settings.tsx
Normal file
37
src/components/routes/settings/Settings.tsx
Normal file
@ -0,0 +1,37 @@
|
||||
import { h } from "preact";
|
||||
import { Page } from "../../../page";
|
||||
import Theme, { ThemeStates } from "../../../theme";
|
||||
import Navigation from "../../../navigation";
|
||||
import ArrowLeft from "feather-icons/dist/icons/arrow-left.svg";
|
||||
|
||||
export default class SettingsPage extends Page<{ state: any }, { vault: string }> {
|
||||
componentWillMount() {
|
||||
|
||||
}
|
||||
|
||||
render() {
|
||||
let active = Theme.active();
|
||||
return <div>
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => history.back()}><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 >;
|
||||
}
|
||||
}
|
@ -165,17 +165,17 @@ export default class EntryComponent extends Component<{ vault: Promise<IVault>,
|
||||
console.log("Rerender")
|
||||
|
||||
return <div>
|
||||
<header class="uk-background-primary">
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => this.exitHandler()}><X height={undefined} width={undefined} /></a>
|
||||
{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="uk-container">
|
||||
<div class="container">
|
||||
<textarea
|
||||
value={this.text}
|
||||
rows={this.rows}
|
||||
class="doc uk-textarea"
|
||||
class="inp"
|
||||
style="width:100%;"
|
||||
onInput={this.textAreaChange}
|
||||
onKeyDown={this.textAreaKeyPress}
|
||||
|
@ -107,15 +107,15 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
||||
|
||||
let share;
|
||||
if ((window.navigator as any).share) {
|
||||
share = <button class="uk-button" onClick={shareNote}>
|
||||
share = <button class="btn" onClick={shareNote}>
|
||||
share
|
||||
</button>
|
||||
}
|
||||
|
||||
let context = <ContextMenu event={evt} >
|
||||
{share}
|
||||
<button class="uk-button" onClick={deleteNote}>delete</button>
|
||||
<button class="uk-button" onClick={copyNote}>copy</button>
|
||||
<button class="btn" onClick={deleteNote}>delete</button>
|
||||
<button class="btn" onClick={copyNote}>copy</button>
|
||||
</ContextMenu>
|
||||
|
||||
this.setState({ context });
|
||||
@ -265,31 +265,29 @@ export default class EntryList extends Component<{ vault: Promise<IVault> }, { n
|
||||
|
||||
return <div>
|
||||
{this.state.context}
|
||||
<header class="uk-background-primary">
|
||||
<header class="header">
|
||||
<a class="header-icon-button" onClick={() => history.back()}><ArrowLeft height={undefined} width={undefined} /></a>
|
||||
<h3 style="display:inline" class="header-title" onClick={() => Navigation.setPage("/")}>{this.vault ? this.vault.name : ""}</h3>
|
||||
<span></span>
|
||||
{/* <a class="button header_icon_button"><MoreVertival height={undefined} width={undefined} /></a> */}
|
||||
</header>
|
||||
<AddButton onClick={() => open_entry(null)} />
|
||||
<div class="uk-container">
|
||||
<div class="container">
|
||||
<div style="display:flex;">
|
||||
<input class="uk-input" type="text" onKeyUp={this.searchChanged} ref={elm => this.searchInput = elm} />
|
||||
<button class="uk-button uk-button-primary" style="padding: 0 10px;">
|
||||
<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="uk-child-width-1-3@m uk-grid-small uk-grid-match" style="margin-top: 1rem;" uk-grid>
|
||||
<div class="vault-list" style="margin-top: 1rem;">
|
||||
{this.state.notes.map(note => {
|
||||
let [first, second] = note.preview.split("\n", 2);
|
||||
return <div class="" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
|
||||
return <div class="card vault-vault" onContextMenu={evt => this.onContext(evt, note)} onClick={() => {
|
||||
open_entry(note._id)
|
||||
}}>
|
||||
<div class="uk-card uk-card-default uk-card-body vault-vault" style="box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3)">
|
||||
<div>{first}</div>
|
||||
<div>{second}</div>
|
||||
</div>
|
||||
<div>{first}</div>
|
||||
<div>{second}</div>
|
||||
</div>
|
||||
})}
|
||||
</div>
|
||||
|
@ -1,13 +1,28 @@
|
||||
.uk-container> :last-child {
|
||||
.container> :last-child {
|
||||
margin-bottom: 15px !important;
|
||||
}
|
||||
|
||||
.vault-list {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-gap: 1rem;
|
||||
grid-auto-rows: auto;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 50rem) {
|
||||
.vault-list {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO Media Query for small screens
|
||||
|
||||
.vault-vault {
|
||||
width: 100%;
|
||||
overflow: hidden;
|
||||
|
||||
>div {
|
||||
width: 100%;
|
||||
font-size: 1rem;
|
||||
font-size: 1.1rem;
|
||||
margin-left: 1rem;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
@ -25,22 +40,4 @@
|
||||
white-space: pre;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// .vault_vault {
|
||||
// padding: 0.5rem;
|
||||
// border-bottom: solid 1px var(--card-border-color);
|
||||
// }
|
||||
|
||||
// .vault_vault:hover {
|
||||
// background: var(--nav-hover-back-color);
|
||||
// }
|
||||
|
||||
// .vault_vault>svg {
|
||||
// height: 2rem;
|
||||
// margin-right: 1rem;
|
||||
// }
|
||||
|
||||
// .vault_vault:last-child {
|
||||
// border-bottom: none;
|
||||
// }
|
||||
}
|
@ -4,6 +4,7 @@ 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 "../../modals/InputModal";
|
||||
import { YesNoModal } from "../../modals/YesNoModal";
|
||||
@ -135,14 +136,14 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
||||
}
|
||||
document.documentElement.addEventListener("click", close);
|
||||
|
||||
let deleteb = <button class="uk-button" onClick={async () => {
|
||||
let deleteb = <button class="btn" onClick={async () => {
|
||||
let delete_modal = new YesNoModal("Delete Vault? Cannot be undone!");
|
||||
let result = await delete_modal.getResult();
|
||||
if (result) {
|
||||
Notes.deleteVault(vault.id).then(() => {
|
||||
this.updateVaults();
|
||||
}).catch(err => {
|
||||
Notifications.sendError("error deleting vault!")
|
||||
Notifications.sendError("Error deleting vault!")
|
||||
console.error(err);
|
||||
})
|
||||
}
|
||||
@ -152,15 +153,15 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
||||
|
||||
let delete_key;
|
||||
if (Notes.getVaultKey(vault.id)) {
|
||||
delete_key = <button class="uk-button" onClick={() => {
|
||||
delete_key = <button class="btn" onClick={() => {
|
||||
Notes.forgetVaultKey(vault.id);
|
||||
Notifications.sendSuccess("Forgot key!")
|
||||
Notifications.sendSuccess("Forgot password!")
|
||||
}}>
|
||||
forget password
|
||||
</button>;
|
||||
}
|
||||
|
||||
let exportb = <button class="uk-button" onClick={async () => {
|
||||
let exportb = <button class="btn" onClick={async () => {
|
||||
let key: Uint8Array;
|
||||
if (vault.encrypted) {
|
||||
await this.getKey(vault, false)
|
||||
@ -217,14 +218,14 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
|
||||
return <div style={{ marginTop: "-12px", paddingTop: "12px" }} >
|
||||
{/* {this.state.modal} */}
|
||||
{this.state.context}
|
||||
<header class="uk-background-primary">
|
||||
<header class="header">
|
||||
<span></span>
|
||||
<h3 style="display:inline" onClick={() => Navigation.setPage("/")}>{this.props.selectVault ? "Select Vault for share" : "Your vaults:"}</h3>
|
||||
<span></span>
|
||||
<a class="header-icon-button" onClick={() => Navigation.setPage("/settings")}><Settings height={undefined} width={undefined} /></a>
|
||||
</header>
|
||||
<AddButton onClick={() => this.addButtonClick()} />
|
||||
<div class="uk-container">
|
||||
<ul class="uk-list uk-list-divider">
|
||||
<div class="container">
|
||||
<ul class="list list-divider list-clickable">
|
||||
{elms}
|
||||
</ul>
|
||||
</div>
|
||||
|
@ -1,23 +1,19 @@
|
||||
@import "../../../vars.scss";
|
||||
|
||||
.vaults_vault {
|
||||
display: flex;
|
||||
padding: 0.5rem;
|
||||
margin-top: 0 !important;
|
||||
align-items: flex-end;
|
||||
justify-content: start;
|
||||
|
||||
// >span {
|
||||
// font-size: 2rem !important;
|
||||
// }
|
||||
|
||||
// &:not(:last-child) {
|
||||
// border-bottom: 1px $border_color solid;
|
||||
// }
|
||||
>span {
|
||||
font-size: 1.5rem;
|
||||
line-height: 1.5rem;
|
||||
}
|
||||
|
||||
>svg {
|
||||
height: 2rem;
|
||||
display: inline-block;
|
||||
height: 1.5em;
|
||||
width: 1.5em;
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: $hover-background;
|
||||
}
|
||||
}
|
@ -1,14 +1,12 @@
|
||||
import { Lock } from "@hibas123/utils";
|
||||
|
||||
import { DB, openDb, Transaction } from "idb";
|
||||
import { openDB, IDBPDatabase, IDBPTransaction, } from "idb";
|
||||
|
||||
export default class IDB {
|
||||
initLock = new Lock();
|
||||
db: DB;
|
||||
db: IDBPDatabase;
|
||||
constructor(database: string, private stores: string[]) {
|
||||
let lock = this.initLock.getLock();
|
||||
lock.then(async l => {
|
||||
|
||||
this.initLock.getLock().then(async l => {
|
||||
let v = localStorage.getItem(database + "_version");
|
||||
let version = 0;
|
||||
if (v) version = Number(v)
|
||||
@ -21,12 +19,15 @@ export default class IDB {
|
||||
localStorage.setItem(database + "_version", version.toString());
|
||||
localStorage.setItem(database + "_stores", stores.join(","));
|
||||
|
||||
this.db = await openDb(database, version, db => {
|
||||
console.log("IndexedDB need update")
|
||||
stores.forEach(store => {
|
||||
if (!db.objectStoreNames.contains(store))
|
||||
db.createObjectStore(store);
|
||||
})
|
||||
this.db = await openDB(database, version, {
|
||||
upgrade: (db) => {
|
||||
console.log("IndexedDB need update")
|
||||
const check = name => (<any>db.objectStoreNames as DOMStringList).contains ? (<any>db.objectStoreNames as DOMStringList).contains(name) : db.objectStoreNames.find(e => e === name);
|
||||
stores.forEach(store => {
|
||||
if (!check(store))
|
||||
db.createObjectStore(store);
|
||||
})
|
||||
},
|
||||
})
|
||||
console.log("Got DATABASE", this.db)
|
||||
l.release();
|
||||
@ -48,42 +49,42 @@ export default class IDB {
|
||||
return {
|
||||
name: name,
|
||||
transaction: () => {
|
||||
return this.db.transaction(name, "readwrite")
|
||||
return <any>this.db.transaction(name, "readwrite") as IDBPTransaction<unknown, string[]>;
|
||||
},
|
||||
get: async (key: string, transaction?: Transaction): Promise<T> => {
|
||||
get: async (key: string, transaction?: IDBPTransaction<unknown, string[]>): Promise<T> => {
|
||||
(await this.initLock.getLock()).release()
|
||||
return (transaction || this.db.transaction(name))
|
||||
.objectStore(name).get(key);
|
||||
},
|
||||
|
||||
getAll: async (transaction?: Transaction): Promise<T[]> => {
|
||||
getAll: async (transaction?: IDBPTransaction<unknown, string[]>): Promise<T[]> => {
|
||||
(await this.initLock.getLock()).release()
|
||||
return (transaction || this.db.transaction(name))
|
||||
.objectStore(name).getAll();
|
||||
},
|
||||
|
||||
set: async (key: string, val: T, transaction?: Transaction) => {
|
||||
set: async (key: string, val: T, transaction?: IDBPTransaction<unknown, string[]>) => {
|
||||
(await this.initLock.getLock()).release()
|
||||
const tx = (transaction || this.db.transaction(name, "readwrite"));
|
||||
tx.objectStore(name).put(val, key);
|
||||
return tx.complete;
|
||||
return tx.done;
|
||||
},
|
||||
|
||||
delete: async (key: string, transaction?: Transaction) => {
|
||||
delete: async (key: string, transaction?: IDBPTransaction<unknown, string[]>) => {
|
||||
(await this.initLock.getLock()).release()
|
||||
const tx = (transaction || this.db.transaction(name, "readwrite"));
|
||||
tx.objectStore(name).delete(key);
|
||||
return tx.complete;
|
||||
return tx.done;
|
||||
},
|
||||
|
||||
clear: async (transaction?: Transaction) => {
|
||||
clear: async (transaction?: IDBPTransaction<unknown, string[]>) => {
|
||||
(await this.initLock.getLock()).release()
|
||||
const tx = (transaction || this.db.transaction(name, "readwrite"));
|
||||
tx.objectStore(name).clear();
|
||||
return tx.complete;
|
||||
return tx.done;
|
||||
},
|
||||
|
||||
keys: async (transaction?: Transaction): Promise<string[]> => {
|
||||
keys: async (transaction?: IDBPTransaction<unknown, string[]>): Promise<string[]> => {
|
||||
(await this.initLock.getLock()).release()
|
||||
const tx = (transaction || this.db.transaction(name));
|
||||
const keys: string[] = [];
|
||||
@ -91,13 +92,15 @@ export default class IDB {
|
||||
|
||||
// This would be store.getAllKeys(), but it isn't supported by Edge or Safari.
|
||||
// openKeyCursor isn't supported by Safari, so we fall back
|
||||
(store.iterateKeyCursor || store.iterateCursor).call(store, (cursor: any) => {
|
||||
if (!cursor) return;
|
||||
keys.push(cursor.key);
|
||||
cursor.continue();
|
||||
});
|
||||
store.getAllKeys()
|
||||
|
||||
return tx.complete.then(() => keys);
|
||||
// (store.iterateKeyCursor || store.iterateCursor).call(store, (cursor: any) => {
|
||||
// if (!cursor) return;
|
||||
// keys.push(cursor.key);
|
||||
// cursor.continue();
|
||||
// });
|
||||
|
||||
return tx.done.then(() => keys);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,65 +1,60 @@
|
||||
@import "./vars.scss";
|
||||
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: 'Roboto', sans-serif; // font-family: Verdana, Geneva, sans-serif;
|
||||
font-size: 18px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overscroll-behavior-y: contain;
|
||||
}
|
||||
|
||||
html {
|
||||
min-height: 100%;
|
||||
display: flex;
|
||||
}
|
||||
// html {
|
||||
// min-height: 100%;
|
||||
// display: flex;
|
||||
// }
|
||||
|
||||
$header-margin: .5em;
|
||||
$header-icon-size: calc(1.5rem * 1);
|
||||
// $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);
|
||||
// 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);
|
||||
}
|
||||
// >* {
|
||||
// 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-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;
|
||||
// .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;
|
||||
}
|
||||
}
|
||||
// >svg {
|
||||
// height: $header-icon-size;
|
||||
// width: $header-icon-size;
|
||||
// }
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
|
||||
body {
|
||||
overscroll-behavior-y: contain;
|
||||
}
|
||||
|
||||
.def-shadow {
|
||||
|
@ -64,8 +64,11 @@ import { h, render } from 'preact';
|
||||
import App from './components/App';
|
||||
|
||||
|
||||
import "uikit";
|
||||
import "uikit/dist/css/uikit.css"
|
||||
// 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 "./index.scss";
|
||||
import Navigation from './navigation';
|
||||
@ -78,8 +81,14 @@ 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);
|
||||
|
||||
(async () => {
|
||||
// Initialize notes provider
|
||||
if (Notes.loginRequired()) {
|
||||
@ -90,21 +99,30 @@ window.debug.notes = Notes;
|
||||
let err = await Notes.getToken(code)
|
||||
if (err) {
|
||||
Notifications.sendError("Login failed: " + err)
|
||||
Notes.login()
|
||||
return Notes.login()
|
||||
} else {
|
||||
window.history.replaceState(null, document.title, "/" + window.location.hash);
|
||||
}
|
||||
} else {
|
||||
Notes.login()
|
||||
return Notes.login()
|
||||
}
|
||||
}
|
||||
|
||||
await Notes.start();
|
||||
|
||||
if (window.navigator.storage && navigator.storage.persist) {
|
||||
navigator.storage.persisted()
|
||||
.then(has => has ? true : navigator.storage.persist())
|
||||
.then(is => {
|
||||
console.log("Persistant Storage:", is);
|
||||
})
|
||||
}
|
||||
|
||||
Navigation.default = VaultsPage as typeof Page;
|
||||
Navigation.addPage("/vault", VaultPage as typeof Page)
|
||||
Navigation.addPage("/demo", DemoPage as typeof Page)
|
||||
Navigation.addPage("/share", SharePage as typeof Page)
|
||||
Navigation.addPage("/settings", SettingsPage as typeof Page)
|
||||
Navigation.addPage("/404", Error404Page);
|
||||
const trad = window.location.pathname;
|
||||
if (trad && trad !== "/" && trad !== "") {
|
||||
|
22
src/notes.ts
22
src/notes.ts
@ -1,8 +1,14 @@
|
||||
import * as config from "../config.json"
|
||||
import { Lock, Observable } from "@hibas123/utils"
|
||||
|
||||
import SecureFile, { IFile } from "@hibas123/secure-file-wrapper";
|
||||
import * as b64 from "./helper/base64"
|
||||
import { Lock, Observable } from "@hibas123/utils";
|
||||
import * as aesjs from "aes-js";
|
||||
import { IDBPTransaction } from "idb";
|
||||
import { sha256 } from "js-sha256";
|
||||
import * as uuidv4 from "uuid/v4";
|
||||
import * as config from "../config.json";
|
||||
import * as b64 from "./helper/base64";
|
||||
import IDB from "./helper/indexeddb";
|
||||
import Notifications, { MessageType } from "./notifications";
|
||||
|
||||
|
||||
export class HttpError extends Error {
|
||||
constructor(public status: number, public statusText: string) {
|
||||
@ -32,13 +38,7 @@ export interface ViewNote extends BaseNote {
|
||||
__value: string;
|
||||
}
|
||||
|
||||
import * as aesjs from "aes-js";
|
||||
import { sha256 } from "js-sha256"
|
||||
import clonedeep = require("lodash.clonedeep");
|
||||
import * as uuidv4 from "uuid/v4"
|
||||
import IDB from "./helper/indexeddb";
|
||||
import { Transaction } from "idb";
|
||||
import Notifications, { MessageType } from "./notifications";
|
||||
|
||||
const Encoder = new TextEncoder();
|
||||
const Decoder = new TextDecoder();
|
||||
@ -480,7 +480,7 @@ class NotesProvider {
|
||||
return Decoder.decode(this._decrypt(msg, this.generalEncryption))
|
||||
}
|
||||
|
||||
async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: Transaction) {
|
||||
async addop(note_id: string, type: OpLogType, values: { value: Uint8Array, preview: Uint8Array }, date: Date, transaction?: IDBPTransaction<unknown, string[]>) {
|
||||
let tx = transaction || this.oplogDB.transaction();
|
||||
let oplog = await this.oplogDB.get(note_id, tx);
|
||||
if (!oplog) oplog = { logs: [], id: note_id };
|
||||
|
52
src/theme.ts
Normal file
52
src/theme.ts
Normal file
@ -0,0 +1,52 @@
|
||||
const light = require("!!raw-loader!@hibas123/theme/out/light.css").default;
|
||||
const dark = require("!!raw-loader!@hibas123/theme/out/dark.css").default;
|
||||
|
||||
export enum ThemeStates {
|
||||
AUTO,
|
||||
LIGHT,
|
||||
DARK
|
||||
}
|
||||
|
||||
let themeConfig: ThemeStates = Number(localStorage.getItem("theme"));
|
||||
if (Number.isNaN(themeConfig))
|
||||
themeConfig = ThemeStates.AUTO;
|
||||
|
||||
let isDark = false;
|
||||
let mediaIsDark = false;
|
||||
|
||||
if (window.matchMedia) {
|
||||
const mediaq = matchMedia("(prefers-color-scheme: dark)");
|
||||
mediaIsDark = mediaq.matches;
|
||||
mediaq.onchange = ev => {
|
||||
mediaIsDark = ev.matches;
|
||||
apply();
|
||||
}
|
||||
console.log(mediaq);
|
||||
}
|
||||
|
||||
|
||||
let styleElm: HTMLStyleElement;
|
||||
function apply(force?: boolean) {
|
||||
let shouldDark = themeConfig === ThemeStates.AUTO ? mediaIsDark : themeConfig === ThemeStates.DARK;
|
||||
if (force || shouldDark !== isDark) {
|
||||
if (styleElm) styleElm.remove();
|
||||
styleElm = document.createElement("style");
|
||||
document.head.appendChild(styleElm);
|
||||
styleElm.innerHTML = shouldDark ? dark : light;
|
||||
isDark = shouldDark;
|
||||
}
|
||||
}
|
||||
apply(true);
|
||||
|
||||
|
||||
function change(state: ThemeStates) {
|
||||
themeConfig = state;
|
||||
localStorage.setItem("theme", String(themeConfig));
|
||||
apply();
|
||||
}
|
||||
|
||||
export default {
|
||||
active: () => themeConfig,
|
||||
change: (state: ThemeStates) => change(state)
|
||||
}
|
||||
|
@ -1,21 +1,9 @@
|
||||
:root {
|
||||
--primary: #1E88E5;
|
||||
--on-primary: white;
|
||||
// --mdc-theme-primary: var(--primary);
|
||||
// --mdc-theme-primary-bg: var(--mdc-theme--primary);
|
||||
// --mdc-theme-on-primary: white;
|
||||
--error: #ff2f00;
|
||||
--border-color: #ababab;
|
||||
--default-font-size: 1.05rem;
|
||||
}
|
||||
|
||||
.uk-button-primary {
|
||||
background: var(--primary) !important;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.uk-background-primary {
|
||||
background: var(--primary) !important;
|
||||
color: white;
|
||||
}
|
||||
|
||||
$hover-background: #DDDDDD;
|
||||
}
|
@ -1,5 +1,4 @@
|
||||
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
|
||||
const WorkboxPlugin = require("workbox-webpack-plugin");
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||
const CopyWebpackPlugin = require('copy-webpack-plugin')
|
||||
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
|
||||
|
Loading…
Reference in New Issue
Block a user