Spaces:

dakunesu
/

always-uptime

Paused

App Files Files

sachnun commited on Oct 17, 2025

Commit

72a843b

1 Parent(s): b789293

Update auth, database schema, and routes

Browse files

Files changed (8) hide show

app/lib/auth.server.ts +2 -2
app/lib/db/schema.ts +1 -1
app/routes/login.tsx +14 -12
app/routes/register.tsx +24 -12
app/routes/uptime.tsx +1 -1
drizzle/0001_nostalgic_thing.sql +3 -0
drizzle/meta/0001_snapshot.json +251 -0
drizzle/meta/_journal.json +7 -0

app/lib/auth.server.ts CHANGED Viewed

@@ -13,7 +13,7 @@ export const lucia = new Lucia(adapter, {
   },
   getUserAttributes: (attributes) => {
     return {
-      email: attributes.email,
     };
   },
 });
@@ -22,7 +22,7 @@ declare module "lucia" {
   interface Register {
     Lucia: typeof lucia;
     DatabaseUserAttributes: {
-      email: string;
     };
   }
 }

   },
   getUserAttributes: (attributes) => {
     return {
+      username: attributes.username,
     };
   },
 });
   interface Register {
     Lucia: typeof lucia;
     DatabaseUserAttributes: {
+      username: string;
     };
   }
 }

app/lib/db/schema.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
 export const user = sqliteTable("user", {
   id: text("id").primaryKey(),
-  email: text("email").notNull().unique(),
   hashedPassword: text("hashed_password").notNull(),
   createdAt: integer("created_at").notNull(),
 });

 export const user = sqliteTable("user", {
   id: text("id").primaryKey(),
+  username: text("username").notNull().unique(),
   hashedPassword: text("hashed_password").notNull(),
   createdAt: integer("created_at").notNull(),
 });

app/routes/login.tsx CHANGED Viewed

@@ -3,7 +3,7 @@ import { redirect, data } from "react-router";
 import { lucia } from "~/lib/auth.server";
 import { db } from "~/lib/db";
 import { user } from "~/lib/db/schema";
-import { eq } from "drizzle-orm";
 import { verify } from "@node-rs/argon2";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
