Settings can now save

This commit is contained in:
Cadence Ember 2020-05-05 03:06:07 +12:00
parent 120faae576
commit e93b68abbe
No known key found for this signature in database
GPG Key ID: 128B99B1B74A6412
5 changed files with 124 additions and 5 deletions

View File

@ -68,6 +68,45 @@ let constants = {
feed_disabled_max_age: 2*24*60*60 // 2 days feed_disabled_max_age: 2*24*60*60 // 2 days
}, },
user_settings: [
{
name: "language",
default: "English (International)",
boolean: false,
replaceEmptyWithDefault: true // set this to false if the control is a checkbox and is not disabled
},{
name: "show_comments",
default: "",
boolean: true,
replaceEmptyWithDefault: true
},{
name: "link_hashtags",
default: "",
boolean: true,
replaceEmptyWithDefault: true
},{
name: "spa",
default: "on",
boolean: true,
replaceEmptyWithDefault: true
},{
name: "theme",
default: "Classic",
boolean: false,
replaceEmptyWithDefault: true
},{
name: "caption_side",
default: "Left (Bibliogram)",
boolean: false,
replaceEmptyWithDefault: true
},{
name: "display_alt",
default: "",
boolean: true,
replaceEmptyWithDefault: true
}
],
settings: { settings: {
enable_updater_page: false enable_updater_page: false
}, },
@ -161,7 +200,7 @@ let constants = {
additional_routes: [], additional_routes: [],
database_version: 3 database_version: 4
} }
// Override values from config and export the result // Override values from config and export the result

View File

@ -47,9 +47,20 @@ const deltas = new Map([
db.prepare("CREATE TABLE RequestHistory (type TEXT NOT NULL, success INTEGER NOT NULL, timestamp INTEGER NOT NULL)") db.prepare("CREATE TABLE RequestHistory (type TEXT NOT NULL, success INTEGER NOT NULL, timestamp INTEGER NOT NULL)")
.run() .run()
})() })()
}],
// version 3 to version 4
[4, function() {
db.transaction(() => {
db.prepare("DROP TABLE IF EXISTS UserSettings")
.run()
db.prepare(
"CREATE TABLE UserSettings (token TEXT NOT NULL, created INTEGER NOT NULL, language TEXT NOT NULL, show_comments INTEGER NOT NULL, link_hashtags INTEGER NOT NULL"
+", spa INTEGER NOT NULL, theme TEXT NOT NULL, caption_side TEXT NOT NULL, display_alt INTEGER NOT NULL"
+", PRIMARY KEY (token))"
)
.run()
})()
}] }]
]) ])
module.exports = async function() { module.exports = async function() {

55
src/site/api/settings.js Normal file
View File

@ -0,0 +1,55 @@
const constants = require("../../lib/constants")
const {render, redirect} = require("pinski/plugins")
const crypto = require("crypto")
const db = require("../../lib/db")
module.exports = [
{
route: "/settings", methods: ["GET"], code: async ({url}) => {
const saved = url.searchParams.has("saved")
return render(200, "pug/settings.pug", {saved})
}
},
{
route: "/settings", methods: ["POST"], upload: true, code: async ({body}) => {
const params = new URLSearchParams(body.toString())
const prepared = {}
for (const setting of constants.user_settings) {
let valueOrDefault
if (params.has(setting.name) && params.get(setting.name) !== "") {
valueOrDefault = params.get(setting.name)
} else if (setting.replaceEmptyWithDefault) {
valueOrDefault = setting.default
} else {
valueOrDefault = ""
}
let valueCorrectType
if (setting.boolean) {
valueCorrectType = +(valueOrDefault !== "")
} else {
valueCorrectType = valueOrDefault
}
prepared[setting.name] = valueCorrectType
}
const checkPrepared = db.prepare("SELECT token FROM UserSettings WHERE token = ?")
do {
prepared.token = crypto.randomBytes(16).toString("hex")
} while (checkPrepared.get(prepared.token))
prepared.created = Date.now()
db.prepare(
"INSERT INTO UserSettings (token, created, language, show_comments, link_hashtags, spa, theme, caption_side, display_alt)"
+" VALUES (@token, @created, @language, @show_comments, @link_hashtags, @spa, @theme, @caption_side, @display_alt)"
).run(prepared)
const expires = new Date(Date.now() + 4000*24*60*60*1000).toUTCString()
return {
statusCode: 303,
headers: {
"Location": "/settings?saved=1",
"Set-Cookie": `settings=${prepared.token}; Path=/; Expires=${expires}; SameSite=Strict`
},
contentType: "text/html",
content: "Redirecting..."
}
}
}
]

View File

@ -1,3 +1,5 @@
//- Needs saved
mixin form-component(id, description) mixin form-component(id, description)
.field-row .field-row
label.description(for=id)= description label.description(for=id)= description
@ -33,8 +35,12 @@ html
title Settings | Bibliogram title Settings | Bibliogram
include includes/head include includes/head
body.settings-page body.settings-page
if saved
.status-notice Saved.
script.
history.replaceState(null, "", "/settings")
main.settings main.settings
form(action="/settings" method="post") form(action="/settings" method="post" enctype="application/x-www-form-urlencoded")
h1 Settings h1 Settings
+fieldset("Features") +fieldset("Features")

View File

@ -636,15 +636,23 @@ body
.settings-page .settings-page
background-color: #fff4e8 background-color: #fff4e8
padding: 0px 10px 50px
a, a:visited a, a:visited
color: $main-theme-link-color color: $main-theme-link-color
.settings .settings
padding: 0px 10px 50px
max-width: 600px max-width: 600px
margin: 0 auto margin: 0 auto
.status-notice
padding: 15px
font-size: 24px
line-height: 1
text-align: center
background-color: #0b420b
color: #fff
.action-container .action-container
margin-top: 20px margin-top: 20px
display: flex display: flex