mirror of
https://git.sr.ht/~roxwize/mipilin
synced 2025-01-31 02:53:36 +00:00
:(
Signed-off-by: roxwize <rae@roxwize.xyz>
This commit is contained in:
parent
afc634b0d2
commit
d173e6ea73
GPG key ID:
5B1A0FAB9BAB81EE
22 changed files with 1433 additions and 472 deletions
4
.TODO
4
.TODO
|
|
@ -1,4 +0,0 @@
|
||||||
[ ] An audit log
|
|
||||||
[ ] Invite code pruning
|
|
||||||
[ ] Make the journal work (i dont really remember what was left out though)
|
|
||||||
[ ] Write a 404 page
|
|
||||||
8
TODO.md
Normal file
8
TODO.md
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
- [ ] An audit log
|
||||||
|
- [ ] Invite code pruning
|
||||||
|
- [ ] Make the journal work (i dont really remember what was left out though)
|
||||||
|
- [x] Write a 404 page
|
||||||
|
- [ ] Make better login pages
|
||||||
|
- [ ] You do realize using toLocaleString on the server only makes it use your locale right
|
||||||
|
- [ ] Make recent updates also account for new journal entries
|
||||||
|
- [ ] View all previous moods and journal entries
|
||||||
|
|
@ -32,6 +32,7 @@ export const journalEntries = pgTable("journal_entries", {
|
||||||
.references(() => users.id, { onDelete: "cascade" })
|
.references(() => users.id, { onDelete: "cascade" })
|
||||||
.notNull(),
|
.notNull(),
|
||||||
moodChange: integer("mood-change").default(0).notNull(),
|
moodChange: integer("mood-change").default(0).notNull(),
|
||||||
|
title: varchar({ length: 64 }).default("").notNull(),
|
||||||
entry: varchar({ length: 4096 }).default("").notNull(),
|
entry: varchar({ length: 4096 }).default("").notNull(),
|
||||||
visibility: integer().default(1).notNull(),
|
visibility: integer().default(1).notNull(),
|
||||||
date: timestamp().notNull()
|
date: timestamp().notNull()
|
||||||
|
|
|
||||||
1
drizzle/0001_messy_fallen_one.sql
Normal file
1
drizzle/0001_messy_fallen_one.sql
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE "journal_entries" ADD COLUMN "title" varchar(128) DEFAULT '' NOT NULL;
|
||||||
1
drizzle/0002_special_ben_parker.sql
Normal file
1
drizzle/0002_special_ben_parker.sql
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE "journal_entries" ALTER COLUMN "title" SET DATA TYPE varchar(64);
|
||||||
415
drizzle/meta/0001_snapshot.json
Normal file
415
drizzle/meta/0001_snapshot.json
Normal file
|
|
@ -0,0 +1,415 @@
|
||||||
|
{
|
||||||
|
"id": "a5d70822-0a93-4193-9115-c41b2ee9f5d8",
|
||||||
|
"prevId": "05baee8f-73c9-4001-b69d-ba7c46dadf5c",
|
||||||
|
"version": "7",
|
||||||
|
"dialect": "postgresql",
|
||||||
|
"tables": {
|
||||||
|
"public.follows": {
|
||||||
|
"name": "follows",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"user_id": {
|
||||||
|
"name": "user_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"follower_id": {
|
||||||
|
"name": "follower_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"follows_user_id_users_id_fk": {
|
||||||
|
"name": "follows_user_id_users_id_fk",
|
||||||
|
"tableFrom": "follows",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
},
|
||||||
|
"follows_follower_id_users_id_fk": {
|
||||||
|
"name": "follows_follower_id_users_id_fk",
|
||||||
|
"tableFrom": "follows",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"follower_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {
|
||||||
|
"follows_user_id_follower_id_pk": {
|
||||||
|
"name": "follows_user_id_follower_id_pk",
|
||||||
|
"columns": [
|
||||||
|
"user_id",
|
||||||
|
"follower_id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.invite_codes": {
|
||||||
|
"name": "invite_codes",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"token": {
|
||||||
|
"name": "token",
|
||||||
|
"type": "varchar(22)",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"user_id": {
|
||||||
|
"name": "user_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"granted": {
|
||||||
|
"name": "granted",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"expires": {
|
||||||
|
"name": "expires",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false,
|
||||||
|
"default": "'1970-01-01 00:00:00.000'"
|
||||||
|
},
|
||||||
|
"confers": {
|
||||||
|
"name": "confers",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false,
|
||||||
|
"default": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"invite_codes_user_id_users_id_fk": {
|
||||||
|
"name": "invite_codes_user_id_users_id_fk",
|
||||||
|
"tableFrom": "invite_codes",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.journal_entries": {
|
||||||
|
"name": "journal_entries",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"identity": {
|
||||||
|
"type": "always",
|
||||||
|
"name": "journal_entries_id_seq",
|
||||||
|
"schema": "public",
|
||||||
|
"increment": "1",
|
||||||
|
"startWith": "1",
|
||||||
|
"minValue": "1",
|
||||||
|
"maxValue": "2147483647",
|
||||||
|
"cache": "1",
|
||||||
|
"cycle": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"name": "user",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"mood-change": {
|
||||||
|
"name": "mood-change",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 0
|
||||||
|
},
|
||||||
|
"title": {
|
||||||
|
"name": "title",
|
||||||
|
"type": "varchar(128)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"entry": {
|
||||||
|
"name": "entry",
|
||||||
|
"type": "varchar(4096)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"visibility": {
|
||||||
|
"name": "visibility",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 1
|
||||||
|
},
|
||||||
|
"date": {
|
||||||
|
"name": "date",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"journal_entries_user_users_id_fk": {
|
||||||
|
"name": "journal_entries_user_users_id_fk",
|
||||||
|
"tableFrom": "journal_entries",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.profiles": {
|
||||||
|
"name": "profiles",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"user": {
|
||||||
|
"name": "user",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"bio": {
|
||||||
|
"name": "bio",
|
||||||
|
"type": "varchar(1024)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"website": {
|
||||||
|
"name": "website",
|
||||||
|
"type": "varchar",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"profiles_user_users_id_fk": {
|
||||||
|
"name": "profiles_user_users_id_fk",
|
||||||
|
"tableFrom": "profiles",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.updates": {
|
||||||
|
"name": "updates",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"identity": {
|
||||||
|
"type": "always",
|
||||||
|
"name": "updates_id_seq",
|
||||||
|
"schema": "public",
|
||||||
|
"increment": "1",
|
||||||
|
"startWith": "1",
|
||||||
|
"minValue": "1",
|
||||||
|
"maxValue": "2147483647",
|
||||||
|
"cache": "1",
|
||||||
|
"cycle": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"name": "user",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"mood": {
|
||||||
|
"name": "mood",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 0
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"name": "description",
|
||||||
|
"type": "varchar(512)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"date": {
|
||||||
|
"name": "date",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"updates_user_users_id_fk": {
|
||||||
|
"name": "updates_user_users_id_fk",
|
||||||
|
"tableFrom": "updates",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.users": {
|
||||||
|
"name": "users",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"identity": {
|
||||||
|
"type": "always",
|
||||||
|
"name": "users_id_seq",
|
||||||
|
"schema": "public",
|
||||||
|
"increment": "1",
|
||||||
|
"startWith": "1",
|
||||||
|
"minValue": "1",
|
||||||
|
"maxValue": "2147483647",
|
||||||
|
"cache": "1",
|
||||||
|
"cycle": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"email": {
|
||||||
|
"name": "email",
|
||||||
|
"type": "varchar",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"name": {
|
||||||
|
"name": "name",
|
||||||
|
"type": "varchar(26)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"pass": {
|
||||||
|
"name": "pass",
|
||||||
|
"type": "varchar(255)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"registered": {
|
||||||
|
"name": "registered",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"name": "status",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {
|
||||||
|
"users_email_unique": {
|
||||||
|
"name": "users_email_unique",
|
||||||
|
"nullsNotDistinct": false,
|
||||||
|
"columns": [
|
||||||
|
"email"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"users_name_unique": {
|
||||||
|
"name": "users_name_unique",
|
||||||
|
"nullsNotDistinct": false,
|
||||||
|
"columns": [
|
||||||
|
"name"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"enums": {},
|
||||||
|
"schemas": {},
|
||||||
|
"sequences": {},
|
||||||
|
"roles": {},
|
||||||
|
"policies": {},
|
||||||
|
"views": {},
|
||||||
|
"_meta": {
|
||||||
|
"columns": {},
|
||||||
|
"schemas": {},
|
||||||
|
"tables": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
415
drizzle/meta/0002_snapshot.json
Normal file
415
drizzle/meta/0002_snapshot.json
Normal file
|
|
@ -0,0 +1,415 @@
|
||||||
|
{
|
||||||
|
"id": "f8e1fcdc-dfa2-41cd-886a-5f29a1c091df",
|
||||||
|
"prevId": "a5d70822-0a93-4193-9115-c41b2ee9f5d8",
|
||||||
|
"version": "7",
|
||||||
|
"dialect": "postgresql",
|
||||||
|
"tables": {
|
||||||
|
"public.follows": {
|
||||||
|
"name": "follows",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"user_id": {
|
||||||
|
"name": "user_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"follower_id": {
|
||||||
|
"name": "follower_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"follows_user_id_users_id_fk": {
|
||||||
|
"name": "follows_user_id_users_id_fk",
|
||||||
|
"tableFrom": "follows",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
},
|
||||||
|
"follows_follower_id_users_id_fk": {
|
||||||
|
"name": "follows_follower_id_users_id_fk",
|
||||||
|
"tableFrom": "follows",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"follower_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {
|
||||||
|
"follows_user_id_follower_id_pk": {
|
||||||
|
"name": "follows_user_id_follower_id_pk",
|
||||||
|
"columns": [
|
||||||
|
"user_id",
|
||||||
|
"follower_id"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.invite_codes": {
|
||||||
|
"name": "invite_codes",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"token": {
|
||||||
|
"name": "token",
|
||||||
|
"type": "varchar(22)",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"user_id": {
|
||||||
|
"name": "user_id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false
|
||||||
|
},
|
||||||
|
"granted": {
|
||||||
|
"name": "granted",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"expires": {
|
||||||
|
"name": "expires",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false,
|
||||||
|
"default": "'1970-01-01 00:00:00.000'"
|
||||||
|
},
|
||||||
|
"confers": {
|
||||||
|
"name": "confers",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false,
|
||||||
|
"default": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"invite_codes_user_id_users_id_fk": {
|
||||||
|
"name": "invite_codes_user_id_users_id_fk",
|
||||||
|
"tableFrom": "invite_codes",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user_id"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.journal_entries": {
|
||||||
|
"name": "journal_entries",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"identity": {
|
||||||
|
"type": "always",
|
||||||
|
"name": "journal_entries_id_seq",
|
||||||
|
"schema": "public",
|
||||||
|
"increment": "1",
|
||||||
|
"startWith": "1",
|
||||||
|
"minValue": "1",
|
||||||
|
"maxValue": "2147483647",
|
||||||
|
"cache": "1",
|
||||||
|
"cycle": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"name": "user",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"mood-change": {
|
||||||
|
"name": "mood-change",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 0
|
||||||
|
},
|
||||||
|
"title": {
|
||||||
|
"name": "title",
|
||||||
|
"type": "varchar(64)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"entry": {
|
||||||
|
"name": "entry",
|
||||||
|
"type": "varchar(4096)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"visibility": {
|
||||||
|
"name": "visibility",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 1
|
||||||
|
},
|
||||||
|
"date": {
|
||||||
|
"name": "date",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"journal_entries_user_users_id_fk": {
|
||||||
|
"name": "journal_entries_user_users_id_fk",
|
||||||
|
"tableFrom": "journal_entries",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.profiles": {
|
||||||
|
"name": "profiles",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"user": {
|
||||||
|
"name": "user",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"bio": {
|
||||||
|
"name": "bio",
|
||||||
|
"type": "varchar(1024)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"website": {
|
||||||
|
"name": "website",
|
||||||
|
"type": "varchar",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"profiles_user_users_id_fk": {
|
||||||
|
"name": "profiles_user_users_id_fk",
|
||||||
|
"tableFrom": "profiles",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.updates": {
|
||||||
|
"name": "updates",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"identity": {
|
||||||
|
"type": "always",
|
||||||
|
"name": "updates_id_seq",
|
||||||
|
"schema": "public",
|
||||||
|
"increment": "1",
|
||||||
|
"startWith": "1",
|
||||||
|
"minValue": "1",
|
||||||
|
"maxValue": "2147483647",
|
||||||
|
"cache": "1",
|
||||||
|
"cycle": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"user": {
|
||||||
|
"name": "user",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"mood": {
|
||||||
|
"name": "mood",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 0
|
||||||
|
},
|
||||||
|
"description": {
|
||||||
|
"name": "description",
|
||||||
|
"type": "varchar(512)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": "''"
|
||||||
|
},
|
||||||
|
"date": {
|
||||||
|
"name": "date",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {
|
||||||
|
"updates_user_users_id_fk": {
|
||||||
|
"name": "updates_user_users_id_fk",
|
||||||
|
"tableFrom": "updates",
|
||||||
|
"tableTo": "users",
|
||||||
|
"columnsFrom": [
|
||||||
|
"user"
|
||||||
|
],
|
||||||
|
"columnsTo": [
|
||||||
|
"id"
|
||||||
|
],
|
||||||
|
"onDelete": "cascade",
|
||||||
|
"onUpdate": "no action"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
},
|
||||||
|
"public.users": {
|
||||||
|
"name": "users",
|
||||||
|
"schema": "",
|
||||||
|
"columns": {
|
||||||
|
"id": {
|
||||||
|
"name": "id",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": true,
|
||||||
|
"notNull": true,
|
||||||
|
"identity": {
|
||||||
|
"type": "always",
|
||||||
|
"name": "users_id_seq",
|
||||||
|
"schema": "public",
|
||||||
|
"increment": "1",
|
||||||
|
"startWith": "1",
|
||||||
|
"minValue": "1",
|
||||||
|
"maxValue": "2147483647",
|
||||||
|
"cache": "1",
|
||||||
|
"cycle": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"email": {
|
||||||
|
"name": "email",
|
||||||
|
"type": "varchar",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"name": {
|
||||||
|
"name": "name",
|
||||||
|
"type": "varchar(26)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"pass": {
|
||||||
|
"name": "pass",
|
||||||
|
"type": "varchar(255)",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"registered": {
|
||||||
|
"name": "registered",
|
||||||
|
"type": "timestamp",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true
|
||||||
|
},
|
||||||
|
"status": {
|
||||||
|
"name": "status",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": true,
|
||||||
|
"default": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"indexes": {},
|
||||||
|
"foreignKeys": {},
|
||||||
|
"compositePrimaryKeys": {},
|
||||||
|
"uniqueConstraints": {
|
||||||
|
"users_email_unique": {
|
||||||
|
"name": "users_email_unique",
|
||||||
|
"nullsNotDistinct": false,
|
||||||
|
"columns": [
|
||||||
|
"email"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"users_name_unique": {
|
||||||
|
"name": "users_name_unique",
|
||||||
|
"nullsNotDistinct": false,
|
||||||
|
"columns": [
|
||||||
|
"name"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"policies": {},
|
||||||
|
"checkConstraints": {},
|
||||||
|
"isRLSEnabled": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"enums": {},
|
||||||
|
"schemas": {},
|
||||||
|
"sequences": {},
|
||||||
|
"roles": {},
|
||||||
|
"policies": {},
|
||||||
|
"views": {},
|
||||||
|
"_meta": {
|
||||||
|
"columns": {},
|
||||||
|
"schemas": {},
|
||||||
|
"tables": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -8,6 +8,20 @@
|
||||||
"when": 1733952034836,
|
"when": 1733952034836,
|
||||||
"tag": "0000_hard_leader",
|
"tag": "0000_hard_leader",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 1,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1735184859424,
|
||||||
|
"tag": "0001_messy_fallen_one",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 2,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1735185254730,
|
||||||
|
"tag": "0002_special_ben_parker",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
5
main.ts
5
main.ts
|
|
@ -91,12 +91,13 @@ object-src 'none'; base-uri 'none';"
|
||||||
return {
|
return {
|
||||||
user: e.user,
|
user: e.user,
|
||||||
mood: moods[e.mood],
|
mood: moods[e.mood],
|
||||||
date: date.to(dayjs(e.date)),
|
date: e.date,
|
||||||
|
relativeDate: date.to(dayjs(e.date)),
|
||||||
desc: e.desc
|
desc: e.desc
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
render(db, "index", "Home", res, req, {
|
render(db, "index", "home", res, req, {
|
||||||
users: (await db.select().from(users)).length,
|
users: (await db.select().from(users)).length,
|
||||||
recentUpdates,
|
recentUpdates,
|
||||||
feedUpdates
|
feedUpdates
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ export default function (app: Express, db: NodePgDatabase) {
|
||||||
expiresString: now.to(dayjs(e.expires))
|
expiresString: now.to(dayjs(e.expires))
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
render(db, "admin", "Admin Panel", res, req, { codes });
|
render(db, "admin", "admin panel", res, req, { codes });
|
||||||
});
|
});
|
||||||
|
|
||||||
app.post("/codes/delete", async (req, res) => {
|
app.post("/codes/delete", async (req, res) => {
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ export default function(app: Express, db: NodePgDatabase) {
|
||||||
res.redirect("/");
|
res.redirect("/");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
render(db, "register", "Sign up", res, req);
|
render(db, "register", "sign up", res, req);
|
||||||
});
|
});
|
||||||
app.post("/register", async (req, res) => {
|
app.post("/register", async (req, res) => {
|
||||||
if (req.session["loggedIn"]) {
|
if (req.session["loggedIn"]) {
|
||||||
|
|
@ -50,22 +50,6 @@ export default function(app: Express, db: NodePgDatabase) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// invite code checking
|
|
||||||
const code = (await db.select({ expires: inviteCodes.expires, confers: inviteCodes.confers }).from(inviteCodes).where(eq(inviteCodes.token, req.body.referral)).limit(1))[0];
|
|
||||||
if (!code) {
|
|
||||||
req.flash("error", "Invalid invite code! Make sure you pasted it in correctly WITH the hyphens.");
|
|
||||||
res.redirect("/register");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const expiration = code.expires.getTime();
|
|
||||||
if (expiration > 0 && Date.now() >= expiration) {
|
|
||||||
req.flash("error", "That code is expired.");
|
|
||||||
res.redirect("/register");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// we're verified now so get that dumb fucker out of the database
|
|
||||||
await db.delete(inviteCodes).where(eq(inviteCodes.token, req.body.referral));
|
|
||||||
|
|
||||||
// field conflicts
|
// field conflicts
|
||||||
if (
|
if (
|
||||||
(await db.select().from(users).where(eq(users.name, req.body.name)))
|
(await db.select().from(users).where(eq(users.name, req.body.name)))
|
||||||
|
|
@ -85,6 +69,22 @@ export default function(app: Express, db: NodePgDatabase) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// invite code checking
|
||||||
|
const code = (await db.select({ expires: inviteCodes.expires, confers: inviteCodes.confers }).from(inviteCodes).where(eq(inviteCodes.token, req.body.referral)).limit(1))[0];
|
||||||
|
if (!code) {
|
||||||
|
req.flash("error", "Invalid invite code! Make sure you pasted it in correctly WITH the hyphens.");
|
||||||
|
res.redirect("/register");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const expiration = code.expires.getTime();
|
||||||
|
if (expiration > 0 && Date.now() >= expiration) {
|
||||||
|
req.flash("error", "That code is expired.");
|
||||||
|
res.redirect("/register");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// we're verified now so get that dumb fucker out of the database
|
||||||
|
await db.delete(inviteCodes).where(eq(inviteCodes.token, req.body.referral));
|
||||||
|
|
||||||
const hash = await bcrypt.hash(req.body.pass, 10);
|
const hash = await bcrypt.hash(req.body.pass, 10);
|
||||||
const { uid } = (
|
const { uid } = (
|
||||||
await db
|
await db
|
||||||
|
|
@ -117,7 +117,7 @@ export default function(app: Express, db: NodePgDatabase) {
|
||||||
res.redirect("/");
|
res.redirect("/");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
render(db, "login", "Log in", res, req);
|
render(db, "login", "log in", res, req);
|
||||||
});
|
});
|
||||||
app.post("/login", async (req, res) => {
|
app.post("/login", async (req, res) => {
|
||||||
if (req.session["loggedIn"]) {
|
if (req.session["loggedIn"]) {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import {
|
||||||
} from "../db/schema.js";
|
} from "../db/schema.js";
|
||||||
import { and, count, desc, eq, sql } from "drizzle-orm";
|
import { and, count, desc, eq, sql } from "drizzle-orm";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { getMoods, render } from "./util.js";
|
import { getMoods, render, render404 } from "./util.js";
|
||||||
|
|
||||||
export default async function (app: Express, db: NodePgDatabase) {
|
export default async function (app: Express, db: NodePgDatabase) {
|
||||||
const { moods, moodsSorted } = await getMoods();
|
const { moods, moodsSorted } = await getMoods();
|
||||||
|
|
@ -69,19 +69,25 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
user: e.user,
|
user: e.user,
|
||||||
mood: moods[e.mood],
|
mood: moods[e.mood],
|
||||||
desc: e.desc,
|
desc: e.desc,
|
||||||
date: now.to(dayjs(e.date))
|
date: e.date,
|
||||||
|
relativeDate: now.to(dayjs(e.date))
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
// user invite codes
|
// user invite codes
|
||||||
const codes = (await db
|
const codes = (
|
||||||
.select({ token: inviteCodes.token, expires: inviteCodes.expires })
|
await db
|
||||||
|
.select({
|
||||||
|
token: inviteCodes.token,
|
||||||
|
expires: inviteCodes.expires
|
||||||
|
})
|
||||||
.from(inviteCodes)
|
.from(inviteCodes)
|
||||||
.where(eq(inviteCodes.user, req.session["uid"]))).map((e) => {
|
.where(eq(inviteCodes.user, req.session["uid"]))
|
||||||
|
).map((e) => {
|
||||||
return {
|
return {
|
||||||
token: e.token,
|
token: e.token,
|
||||||
expires: now.to(dayjs(e.expires || 0))
|
expires: now.to(dayjs(e.expires || 0))
|
||||||
}
|
};
|
||||||
});
|
});
|
||||||
const { codesUsed } = (
|
const { codesUsed } = (
|
||||||
await db
|
await db
|
||||||
|
|
@ -98,7 +104,7 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
)
|
)
|
||||||
)[0];
|
)[0];
|
||||||
|
|
||||||
render(db, "dashboard", "Dashboard", res, req, {
|
render(db, "dashboard", "dashboard", res, req, {
|
||||||
user,
|
user,
|
||||||
moods,
|
moods,
|
||||||
moodsSorted,
|
moodsSorted,
|
||||||
|
|
@ -146,13 +152,14 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
|
|
||||||
// JOURNAL
|
// JOURNAL
|
||||||
app.get("/journal", async (req, res) => {
|
app.get("/journal", async (req, res) => {
|
||||||
render(db, "journal", "Journal", res, req);
|
render(db, "journal", "your journal", res, req);
|
||||||
});
|
});
|
||||||
app.get("/journal/:id", async (req, res) => {
|
app.get("/journal/:id", async (req, res) => {
|
||||||
const entry = (
|
const entry = (
|
||||||
await db
|
await db
|
||||||
.select({
|
.select({
|
||||||
uname: users.name,
|
uname: users.name,
|
||||||
|
title: journalEntries.title,
|
||||||
content: journalEntries.entry,
|
content: journalEntries.entry,
|
||||||
date: journalEntries.date
|
date: journalEntries.date
|
||||||
})
|
})
|
||||||
|
|
@ -161,18 +168,26 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
.leftJoin(users, eq(journalEntries.user, users.id))
|
.leftJoin(users, eq(journalEntries.user, users.id))
|
||||||
)[0];
|
)[0];
|
||||||
if (!entry) {
|
if (!entry) {
|
||||||
//! TODO write a 404 page
|
render404(db, res, req);
|
||||||
res.statusCode = 404;
|
|
||||||
res.write("404 not found?? :(");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
render(db, "journal_view", "Journal Entry", res, req, { entry });
|
|
||||||
|
const entryTimestamp = dayjs(entry.date).fromNow();
|
||||||
|
render(db, "journal_view", entry.title, res, req, {
|
||||||
|
entry,
|
||||||
|
entryTimestamp
|
||||||
|
});
|
||||||
});
|
});
|
||||||
app.post("/update/journal", async (req, res) => {
|
app.post("/update/journal", async (req, res) => {
|
||||||
if (!req.session["loggedIn"]) {
|
if (!req.session["loggedIn"]) {
|
||||||
res.redirect("/login");
|
res.redirect("/login");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (req.body.title.length > 64) {
|
||||||
|
req.flash("error", "Title too long!");
|
||||||
|
res.redirect("/journal");
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (req.body.description.length > 4096) {
|
if (req.body.description.length > 4096) {
|
||||||
req.flash("error", "Entry too long!");
|
req.flash("error", "Entry too long!");
|
||||||
res.redirect("/journal");
|
res.redirect("/journal");
|
||||||
|
|
@ -196,7 +211,12 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
user: req.session["uid"],
|
user: req.session["uid"],
|
||||||
moodChange,
|
moodChange,
|
||||||
visibility,
|
visibility,
|
||||||
entry: req.body.description,
|
title: req.body.title,
|
||||||
|
entry: req.body.description
|
||||||
|
.replaceAll("&", "&")
|
||||||
|
.replaceAll("<", "<")
|
||||||
|
.replaceAll(">", ">")
|
||||||
|
.replaceAll("\n", "<br>"),
|
||||||
date: new Date(Date.now())
|
date: new Date(Date.now())
|
||||||
})
|
})
|
||||||
.returning({ id: journalEntries.id });
|
.returning({ id: journalEntries.id });
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,14 @@
|
||||||
import { NodePgDatabase } from "drizzle-orm/node-postgres";
|
import { NodePgDatabase } from "drizzle-orm/node-postgres";
|
||||||
import { Express } from "express";
|
import { Express } from "express";
|
||||||
import { follows, profiles, updates, users } from "../db/schema.js";
|
import {
|
||||||
|
follows,
|
||||||
|
journalEntries,
|
||||||
|
profiles,
|
||||||
|
updates,
|
||||||
|
users
|
||||||
|
} from "../db/schema.js";
|
||||||
import { and, desc, eq } from "drizzle-orm";
|
import { and, desc, eq } from "drizzle-orm";
|
||||||
import { getMoods, render, UserStatus } from "./util.js";
|
import { getMoods, render, render404, UserStatus } from "./util.js";
|
||||||
import { PgColumn } from "drizzle-orm/pg-core";
|
import { PgColumn } from "drizzle-orm/pg-core";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
|
|
@ -11,11 +17,19 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
app.get("/users/:user", async (req, res) => {
|
app.get("/users/:user", async (req, res) => {
|
||||||
const isSelf = req.params.user === req.session["user"];
|
const isSelf = req.params.user === req.session["user"];
|
||||||
|
|
||||||
const user = (
|
const user: {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
registered: Date;
|
||||||
|
relativeRegistered?: string;
|
||||||
|
bio: string;
|
||||||
|
website: string;
|
||||||
|
} = (
|
||||||
await db
|
await db
|
||||||
.select({
|
.select({
|
||||||
id: users.id,
|
id: users.id,
|
||||||
name: users.name,
|
name: users.name,
|
||||||
|
registered: users.registered,
|
||||||
bio: profiles.bio,
|
bio: profiles.bio,
|
||||||
website: profiles.website
|
website: profiles.website
|
||||||
})
|
})
|
||||||
|
|
@ -24,10 +38,10 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
.leftJoin(profiles, eq(profiles.user, users.id))
|
.leftJoin(profiles, eq(profiles.user, users.id))
|
||||||
)[0];
|
)[0];
|
||||||
if (!user) {
|
if (!user) {
|
||||||
req.flash("error", `User ${req.params.user} does not exist`);
|
render404(db, res, req);
|
||||||
res.redirect("/");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
user.relativeRegistered = dayjs(user.registered).fromNow();
|
||||||
|
|
||||||
// follows
|
// follows
|
||||||
const isFollowing = !!(
|
const isFollowing = !!(
|
||||||
|
|
@ -58,28 +72,59 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
.limit(1)
|
.limit(1)
|
||||||
)[0];
|
)[0];
|
||||||
|
|
||||||
// feed
|
// journal entries
|
||||||
const now = dayjs();
|
const now = dayjs();
|
||||||
const userMoodFeed = (await db
|
const userJournalEntries = (
|
||||||
|
await db
|
||||||
|
.select({
|
||||||
|
id: journalEntries.id,
|
||||||
|
title: journalEntries.title,
|
||||||
|
date: journalEntries.date
|
||||||
|
})
|
||||||
|
.from(journalEntries)
|
||||||
|
.where(eq(journalEntries.user, user.id))
|
||||||
|
.orderBy(desc(journalEntries.date))
|
||||||
|
.limit(5)
|
||||||
|
).map((e) => {
|
||||||
|
return {
|
||||||
|
id: e.id,
|
||||||
|
title: e.title,
|
||||||
|
date: e.date,
|
||||||
|
relativeDate: now.to(e.date)
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// feed
|
||||||
|
const userMoodFeed = (
|
||||||
|
await db
|
||||||
.select({
|
.select({
|
||||||
mood: updates.mood,
|
mood: updates.mood,
|
||||||
date: updates.date,
|
date: updates.date,
|
||||||
desc: updates.description
|
desc: updates.description
|
||||||
})
|
})
|
||||||
.from(updates)
|
.from(updates)
|
||||||
.where(eq(updates.user, user.id))).map((e) => {
|
.where(eq(updates.user, user.id))
|
||||||
return { user: user.name, mood: moods[e.mood], date: now.to(dayjs(e.date)), desc: e.desc }
|
.orderBy(desc(updates.date))
|
||||||
|
).map((e) => {
|
||||||
|
return {
|
||||||
|
user: user.name,
|
||||||
|
mood: moods[e.mood],
|
||||||
|
date: e.date,
|
||||||
|
relativeDate: now.to(dayjs(e.date)),
|
||||||
|
desc: e.desc
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!isSelf) {
|
if (!isSelf) {
|
||||||
userMood.mood = moods[userMood.mood as number];
|
userMood.mood = moods[userMood.mood as number];
|
||||||
}
|
}
|
||||||
|
|
||||||
render(db, "user", `${req.params.user}'s Profile`, res, req, {
|
render(db, "user", `${req.params.user}'s profile`, res, req, {
|
||||||
user,
|
user,
|
||||||
isSelf,
|
isSelf,
|
||||||
userMood,
|
userMood,
|
||||||
userMoodFeed,
|
userMoodFeed,
|
||||||
|
userJournalEntries,
|
||||||
isFollowing
|
isFollowing
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -94,7 +139,10 @@ export default async function (app: Express, db: NodePgDatabase) {
|
||||||
.from(users)
|
.from(users)
|
||||||
.where(eq(users.name, req.params.user))
|
.where(eq(users.name, req.params.user))
|
||||||
)[0];
|
)[0];
|
||||||
if ((uname || "") !== req.session["user"] && !(req.session["status"] & UserStatus.MODERATOR)) {
|
if (
|
||||||
|
(uname || "") !== req.session["user"] &&
|
||||||
|
!(req.session["status"] & UserStatus.MODERATOR)
|
||||||
|
) {
|
||||||
res.redirect("back");
|
res.redirect("back");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ export enum UserStatus {
|
||||||
MODERATOR = 0b001,
|
MODERATOR = 0b001,
|
||||||
BANNED = 0b010,
|
BANNED = 0b010,
|
||||||
TRUSTED = 0b100
|
TRUSTED = 0b100
|
||||||
};
|
}
|
||||||
|
|
||||||
const nonceChars =
|
const nonceChars =
|
||||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_";
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_";
|
||||||
|
|
@ -20,8 +20,7 @@ export function setNonce() {
|
||||||
return nonce;
|
return nonce;
|
||||||
}
|
}
|
||||||
export function getNonce() {
|
export function getNonce() {
|
||||||
if (!nonce)
|
if (!nonce) throw new Error("Nonce doesn't exist");
|
||||||
throw new Error("Nonce doesn't exist");
|
|
||||||
return nonce;
|
return nonce;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,20 +67,42 @@ export async function render(
|
||||||
};
|
};
|
||||||
res.render(page, { ...o, ...stuff });
|
res.render(page, { ...o, ...stuff });
|
||||||
}
|
}
|
||||||
|
export async function render404(
|
||||||
|
db: NodePgDatabase,
|
||||||
|
res: Response,
|
||||||
|
req: Request
|
||||||
|
) {
|
||||||
|
res.statusCode = 404;
|
||||||
|
render(db, "404", "not found", res, req);
|
||||||
|
}
|
||||||
|
|
||||||
const inviteCodeChars = "abcdefghijklmnopqrstuvwxyz0123456789"
|
const inviteCodeChars = "abcdefghijklmnopqrstuvwxyz0123456789";
|
||||||
export async function createInviteCode(db: NodePgDatabase, user: number, expires: Date, confers = 0) {
|
export async function createInviteCode(
|
||||||
let existingToken = 1, token: string;
|
db: NodePgDatabase,
|
||||||
|
user: number,
|
||||||
|
expires: Date,
|
||||||
|
confers = 0
|
||||||
|
) {
|
||||||
|
let existingToken = 1,
|
||||||
|
token: string;
|
||||||
while (existingToken) {
|
while (existingToken) {
|
||||||
token = user.toString().padStart(4, "0") + "-"
|
token = user.toString().padStart(4, "0") + "-";
|
||||||
for (let i = 0; i < 17; i++) {
|
for (let i = 0; i < 17; i++) {
|
||||||
if ((i + 1) % 6 === 0) {
|
if ((i + 1) % 6 === 0) {
|
||||||
token += "-";
|
token += "-";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
token += inviteCodeChars[Math.floor(Math.random() * inviteCodeChars.length)];
|
token +=
|
||||||
|
inviteCodeChars[
|
||||||
|
Math.floor(Math.random() * inviteCodeChars.length)
|
||||||
|
];
|
||||||
}
|
}
|
||||||
existingToken = (await db.select({ value: count() }).from(inviteCodes).where(eq(inviteCodes.token, token)))[0].value;
|
existingToken = (
|
||||||
|
await db
|
||||||
|
.select({ value: count() })
|
||||||
|
.from(inviteCodes)
|
||||||
|
.where(eq(inviteCodes.token, token))
|
||||||
|
)[0].value;
|
||||||
}
|
}
|
||||||
|
|
||||||
//@ts-expect-error
|
//@ts-expect-error
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@ body {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
background-color: #21211d;
|
background-color: #21211d;
|
||||||
|
background-image: url("/img/bg.png");
|
||||||
|
background-size: cover;
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
font-family: "Gohufont 14", sans-serif;
|
font-family: "Gohufont 14", sans-serif;
|
||||||
|
|
@ -17,6 +19,7 @@ body {
|
||||||
main {
|
main {
|
||||||
background-color: #faf8da;
|
background-color: #faf8da;
|
||||||
width: 95%;
|
width: 95%;
|
||||||
|
max-width: 953px;
|
||||||
height: 95%;
|
height: 95%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
BIN
static/img/bg.png
Normal file
BIN
static/img/bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 129 KiB |
5
views/404.pug
Normal file
5
views/404.pug
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
extends site.pug
|
||||||
|
|
||||||
|
block content
|
||||||
|
h1 Not Found
|
||||||
|
p No such thing is to be found here!! Perhaps, you would be better off, locating something that exists.
|
||||||
|
|
@ -9,6 +9,6 @@ mixin feed(feed, hideUser)
|
||||||
| #{update.user}
|
| #{update.user}
|
||||||
strong= update.mood
|
strong= update.mood
|
||||||
div= update.desc || "[no mood description provided]"
|
div= update.desc || "[no mood description provided]"
|
||||||
div= update.date
|
div(title=update.date.toLocaleString())= update.relativeDate
|
||||||
else
|
else
|
||||||
span [no updates]
|
span [no updates]
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,9 @@ block content
|
||||||
input.ovm-input(type="radio", name="moodDelta", id="moodDelta-mw", value="-2", required)
|
input.ovm-input(type="radio", name="moodDelta", id="moodDelta-mw", value="-2", required)
|
||||||
label.ovm-input(for="moodDelta-mw", title="Much worse")
|
label.ovm-input(for="moodDelta-mw", title="Much worse")
|
||||||
img(src="/img/downdown.svg", alt="Much worse")
|
img(src="/img/downdown.svg", alt="Much worse")
|
||||||
|
.input
|
||||||
|
label(for="title") Title
|
||||||
|
input(type="text", name="title", id="title", placeholder="max 64 chars", maxlength="64", style="width:66ch;")
|
||||||
.input
|
.input
|
||||||
label(for="description") Journal entry for today
|
label(for="description") Journal entry for today
|
||||||
textarea(name="description", id="description", placeholder="max 4096 chars", maxlength="4096", cols="60", rows="12")
|
textarea(name="description", id="description", placeholder="max 4096 chars", maxlength="4096", cols="60", rows="12")
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,12 @@
|
||||||
extends site.pug
|
extends site.pug
|
||||||
|
|
||||||
block content
|
block content
|
||||||
h1= entry.date.toLocaleDateString()
|
h1= entry.title
|
||||||
span
|
span
|
||||||
| by
|
| by
|
||||||
|
|
|
||||||
a(href=`/users/${entry.uname}`)= entry.uname
|
a(href=`/users/${entry.uname}`)= entry.uname
|
||||||
|
|
|
|
||||||
| at #{entry.date.toLocaleTimeString()}
|
span(title=entry.date.toLocaleString()) #{entryTimestamp}
|
||||||
br
|
br
|
||||||
br
|
br
|
||||||
div= entry.content
|
div!= entry.content
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ html(lang="en")
|
||||||
main
|
main
|
||||||
header
|
header
|
||||||
a(href="/")
|
a(href="/")
|
||||||
img#header-logo(src="/img/logo.svg", alt="logo")
|
img#header-logo(src="/img/logo.svg", alt="logo", title="meow")
|
||||||
nav
|
nav
|
||||||
if session.loggedIn
|
if session.loggedIn
|
||||||
if session.status & 0b001
|
if session.status & 0b001
|
||||||
|
|
|
||||||
|
|
@ -2,20 +2,21 @@ extends site.pug
|
||||||
|
|
||||||
//- Display mood here but keep yourself dry (i.e. dont request user mood if the profile being viewed is the profile of the currently logged-in user)
|
//- Display mood here but keep yourself dry (i.e. dont request user mood if the profile being viewed is the profile of the currently logged-in user)
|
||||||
block content
|
block content
|
||||||
|
div(style="display:flex;align-items:center;gap:8px;")
|
||||||
h1= user.name
|
h1= user.name
|
||||||
if !isSelf
|
if !isSelf
|
||||||
form(action=`/users/${user.name}/follow`, method="post")
|
form(action=`/users/${user.name}/follow`, method="post")
|
||||||
button(type="submit")= isFollowing ? "unfollow" : "follow"
|
button(type="submit")= isFollowing ? "unfollow" : "follow"
|
||||||
br
|
br
|
||||||
span= user.bio || "[no bio]"
|
div(style="margin-bottom:1em;")
|
||||||
|
| Joined
|
||||||
|
span(title=user.registered.toLocaleString())= user.relativeRegistered
|
||||||
|
div= user.bio || "[no bio]"
|
||||||
if user.website
|
if user.website
|
||||||
br
|
|
||||||
a(href=user.website)= user.website
|
a(href=user.website)= user.website
|
||||||
br
|
h2(style="margin-top:1em;") Current mood
|
||||||
br
|
|
||||||
h2 Current mood
|
|
||||||
if userMood
|
if userMood
|
||||||
span
|
div
|
||||||
| Feeling
|
| Feeling
|
||||||
|
|
|
|
||||||
strong
|
strong
|
||||||
|
|
@ -23,11 +24,20 @@ block content
|
||||||
| #{currentMood}
|
| #{currentMood}
|
||||||
else
|
else
|
||||||
| #{userMood.mood}
|
| #{userMood.mood}
|
||||||
br
|
|
||||||
div(style="margin-left:2ch;word-wrap:break-word;")= userMood.desc || "[no mood description]"
|
div(style="margin-left:2ch;word-wrap:break-word;")= userMood.desc || "[no mood description]"
|
||||||
else
|
else
|
||||||
span User has not yet set a mood!
|
div User has not yet set a mood!
|
||||||
br
|
br
|
||||||
h2 Recent updates
|
h2 Recent journal entries
|
||||||
|
if userJournalEntries.length > 0
|
||||||
|
ul
|
||||||
|
for entry of userJournalEntries
|
||||||
|
li
|
||||||
|
a(href=`/journal/${entry.id}`)= entry.title
|
||||||
|
span.subtle(title=entry.date.toLocaleString()) (#{entry.relativeDate})
|
||||||
|
else
|
||||||
|
div [no entries]
|
||||||
|
br
|
||||||
|
h2 Recent mood updates
|
||||||
include _feed.pug
|
include _feed.pug
|
||||||
+feed(userMoodFeed, true)
|
+feed(userMoodFeed, true)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue