diff --git a/server/db/db.js b/server/db/db.js index 4403979..6630e31 100644 --- a/server/db/db.js +++ b/server/db/db.js @@ -93,7 +93,6 @@ export default class Database { } setInterval(() => { - console.log("saving db") global.db.saveData() }, 5000) } diff --git a/server/db/model/member.js b/server/db/model/member.js index 95eaec1..c8cbacc 100644 --- a/server/db/model/member.js +++ b/server/db/model/member.js @@ -22,12 +22,8 @@ export default class Member { firstName: z.string(), lastName: z.string(), password: z.string(), - tokenUsed: z.string().regex( - /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i, - "Invalid UUID" - ), joined: z.string(), - address: this.addressSchema + address: this.addressSchema.optional() }) isHashed = (s) => {return s.startsWith("$argon2")} @@ -37,7 +33,7 @@ export default class Member { let result = this.schema.safeParse(member) if(result.success) { try { - super.add(id, member) + global.db.addNode(id, member) } catch(e) { console.error(e) throw e @@ -48,12 +44,11 @@ export default class Member { } } - async add(newMember, tokenID) { - newMember.tokenUsed = tokenID + async add(newMember) { const hash = await argon2.hash(newMember.password); newMember.password = hash newMember.joined = global.currentTime() - newMember.id = this.entries.length+1 + newMember.id = this.indices[1] - 1 this.save(newMember) } diff --git a/server/index.js b/server/index.js index 8724879..bf3421f 100644 --- a/server/index.js +++ b/server/index.js @@ -35,7 +35,7 @@ class Server { router.get('/signout', this.auth.logout) /* Site */ - router.post('/signup', this.verifySignupToken, this.newUserSubmission) + router.post('/free', this.newUserSubmission) router.get('/db/images/*', this.getUserImage) router.get('/app/comaldata', this.getComalData) router.get('/*', this.get) @@ -79,12 +79,8 @@ class Server { } newUserSubmission = async (req, res) => { - const { token } = req.query; try { - let tokenData = db.tokens.get(token) - if(tokenData.used) throw new global.ServerError(400, "Token alredy used!") - await db.members.add(req.body, tokenData.uuid) - db.tokens.markUsed(token) + await db.members.add(req.body) global.db.saveData() return res.status(200).json({}); } catch(e) { diff --git a/ui/_/code/shared.css b/ui/_/code/shared.css index 7c8f750..2f939fd 100644 --- a/ui/_/code/shared.css +++ b/ui/_/code/shared.css @@ -46,7 +46,8 @@ } :root.public { - --accent: var(--gold); + --main: black; + --accent: var(--parchment); } @font-face { diff --git a/ui/public/pages/SignupForm.js b/ui/public/pages/SignupForm.js index 56a9bc3..fadf243 100644 --- a/ui/public/pages/SignupForm.js +++ b/ui/public/pages/SignupForm.js @@ -1,6 +1,6 @@ class SignupForm extends Shadow { - errorMessage = "Error signing up. Please try again later or email info@hyperia.so if the problem persists." + errorMessage = "Error signing up. Please try again later or email samuel@sun.museum if the problem persists." successMessage = "Success! You may now log in." inputStyles(el) {