@@ -13,28 +13,29 @@ import { Link } from "react-router";
 export async function action({ request }: Route.ActionArgs) {
   const formData = await request.formData();
-  const email = formData.get("email");
   const password = formData.get("password");
-  if (!email || typeof email !== "string" || !email.includes("@")) {
-    return data({ error: "Invalid email" }, { status: 400 });
   }
   if (!password || typeof password !== "string" || password.length < 6) {
     return data({ error: "Password must be at least 6 characters" }, { status: 400 });
   }
   const existingUser = await db.query.user.findFirst({
-    where: eq(user.email, email),
   });
   if (!existingUser) {
-    return data({ error: "Invalid email or password" }, { status: 400 });
   }
   const validPassword = await verify(existingUser.hashedPassword, password);
   if (!validPassword) {
-    return data({ error: "Invalid email or password" }, { status: 400 });
   }
   const session = await lucia.createSession(existingUser.id, {});
@@ -65,13 +66,14 @@ export default function Login({ actionData }: Route.ComponentProps) {
         <CardContent>
           <form method="post" className="space-y-4">
             <div className="space-y-2">
-              <Label htmlFor="email">Email</Label>
               <Input
-                id="email"
-                name="email"
-                type="email"
-                placeholder="you@example.com"
                 required
               />
             </div>
             <div className="space-y-2">

 import { lucia } from "~/lib/auth.server";
 import { db } from "~/lib/db";
 import { user } from "~/lib/db/schema";
+import { eq, sql } from "drizzle-orm";
 import { verify } from "@node-rs/argon2";
 import { Button } from "~/components/ui/button";
 import { Input } from "~/components/ui/input";
 export async function action({ request }: Route.ActionArgs) {
   const formData = await request.formData();
+  const username = formData.get("username");
   const password = formData.get("password");
+  if (!username || typeof username !== "string" || username.length < 3) {
+    return data({ error: "Username must be at least 3 characters" }, { status: 400 });
   }
   if (!password || typeof password !== "string" || password.length < 6) {
     return data({ error: "Password must be at least 6 characters" }, { status: 400 });
   }
+  // Case-insensitive username lookup
   const existingUser = await db.query.user.findFirst({
+    where: sql`lower(${user.username}) = lower(${username})`,
   });
   if (!existingUser) {
+    return data({ error: "Invalid username or password" }, { status: 400 });
   }
   const validPassword = await verify(existingUser.hashedPassword, password);
   if (!validPassword) {
+    return data({ error: "Invalid username or password" }, { status: 400 });
   }
   const session = await lucia.createSession(existingUser.id, {});
         <CardContent>
           <form method="post" className="space-y-4">
             <div className="space-y-2">
+              <Label htmlFor="username">Username</Label>
               <Input
+                id="username"
+                name="username"
+                type="text"
+                placeholder="username"
                 required
+                minLength={3}
               />
             </div>
             <div className="space-y-2">

app/routes/register.tsx CHANGED Viewed

@@ -3,7 +3,7 @@ import { redirect, data } from "react-router";
 import { lucia } from "~/lib/auth.server";
 import { db } from "~/lib/db";
 import { user } from "~/lib/db/schema";
-import { eq } from "drizzle-orm";
 import { hash } from "@node-rs/argon2";
 import { generateId } from "lucia";
 import { Button } from "~/components/ui/button";
@@ -14,23 +14,29 @@ import { Link } from "react-router";
 export async function action({ request }: Route.ActionArgs) {
   const formData = await request.formData();
-  const email = formData.get("email");
   const password = formData.get("password");
-  if (!email || typeof email !== "string" || !email.includes("@")) {
-    return data({ error: "Invalid email" }, { status: 400 });
   }
   if (!password || typeof password !== "string" || password.length < 6) {
     return data({ error: "Password must be at least 6 characters" }, { status: 400 });
   }
   const existingUser = await db.query.user.findFirst({
-    where: eq(user.email, email),
   });
   if (existingUser) {
-    return data({ error: "Email already in use" }, { status: 400 });
   }
   const userId = generateId(15);
@@ -38,7 +44,7 @@ export async function action({ request }: Route.ActionArgs) {
   await db.insert(user).values({
     id: userId,
-    email,
     hashedPassword,
     createdAt: Date.now(),
   });
@@ -71,14 +77,20 @@ export default function Register({ actionData }: Route.ComponentProps) {
         <CardContent>
           <form method="post" className="space-y-4">
             <div className="space-y-2">
-              <Label htmlFor="email">Email</Label>
               <Input
-                id="email"
-                name="email"
-                type="email"
-                placeholder="you@example.com"
                 required
               />
             </div>
             <div className="space-y-2">
               <Label htmlFor="password">Password</Label>

 import { lucia } from "~/lib/auth.server";
 import { db } from "~/lib/db";
 import { user } from "~/lib/db/schema";
+import { sql } from "drizzle-orm";
 import { hash } from "@node-rs/argon2";
 import { generateId } from "lucia";
 import { Button } from "~/components/ui/button";
 export async function action({ request }: Route.ActionArgs) {
   const formData = await request.formData();
+  const username = formData.get("username");
   const password = formData.get("password");
+  if (!username || typeof username !== "string" || username.length < 3) {
+    return data({ error: "Username must be at least 3 characters" }, { status: 400 });
+  }
+  // Validate username format (alphanumeric and underscores only)
+  if (!/^[a-zA-Z0-9_]+$/.test(username)) {
+    return data({ error: "Username can only contain letters, numbers, and underscores" }, { status: 400 });
   }
   if (!password || typeof password !== "string" || password.length < 6) {
     return data({ error: "Password must be at least 6 characters" }, { status: 400 });
   }
+  // Case-insensitive username check
   const existingUser = await db.query.user.findFirst({
+    where: sql`lower(${user.username}) = lower(${username})`,
   });
   if (existingUser) {
+    return data({ error: "Username already in use" }, { status: 400 });
   }
   const userId = generateId(15);
   await db.insert(user).values({
     id: userId,
+    username,
     hashedPassword,
     createdAt: Date.now(),
   });
         <CardContent>
           <form method="post" className="space-y-4">
             <div className="space-y-2">
+              <Label htmlFor="username">Username</Label>
               <Input
+                id="username"
+                name="username"
+                type="text"
+                placeholder="username"
                 required
+                minLength={3}
+                pattern="[a-zA-Z0-9_]+"
+                title="Username can only contain letters, numbers, and underscores"
               />
+              <p className="text-xs text-zinc-500 dark:text-zinc-400">
+                At least 3 characters, letters, numbers, and underscores only
+              </p>
             </div>
             <div className="space-y-2">
               <Label htmlFor="password">Password</Label>

app/routes/uptime.tsx CHANGED Viewed

@@ -169,7 +169,7 @@ export default function Uptime({ loaderData, actionData }: Route.ComponentProps)
             </p>
           </div>
           <div className="flex items-center gap-4">
-            <span className="text-sm text-gray-600 dark:text-gray-400">{user.email}</span>
             <Form method="post" action="/logout">
               <Button variant="outline" size="sm" type="submit">
                 Logout

             </p>
           </div>
           <div className="flex items-center gap-4">
+            <span className="text-sm text-gray-600 dark:text-gray-400">{user.username}</span>
             <Form method="post" action="/logout">
               <Button variant="outline" size="sm" type="submit">
                 Logout

drizzle/0001_nostalgic_thing.sql ADDED Viewed

	@@ -0,0 +1,3 @@

+ALTER TABLE `user` RENAME COLUMN "email" TO "username";--> statement-breakpoint
+DROP INDEX `user_email_unique`;--> statement-breakpoint
+CREATE UNIQUE INDEX `user_username_unique` ON `user` (`username`);

drizzle/meta/0001_snapshot.json ADDED Viewed

	@@ -0,0 +1,251 @@

+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "0bdec8f5-8ec8-4237-ba18-bfad6fe46d86",
+  "prevId": "b8c81268-00fb-462d-b9a0-8f306736cec1",
+  "tables": {
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "uptime_check": {
+      "name": "uptime_check",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "monitor_id": {
+          "name": "monitor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status_code": {
+          "name": "status_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "response_time": {
+          "name": "response_time",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "uptime_check_monitor_id_uptime_monitor_id_fk": {
+          "name": "uptime_check_monitor_id_uptime_monitor_id_fk",
+          "tableFrom": "uptime_check",
+          "tableTo": "uptime_monitor",
+          "columnsFrom": [
+            "monitor_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "uptime_monitor": {
+      "name": "uptime_monitor",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "interval": {
+          "name": "interval",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 30
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "uptime_monitor_user_id_user_id_fk": {
+          "name": "uptime_monitor_user_id_user_id_fk",
+          "tableFrom": "uptime_monitor",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "hashed_password": {
+          "name": "hashed_password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "user_username_unique": {
+          "name": "user_username_unique",
+          "columns": [
+            "username"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {
+      "\"user\".\"email\"": "\"user\".\"username\""
+    }
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/_journal.json CHANGED Viewed

@@ -8,6 +8,13 @@
       "when": 1760677880081,
       "tag": "0000_nasty_praxagora",
       "breakpoints": true
     }
   ]
 }

       "when": 1760677880081,
       "tag": "0000_nasty_praxagora",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1760699775103,
+      "tag": "0001_nostalgic_thing",
+      "breakpoints": true
     }
   ]
 }