@@ -213,7 +218,11 @@ export class NodeUI extends Component {
this.node.value.create(name, nodeID=>this.goToNode(nodeID))
}//}}}
saveNode() {//{{{
- let content = this.nodeContent.current.contentDiv.current.value
+ let nodeContent = this.nodeContent.current
+ if(this.page.value != 'node' || nodeContent === null)
+ return
+
+ let content = nodeContent.contentDiv.current.value
this.node.value.setContent(content)
this.node.value.save(()=>this.props.app.nodeModified.value = false)
}//}}}
@@ -547,10 +556,14 @@ class Menu extends Component {
return html`
nodeui.menu.value = false}>
`
@@ -788,4 +801,77 @@ class Search extends Component {
}//}}}
}
+class ProfileSettings extends Component {
+ render({ nodeui }, {}) {//{{{
+ return html`
+
+
User settings
+
+
Password
+
+
Current
+
this.keyHandler(evt)} />
+
+
New
+
this.keyHandler(evt)} />
+
+
Repeat
+
this.keyHandler(evt)} />
+
+
+
+
`
+ }//}}}
+ componentDidMount() {//{{{
+ document.getElementById('current-password').focus()
+ }//}}}
+
+ keyHandler(evt) {//{{{
+ let handled = true
+
+ switch(evt.key.toUpperCase()) {
+ case 'ENTER':
+ this.updatePassword()
+ break
+
+ default:
+ handled = false
+ }
+
+ if(handled) {
+ evt.preventDefault()
+ evt.stopPropagation()
+ }
+ }//}}}
+ updatePassword() {//{{{
+ let curr_pass = document.getElementById('current-password').value
+ let pass1 = document.getElementById('new-password1').value
+ let pass2 = document.getElementById('new-password2').value
+
+ try {
+ if(pass1.length < 4) {
+ throw new Error('Password has to be at least 4 characters long')
+ }
+
+ if(pass1 != pass2) {
+ throw new Error(`Passwords don't match`)
+ }
+
+ window._app.current.request('/user/password', {
+ CurrentPassword: curr_pass,
+ NewPassword: pass1,
+ })
+ .then(res=>{
+ if(res.CurrentPasswordOK)
+ alert('Password is changed successfully')
+ else
+ alert('Current password is invalid')
+ })
+ } catch(err) {
+ alert(err.message)
+ }
+
+ }//}}}
+}
+
// vim: foldmethod=marker
diff --git a/static/less/main.less b/static/less/main.less
index 7435f57..c885ec8 100644
--- a/static/less/main.less
+++ b/static/less/main.less
@@ -56,6 +56,14 @@ button {
border: 2px solid #000;
box-shadow: 5px 5px 8px 0px rgba(0,0,0,0.5);
z-index: 1025;
+ width: min-content;
+
+ .section {
+ padding: 16px 16px 0px 16px;
+ font-weight: bold;
+ white-space: nowrap;
+ color: @accent_3;
+ }
.item {
padding: 16px;
@@ -154,7 +162,7 @@ button {
header {
display: grid;
grid-area: header;
- grid-template-columns: min-content 1fr repeat(3, min-content);
+ grid-template-columns: min-content 1fr repeat(4, min-content);
align-items: center;
padding: 8px 0px;
color: darken(@accent_1, 35%);
@@ -181,17 +189,7 @@ header {
font-size: 1.25em;
}
- .add {
- padding-right: 16px;
- cursor: pointer;
-
- img {
- cursor: pointer;
- height: 24px;
- }
- }
-
- .keys {
+ .search, .add, .keys {
padding-right: 16px;
img {
@@ -324,6 +322,12 @@ header {
font-size: 1.5em;
}
+#notes-version {
+ margin-top: 64px;
+ color: #888;
+ text-align: center;
+}
+
#node-content.encrypted {
color: #a00;
}
@@ -617,6 +621,22 @@ header {
}
+#profile-settings {
+ color: #333;
+ padding: 16px;
+
+ .passwords {
+ display: grid;
+ grid-template-columns: min-content 200px;
+ grid-gap: 8px 16px;
+ margin-bottom: 16px;
+
+ div {
+ white-space: nowrap;
+ }
+ }
+}
+
@media only screen and (max-width: 932px) {
#app.node {
.layout-crumbs();
diff --git a/user.go b/user.go
new file mode 100644
index 0000000..0d9b4ee
--- /dev/null
+++ b/user.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+ // Standard
+ "database/sql"
+)
+
+func (session Session) UpdatePassword(currPass, newPass string) (ok bool, err error) {
+ var result sql.Result
+ var rowsAffected int64
+
+ result, err = db.Exec(`
+ UPDATE public.user
+ SET
+ password = password_hash(
+ /* salt in hex */
+ ENCODE(gen_random_bytes(16), 'hex'),
+
+ /* password */
+ $1::bytea
+ )
+ WHERE
+ id = $2 AND
+ password=password_hash(SUBSTRING(password FROM 1 FOR 32), $3::bytea)
+ RETURNING id
+ `,
+ newPass,
+ session.UserID,
+ currPass,
+ )
+
+ if rowsAffected, err = result.RowsAffected(); err != nil {
+ return
+ }
+
+ return rowsAffected > 0, nil
+}
document.getElementById('app').classList.toggle('toggle-tree')} />
