Feat: Track Sessions

.devcontainer/init/init.sql

@@ -0,0 +1,132 @@
+/* Create a debug admin user
+ * User: debug
+ * Pass: test
+INSERT INTO users (username, password_hash, isAdmin) 
+VALUES ('debug', '$argon2id$v=19$m=65536,t=2,p=1$Wk4wtKV3dv4IraDG2bq5cif5bIfmt8oRElEqAxk9AXY$LlUNVKfc/ivAqgEFYLgDqIgV76z2Gg35j2yl6cPf3UA', 1)
+ */
+
+/* Toggle preferences
+[card | compact]
+UPDATE users SET pref_view = 'card' WHERE id = 1
+
+[hot | best | new | rising | top | top&t=day | top&t=week | top&t=month | top&t=year | top&t=all]
+UPDATE users SET pref_sort = 'best' WHERE id = 1
+
+[0 | 1]
+UPDATE users SET pref_collapseAutoMod = 1 WHERE id = 1
+
+UPDATE users SET pref_trackSessions = 1 WHERE id = 1
+ */
+
+/* Subscribe  to some subreddits
+INSERT INTO subscriptions (user_id, subreddit) VALUES
+(1, '3dshacks'),
+(1, 'ATBGE'),
+(1, 'AdviceAnimals'),
+(1, 'Audi'),
+(1, 'CatastrophicFailure'),
+(1, 'CityPorn'),
+(1, 'Colorado'),
+(1, 'DMAcademy'),
+(1, 'EarthPorn'),
+(1, 'F1Porn'),
+(1, 'F1Technical'),
+(1, 'FinalFantasy'),
+(1, 'Greyhounds'),
+(1, 'HistoryPorn'),
+(1, 'HomeServer'),
+(1, 'IAmA'),
+(1, 'ImaginaryArchitecture'),
+(1, 'ImaginaryCityscapes'),
+(1, 'ImaginaryLandscapes'),
+(1, 'ImaginaryTechnology'),
+(1, 'JRPG'),
+(1, 'Justrolledintotheshop'),
+(1, 'MadeMeSmile'),
+(1, 'MilitaryPorn'),
+(1, 'MinimalWallpaper'),
+(1, 'MobileWallpaper'),
+(1, 'PleX'),
+(1, 'PowerShell'),
+(1, 'ProgrammerHumor'),
+(1, 'RetroArch'),
+(1, 'RetroPie'),
+(1, 'Roms'),
+(1, 'Shitty_Car_Mods'),
+(1, 'StarWars'),
+(1, 'ThatLookedExpensive'),
+(1, 'TopGear'),
+(1, 'WhatsWrongWithYourDog'),
+(1, 'adhdmeme'),
+(1, 'apple'),
+(1, 'battlemaps'),
+(1, 'bestof'),
+(1, 'books'),
+(1, 'comics'),
+(1, 'criticalrole'),
+(1, 'csharp'),
+(1, 'cyberpunkgame'),
+(1, 'dndmaps'),
+(1, 'dndmemes'),
+(1, 'docker'),
+(1, 'dotnet'),
+(1, 'emulation'),
+(1, 'food'),
+(1, 'formula1'),
+(1, 'formuladank'),
+(1, 'funny'),
+(1, 'gaming'),
+(1, 'gifs'),
+(1, 'homelab'),
+(1, 'horizon'),
+(1, 'iOSBeta'),
+(1, 'ios'),
+(1, 'iphonewallpapers'),
+(1, 'k3s'),
+(1, 'kubernetes'),
+(1, 'longboyes'),
+(1, 'macgaming'),
+(1, 'macos'),
+(1, 'macosbeta'),
+(1, 'news'),
+(1, 'pics'),
+(1, 'printSF'),
+(1, 'raspberry_pi'),
+(1, 'reddit'),
+(1, 'rpg'),
+(1, 'science'),
+(1, 'scifi'),
+(1, 'selfhosted'),
+(1, 'softwaregore'),
+(1, 'spaceporn'),
+(1, 'sysadmin'),
+(1, 'talesfromtechsupport'),
+(1, 'technology'),
+(1, 'techsupportgore'),
+(1, 'techsupportmacgyver'),
+(1, 'thegrandtour'),
+(1, 'thewholecar'),
+(1, 'tiltshift'),
+(1, 'todayilearned'),
+(1, 'urbanexploration'),
+(1, 'ubiquiti'),
+(1, 'wallpaper'),
+(1, 'wallpapers'),
+(1, 'windowsinsiders'),
+(1, 'worldnews'),
+(1, 'xkcd')
+ */
+
+/* Create some multireddits
+INSERT INTO multireddits (user_id, multireddit, subreddit) VALUES
+(1, 'F1', 'formula1'),
+(1, 'F1', 'formuladank'),
+(1, 'F1', 'f1technical'),
+(1, 'F1', 'f1porn'),
+(1, 'Homelab', 'homelab'),
+(1, 'Homelab', 'selfhosted'),
+(1, 'Homelab', 'homeserver'),
+(1, 'Homelab', 'k3s'),
+(1, 'Homelab', 'raspberry_pi'),
+(1, 'Homelab', 'docker')
+ */

src/db.js

@@ -55,6 +55,27 @@ db.run(`
   )
 `);
 
