Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat: :fire: migrating to sessions, using file routes, adding auth provider

Andrejd6f8ecce077e
diff --git a/apps/api/drizzle/0002_flowery_secret_warriors.sql b/apps/api/drizzle/0002_flowery_secret_warriors.sql
new file mode 100644
index 000000000..1131d0297
--- /dev/null
+++ b/apps/api/drizzle/0002_flowery_secret_warriors.sql
@@ -0,0 +1,21 @@
+CREATE TABLE `session` (
+ `id` text PRIMARY KEY NOT NULL,
+ `user_id` text NOT NULL,
+ `expires_at` integer NOT NULL,
+ FOREIGN KEY (`user_id`) REFERENCES `user`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_user` (
+ `id` text PRIMARY KEY NOT NULL,
+ `name` text NOT NULL,
+ `password` text NOT NULL,
+ `email` text NOT NULL,
+ `created_at` integer DEFAULT '"2025-01-04T22:24:29.828Z"' NOT NULL
+);
+--> statement-breakpoint
+INSERT INTO `__new_user`("id", "name", "password", "email", "created_at") SELECT "id", "name", "password", "email", "created_at" FROM `user`;--> statement-breakpoint
+DROP TABLE `user`;--> statement-breakpoint
+ALTER TABLE `__new_user` RENAME TO `user`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE UNIQUE INDEX `user_email_unique` ON `user` (`email`);
\ No newline at end of file
diff --git a/apps/api/drizzle/meta/0002_snapshot.json b/apps/api/drizzle/meta/0002_snapshot.json
new file mode 100644
index 000000000..74016a49b
--- /dev/null
+++ b/apps/api/drizzle/meta/0002_snapshot.json
@@ -0,0 +1,111 @@
+{
+ "version": "6",
+ "dialect": "sqlite",
+ "id": "1c74d9e8-3e5e-4199-9175-7514767a6912",
+ "prevId": "e1a9d8d8-e2dd-4fa3-864a-b396b6f6034e",
+ "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": {}
+ },
+ "user": {
+ "name": "user",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "text",
+ "primaryKey": true,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "password": {
+ "name": "password",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "email": {
+ "name": "email",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false,
+ "default": "'\"2025-01-04T22:24:29.828Z\"'"
+ }
+ },
+ "indexes": {
+ "user_email_unique": {
+ "name": "user_email_unique",
+ "columns": ["email"],
+ "isUnique": true
+ }
+ },
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {},
+ "checkConstraints": {}
+ }
+ },
+ "views": {},
+ "enums": {},
+ "_meta": {
+ "schemas": {},
+ "tables": {},
+ "columns": {}
+ },
+ "internal": {
+ "indexes": {}
+ }
+}
diff --git a/apps/api/drizzle/meta/_journal.json b/apps/api/drizzle/meta/_journal.json
index 440f484cf..aa65f0b43 100644
--- a/apps/api/drizzle/meta/_journal.json
+++ b/apps/api/drizzle/meta/_journal.json
@@ -15,6 +15,13 @@
"when": 1735996197501,
"tag": "0001_melted_whizzer",
"breakpoints": true
+ },
+ {
+ "idx": 2,
+ "version": "6",
+ "when": 1736029469835,
+ "tag": "0002_flowery_secret_warriors",
+ "breakpoints": true
}
]
}
diff --git a/apps/api/package.json b/apps/api/package.json
index d87f4d4da..ffb8955d7 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -10,13 +10,15 @@
"@elysiajs/cors": "^1.2.0",
"@elysiajs/jwt": "^1.2.0",
"@elysiajs/websocket": "^0.2.8",
+ "@kaneo/typescript-config": "workspace:*",
+ "@oslojs/crypto": "^1.0.1",
+ "@oslojs/encoding": "^1.1.0",
"@paralleldrive/cuid2": "^2.2.2",
"better-sqlite3": "^11.7.0",
"drizzle-kit": "^0.30.1",
"drizzle-orm": "^0.38.3",
"drizzle-typebox": "^0.2.1",
- "elysia": "latest",
- "@kaneo/typescript-config": "workspace:*"
+ "elysia": "latest"
},
"devDependencies": {
"bun-types": "latest"
diff --git a/apps/api/src/database/schema.ts b/apps/api/src/database/schema.ts
index b569291bd..c28ffdddf 100644
--- a/apps/api/src/database/schema.ts
+++ b/apps/api/src/database/schema.ts
@@ -1,4 +1,5 @@
import { createId } from "@paralleldrive/cuid2";
+import type { InferSelectModel } from "drizzle-orm";
import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
export const userTable = sqliteTable("user", {
@@ -12,3 +13,16 @@ export const userTable = sqliteTable("user", {
.default(new Date())
.notNull(),
});
+
+export const sessionTable = sqliteTable("session", {
+ id: text("id").primaryKey(),
+ userId: text("user_id")
+ .notNull()
+ .references(() => userTable.id),
+ expiresAt: integer("expires_at", {
+ mode: "timestamp",
+ }).notNull(),
+});
+
+export type User = InferSelectModel<typeof userTable>;
+export type Session = InferSelectModel<typeof sessionTable>;
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
index 5a0105163..18be604fd 100644
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -1,45 +1,34 @@
import { cors } from "@elysiajs/cors";
import { Elysia } from "elysia";
import user from "./user";
-import { REFRESH_TOKEN_EXPIRY } from "./user/constants";
-import createToken from "./user/utils/create-token";
+import { validateSessionToken } from "./user/controllers/validate-session-token";
const app = new Elysia()
.use(cors())
.use(user)
.guard({
- async beforeHandle({
- set,
- accessJwt,
- refreshJwt,
- cookie: { accessToken, refreshToken },
- }) {
- const decodedAccessToken = await accessJwt.verify(accessToken.value);
- const decodedRefreshToken = await refreshJwt.verify(refreshToken.value);
-
- if (!decodedAccessToken) {
+ async beforeHandle({ set, cookie: { session } }) {
+ if (!session?.value) {
set.status = "Unauthorized";
return set.status;
}
- if (!decodedRefreshToken) {
- const refreshToken = await createToken({
- jwt: refreshJwt,
- expires: REFRESH_TOKEN_EXPIRY,
- payload: {
- id: String(decodedAccessToken.id),
- },
- });
+ const { user, session: validatedSession } = await validateSessionToken(
+ session.value,
+ );
- if (set.cookie) set.cookie.refreshToken = refreshToken;
+ if (!user || !validatedSession) {
+ set.status = "Unauthorized";
+
+ return set.status;
}
},
})
- .get("/me", async ({ refreshJwt, cookie: { refreshToken } }) => {
- const profile = await refreshJwt.verify(refreshToken.value);
+ .get("/me", async ({ cookie: { session } }) => {
+ const { user } = await validateSessionToken(session.value ?? "");
- return profile;
+ return user;
})
.onError(({ code, error }) => {
switch (code) {
diff --git a/apps/api/src/user/constants.ts b/apps/api/src/user/constants.ts
deleted file mode 100644
index be6ad4b27..000000000
--- a/apps/api/src/user/constants.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const ACCESS_TOKEN_EXPIRY = new Date(
- Date.now() + 30 * 24 * 60 * 60 * 1000, // 30d
-);
-
-export const REFRESH_TOKEN_EXPIRY = new Date(
- new Date(Date.now() + 15 * 60 * 1000), // 15m
-);
diff --git a/apps/api/src/user/controllers/create-session.ts b/apps/api/src/user/controllers/create-session.ts
new file mode 100644
index 000000000..20aaa437a
--- /dev/null
+++ b/apps/api/src/user/controllers/create-session.ts
@@ -0,0 +1,18 @@
+import { sha256 } from "@oslojs/crypto/sha2";
+import { encodeHexLowerCase } from "@oslojs/encoding";
+import db from "../../database";
+import type { Session } from "../../database/schema";
+import { sessionTable } from "../../database/schema";
+
+async function createSession(token: string, userId: string): Promise<Session> {
+ const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
+ const session: Session = {
+ id: sessionId,
+ userId,
+ expiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24 * 30),
+ };
+ await db.insert(sessionTable).values(session);
+ return session;
+}
+
+export default createSession;
diff --git a/apps/api/src/user/controllers/invalidate-session.ts b/apps/api/src/user/controllers/invalidate-session.ts
new file mode 100644
index 000000000..c6308e4b8
--- /dev/null
+++ b/apps/api/src/user/controllers/invalidate-session.ts
@@ -0,0 +1,9 @@
+import { eq } from "drizzle-orm";
+import db from "../../database";
+import { sessionTable } from "../../database/schema";
+
+async function invalidateSession(sessionId: string): Promise<void> {
+ await db.delete(sessionTable).where(eq(sessionTable.id, sessionId));
+}
+
+export default invalidateSession;
diff --git a/apps/api/src/user/controllers/validate-session-token.ts b/apps/api/src/user/controllers/validate-session-token.ts
new file mode 100644
index 000000000..9e88750cb
--- /dev/null
+++ b/apps/api/src/user/controllers/validate-session-token.ts
@@ -0,0 +1,45 @@
+import { sha256 } from "@oslojs/crypto/sha2";
+import { encodeHexLowerCase } from "@oslojs/encoding";
+import { eq } from "drizzle-orm";
+import db from "../../database";
+import { sessionTable, userTable } from "../../database/schema";
+import type { SessionValidationResult } from "../types";
+
+export async function validateSessionToken(
+ token: string,
+): Promise<SessionValidationResult> {
+ const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
+ const result = await db
+ .select({ user: userTable, session: sessionTable })
+ .from(sessionTable)
+ .innerJoin(userTable, eq(sessionTable.userId, userTable.id))
+ .where(eq(sessionTable.id, sessionId));
+
+ if (result.length < 1) {
+ return { session: null, user: null };
+ }
+
+ const { user, session } = result[0];
+
+ const isSessionExpired = Date.now() >= session.expiresAt.getTime();
+
+ if (isSessionExpired) {
+ await db.delete(sessionTable).where(eq(sessionTable.id, session.id));
+ return { session: null, user: null };
+ }
+
+ const isSessionHalfWayExpired =
+ Date.now() >= session.expiresAt.getTime() - 1000 * 60 * 60 * 24 * 15;
+
+ if (isSessionHalfWayExpired) {
+ session.expiresAt = new Date(Date.now() + 1000 * 60 * 60 * 24 * 30);
+ await db
+ .update(sessionTable)
+ .set({
+ expiresAt: session.expiresAt,
+ })
+ .where(eq(sessionTable.id, session.id));
+ }
+
+ return { session, user };
+}
diff --git a/apps/api/src/user/index.ts b/apps/api/src/user/index.ts
index 1aa43c2f1..e3a8c80eb 100644
--- a/apps/api/src/user/index.ts
+++ b/apps/api/src/user/index.ts
@@ -1,54 +1,39 @@
import { jwt } from "@elysiajs/jwt";
import { Elysia, t } from "elysia";
-import { ACCESS_TOKEN_EXPIRY, REFRESH_TOKEN_EXPIRY } from "./constants";
+import createSession from "./controllers/create-session";
+import invalidateSession from "./controllers/invalidate-session";
import signIn from "./controllers/sign-in";
import signUp from "./controllers/sign-up";
import { signInUserSchema, signUpUserSchema } from "./db/queries";
import { UserErrors } from "./errors";
-import createToken from "./utils/create-token";
+import generateSessionToken from "./utils/generate-session-token";
const user = new Elysia({ prefix: "/user" })
.use(
jwt({
- name: "accessJwt",
+ name: "sessionToken",
secret: process.env.JWT_ACCESS ?? "",
}),
)
- .use(
- jwt({
- name: "refreshJwt",
- secret: process.env.JWT_REFRESH ?? "",
- }),
- )
.post(
"/sign-in",
- async ({ body, accessJwt, refreshJwt, set }) => {
+ async ({ body, set }) => {
const user = await signIn(body);
- const accessToken = await createToken({
- expires: ACCESS_TOKEN_EXPIRY,
- jwt: accessJwt,
- payload: {
- id: user.id,
- },
- });
-
- const refreshToken = await createToken({
- expires: REFRESH_TOKEN_EXPIRY,
- jwt: refreshJwt,
- payload: {
- id: user.id,
- },
- });
-
+ const token = generateSessionToken();
+ const session = await createSession(token, user.id);
set.cookie = {
- accessToken,
- refreshToken,
+ session: {
+ value: token,
+ httpOnly: true,
+ path: "/",
+ secure: process.env.NODE_ENV === "production",
+ sameSite: "lax",
+ expires: session.expiresAt,
+ },
};
- return {
- user,
- };
+ return user;
},
{
body: t.Omit(signInUserSchema, ["id", "name", "createdAt"]),
@@ -56,30 +41,22 @@ const user = new Elysia({ prefix: "/user" })
)
.post(
"/sign-up",
- async ({ body, accessJwt, refreshJwt, set }) => {
+ async ({ body, set }) => {
const user = await signUp(body);
if (!user) throw new Error(UserErrors.FailedToCreateAnAccount);
- const accessToken = await createToken({
- expires: ACCESS_TOKEN_EXPIRY,
- jwt: accessJwt,
- payload: {
- id: user.id,
- },
- });
-
- const refreshToken = await createToken({
- expires: REFRESH_TOKEN_EXPIRY,
- jwt: refreshJwt,
- payload: {
- id: user.id,
- },
- });
-
+ const token = generateSessionToken();
+ const session = await createSession(token, user.id);
set.cookie = {
- accessToken,
- refreshToken,
+ session: {
+ value: token,
+ httpOnly: true,
+ path: "/",
+ secure: process.env.NODE_ENV === "production",
+ sameSite: "lax",
+ expires: session.expiresAt,
+ },
};
return user;
@@ -88,6 +65,13 @@ const user = new Elysia({ prefix: "/user" })
body: signUpUserSchema,
},
)
+ .post("/sign-out", async ({ cookie, cookie: { session } }) => {
+ await invalidateSession(session?.value ?? "");
+ session.remove();
+
+ // biome-ignore lint/performance/noDelete: https://elysiajs.com/patterns/cookie#remove
+ delete cookie.session;
+ })
.onError(({ code, error }) => {
switch (code) {
case "VALIDATION":
diff --git a/apps/api/src/user/types.ts b/apps/api/src/user/types.ts
new file mode 100644
index 000000000..e510b339d
--- /dev/null
+++ b/apps/api/src/user/types.ts
@@ -0,0 +1,5 @@
+import type { Session, User } from "../database/schema";
+
+export type SessionValidationResult =
+ | { session: Session; user: User }
+ | { session: null; user: null };
diff --git a/apps/api/src/user/utils/create-token.ts b/apps/api/src/user/utils/create-token.ts
deleted file mode 100644
index b7956deae..000000000
--- a/apps/api/src/user/utils/create-token.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { jwt as jwtInstance } from "@elysiajs/jwt";
-import type { Static } from "elysia";
-import type { signInUserSchema } from "../db/queries";
-
-const createToken = async ({
- jwt,
- payload,
- expires,
-}: {
- expires: Date;
- jwt: ReturnType<typeof jwtInstance>;
- payload: Pick<Static<typeof signInUserSchema>, "id">;
-}) => {
- return {
- value: await jwt.sign(payload),
- httpOnly: true,
- path: "/",
- expires,
- };
-};
-
-export default createToken;
diff --git a/apps/api/src/user/utils/generate-session-token.ts b/apps/api/src/user/utils/generate-session-token.ts
new file mode 100644
index 000000000..a9d60d886
--- /dev/null
+++ b/apps/api/src/user/utils/generate-session-token.ts
@@ -0,0 +1,10 @@
+import { encodeBase32LowerCaseNoPadding } from "@oslojs/encoding";
+
+function generateSessionToken(): string {
+ const bytes = new Uint8Array(20);
+ crypto.getRandomValues(bytes);
+ const token = encodeBase32LowerCaseNoPadding(bytes);
+ return token;
+}
+
+export default generateSessionToken;
diff --git a/apps/web/index.html b/apps/web/index.html
index 53b303773..7bd8c8056 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8" />
- <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+ <link rel="icon" type="image/svg+xml" href="/logo.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>Vite + React + TS</title>
+ <title>Kaneo</title>
</head>
<body>
diff --git a/apps/web/package.json b/apps/web/package.json
index 4c6d51083..f57e06e41 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -25,7 +25,7 @@
"react-hook-form": "^7.54.2",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
- "zod": "link:@hookform/resolvers/zod",
+ "zod": "3.24.1",
"zustand": "^5.0.2"
},
"devDependencies": {
diff --git a/apps/web/public/logo.svg b/apps/web/public/logo.svg
new file mode 100644
index 000000000..89adda930
--- /dev/null
+++ b/apps/web/public/logo.svg
@@ -0,0 +1,25 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_1_14)">
+<rect x="2" y="1" width="32" height="32" rx="4" fill="url(#paint0_linear_1_14)"/>
+<path d="M15 8H10C9.44772 8 9 8.44772 9 9V14C9 14.5523 9.44772 15 10 15H15C15.5523 15 16 14.5523 16 14V9C16 8.44772 15.5523 8 15 8Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 19H10C9.44772 19 9 19.4477 9 20V25C9 25.5523 9.44772 26 10 26H15C15.5523 26 16 25.5523 16 25V20C16 19.4477 15.5523 19 15 19Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26 8H21C20.4477 8 20 8.44772 20 9V14C20 14.5523 20.4477 15 21 15H26C26.5523 15 27 14.5523 27 14V9C27 8.44772 26.5523 8 26 8Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26 19H21C20.4477 19 20 19.4477 20 20V25C20 25.5523 20.4477 26 21 26H26C26.5523 26 27 25.5523 27 25V20C27 19.4477 26.5523 19 26 19Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<filter id="filter0_d_1_14" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1_14"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1_14" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_1_14" x1="18" y1="1" x2="18" y2="33" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6366F1"/>
+<stop offset="1" stop-color="#A855F7"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/apps/web/public/vite.svg b/apps/web/public/vite.svg
deleted file mode 100644
index e7b8dfb1b..000000000
--- a/apps/web/public/vite.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file
diff --git a/apps/web/src/components/auth/layout.tsx b/apps/web/src/components/auth/layout.tsx
index a36d4a09f..7f28e1f2e 100644
--- a/apps/web/src/components/auth/layout.tsx
+++ b/apps/web/src/components/auth/layout.tsx
@@ -9,7 +9,7 @@ interface AuthLayoutProps {
export function AuthLayout({ children, title, subtitle }: AuthLayoutProps) {
return (
- <div className="min-h-screen bg-gradient-to-b from-zinc-100 to-white dark:from-zinc-900 dark:to-zinc-950 flex flex-col items-center justify-center p-4">
+ <div className="min-h-screen w-full bg-gradient-to-b from-zinc-100 to-white dark:from-zinc-900 dark:to-zinc-950 flex flex-col items-center justify-center p-4">
<motion.div
initial={{ opacity: 0, y: 20 }}
animate={{ opacity: 1, y: 0 }}
diff --git a/apps/web/src/components/auth/sign-in-form.tsx b/apps/web/src/components/auth/sign-in-form.tsx
index 0e23cc25e..f4c31d590 100644
--- a/apps/web/src/components/auth/sign-in-form.tsx
+++ b/apps/web/src/components/auth/sign-in-form.tsx
@@ -8,9 +8,8 @@ import {
FormMessage,
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
-import signIn from "@/fetchers/user/sign-in";
+import useSignIn from "@/hooks/mutations/use-sign-in";
import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
import { useRouter } from "@tanstack/react-router";
import { AlertCircle, Eye, EyeOff } from "lucide-react";
import { useState } from "react";
@@ -38,17 +37,13 @@ export function SignInForm() {
password: "",
},
});
- const { error, isError, mutateAsync, isPending } = useMutation({
- mutationFn: () =>
- signIn({
- email: form.getValues().email,
- password: form.getValues().password,
- }),
+ const { error, isError, mutateAsync, isPending } = useSignIn({
+ email: form.getValues("email"),
+ password: form.getValues("password"),
});
const onSubmit = async () => {
await mutateAsync();
-
history.push("/dashboard");
};
diff --git a/apps/web/src/components/auth/sign-up-form.tsx b/apps/web/src/components/auth/sign-up-form.tsx
index 55f445d54..a28d6ba0a 100644
--- a/apps/web/src/components/auth/sign-up-form.tsx
+++ b/apps/web/src/components/auth/sign-up-form.tsx
@@ -8,9 +8,8 @@ import {
FormMessage,
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
-import signUp from "@/fetchers/user/sign-up";
+import useSignUp from "@/hooks/mutations/use-sign-up";
import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation } from "@tanstack/react-query";
import { useRouter } from "@tanstack/react-router";
import { AlertCircle, Eye, EyeOff } from "lucide-react";
import { useState } from "react";
@@ -41,13 +40,10 @@ export function SignUpForm() {
name: "",
},
});
- const { isError, error, mutateAsync } = useMutation({
- mutationFn: () =>
- signUp({
- email: form.getValues().email,
- password: form.getValues().password,
- name: form.getValues().name,
- }),
+ const { isError, error, mutateAsync } = useSignUp({
+ email: form.getValues("email"),
+ password: form.getValues("password"),
+ name: form.getValues("name"),
});
const onSubmit = async () => {
diff --git a/apps/web/src/components/common/sidebar/index.tsx b/apps/web/src/components/common/sidebar/index.tsx
index 85ca39931..844afc6a2 100644
--- a/apps/web/src/components/common/sidebar/index.tsx
+++ b/apps/web/src/components/common/sidebar/index.tsx
@@ -1,4 +1,6 @@
+import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
import { cn } from "@/lib/utils";
+import { motion } from "framer-motion";
import { X } from "lucide-react";
import { useState } from "react";
import { Logo } from "../logo";
@@ -8,16 +10,14 @@ import { SidebarHeader } from "./sidebar-header";
export function Sidebar() {
const [isOpen, setIsOpen] = useState(false);
- // const { workspaces, currentWorkspace, setCurrentWorkspace } = useKaneoStore();
- const currentUser = {
- name: "John Doe",
- email: "[email protected]",
- avatar:
- "https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?w=32&h=32&fit=crop&crop=face",
- };
+ const { user } = useAuth();
return (
- <>
+ <motion.div
+ initial={{ opacity: 0, x: -20 }}
+ animate={{ opacity: 1, x: 0 }}
+ className="w-full"
+ >
<MobileHeader onMenuClick={() => setIsOpen(true)} />
<div
@@ -47,7 +47,7 @@ export function Sidebar() {
workspaces={[]}
currentWorkspace={"Andrej's workspace"}
setCurrentWorkspace={() => {}}
- currentUser={currentUser}
+ currentUser={user}
/>
</div>
</div>
@@ -58,9 +58,9 @@ export function Sidebar() {
workspaces={[]}
currentWorkspace={"Andrej's workspace"}
setCurrentWorkspace={() => {}}
- currentUser={currentUser}
+ currentUser={user}
/>
</div>
- </>
+ </motion.div>
);
}
diff --git a/apps/web/src/components/common/sidebar/sidebar-content.tsx b/apps/web/src/components/common/sidebar/sidebar-content.tsx
index a753948e7..52c4c9afc 100644
--- a/apps/web/src/components/common/sidebar/sidebar-content.tsx
+++ b/apps/web/src/components/common/sidebar/sidebar-content.tsx
@@ -1,16 +1,14 @@
-import { Folder, LogOut, Plus, Settings, Users } from "lucide-react";
-import { Avatar, AvatarFallback, AvatarImage } from "../../ui/avatar";
+import type { User } from "@/components/providers/auth-provider";
+import { Folder, Plus, Settings, Users } from "lucide-react";
+import { Avatar, AvatarFallback } from "../../ui/avatar";
+import SignOutButton from "./sign-out-button";
interface SidebarContentProps {
// biome-ignore lint/suspicious/noExplicitAny: Still WIP
workspaces: any[];
currentWorkspace: string | null;
setCurrentWorkspace: (id: string) => void;
- currentUser: {
- name: string;
- email: string;
- avatar: string;
- };
+ currentUser: User;
}
export function SidebarContent({
@@ -77,8 +75,7 @@ export function SidebarContent({
<div className="p-4 border-t border-zinc-200 dark:border-zinc-800">
<div className="flex items-center gap-3 mb-3">
- <Avatar>
- <AvatarImage src={currentUser.avatar} alt={currentUser.name} />
+ <Avatar className="text-zinc-900 dark:text-zinc-100">
<AvatarFallback>{currentUser.name.charAt(0)}</AvatarFallback>
</Avatar>
<div className="flex-1 min-w-0">
@@ -98,13 +95,7 @@ export function SidebarContent({
<Settings className="w-3 h-3 mr-1" />
Settings
</button>
- <button
- type="button"
- className="flex-1 px-2 py-1.5 text-xs text-zinc-600 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center justify-center transition-colors"
- >
- <LogOut className="w-3 h-3 mr-1" />
- Sign out
- </button>
+ <SignOutButton />
</div>
</div>
</>
diff --git a/apps/web/src/components/common/sidebar/sign-out-button.tsx b/apps/web/src/components/common/sidebar/sign-out-button.tsx
new file mode 100644
index 000000000..93c273c59
--- /dev/null
+++ b/apps/web/src/components/common/sidebar/sign-out-button.tsx
@@ -0,0 +1,30 @@
+import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
+import useSignOut from "@/hooks/mutations/use-sign-out";
+import { useRouter } from "@tanstack/react-router";
+import { LogOut } from "lucide-react";
+
+function SignOutButton() {
+ const { setUser } = useAuth();
+ const { mutateAsync, isPending } = useSignOut();
+ const { history } = useRouter();
+
+ const handleSignOut = async () => {
+ await mutateAsync();
+ setUser(null);
+ history.push("/auth/sign-in");
+ };
+
+ return (
+ <button
+ type="button"
+ disabled={isPending}
+ onClick={handleSignOut}
+ className="flex-1 px-2 py-1.5 text-xs text-zinc-600 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center justify-center transition-colors"
+ >
+ <LogOut className="w-3 h-3 mr-1" />
+ Sign out
+ </button>
+ );
+}
+
+export default SignOutButton;
diff --git a/apps/web/src/components/providers/auth-provider/hooks/use-auth.ts b/apps/web/src/components/providers/auth-provider/hooks/use-auth.ts
new file mode 100644
index 000000000..df2525ba4
--- /dev/null
+++ b/apps/web/src/components/providers/auth-provider/hooks/use-auth.ts
@@ -0,0 +1,14 @@
+import { useContext } from "react";
+import { AuthContext } from "..";
+
+const useAuth = () => {
+ const context = useContext(AuthContext);
+
+ if (!context) {
+ throw new Error("useAuth must be used within an AuthProvider");
+ }
+
+ return context;
+};
+
+export default useAuth;
diff --git a/apps/web/src/components/providers/auth-provider/index.tsx b/apps/web/src/components/providers/auth-provider/index.tsx
new file mode 100644
index 000000000..f3bed7cb6
--- /dev/null
+++ b/apps/web/src/components/providers/auth-provider/index.tsx
@@ -0,0 +1,58 @@
+import useGetMe from "@/hooks/queries/use-get-me";
+import type { User } from "@/types/user";
+import { LayoutGrid } from "lucide-react";
+import {
+ type PropsWithChildren,
+ createContext,
+ useEffect,
+ useState,
+} from "react";
+
+export const AuthContext = createContext<{
+ user: User | null;
+ setUser: (user: User | null) => void;
+}>({
+ user: null,
+ setUser: () => {},
+});
+
+function AuthProvider({ children }: PropsWithChildren) {
+ const [user, setUser] = useState<{
+ name: string;
+ id: string;
+ password: string;
+ email: string;
+ createdAt: Date;
+ } | null>(null);
+
+ const { data, isLoading } = useGetMe();
+
+ useEffect(() => {
+ if (data) {
+ setUser(data.data);
+ }
+ }, [data]);
+
+ if (isLoading) {
+ return (
+ <div className="flex w-full items-center justify-center h-screen flex-col md:flex-row bg-zinc-50 dark:bg-zinc-950">
+ <div className="p-1.5 bg-gradient-to-br from-indigo-500 to-purple-500 rounded-lg shadow-sm animate-spin">
+ <LayoutGrid className="w-5 h-5 text-white" />
+ </div>
+ </div>
+ );
+ }
+
+ return (
+ <AuthContext.Provider
+ value={{
+ user,
+ setUser,
+ }}
+ >
+ {children}
+ </AuthContext.Provider>
+ );
+}
+
+export default AuthProvider;
diff --git a/apps/web/src/hooks/theme/use-theme.tsx b/apps/web/src/components/providers/theme-provider/hooks/use-theme.tsx
similarity index 100%
rename from apps/web/src/hooks/theme/use-theme.tsx
rename to apps/web/src/components/providers/theme-provider/hooks/use-theme.tsx
diff --git a/apps/web/src/components/providers/theme-provider.tsx b/apps/web/src/components/providers/theme-provider/index.tsx
similarity index 87%
rename from apps/web/src/components/providers/theme-provider.tsx
rename to apps/web/src/components/providers/theme-provider/index.tsx
index 89c1384f5..631bcd4e0 100644
--- a/apps/web/src/components/providers/theme-provider.tsx
+++ b/apps/web/src/components/providers/theme-provider/index.tsx
@@ -1,5 +1,5 @@
-import useTheme from "@/hooks/theme/use-theme";
import { useEffect } from "react";
+import useTheme from "./hooks/use-theme";
export function ThemeProvider({ children }: { children: React.ReactNode }) {
const { theme } = useTheme();
diff --git a/apps/web/src/components/theme/theme-toggle.tsx b/apps/web/src/components/theme/theme-toggle.tsx
index 9ccf72672..19556b2a4 100644
--- a/apps/web/src/components/theme/theme-toggle.tsx
+++ b/apps/web/src/components/theme/theme-toggle.tsx
@@ -1,5 +1,5 @@
-import useTheme from "@/hooks/theme/use-theme";
import { Moon, Sun } from "lucide-react";
+import useTheme from "../providers/theme-provider/hooks/use-theme";
export function ThemeToggle() {
const { theme, toggleTheme } = useTheme();
diff --git a/apps/web/src/components/ui/spinner.tsx b/apps/web/src/components/ui/spinner.tsx
new file mode 100644
index 000000000..e36a72351
--- /dev/null
+++ b/apps/web/src/components/ui/spinner.tsx
@@ -0,0 +1,49 @@
+import { cn } from "@/lib/utils";
+import { type VariantProps, cva } from "class-variance-authority";
+import { Loader2 } from "lucide-react";
+
+const spinnerVariants = cva("flex-col items-center justify-center", {
+ variants: {
+ show: {
+ true: "flex",
+ false: "hidden",
+ },
+ },
+ defaultVariants: {
+ show: true,
+ },
+});
+
+const loaderVariants = cva("animate-spin text-primary", {
+ variants: {
+ size: {
+ small: "size-6",
+ medium: "size-8",
+ large: "size-12",
+ },
+ },
+ defaultVariants: {
+ size: "medium",
+ },
+});
+
+interface SpinnerContentProps
+ extends VariantProps<typeof spinnerVariants>,
+ VariantProps<typeof loaderVariants> {
+ className?: string;
+ children?: React.ReactNode;
+}
+
+export function Spinner({
+ size,
+ show,
+ children,
+ className,
+}: SpinnerContentProps) {
+ return (
+ <span className={spinnerVariants({ show })}>
+ <Loader2 className={cn(loaderVariants({ size }), className)} />
+ {children}
+ </span>
+ );
+}
diff --git a/apps/web/src/fetchers/user/me.ts b/apps/web/src/fetchers/user/me.ts
new file mode 100644
index 000000000..aa5f4bcdb
--- /dev/null
+++ b/apps/web/src/fetchers/user/me.ts
@@ -0,0 +1,9 @@
+import { api } from "@kaneo/libs";
+
+const me = async () => {
+ const response = await api.me.get();
+
+ return response;
+};
+
+export default me;
diff --git a/apps/web/src/fetchers/user/sign-out.ts b/apps/web/src/fetchers/user/sign-out.ts
new file mode 100644
index 000000000..7c01d0c06
--- /dev/null
+++ b/apps/web/src/fetchers/user/sign-out.ts
@@ -0,0 +1,9 @@
+import { api } from "@kaneo/libs";
+
+const signOut = async () => {
+ const response = await api.user["sign-out"].post();
+
+ return response;
+};
+
+export default signOut;
diff --git a/apps/web/src/hooks/mutations/use-sign-in.ts b/apps/web/src/hooks/mutations/use-sign-in.ts
new file mode 100644
index 000000000..2a21adea9
--- /dev/null
+++ b/apps/web/src/hooks/mutations/use-sign-in.ts
@@ -0,0 +1,15 @@
+import type { SignInFormValues } from "@/components/auth/sign-in-form";
+import signIn from "@/fetchers/user/sign-in";
+import { useMutation } from "@tanstack/react-query";
+
+function useSignIn({ email, password }: SignInFormValues) {
+ return useMutation({
+ mutationFn: () =>
+ signIn({
+ email,
+ password,
+ }),
+ });
+}
+
+export default useSignIn;
diff --git a/apps/web/src/hooks/mutations/use-sign-out.ts b/apps/web/src/hooks/mutations/use-sign-out.ts
new file mode 100644
index 000000000..594b32200
--- /dev/null
+++ b/apps/web/src/hooks/mutations/use-sign-out.ts
@@ -0,0 +1,10 @@
+import signOut from "@/fetchers/user/sign-out";
+import { useMutation } from "@tanstack/react-query";
+
+function useSignOut() {
+ return useMutation({
+ mutationFn: () => signOut(),
+ });
+}
+
+export default useSignOut;
diff --git a/apps/web/src/hooks/mutations/use-sign-up.ts b/apps/web/src/hooks/mutations/use-sign-up.ts
new file mode 100644
index 000000000..045f22610
--- /dev/null
+++ b/apps/web/src/hooks/mutations/use-sign-up.ts
@@ -0,0 +1,16 @@
+import type { SignUpFormValues } from "@/components/auth/sign-up-form";
+import signUp from "@/fetchers/user/sign-up";
+import { useMutation } from "@tanstack/react-query";
+
+function useSignUp({ email, password, name }: SignUpFormValues) {
+ return useMutation({
+ mutationFn: () =>
+ signUp({
+ email,
+ password,
+ name,
+ }),
+ });
+}
+
+export default useSignUp;
diff --git a/apps/web/src/hooks/queries/use-get-me.ts b/apps/web/src/hooks/queries/use-get-me.ts
new file mode 100644
index 000000000..e3d99d731
--- /dev/null
+++ b/apps/web/src/hooks/queries/use-get-me.ts
@@ -0,0 +1,12 @@
+import me from "@/fetchers/user/me";
+import { useQuery } from "@tanstack/react-query";
+
+function useGetMe() {
+ return useQuery({
+ queryKey: ["me"],
+ queryFn: () => me(),
+ retry: 0,
+ });
+}
+
+export default useGetMe;
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index 1e1e0b990..1f41740ba 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -1,11 +1,35 @@
import queryClient from "@/query-client";
import { QueryClientProvider } from "@tanstack/react-query";
-import { RouterProvider } from "@tanstack/react-router";
+import { RouterProvider, createRouter } from "@tanstack/react-router";
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
import "@/index.css";
-import router from "@/routes";
+import AuthProvider from "./components/providers/auth-provider";
+import useAuth from "./components/providers/auth-provider/hooks/use-auth";
import { ThemeProvider } from "./components/providers/theme-provider";
+import { routeTree } from "./routeTree.gen";
+
+const router = createRouter({
+ routeTree,
+ defaultPreload: "intent",
+ defaultPreloadStaleTime: 0,
+ context: {
+ user: null,
+ queryClient,
+ },
+});
+
+declare module "@tanstack/react-router" {
+ interface Register {
+ router: typeof router;
+ }
+}
+
+function App() {
+ const { user } = useAuth();
+
+ return <RouterProvider router={router} context={{ user }} />;
+}
const rootElement = document.getElementById("root") as HTMLElement;
if (!rootElement.innerHTML) {
@@ -14,7 +38,9 @@ if (!rootElement.innerHTML) {
<StrictMode>
<QueryClientProvider client={queryClient}>
<ThemeProvider>
- <RouterProvider router={router} />
+ <AuthProvider>
+ <App />
+ </AuthProvider>
</ThemeProvider>
</QueryClientProvider>
</StrictMode>,
diff --git a/apps/web/src/pages/dashboard/index.tsx b/apps/web/src/pages/dashboard/index.tsx
deleted file mode 100644
index 67157e4a7..000000000
--- a/apps/web/src/pages/dashboard/index.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Sidebar } from "@/components/common/sidebar";
-import { createRoute } from "@tanstack/react-router";
-import { indexRoute } from "..";
-
-export const dashboardIndexRoute = createRoute({
- getParentRoute: () => indexRoute,
- path: "/dashboard",
- component: DashboardIndexRouteComponent,
-});
-
-function DashboardIndexRouteComponent() {
- return (
- <>
- <Sidebar />
- <main className="flex-1 overflow-hidden p-6">Welcome to Kaneo!</main>
- </>
- );
-}
diff --git a/apps/web/src/pages/index.tsx b/apps/web/src/pages/index.tsx
deleted file mode 100644
index c77379869..000000000
--- a/apps/web/src/pages/index.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import queryClient from "@/query-client";
-import { rootRoute } from "@/routes";
-import { api } from "@kaneo/libs";
-import { Outlet, createRoute, redirect } from "@tanstack/react-router";
-
-export const indexRoute = createRoute({
- getParentRoute: () => rootRoute,
- path: "/",
- component: IndexRouteComponent,
- beforeLoad: async () => {
- const { data: isAuthenticated } = await queryClient.ensureQueryData({
- queryKey: ["me"],
- queryFn: () => api.me.get(),
- staleTime: 15 * 60 * 1000, // 15 mins
- revalidateIfStale: true,
- });
-
- if (!isAuthenticated) {
- throw redirect({
- to: "/auth/sign-in",
- });
- }
- },
-});
-
-function IndexRouteComponent() {
- return (
- <div className="flex h-screen flex-col md:flex-row bg-zinc-50 dark:bg-zinc-950">
- <Outlet />
- </div>
- );
-}
diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts
index d94a3add8..225900f88 100644
--- a/apps/web/src/routeTree.gen.ts
+++ b/apps/web/src/routeTree.gen.ts
@@ -12,6 +12,9 @@
import { Route as rootRoute } from './routes/__root'
import { Route as IndexImport } from './routes/index'
+import { Route as DashboardIndexImport } from './routes/dashboard/index'
+import { Route as AuthSignUpImport } from './routes/auth/sign-up'
+import { Route as AuthSignInImport } from './routes/auth/sign-in'
// Create/Update Routes
@@ -21,6 +24,24 @@ const IndexRoute = IndexImport.update({
getParentRoute: () => rootRoute,
} as any)
+const DashboardIndexRoute = DashboardIndexImport.update({
+ id: '/dashboard/',
+ path: '/dashboard/',
+ getParentRoute: () => rootRoute,
+} as any)
+
+const AuthSignUpRoute = AuthSignUpImport.update({
+ id: '/auth/sign-up',
+ path: '/auth/sign-up',
+ getParentRoute: () => rootRoute,
+} as any)
+
+const AuthSignInRoute = AuthSignInImport.update({
+ id: '/auth/sign-in',
+ path: '/auth/sign-in',
+ getParentRoute: () => rootRoute,
+} as any)
+
// Populate the FileRoutesByPath interface
declare module '@tanstack/react-router' {
@@ -32,6 +53,27 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof IndexImport
parentRoute: typeof rootRoute
}
+ '/auth/sign-in': {
+ id: '/auth/sign-in'
+ path: '/auth/sign-in'
+ fullPath: '/auth/sign-in'
+ preLoaderRoute: typeof AuthSignInImport
+ parentRoute: typeof rootRoute
+ }
+ '/auth/sign-up': {
+ id: '/auth/sign-up'
+ path: '/auth/sign-up'
+ fullPath: '/auth/sign-up'
+ preLoaderRoute: typeof AuthSignUpImport
+ parentRoute: typeof rootRoute
+ }
+ '/dashboard/': {
+ id: '/dashboard/'
+ path: '/dashboard'
+ fullPath: '/dashboard'
+ preLoaderRoute: typeof DashboardIndexImport
+ parentRoute: typeof rootRoute
+ }
}
}
@@ -39,32 +81,47 @@ declare module '@tanstack/react-router' {
export interface FileRoutesByFullPath {
'/': typeof IndexRoute
+ '/auth/sign-in': typeof AuthSignInRoute
+ '/auth/sign-up': typeof AuthSignUpRoute
+ '/dashboard': typeof DashboardIndexRoute
}
export interface FileRoutesByTo {
'/': typeof IndexRoute
+ '/auth/sign-in': typeof AuthSignInRoute
+ '/auth/sign-up': typeof AuthSignUpRoute
+ '/dashboard': typeof DashboardIndexRoute
}
export interface FileRoutesById {
__root__: typeof rootRoute
'/': typeof IndexRoute
+ '/auth/sign-in': typeof AuthSignInRoute
+ '/auth/sign-up': typeof AuthSignUpRoute
+ '/dashboard/': typeof DashboardIndexRoute
}
export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
- fullPaths: '/'
+ fullPaths: '/' | '/auth/sign-in' | '/auth/sign-up' | '/dashboard'
fileRoutesByTo: FileRoutesByTo
- to: '/'
- id: '__root__' | '/'
+ to: '/' | '/auth/sign-in' | '/auth/sign-up' | '/dashboard'
+ id: '__root__' | '/' | '/auth/sign-in' | '/auth/sign-up' | '/dashboard/'
fileRoutesById: FileRoutesById
}
export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
+ AuthSignInRoute: typeof AuthSignInRoute
+ AuthSignUpRoute: typeof AuthSignUpRoute
+ DashboardIndexRoute: typeof DashboardIndexRoute
}
const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
+ AuthSignInRoute: AuthSignInRoute,
+ AuthSignUpRoute: AuthSignUpRoute,
+ DashboardIndexRoute: DashboardIndexRoute,
}
export const routeTree = rootRoute
@@ -77,11 +134,23 @@ export const routeTree = rootRoute
"__root__": {
"filePath": "__root.tsx",
"children": [
- "/"
+ "/",
+ "/auth/sign-in",
+ "/auth/sign-up",
+ "/dashboard/"
]
},
"/": {
- "filePath": "index.ts"
+ "filePath": "index.tsx"
+ },
+ "/auth/sign-in": {
+ "filePath": "auth/sign-in.tsx"
+ },
+ "/auth/sign-up": {
+ "filePath": "auth/sign-up.tsx"
+ },
+ "/dashboard/": {
+ "filePath": "dashboard/index.tsx"
}
}
}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index 8ec539a6a..e36c39c32 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -1,10 +1,12 @@
+import type { User } from "@/types/user";
import type { QueryClient } from "@tanstack/react-query";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";
import { TanStackRouterDevtools } from "@tanstack/router-devtools";
-export const rootRoute = createRootRouteWithContext<{
+export const Route = createRootRouteWithContext<{
queryClient: QueryClient;
+ user: User;
}>()({
component: RootComponent,
});
@@ -12,7 +14,9 @@ export const rootRoute = createRootRouteWithContext<{
function RootComponent() {
return (
<>
- <Outlet />
+ <div className="flex w-full h-screen flex-col md:flex-row bg-zinc-50 dark:bg-zinc-950">
+ <Outlet />
+ </div>
<ReactQueryDevtools buttonPosition="top-right" />
<TanStackRouterDevtools position="bottom-right" />
</>
diff --git a/apps/web/src/pages/auth/sign-in.tsx b/apps/web/src/routes/auth/sign-in.tsx
similarity index 73%
rename from apps/web/src/pages/auth/sign-in.tsx
rename to apps/web/src/routes/auth/sign-in.tsx
index 32299d64d..a69e4fc34 100644
--- a/apps/web/src/pages/auth/sign-in.tsx
+++ b/apps/web/src/routes/auth/sign-in.tsx
@@ -1,12 +1,9 @@
-import { rootRoute } from "@/routes";
-import { createRoute } from "@tanstack/react-router";
+import { createFileRoute } from "@tanstack/react-router";
import { AuthLayout } from "../../components/auth/layout";
import { SignInForm } from "../../components/auth/sign-in-form";
import { AuthToggle } from "../../components/auth/toggle";
-export const signInRoute = createRoute({
- getParentRoute: () => rootRoute,
- path: "/auth/sign-in",
+export const Route = createFileRoute("/auth/sign-in")({
component: SignIn,
});
diff --git a/apps/web/src/pages/auth/sign-up.tsx b/apps/web/src/routes/auth/sign-up.tsx
similarity index 72%
rename from apps/web/src/pages/auth/sign-up.tsx
rename to apps/web/src/routes/auth/sign-up.tsx
index d0f610721..acfbfca9e 100644
--- a/apps/web/src/pages/auth/sign-up.tsx
+++ b/apps/web/src/routes/auth/sign-up.tsx
@@ -1,12 +1,9 @@
import { AuthLayout } from "@/components/auth/layout";
import { SignUpForm } from "@/components/auth/sign-up-form";
import { AuthToggle } from "@/components/auth/toggle";
-import { rootRoute } from "@/routes";
-import { createRoute } from "@tanstack/react-router";
+import { createFileRoute } from "@tanstack/react-router";
-export const signUpRoute = createRoute({
- getParentRoute: () => rootRoute,
- path: "/auth/sign-up",
+export const Route = createFileRoute("/auth/sign-up")({
component: SignUp,
});
diff --git a/apps/web/src/routes/dashboard/index.tsx b/apps/web/src/routes/dashboard/index.tsx
new file mode 100644
index 000000000..c24dd6d27
--- /dev/null
+++ b/apps/web/src/routes/dashboard/index.tsx
@@ -0,0 +1,19 @@
+import { Sidebar } from "@/components/common/sidebar";
+import { createFileRoute } from "@tanstack/react-router";
+
+export const Route = createFileRoute("/dashboard/")({
+ component: DashboardIndexRouteComponent,
+ loader: ({ context: { queryClient } }) =>
+ queryClient.ensureQueryData({
+ queryKey: ["me"],
+ }),
+});
+
+function DashboardIndexRouteComponent() {
+ return (
+ <>
+ <Sidebar />
+ <main className="flex-1 overflow-hidden p-6" />
+ </>
+ );
+}
diff --git a/apps/web/src/routes/index.ts b/apps/web/src/routes/index.ts
deleted file mode 100644
index fe6f9fce6..000000000
--- a/apps/web/src/routes/index.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { indexRoute } from "@/pages";
-import { signInRoute } from "@/pages/auth/sign-in";
-import { signUpRoute } from "@/pages/auth/sign-up";
-import { dashboardIndexRoute } from "@/pages/dashboard";
-import queryClient from "@/query-client";
-import type { QueryClient } from "@tanstack/react-query";
-import {
- createRootRouteWithContext,
- createRouter,
-} from "@tanstack/react-router";
-import RootComponent from "./__root";
-
-export const rootRoute = createRootRouteWithContext<{
- queryClient: QueryClient;
-}>()({
- component: RootComponent,
-});
-
-const routeTree = rootRoute.addChildren([
- indexRoute.addChildren([signInRoute, signUpRoute, dashboardIndexRoute]),
-]);
-
-const router = createRouter({
- routeTree,
- defaultPreload: "intent",
- defaultPreloadStaleTime: 0,
- context: {
- queryClient,
- },
-});
-
-declare module "@tanstack/react-router" {
- interface Register {
- router: typeof router;
- }
-}
-
-export default router;
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
new file mode 100644
index 000000000..ad754ee17
--- /dev/null
+++ b/apps/web/src/routes/index.tsx
@@ -0,0 +1,23 @@
+import type { User } from "@/types/user";
+import { redirect } from "@tanstack/react-router";
+import { createFileRoute } from "@tanstack/react-router";
+
+export const Route = createFileRoute("/")({
+ async beforeLoad({ context: { queryClient } }) {
+ const { data: user } = await queryClient.ensureQueryData<{
+ data: User;
+ }>({
+ queryKey: ["me"],
+ });
+
+ if (!user) {
+ throw redirect({
+ to: "/auth/sign-in",
+ });
+ }
+
+ throw redirect({
+ to: "/dashboard",
+ });
+ },
+});
diff --git a/apps/web/src/types/api-response.ts b/apps/web/src/types/api-response.ts
new file mode 100644
index 000000000..e81363f22
--- /dev/null
+++ b/apps/web/src/types/api-response.ts
@@ -0,0 +1,5 @@
+type ApiResponse<T extends (...args: never[]) => Promise<unknown>> = Awaited<
+ ReturnType<T>
+>["data"];
+
+export default ApiResponse;
diff --git a/apps/web/src/types/user.ts b/apps/web/src/types/user.ts
new file mode 100644
index 000000000..13b6e84d0
--- /dev/null
+++ b/apps/web/src/types/user.ts
@@ -0,0 +1,4 @@
+import type { api } from "@kaneo/libs";
+import type ApiResponse from "./api-response";
+
+export type User = ApiResponse<typeof api.me.get>;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c145b7fbd..75ead9064 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -54,6 +54,12 @@ importers:
'@kaneo/typescript-config':
specifier: workspace:*
version: link:../../packages/typescript-config
+ '@oslojs/crypto':
+ specifier: ^1.0.1
+ version: 1.0.1
+ '@oslojs/encoding':
+ specifier: ^1.1.0
+ version: 1.1.0
'@paralleldrive/cuid2':
specifier: ^2.2.2
version: 2.2.2
@@ -128,8 +134,8 @@ importers:
specifier: ^1.0.7
version: 1.0.7([email protected])
zod:
- specifier: link:@hookform/resolvers/zod
- version: link:@hookform/resolvers/zod
+ specifier: 3.24.1
+ version: 3.24.1
zustand:
specifier: ^5.0.2
@@ -1050,6 +1056,18 @@ packages:
resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
engines: {node: '>= 8'}
+ '@oslojs/[email protected]':
+ resolution: {integrity: sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA==}
+
+ '@oslojs/[email protected]':
+ resolution: {integrity: sha512-9RCU6OwXU6p67H4NODbuxv2S3eenuQ4/WFLrsq+K/k682xrznH5EVWA7N4VFk9VYVcbFtKqur5YQQZc0ySGhsQ==}
+
+ '@oslojs/[email protected]':
+ resolution: {integrity: sha512-7n08G8nWjAr/Yu3vu9zzrd0L9XnrJfpMioQcvCMxBIiF5orECHe5/3J0jmXRVvgfqMm/+4oxlQ+Sq39COYLcNQ==}
+
+ '@oslojs/[email protected]':
+ resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
+
'@paralleldrive/[email protected]':
resolution: {integrity: sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==}
@@ -3295,6 +3313,19 @@ snapshots:
'@nodelib/fs.scandir': 2.1.5
fastq: 1.18.0
+ '@oslojs/[email protected]':
+ dependencies:
+ '@oslojs/binary': 1.0.0
+
+ '@oslojs/[email protected]': {}
+
+ '@oslojs/[email protected]':
+ dependencies:
+ '@oslojs/asn1': 1.0.0
+ '@oslojs/binary': 1.0.0
+
+ '@oslojs/[email protected]': {}
+
'@paralleldrive/[email protected]':
dependencies:
'@noble/hashes': 1.6.1