+// sessions table
+db.run(`
+  CREATE TABLE IF NOT EXISTS sessions (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    user_id INTEGER,
+    subreddit TEXT,
+    query TEXT,
+    FOREIGN KEY(user_id) REFERENCES users(id),
+    UNIQUE(user_id, query)
+  )
+`);
+
+// views table
+db.run(`
+  CREATE TABLE IF NOT EXISTS views (
+    session_id INTEGER,
+    post_id TEXT,
+    FOREIGN KEY(session_id) REFERENCES sessions(id)
+  )
+`);
+
 // migrations table
 db.query(`
   CREATE TABLE IF NOT EXISTS migrations (
@@ -87,7 +108,7 @@ runMigration("add-sort-view-pref-columns", () => {
   // Add viewPref column
   db.query(`
     ALTER TABLE users 
-    ADD COLUMN viewPref TEXT DEFAULT 'compact'
+    ADD COLUMN viewPref TEXT DEFAULT 'card'
   `).run();
 });
 
@@ -99,4 +120,33 @@ runMigration("add-collapse-automod-pref-column", () => {
   `).run();
 });
 
+// Add Track Sessions pref
+runMigration("add-track-sessions-pref-column", () => {
+  db.query(`
+    ALTER TABLE users
+    ADD COLUMN pref_trackSessions BOOLEAN DEFAULT 0
+  `).run();
+});
+
+// Standardize pref columns
+runMigration("standardize-pref-columns", () => {
+  // viewPref -> pref_view
+  db.query(`
+    ALTER TABLE users
+    RENAME COLUMN viewPref TO pref_view
+  `).run();
+
+  // sortPref -> pref_sort
+  db.query(`
+    ALTER TABLE users
+    RENAME COLUMN sortPref TO pref_sort
+  `).run();
+
+  // collapseAutoModPref -> pref_collapseAutomod
+  db.query(`
+    ALTER TABLE users
+    RENAME COLUMN collapseAutoModPref TO pref_collapseAutomod
+  `).run();
+});
+
 module.exports = { db };

src/mixins/header.pug

@@ -1,5 +1,5 @@
 mixin header(user)
-  - var viewQuery = 'view=' + (prefs ? prefs.view : (query && query.view ? query.view : 'compact'))
+  - var viewQuery = 'view=' + (prefs ? prefs.view : (query && query.view ? query.view : 'card'))
   - var sortQuery = 'sort=' + (prefs ? prefs.sort : (query ? (query.sort ? query.sort + (query.t ? '&t=' + query.t : '') : 'hot') : 'hot'))
   div.header
     div.header-item
@@ -12,7 +12,7 @@ mixin header(user)
       a(href=`/subs?${viewQuery}`) subs
     if user
       div.header-item
-        a(href=`/dashboard${viewQuery}`) #{user.username}
+        a(href=`/dashboard?${viewQuery}`) #{user.username}
         | 
         a(href='/logout') (logout)
     else

src/public/styles.css

@@ -1,5 +1,15 @@
 :root {
-  /* Light mode colors */
+  /* Messages */
+  --msg-success: #1a7f37;
+  --msg-success-muted: #4ac26b66;
+  --msg-info: #0969da;
+  --msg-info-muted: #54aeff66;
+  --msg-warn: #9a6700;
+  --msg-warn-muted: #d4a72c66;
+  --msg-danger: #cf222e;
+  --msg-danger-muted: #ff818266;
+
+  /* Light Mode */
   --bg-color: white;
   --bg-color-muted: #eee;
   --text-color: black;
@@ -22,6 +32,17 @@
 
 @media (prefers-color-scheme: dark) {
   :root {
+    /* Messages */
+    --msg-success: #238636;
+    --msg-success-muted: #2ea04366;
+    --msg-info: #1f6feb;
+    --msg-info-muted: #388bfd66;
+    --msg-warn: #9e6a03;
+    --msg-warn-muted: #bb800966;
+    --msg-danger: #da3633;
+    --msg-danger-muted: #f8514966;
+
+    /* Dark Mode */
     --bg-color: black;
     --bg-color-muted: #333;
     --text-color: white;
@@ -123,6 +144,15 @@ a:visited {
   margin-top: 20px;
 }
 
+.preference:first-child {
+  margin-top: unset;
+}
+
+.preference-group {
+  margin: 0.5rem 0rem 0.5rem 1rem;
+  padding: 0.5rem;
+}
+
 .pref-opts {
   display: grid;
   margin: 10px;
@@ -750,7 +780,6 @@ input[type="checkbox"] {
 .preference label {
   margin: 0;
   margin-left: 5px;
-  color: var(--text-color);
 }
 
 form label {
@@ -884,3 +913,54 @@ select {
 .inline {
   max-width: 100%;
 }
+
+.message {
+  padding: 8px 16px;
+  margin-bottom: 16px;
+  border-left: 0.25em solid var(--bg-color-muted);
+}
+
+.message > p:first-of-type {
+  margin-top: unset;
+}
+
+.message:last-of-type {
+  margin-bottom: 8px;
+}
+
+.message.success {
+  border-left-color: var(--msg-success);
+}
+
+.message.info {
+  border-left-color: var(--msg-info);
+}
+
+.message.warning {
+  border-left-color: var(--msg-warn);
+}
+
+.message.danger {
+  border-left-color: var(--msg-danger);
+}
+
+.message-title {
+  font-weight: bold;
+  color: var(--text-color-muted);
+}
+
+.message.success > .message-title {
+  color: var(--msg-success);
+}
+
+.message.info > .message-title {
+  color: var(--msg-info);
+}
+
+.message.warning > .message-title {
+  color: var(--msg-warn);
+}
+
+.message.danger > .message-title {
+  color: var(--msg-danger);
+}