⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
feat: :sparkles: finishing authentication, adding color modes
Andrejda9c10fa56cc
diff --git a/apps/api/drizzle.config.ts b/apps/api/drizzle.config.tsindex 3f0e38681..78dad0d85 100644--- a/apps/api/drizzle.config.ts+++ b/apps/api/drizzle.config.ts@@ -1,10 +1,10 @@import { type Config, defineConfig } from "drizzle-kit";export default defineConfig({- out: "./drizzle",- schema: "./src/database/schema.ts",- dialect: "sqlite",- dbCredentials: {- url: "file:local.db",- },+ out: "./drizzle",+ schema: "./src/database/schema.ts",+ dialect: "sqlite",+ dbCredentials: {+ url: "file:local.db",+ },}) satisfies Config;diff --git a/apps/api/drizzle/0001_melted_whizzer.sql b/apps/api/drizzle/0001_melted_whizzer.sqlnew file mode 100644index 000000000..1a806a8dd--- /dev/null+++ b/apps/api/drizzle/0001_melted_whizzer.sql@@ -0,0 +1,14 @@+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-04T13:09:57.494Z"' 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 filediff --git a/apps/api/drizzle/meta/0001_snapshot.json b/apps/api/drizzle/meta/0001_snapshot.jsonnew file mode 100644index 000000000..dccb1e934--- /dev/null+++ b/apps/api/drizzle/meta/0001_snapshot.json@@ -0,0 +1,70 @@+{+ "version": "6",+ "dialect": "sqlite",+ "id": "e1a9d8d8-e2dd-4fa3-864a-b396b6f6034e",+ "prevId": "5647ebd6-d065-463c-89be-de3b3e73393d",+ "tables": {+ "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-04T13:09:57.494Z\"'"+ }+ },+ "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.jsonindex a733aa195..440f484cf 100644--- a/apps/api/drizzle/meta/_journal.json+++ b/apps/api/drizzle/meta/_journal.json@@ -8,6 +8,13 @@"when": 1735769491908,"tag": "0000_shocking_screwball","breakpoints": true+ },+ {+ "idx": 1,+ "version": "6",+ "when": 1735996197501,+ "tag": "0001_melted_whizzer",+ "breakpoints": true}]}diff --git a/apps/api/src/database/schema.ts b/apps/api/src/database/schema.tsindex dd09e65bf..b569291bd 100644--- a/apps/api/src/database/schema.ts+++ b/apps/api/src/database/schema.ts@@ -2,13 +2,13 @@ import { createId } from "@paralleldrive/cuid2";import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";export const userTable = sqliteTable("user", {- id: text("id")- .$defaultFn(() => createId())- .primaryKey(),- name: text("name").notNull().unique(),- password: text("password").notNull(),- email: text("email").notNull().unique(),- createdAt: integer("created_at", { mode: "timestamp" })- .default(new Date())- .notNull(),+ id: text("id")+ .$defaultFn(() => createId())+ .primaryKey(),+ name: text("name").notNull(),+ password: text("password").notNull(),+ email: text("email").notNull().unique(),+ createdAt: integer("created_at", { mode: "timestamp" })+ .default(new Date())+ .notNull(),});diff --git a/apps/api/src/index.ts b/apps/api/src/index.tsindex da8e3da0c..5a0105163 100644--- a/apps/api/src/index.ts+++ b/apps/api/src/index.ts@@ -5,46 +5,59 @@ import { REFRESH_TOKEN_EXPIRY } from "./user/constants";import createToken from "./user/utils/create-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) {- set.status = "Unauthorized";-- return set.status;- }-- if (!decodedRefreshToken) {- const refreshToken = await createToken({- jwt: refreshJwt,- expires: REFRESH_TOKEN_EXPIRY,- payload: {- id: String(decodedAccessToken.id),- },- });-- if (set.cookie) set.cookie.refreshToken = refreshToken;- }- },- })- .get("/me", async ({ refreshJwt, cookie: { refreshToken } }) => {- const profile = await refreshJwt.verify(refreshToken.value);-- return profile;- })- .listen(1337);+ .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) {+ set.status = "Unauthorized";++ return set.status;+ }++ if (!decodedRefreshToken) {+ const refreshToken = await createToken({+ jwt: refreshJwt,+ expires: REFRESH_TOKEN_EXPIRY,+ payload: {+ id: String(decodedAccessToken.id),+ },+ });++ if (set.cookie) set.cookie.refreshToken = refreshToken;+ }+ },+ })+ .get("/me", async ({ refreshJwt, cookie: { refreshToken } }) => {+ const profile = await refreshJwt.verify(refreshToken.value);++ return profile;+ })+ .onError(({ code, error }) => {+ switch (code) {+ case "VALIDATION":+ return error.all;+ default:+ if (error instanceof Error) {+ return {+ name: error.name,+ message: error.message,+ };+ }+ }+ })+ .listen(1337);export type App = typeof app;console.log(- `🦊 Elysia is running at ${app.server?.hostname}:${app.server?.port}`,+ `🦊 Elysia is running at ${app.server?.hostname}:${app.server?.port}`,);diff --git a/apps/api/src/user/constants.ts b/apps/api/src/user/constants.tsindex 85360d6ad..be6ad4b27 100644--- a/apps/api/src/user/constants.ts+++ b/apps/api/src/user/constants.ts@@ -1,7 +1,7 @@export const ACCESS_TOKEN_EXPIRY = new Date(- Date.now() + 30 * 24 * 60 * 60 * 1000, // 30d+ Date.now() + 30 * 24 * 60 * 60 * 1000, // 30d);export const REFRESH_TOKEN_EXPIRY = new Date(- new Date(Date.now() + 15 * 60 * 1000), // 15m+ new Date(Date.now() + 15 * 60 * 1000), // 15m);diff --git a/apps/api/src/user/controllers/sign-in.ts b/apps/api/src/user/controllers/sign-in.tsindex 596560bc5..465b87902 100644--- a/apps/api/src/user/controllers/sign-in.ts+++ b/apps/api/src/user/controllers/sign-in.ts@@ -6,28 +6,28 @@ import { UserErrors } from "../errors";type SignInArgs = Static<typeof signInUserSchema>;async function signIn({- email,- password,+ email,+ password,}: Pick<SignInArgs, "email" | "password">) {- const user = await db.query.userTable.findFirst({- where: (users, { eq }) => eq(users.email, email),- });+ const user = await db.query.userTable.findFirst({+ where: (users, { eq }) => eq(users.email, email),+ });- if (!user) {- throw new Error(UserErrors.NotFound);- }+ if (!user) {+ throw new Error(UserErrors.NotFound);+ }- const isPasswordValid = await Bun.password.verify(- password,- user.password,- "bcrypt",- );+ const isPasswordValid = await Bun.password.verify(+ password,+ user.password,+ "bcrypt",+ );- if (!isPasswordValid) {- throw new Error(UserErrors.InvalidCredentials);- }+ if (!isPasswordValid) {+ throw new Error(UserErrors.InvalidCredentials);+ }- return user;+ return user;}export default signIn;diff --git a/apps/api/src/user/controllers/sign-up.ts b/apps/api/src/user/controllers/sign-up.tsindex 2f24316d2..6e62f0074 100644--- a/apps/api/src/user/controllers/sign-up.ts+++ b/apps/api/src/user/controllers/sign-up.ts@@ -7,25 +7,28 @@ import { UserErrors } from "../errors";type SignUpArgs = Static<typeof signUpUserSchema>;async function signUp({ email, name, password }: SignUpArgs) {- const isEmailTaken = Boolean(- await db.query.userTable.findFirst({- where: (users, { eq }) => eq(users.email, email),- }),- );+ const isEmailTaken = Boolean(+ await db.query.userTable.findFirst({+ where: (users, { eq }) => eq(users.email, email),+ }),+ );- if (isEmailTaken) {- throw new Error(UserErrors.EmailTaken);- }+ if (isEmailTaken) {+ throw new Error(UserErrors.EmailTaken);+ }- const hashedPassword = await Bun.password.hash(password, {- algorithm: "bcrypt",- });+ const hashedPassword = await Bun.password.hash(password, {+ algorithm: "bcrypt",+ });- const user = await db- .insert(userTable)- .values({ email, name, password: hashedPassword });+ const user = (+ await db+ .insert(userTable)+ .values({ email, name, password: hashedPassword })+ .returning()+ ).at(0);- return user;+ return user;}export default signUp;diff --git a/apps/api/src/user/db/queries.ts b/apps/api/src/user/db/queries.tsindex 9f9c5749d..8610621ae 100644--- a/apps/api/src/user/db/queries.ts+++ b/apps/api/src/user/db/queries.ts@@ -3,12 +3,12 @@ import { t } from "elysia";import { userTable } from "../../database/schema";export const signUpUserSchema = createInsertSchema(userTable, {- email: t.String({ format: "email" }),- password: t.String(),- name: t.String(),+ email: t.String({ format: "email" }),+ password: t.String(),+ name: t.String(),});export const signInUserSchema = createSelectSchema(userTable, {- email: t.String({ format: "email" }),- password: t.String(),+ email: t.String({ format: "email" }),+ password: t.String(),});diff --git a/apps/api/src/user/errors.ts b/apps/api/src/user/errors.tsindex 99eb7d2e4..a2ab36a32 100644--- a/apps/api/src/user/errors.ts+++ b/apps/api/src/user/errors.ts@@ -1,5 +1,6 @@export enum UserErrors {- NotFound = "UserError: NotFound",- EmailTaken = "UserError: EmailTaken",- InvalidCredentials = "UserError: InvalidCredentials",+ NotFound = "UserError: NotFound",+ EmailTaken = "UserError: EmailTaken",+ InvalidCredentials = "UserError: InvalidCredentials",+ FailedToCreateAnAccount = "UserError: FailedToCreateAnAccount",}diff --git a/apps/api/src/user/index.ts b/apps/api/src/user/index.tsindex bbf345ac0..1aa43c2f1 100644--- a/apps/api/src/user/index.ts+++ b/apps/api/src/user/index.ts@@ -4,63 +4,102 @@ import { ACCESS_TOKEN_EXPIRY, REFRESH_TOKEN_EXPIRY } from "./constants";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";const user = new Elysia({ prefix: "/user" })- .use(- jwt({- name: "accessJwt",- secret: process.env.JWT_ACCESS ?? "",- }),- )- .use(- jwt({- name: "refreshJwt",- secret: process.env.JWT_REFRESH ?? "",- }),- )- .post(- "/sign-in",- async ({ body, accessJwt, refreshJwt, set }) => {- const user = await signIn(body);+ .use(+ jwt({+ name: "accessJwt",+ secret: process.env.JWT_ACCESS ?? "",+ }),+ )+ .use(+ jwt({+ name: "refreshJwt",+ secret: process.env.JWT_REFRESH ?? "",+ }),+ )+ .post(+ "/sign-in",+ async ({ body, accessJwt, refreshJwt, set }) => {+ const user = await signIn(body);- const accessToken = await createToken({- expires: ACCESS_TOKEN_EXPIRY,- jwt: accessJwt,- payload: {- id: user.id,- },- });+ 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 refreshToken = await createToken({+ expires: REFRESH_TOKEN_EXPIRY,+ jwt: refreshJwt,+ payload: {+ id: user.id,+ },+ });- set.cookie = {- accessToken,- refreshToken,- };+ set.cookie = {+ accessToken,+ refreshToken,+ };- return {- user,- };- },- {- body: t.Omit(signInUserSchema, ["id", "name", "createdAt"]),- },- )- .post(- "/sign-up",- async ({ body }) => {- return signUp(body);- },- {- body: signUpUserSchema,- },- );+ return {+ user,+ };+ },+ {+ body: t.Omit(signInUserSchema, ["id", "name", "createdAt"]),+ },+ )+ .post(+ "/sign-up",+ async ({ body, accessJwt, refreshJwt, 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,+ },+ });++ set.cookie = {+ accessToken,+ refreshToken,+ };++ return user;+ },+ {+ body: signUpUserSchema,+ },+ )+ .onError(({ code, error }) => {+ switch (code) {+ case "VALIDATION":+ return error.all;+ default:+ if (error instanceof Error) {+ return {+ name: error.name,+ message: error.message,+ };+ }+ }+ });export default user;diff --git a/apps/api/src/user/utils/create-token.ts b/apps/api/src/user/utils/create-token.tsindex 61cfba4ed..b7956deae 100644--- a/apps/api/src/user/utils/create-token.ts+++ b/apps/api/src/user/utils/create-token.ts@@ -3,20 +3,20 @@ import type { Static } from "elysia";import type { signInUserSchema } from "../db/queries";const createToken = async ({- jwt,- payload,- expires,+ jwt,+ payload,+ expires,}: {- expires: Date;- jwt: ReturnType<typeof jwtInstance>;- payload: Pick<Static<typeof signInUserSchema>, "id">;+ expires: Date;+ jwt: ReturnType<typeof jwtInstance>;+ payload: Pick<Static<typeof signInUserSchema>, "id">;}) => {- return {- value: await jwt.sign(payload),- httpOnly: true,- path: "/",- expires,- };+ return {+ value: await jwt.sign(payload),+ httpOnly: true,+ path: "/",+ expires,+ };};export default createToken;diff --git a/apps/web/package.json b/apps/web/package.jsonindex b0495004a..4c6d51083 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -25,7 +25,8 @@"react-hook-form": "^7.54.2","tailwind-merge": "^2.6.0","tailwindcss-animate": "^1.0.7",- "zod": "link:@hookform/resolvers/zod"+ "zod": "link:@hookform/resolvers/zod",+ "zustand": "^5.0.2"},"devDependencies": {"@kaneo/libs": "workspace:*",diff --git a/apps/web/postcss.config.js b/apps/web/postcss.config.jsindex 7b75c83af..2aa7205d4 100644--- a/apps/web/postcss.config.js+++ b/apps/web/postcss.config.js@@ -1,6 +1,6 @@export default {- plugins: {- tailwindcss: {},- autoprefixer: {},- },+ plugins: {+ tailwindcss: {},+ autoprefixer: {},+ },};diff --git a/apps/web/src/components/auth/layout.tsx b/apps/web/src/components/auth/layout.tsxindex 559e0a175..a36d4a09f 100644--- a/apps/web/src/components/auth/layout.tsx+++ b/apps/web/src/components/auth/layout.tsx@@ -2,29 +2,31 @@ import { motion } from "framer-motion";import { Logo } from "../common/logo";interface AuthLayoutProps {- children: React.ReactNode;- title: string;- subtitle: string;+ children: React.ReactNode;+ title: string;+ subtitle: string;}export function AuthLayout({ children, title, subtitle }: AuthLayoutProps) {- return (- <div className="min-h-screen bg-gradient-to-b from-zinc-900 to-zinc-950 flex flex-col items-center justify-center p-4">- <motion.div- initial={{ opacity: 0, y: 20 }}- animate={{ opacity: 1, y: 0 }}- className="w-full max-w-md"- >- <div className="mb-8 text-center">- <Logo className="mx-auto mb-6" />- <h1 className="text-3xl font-bold text-zinc-100 mb-2">{title}</h1>- <p className="text-zinc-400">{subtitle}</p>- </div>+ 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">+ <motion.div+ initial={{ opacity: 0, y: 20 }}+ animate={{ opacity: 1, y: 0 }}+ className="w-full max-w-md"+ >+ <div className="mb-8 text-center">+ <Logo className="mx-auto mb-6" />+ <h1 className="text-3xl font-bold text-zinc-900 dark:text-zinc-100 mb-2">+ {title}+ </h1>+ <p className="text-zinc-600 dark:text-zinc-400">{subtitle}</p>+ </div>- <div className="bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-800/50 p-6">- {children}- </div>- </motion.div>- </div>- );+ <div className="bg-white/50 dark:bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-200/50 dark:border-zinc-800/50 p-6 shadow-xl shadow-zinc-200/20 dark:shadow-zinc-950/20">+ {children}+ </div>+ </motion.div>+ </div>+ );}diff --git a/apps/web/src/components/auth/sign-in-form.tsx b/apps/web/src/components/auth/sign-in-form.tsxindex 18a757103..0e23cc25e 100644--- a/apps/web/src/components/auth/sign-in-form.tsx+++ b/apps/web/src/components/auth/sign-in-form.tsx@@ -1,136 +1,144 @@import { Button } from "@/components/ui/button";import {- Form,- FormControl,- FormField,- FormItem,- FormLabel,- FormMessage,+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,} from "@/components/ui/form";import { Input } from "@/components/ui/input";+import signIn from "@/fetchers/user/sign-in";import { zodResolver } from "@hookform/resolvers/zod";-import { api } from "@kaneo/libs";import { useMutation } from "@tanstack/react-query";import { useRouter } from "@tanstack/react-router";-import { Eye, EyeOff } from "lucide-react";+import { AlertCircle, Eye, EyeOff } from "lucide-react";import { useState } from "react";import { useForm } from "react-hook-form";import { type ZodType, z } from "zod";+import { Alert, AlertDescription, AlertTitle } from "../ui/alert";-type FormValues = {- email: string;- password: string;+export type SignInFormValues = {+ email: string;+ password: string;};-const signInSchema: ZodType<FormValues> = z.object({- email: z.string().email(),- password: z- .string()- .min(8, { message: "Password is too short" })- .max(20, { message: "Password is too long" }),+const signInSchema: ZodType<SignInFormValues> = z.object({+ email: z.string().email(),+ password: z.string(),});export function SignInForm() {- const [showPassword, setShowPassword] = useState(false);- const { history } = useRouter();- const form = useForm<FormValues>({- resolver: zodResolver(signInSchema),- defaultValues: {- email: "",- password: "",- },- });- const { mutateAsync } = useMutation({- mutationFn: () =>- api.user["sign-in"].post({- email: form.getValues().email,- password: form.getValues().password,- }),- });+ const [showPassword, setShowPassword] = useState(false);+ const { history } = useRouter();+ const form = useForm<SignInFormValues>({+ resolver: zodResolver(signInSchema),+ defaultValues: {+ email: "",+ password: "",+ },+ });+ const { error, isError, mutateAsync, isPending } = useMutation({+ mutationFn: () =>+ signIn({+ email: form.getValues().email,+ password: form.getValues().password,+ }),+ });- const onSubmit = async () => {- await mutateAsync();- history.push("/");- };+ const onSubmit = async () => {+ await mutateAsync();- return (- <Form {...form}>- <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">- <div className="space-y-4">- <div>- <FormField- control={form.control}- name="email"- render={({ field }) => (- <FormItem>- <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">- </FormLabel>- <FormControl>- <Input- className="bg-zinc-800/50 border-zinc-700/50 text-zinc-100"- placeholder="[email protected]"- {...field}- />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>+ history.push("/dashboard");+ };- <div>- <FormField- control={form.control}- name="password"- render={({ field }) => (- <FormItem>- <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">- Password- </FormLabel>- <FormControl>- <div className="relative">- <Input- className="bg-zinc-800/50 border-zinc-700/50 text-zinc-100 pr-10"- placeholder="••••••••"- type={showPassword ? "text" : "password"}- {...field}- />- <button- type="button"- onClick={() => setShowPassword(!showPassword)}- className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-400 hover:text-zinc-300"- >- {showPassword ? (- <EyeOff size={16} />- ) : (- <Eye size={16} />- )}- </button>- </div>- </FormControl>- <FormMessage />- </FormItem>- )}- />- <div className="flex justify-end mt-1">- <button- type="button"- className="text-sm text-zinc-400 hover:text-zinc-300"- >- Forgot password?- </button>- </div>- </div>- </div>+ return (+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">+ <div className="space-y-4">+ <div>+ <FormField+ control={form.control}+ name="email"+ render={({ field }) => (+ <FormItem>+ <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">+ </FormLabel>+ <FormControl>+ <Input+ className="bg-white dark:bg-zinc-800/50 border-zinc-200 dark:border-zinc-700/50 text-zinc-900 dark:text-zinc-100"+ placeholder="[email protected]"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>- <Button- type="submit"- className="w-full bg-zinc-100 text-zinc-900 hover:bg-zinc-200 mt-6"- >- Sign In- </Button>- </form>- </Form>- );+ <div>+ <FormField+ control={form.control}+ name="password"+ render={({ field }) => (+ <FormItem>+ <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">+ Password+ </FormLabel>+ <FormControl>+ <div className="relative">+ <Input+ className="bg-white dark:bg-zinc-800/50 border-zinc-200 dark:border-zinc-700/50 text-zinc-900 dark:text-zinc-100"+ placeholder="••••••••"+ type={showPassword ? "text" : "password"}+ {...field}+ />+ <button+ type="button"+ onClick={() => setShowPassword(!showPassword)}+ className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-400 hover:text-zinc-300"+ >+ {showPassword ? (+ <EyeOff size={16} />+ ) : (+ <Eye size={16} />+ )}+ </button>+ </div>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ <div className="flex justify-end mt-1">+ <button+ type="button"+ className="text-sm text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300"+ >+ Forgot password?+ </button>+ </div>+ </div>+ </div>++ {isError && (+ <Alert variant="destructive">+ <AlertCircle className="h-4 w-4" />+ <AlertTitle>Error</AlertTitle>+ <AlertDescription>{error.message}</AlertDescription>+ </Alert>+ )}++ <Button+ type="submit"+ disabled={isPending}+ className="w-full bg-indigo-600 text-white hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400 mt-6"+ >+ {isPending ? "Signing In..." : "Sign In"}+ </Button>+ </form>+ </Form>+ );}diff --git a/apps/web/src/components/auth/sign-up-form.tsx b/apps/web/src/components/auth/sign-up-form.tsxnew file mode 100644index 000000000..55f445d54--- /dev/null+++ b/apps/web/src/components/auth/sign-up-form.tsx@@ -0,0 +1,150 @@+import { Button } from "@/components/ui/button";+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "@/components/ui/form";+import { Input } from "@/components/ui/input";+import signUp from "@/fetchers/user/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";+import { useForm } from "react-hook-form";+import { type ZodType, z } from "zod";+import { Alert, AlertDescription, AlertTitle } from "../ui/alert";++export type SignUpFormValues = {+ email: string;+ password: string;+ name: string;+};++const signUpSchema: ZodType<SignUpFormValues> = z.object({+ email: z.string().email(),+ password: z.string().min(8, { message: "Password is too short" }),+ name: z.string(),+});++export function SignUpForm() {+ const [showPassword, setShowPassword] = useState(false);+ const { history } = useRouter();+ const form = useForm<SignUpFormValues>({+ resolver: zodResolver(signUpSchema),+ defaultValues: {+ email: "",+ password: "",+ name: "",+ },+ });+ const { isError, error, mutateAsync } = useMutation({+ mutationFn: () =>+ signUp({+ email: form.getValues().email,+ password: form.getValues().password,+ name: form.getValues().name,+ }),+ });++ const onSubmit = async () => {+ await mutateAsync();+ history.push("/dashboard");+ };++ return (+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">+ <div className="space-y-4">+ <FormField+ control={form.control}+ name="name"+ render={({ field }) => (+ <FormItem>+ <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">+ Full Name+ </FormLabel>+ <FormControl>+ <Input+ className="bg-white dark:bg-zinc-800/50 border-zinc-200 dark:border-zinc-700/50 text-zinc-900 dark:text-zinc-100"+ placeholder="Andrej Acevski"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <FormField+ control={form.control}+ name="email"+ render={({ field }) => (+ <FormItem>+ <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">+ </FormLabel>+ <FormControl>+ <Input+ className="bg-white dark:bg-zinc-800/50 border-zinc-200 dark:border-zinc-700/50 text-zinc-900 dark:text-zinc-100"+ placeholder="[email protected]"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <FormField+ control={form.control}+ name="password"+ render={({ field }) => (+ <FormItem>+ <FormLabel className="text-sm font-medium text-zinc-300 mb-1.5 block">+ Password+ </FormLabel>+ <FormControl>+ <div className="relative">+ <Input+ className="bg-white dark:bg-zinc-800/50 border-zinc-200 dark:border-zinc-700/50 text-zinc-900 dark:text-zinc-100"+ placeholder="••••••••"+ type={showPassword ? "text" : "password"}+ {...field}+ />+ <button+ type="button"+ onClick={() => setShowPassword(!showPassword)}+ className="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-400 hover:text-zinc-300"+ >+ {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}+ </button>+ </div>+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {isError && (+ <Alert variant="destructive">+ <AlertCircle className="h-4 w-4" />+ <AlertTitle>Error</AlertTitle>+ <AlertDescription>{error.message}</AlertDescription>+ </Alert>+ )}++ <Button+ type="submit"+ className="w-full bg-indigo-600 text-white hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400 mt-6"+ >+ Sign Up+ </Button>+ </form>+ </Form>+ );+}diff --git a/apps/web/src/components/auth/toggle.tsx b/apps/web/src/components/auth/toggle.tsxindex 2ae05e2ba..234a391c1 100644--- a/apps/web/src/components/auth/toggle.tsx+++ b/apps/web/src/components/auth/toggle.tsx@@ -1,23 +1,23 @@import { Link } from "@tanstack/react-router";interface AuthToggleProps {- message: string;- linkText: string;- linkTo: string;+ message: string;+ linkText: string;+ linkTo: string;}export function AuthToggle({ message, linkText, linkTo }: AuthToggleProps) {- return (- <div className="mt-6 text-center">- <p className="text-sm text-zinc-400">- {message}{" "}- <Link- href={linkTo}- className="text-zinc-300 hover:text-zinc-100 font-medium"- >- {linkText}- </Link>- </p>- </div>- );+ return (+ <div className="mt-6 text-center">+ <p className="text-sm text-zinc-600 dark:text-zinc-400">+ {message}{" "}+ <Link+ href={linkTo}+ className="text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300 font-medium"+ >+ {linkText}+ </Link>+ </p>+ </div>+ );}diff --git a/apps/web/src/components/common/logo.tsx b/apps/web/src/components/common/logo.tsxindex a4ca56e09..0bba0f94a 100644--- a/apps/web/src/components/common/logo.tsx+++ b/apps/web/src/components/common/logo.tsx@@ -1,18 +1,18 @@import { LayoutGrid } from "lucide-react";interface LogoProps {- className?: string;+ className?: string;}export function Logo({ className = "" }: LogoProps) {- return (- <div className={`flex items-center gap-2 ${className}`}>- <div className="p-1.5 bg-gradient-to-br from-indigo-500 to-purple-500 rounded-lg shadow-sm">- <LayoutGrid className="w-5 h-5 text-white" />- </div>- <span className="text-lg font-semibold bg-gradient-to-br from-indigo-600 to-purple-600 dark:from-indigo-400 dark:to-purple-400 bg-clip-text text-transparent">- Kaneo- </span>- </div>- );+ return (+ <div className={`flex items-center gap-2 ${className}`}>+ <div className="p-1.5 bg-gradient-to-br from-indigo-500 to-purple-500 rounded-lg shadow-sm">+ <LayoutGrid className="w-5 h-5 text-white" />+ </div>+ <span className="text-lg font-semibold bg-gradient-to-br from-indigo-600 to-purple-600 dark:from-indigo-400 dark:to-purple-400 bg-clip-text text-transparent">+ Kaneo+ </span>+ </div>+ );}diff --git a/apps/web/src/components/common/mobile-header.tsx b/apps/web/src/components/common/mobile-header.tsxindex b1328f58a..bb1977f3d 100644--- a/apps/web/src/components/common/mobile-header.tsx+++ b/apps/web/src/components/common/mobile-header.tsx@@ -2,20 +2,20 @@ import { Menu } from "lucide-react";import { Logo } from "./logo";interface MobileHeaderProps {- onMenuClick: () => void;+ onMenuClick: () => void;}export function MobileHeader({ onMenuClick }: MobileHeaderProps) {- return (- <div className="flex items-center justify-between p-4 border-b border-zinc-800 md:hidden">- <Logo />- <button- type="button"- onClick={onMenuClick}- className="p-2 text-zinc-400 hover:text-zinc-300 hover:bg-zinc-800 rounded-lg transition-colors"- >- <Menu className="h-6 w-6" />- </button>- </div>- );+ return (+ <div className="flex items-center justify-between p-4 border-b border-zinc-800 md:hidden">+ <Logo />+ <button+ type="button"+ onClick={onMenuClick}+ className="p-2 text-zinc-400 hover:text-zinc-300 hover:bg-zinc-800 rounded-lg transition-colors"+ >+ <Menu className="h-6 w-6" />+ </button>+ </div>+ );}diff --git a/apps/web/src/components/common/sidebar/index.tsx b/apps/web/src/components/common/sidebar/index.tsxindex 4ad2ab04d..85ca39931 100644--- a/apps/web/src/components/common/sidebar/index.tsx+++ b/apps/web/src/components/common/sidebar/index.tsx@@ -1,66 +1,66 @@+import { cn } from "@/lib/utils";import { X } from "lucide-react";import { useState } from "react";-import { cn } from "../../../lib/utils";import { Logo } from "../logo";import { MobileHeader } from "../mobile-header";import { SidebarContent } from "./sidebar-content";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 [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",+ };- return (- <>- <MobileHeader onMenuClick={() => setIsOpen(true)} />+ return (+ <>+ <MobileHeader onMenuClick={() => setIsOpen(true)} />- <div- className={cn(- "fixed inset-0 z-40 bg-white/80 dark:bg-zinc-950/80 backdrop-blur-sm md:hidden",- isOpen ? "opacity-100" : "opacity-0 pointer-events-none",- )}- >- <div- className={cn(- "fixed inset-y-0 left-0 w-64 bg-white dark:bg-zinc-900 transform transition-transform duration-200 ease-in-out",- isOpen ? "translate-x-0" : "-translate-x-full",- )}- >- <div className="flex items-center justify-between p-4 border-b border-zinc-200 dark:border-zinc-800">- <Logo />- <button- type="button"- onClick={() => setIsOpen(false)}- className="p-2 text-zinc-500 hover:text-zinc-700 dark:text-zinc-400 dark:hover:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-800 rounded-lg transition-colors"- >- <X className="h-5 w-5" />- </button>- </div>+ <div+ className={cn(+ "fixed inset-0 z-40 bg-white/80 dark:bg-zinc-950/80 backdrop-blur-sm md:hidden",+ isOpen ? "opacity-100" : "opacity-0 pointer-events-none",+ )}+ >+ <div+ className={cn(+ "fixed inset-y-0 left-0 w-64 bg-white dark:bg-zinc-900 transform transition-transform duration-200 ease-in-out",+ isOpen ? "translate-x-0" : "-translate-x-full",+ )}+ >+ <div className="flex items-center justify-between p-4 border-b border-zinc-200 dark:border-zinc-800">+ <Logo />+ <button+ type="button"+ onClick={() => setIsOpen(false)}+ className="p-2 text-zinc-500 hover:text-zinc-700 dark:text-zinc-400 dark:hover:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-800 rounded-lg transition-colors"+ >+ <X className="h-5 w-5" />+ </button>+ </div>- <SidebarContent- workspaces={[]}- currentWorkspace={"Andrej's workspace"}- setCurrentWorkspace={() => {}}- currentUser={currentUser}- />- </div>- </div>+ <SidebarContent+ workspaces={[]}+ currentWorkspace={"Andrej's workspace"}+ setCurrentWorkspace={() => {}}+ currentUser={currentUser}+ />+ </div>+ </div>- <div className="hidden md:flex w-64 bg-white dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-800 h-screen flex-col">- <SidebarHeader />- <SidebarContent- workspaces={[]}- currentWorkspace={"Andrej's workspace"}- setCurrentWorkspace={() => {}}- currentUser={currentUser}- />- </div>- </>- );+ <div className="hidden md:flex w-64 bg-white dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-800 h-screen flex-col">+ <SidebarHeader />+ <SidebarContent+ workspaces={[]}+ currentWorkspace={"Andrej's workspace"}+ setCurrentWorkspace={() => {}}+ currentUser={currentUser}+ />+ </div>+ </>+ );}diff --git a/apps/web/src/components/common/sidebar/sidebar-content.tsx b/apps/web/src/components/common/sidebar/sidebar-content.tsxindex e61d7dd6e..a753948e7 100644--- a/apps/web/src/components/common/sidebar/sidebar-content.tsx+++ b/apps/web/src/components/common/sidebar/sidebar-content.tsx@@ -2,111 +2,111 @@ import { Folder, LogOut, Plus, Settings, Users } from "lucide-react";import { Avatar, AvatarFallback, AvatarImage } from "../../ui/avatar";interface SidebarContentProps {- // biome-ignore lint/suspicious/noExplicitAny: <explanation>- workspaces: any[];- currentWorkspace: string | null;- setCurrentWorkspace: (id: string) => void;- currentUser: {- name: string;- email: string;- avatar: string;- };+ // biome-ignore lint/suspicious/noExplicitAny: Still WIP+ workspaces: any[];+ currentWorkspace: string | null;+ setCurrentWorkspace: (id: string) => void;+ currentUser: {+ name: string;+ email: string;+ avatar: string;+ };}export function SidebarContent({- workspaces,- currentWorkspace,- setCurrentWorkspace,- currentUser,+ workspaces,+ currentWorkspace,+ setCurrentWorkspace,+ currentUser,}: SidebarContentProps) {- return (- <>- <nav className="flex-1 overflow-y-auto p-3">- <div className="space-y-4">- <div>- <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider mb-2 px-3">- Workspaces- </h2>- <div className="space-y-1">- {workspaces.map((workspace) => (- <button- type="button"- key={workspace.id}- onClick={() => setCurrentWorkspace(workspace.id)}- className={`w-full text-left px-3 py-2 rounded-lg flex items-center transition-colors ${- currentWorkspace === workspace.id- ? "bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"- : "text-zinc-700 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800"- }`}- >- <Folder- className={`w-4 h-4 mr-2 ${- currentWorkspace === workspace.id- ? "text-indigo-600 dark:text-indigo-400"- : "text-zinc-500 dark:text-zinc-400"- }`}- />- {workspace.name}- </button>- ))}+ return (+ <>+ <nav className="flex-1 overflow-y-auto p-3">+ <div className="space-y-4">+ <div>+ <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider mb-2 px-3">+ Workspaces+ </h2>+ <div className="space-y-1">+ {workspaces.map((workspace) => (+ <button+ type="button"+ key={workspace.id}+ onClick={() => setCurrentWorkspace(workspace.id)}+ className={`w-full text-left px-3 py-2 rounded-lg flex items-center transition-colors ${+ currentWorkspace === workspace.id+ ? "bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"+ : "text-zinc-700 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800"+ }`}+ >+ <Folder+ className={`w-4 h-4 mr-2 ${+ currentWorkspace === workspace.id+ ? "text-indigo-600 dark:text-indigo-400"+ : "text-zinc-500 dark:text-zinc-400"+ }`}+ />+ {workspace.name}+ </button>+ ))}- <button- type="button"- className="w-full text-left px-3 py-2 text-zinc-700 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center transition-colors"- >- <Plus className="w-4 h-4 mr-2 text-zinc-500 dark:text-zinc-400" />- Add Workspace- </button>- </div>- </div>+ <button+ type="button"+ className="w-full text-left px-3 py-2 text-zinc-700 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center transition-colors"+ >+ <Plus className="w-4 h-4 mr-2 text-zinc-500 dark:text-zinc-400" />+ Add Workspace+ </button>+ </div>+ </div>- <div>- <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider mb-2 px-3">- Team- </h2>- <button- type="button"- className="w-full text-left px-3 py-2 text-zinc-700 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center transition-colors"- >- <Users className="w-4 h-4 mr-2 text-zinc-500 dark:text-zinc-400" />- Manage Team- </button>- </div>- </div>- </nav>+ <div>+ <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider mb-2 px-3">+ Team+ </h2>+ <button+ type="button"+ className="w-full text-left px-3 py-2 text-zinc-700 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center transition-colors"+ >+ <Users className="w-4 h-4 mr-2 text-zinc-500 dark:text-zinc-400" />+ Manage Team+ </button>+ </div>+ </div>+ </nav>- <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} />- <AvatarFallback>{currentUser.name.charAt(0)}</AvatarFallback>- </Avatar>- <div className="flex-1 min-w-0">- <p className="text-sm font-medium text-zinc-900 dark:text-zinc-100 truncate">- {currentUser.name}- </p>- <p className="text-xs text-zinc-500 dark:text-zinc-400 truncate">- {currentUser.email}- </p>- </div>- </div>- <div className="flex gap-1">- <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"- >- <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>- </div>- </div>- </>- );+ <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} />+ <AvatarFallback>{currentUser.name.charAt(0)}</AvatarFallback>+ </Avatar>+ <div className="flex-1 min-w-0">+ <p className="text-sm font-medium text-zinc-900 dark:text-zinc-100 truncate">+ {currentUser.name}+ </p>+ <p className="text-xs text-zinc-500 dark:text-zinc-400 truncate">+ {currentUser.email}+ </p>+ </div>+ </div>+ <div className="flex gap-1">+ <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"+ >+ <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>+ </div>+ </div>+ </>+ );}diff --git a/apps/web/src/components/common/sidebar/sidebar-header.tsx b/apps/web/src/components/common/sidebar/sidebar-header.tsxindex f916d12c3..f0ee998c2 100644--- a/apps/web/src/components/common/sidebar/sidebar-header.tsx+++ b/apps/web/src/components/common/sidebar/sidebar-header.tsx@@ -1,9 +1,11 @@+import { ThemeToggle } from "@/components/theme/theme-toggle";import { Logo } from "../logo";export function SidebarHeader() {- return (- <div className="p-4 border-b border-zinc-200 dark:border-zinc-800 flex items-center justify-between">- <Logo />- </div>- );+ return (+ <div className="p-4 border-b border-zinc-200 dark:border-zinc-800 flex items-center justify-between">+ <Logo />+ <ThemeToggle />+ </div>+ );}diff --git a/apps/web/src/components/providers/theme-provider.tsx b/apps/web/src/components/providers/theme-provider.tsxnew file mode 100644index 000000000..89c1384f5--- /dev/null+++ b/apps/web/src/components/providers/theme-provider.tsx@@ -0,0 +1,13 @@+import useTheme from "@/hooks/theme/use-theme";+import { useEffect } from "react";++export function ThemeProvider({ children }: { children: React.ReactNode }) {+ const { theme } = useTheme();++ useEffect(() => {+ document.documentElement.classList.remove("light", "dark");+ document.documentElement.classList.add(theme);+ }, [theme]);++ return <>{children}</>;+}diff --git a/apps/web/src/components/theme/theme-toggle.tsx b/apps/web/src/components/theme/theme-toggle.tsxnew file mode 100644index 000000000..9ccf72672--- /dev/null+++ b/apps/web/src/components/theme/theme-toggle.tsx@@ -0,0 +1,21 @@+import useTheme from "@/hooks/theme/use-theme";+import { Moon, Sun } from "lucide-react";++export function ThemeToggle() {+ const { theme, toggleTheme } = useTheme();++ return (+ <button+ type="button"+ onClick={toggleTheme}+ className="p-2 text-zinc-500 hover:text-zinc-700 hover:bg-zinc-100 dark:text-zinc-400 dark:hover:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg transition-colors"+ title={`Switch to ${theme === "dark" ? "light" : "dark"} mode`}+ >+ {theme === "dark" ? (+ <Sun className="h-5 w-5" />+ ) : (+ <Moon className="h-5 w-5" />+ )}+ </button>+ );+}diff --git a/apps/web/src/components/ui/alert.tsx b/apps/web/src/components/ui/alert.tsxnew file mode 100644index 000000000..ab2b95a95--- /dev/null+++ b/apps/web/src/components/ui/alert.tsx@@ -0,0 +1,59 @@+import { type VariantProps, cva } from "class-variance-authority";+import * as React from "react";++import { cn } from "@/lib/utils";++const alertVariants = cva(+ "relative w-full rounded-lg border px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7",+ {+ variants: {+ variant: {+ default: "bg-background text-foreground",+ destructive:+ "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive",+ },+ },+ defaultVariants: {+ variant: "default",+ },+ },+);++const Alert = React.forwardRef<+ HTMLDivElement,+ React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>+>(({ className, variant, ...props }, ref) => (+ <div+ ref={ref}+ role="alert"+ className={cn(alertVariants({ variant }), className)}+ {...props}+ />+));+Alert.displayName = "Alert";++const AlertTitle = React.forwardRef<+ HTMLParagraphElement,+ React.HTMLAttributes<HTMLHeadingElement>+>(({ className, ...props }, ref) => (+ <h5+ ref={ref}+ className={cn("mb-1 font-medium leading-none tracking-tight", className)}+ {...props}+ />+));+AlertTitle.displayName = "AlertTitle";++const AlertDescription = React.forwardRef<+ HTMLParagraphElement,+ React.HTMLAttributes<HTMLParagraphElement>+>(({ className, ...props }, ref) => (+ <div+ ref={ref}+ className={cn("text-sm [&_p]:leading-relaxed", className)}+ {...props}+ />+));+AlertDescription.displayName = "AlertDescription";++export { Alert, AlertTitle, AlertDescription };diff --git a/apps/web/src/components/ui/avatar.tsx b/apps/web/src/components/ui/avatar.tsxindex 13b276cd3..e87d9aaee 100644--- a/apps/web/src/components/ui/avatar.tsx+++ b/apps/web/src/components/ui/avatar.tsx@@ -4,44 +4,44 @@ import * as React from "react";import { cn } from "@/lib/utils";const Avatar = React.forwardRef<- React.ElementRef<typeof AvatarPrimitive.Root>,- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>+ React.ElementRef<typeof AvatarPrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>>(({ className, ...props }, ref) => (- <AvatarPrimitive.Root- ref={ref}- className={cn(- "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",- className,- )}- {...props}- />+ <AvatarPrimitive.Root+ ref={ref}+ className={cn(+ "relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full",+ className,+ )}+ {...props}+ />));Avatar.displayName = AvatarPrimitive.Root.displayName;const AvatarImage = React.forwardRef<- React.ElementRef<typeof AvatarPrimitive.Image>,- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>+ React.ElementRef<typeof AvatarPrimitive.Image>,+ React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>>(({ className, ...props }, ref) => (- <AvatarPrimitive.Image- ref={ref}- className={cn("aspect-square h-full w-full", className)}- {...props}- />+ <AvatarPrimitive.Image+ ref={ref}+ className={cn("aspect-square h-full w-full", className)}+ {...props}+ />));AvatarImage.displayName = AvatarPrimitive.Image.displayName;const AvatarFallback = React.forwardRef<- React.ElementRef<typeof AvatarPrimitive.Fallback>,- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>+ React.ElementRef<typeof AvatarPrimitive.Fallback>,+ React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>>(({ className, ...props }, ref) => (- <AvatarPrimitive.Fallback- ref={ref}- className={cn(- "flex h-full w-full items-center justify-center rounded-full bg-muted",- className,- )}- {...props}- />+ <AvatarPrimitive.Fallback+ ref={ref}+ className={cn(+ "flex h-full w-full items-center justify-center rounded-full bg-muted",+ className,+ )}+ {...props}+ />));AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsxindex d18eb21f7..76f1b90f4 100644--- a/apps/web/src/components/ui/button.tsx+++ b/apps/web/src/components/ui/button.tsx@@ -5,52 +5,52 @@ import * as React from "react";import { cn } from "@/lib/utils";const buttonVariants = cva(- "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",- {- variants: {- variant: {- default:- "bg-primary text-primary-foreground shadow hover:bg-primary/90",- destructive:- "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",- outline:- "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",- secondary:- "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",- ghost: "hover:bg-accent hover:text-accent-foreground",- link: "text-primary underline-offset-4 hover:underline",- },- size: {- default: "h-9 px-4 py-2",- sm: "h-8 rounded-md px-3 text-xs",- lg: "h-10 rounded-md px-8",- icon: "h-9 w-9",- },- },- defaultVariants: {- variant: "default",- size: "default",- },- },+ "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",+ {+ variants: {+ variant: {+ default:+ "bg-primary text-primary-foreground shadow hover:bg-primary/90",+ destructive:+ "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",+ outline:+ "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",+ secondary:+ "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",+ ghost: "hover:bg-accent hover:text-accent-foreground",+ link: "text-primary underline-offset-4 hover:underline",+ },+ size: {+ default: "h-9 px-4 py-2",+ sm: "h-8 rounded-md px-3 text-xs",+ lg: "h-10 rounded-md px-8",+ icon: "h-9 w-9",+ },+ },+ defaultVariants: {+ variant: "default",+ size: "default",+ },+ },);export interface ButtonProps- extends React.ButtonHTMLAttributes<HTMLButtonElement>,- VariantProps<typeof buttonVariants> {- asChild?: boolean;+ extends React.ButtonHTMLAttributes<HTMLButtonElement>,+ VariantProps<typeof buttonVariants> {+ asChild?: boolean;}const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(- ({ className, variant, size, asChild = false, ...props }, ref) => {- const Comp = asChild ? Slot : "button";- return (- <Comp- className={cn(buttonVariants({ variant, size, className }))}- ref={ref}- {...props}- />- );- },+ ({ className, variant, size, asChild = false, ...props }, ref) => {+ const Comp = asChild ? Slot : "button";+ return (+ <Comp+ className={cn(buttonVariants({ variant, size, className }))}+ ref={ref}+ {...props}+ />+ );+ },);Button.displayName = "Button";diff --git a/apps/web/src/components/ui/form.tsx b/apps/web/src/components/ui/form.tsxindex 215b3695f..211b9d4db 100644--- a/apps/web/src/components/ui/form.tsx+++ b/apps/web/src/components/ui/form.tsx@@ -2,12 +2,12 @@ import type * as LabelPrimitive from "@radix-ui/react-label";import { Slot } from "@radix-ui/react-slot";import * as React from "react";import {- Controller,- type ControllerProps,- type FieldPath,- type FieldValues,- FormProvider,- useFormContext,+ Controller,+ type ControllerProps,+ type FieldPath,+ type FieldValues,+ FormProvider,+ useFormContext,} from "react-hook-form";import { Label } from "@/components/ui/label";@@ -16,162 +16,162 @@ import { cn } from "@/lib/utils";const Form = FormProvider;type FormFieldContextValue<- TFieldValues extends FieldValues = FieldValues,- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,+ TFieldValues extends FieldValues = FieldValues,+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,> = {- name: TName;+ name: TName;};const FormFieldContext = React.createContext<FormFieldContextValue>(- {} as FormFieldContextValue,+ {} as FormFieldContextValue,);const FormField = <- TFieldValues extends FieldValues = FieldValues,- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,+ TFieldValues extends FieldValues = FieldValues,+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,>({- ...props+ ...props}: ControllerProps<TFieldValues, TName>) => {- return (- <FormFieldContext.Provider value={{ name: props.name }}>- <Controller {...props} />- </FormFieldContext.Provider>- );+ return (+ <FormFieldContext.Provider value={{ name: props.name }}>+ <Controller {...props} />+ </FormFieldContext.Provider>+ );};const useFormField = () => {- const fieldContext = React.useContext(FormFieldContext);- const itemContext = React.useContext(FormItemContext);- const { getFieldState, formState } = useFormContext();-- const fieldState = getFieldState(fieldContext.name, formState);-- if (!fieldContext) {- throw new Error("useFormField should be used within <FormField>");- }-- const { id } = itemContext;-- return {- id,- name: fieldContext.name,- formItemId: `${id}-form-item`,- formDescriptionId: `${id}-form-item-description`,- formMessageId: `${id}-form-item-message`,- ...fieldState,- };+ const fieldContext = React.useContext(FormFieldContext);+ const itemContext = React.useContext(FormItemContext);+ const { getFieldState, formState } = useFormContext();++ const fieldState = getFieldState(fieldContext.name, formState);++ if (!fieldContext) {+ throw new Error("useFormField should be used within <FormField>");+ }++ const { id } = itemContext;++ return {+ id,+ name: fieldContext.name,+ formItemId: `${id}-form-item`,+ formDescriptionId: `${id}-form-item-description`,+ formMessageId: `${id}-form-item-message`,+ ...fieldState,+ };};type FormItemContextValue = {- id: string;+ id: string;};const FormItemContext = React.createContext<FormItemContextValue>(- {} as FormItemContextValue,+ {} as FormItemContextValue,);const FormItem = React.forwardRef<- HTMLDivElement,- React.HTMLAttributes<HTMLDivElement>+ HTMLDivElement,+ React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => {- const id = React.useId();+ const id = React.useId();- return (- <FormItemContext.Provider value={{ id }}>- <div ref={ref} className={cn("space-y-2", className)} {...props} />- </FormItemContext.Provider>- );+ return (+ <FormItemContext.Provider value={{ id }}>+ <div ref={ref} className={cn("space-y-2", className)} {...props} />+ </FormItemContext.Provider>+ );});FormItem.displayName = "FormItem";const FormLabel = React.forwardRef<- React.ElementRef<typeof LabelPrimitive.Root>,- React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>+ React.ElementRef<typeof LabelPrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>>(({ className, ...props }, ref) => {- const { error, formItemId } = useFormField();-- return (- <Label- ref={ref}- className={cn(error && "text-destructive", className)}- htmlFor={formItemId}- {...props}- />- );+ const { error, formItemId } = useFormField();++ return (+ <Label+ ref={ref}+ className={cn(error && "text-destructive", className)}+ htmlFor={formItemId}+ {...props}+ />+ );});FormLabel.displayName = "FormLabel";const FormControl = React.forwardRef<- React.ElementRef<typeof Slot>,- React.ComponentPropsWithoutRef<typeof Slot>+ React.ElementRef<typeof Slot>,+ React.ComponentPropsWithoutRef<typeof Slot>>(({ ...props }, ref) => {- const { error, formItemId, formDescriptionId, formMessageId } =- useFormField();-- return (- <Slot- ref={ref}- id={formItemId}- aria-describedby={- !error- ? `${formDescriptionId}`- : `${formDescriptionId} ${formMessageId}`- }- aria-invalid={!!error}- {...props}- />- );+ const { error, formItemId, formDescriptionId, formMessageId } =+ useFormField();++ return (+ <Slot+ ref={ref}+ id={formItemId}+ aria-describedby={+ !error+ ? `${formDescriptionId}`+ : `${formDescriptionId} ${formMessageId}`+ }+ aria-invalid={!!error}+ {...props}+ />+ );});FormControl.displayName = "FormControl";const FormDescription = React.forwardRef<- HTMLParagraphElement,- React.HTMLAttributes<HTMLParagraphElement>+ HTMLParagraphElement,+ React.HTMLAttributes<HTMLParagraphElement>>(({ className, ...props }, ref) => {- const { formDescriptionId } = useFormField();-- return (- <p- ref={ref}- id={formDescriptionId}- className={cn("text-[0.8rem] text-muted-foreground", className)}- {...props}- />- );+ const { formDescriptionId } = useFormField();++ return (+ <p+ ref={ref}+ id={formDescriptionId}+ className={cn("text-[0.8rem] text-muted-foreground", className)}+ {...props}+ />+ );});FormDescription.displayName = "FormDescription";const FormMessage = React.forwardRef<- HTMLParagraphElement,- React.HTMLAttributes<HTMLParagraphElement>+ HTMLParagraphElement,+ React.HTMLAttributes<HTMLParagraphElement>>(({ className, children, ...props }, ref) => {- const { error, formMessageId } = useFormField();- const body = error ? String(error?.message) : children;-- if (!body) {- return null;- }-- return (- <p- ref={ref}- id={formMessageId}- className={cn("text-[0.8rem] font-medium text-destructive", className)}- {...props}- >- {body}- </p>- );+ const { error, formMessageId } = useFormField();+ const body = error ? String(error?.message) : children;++ if (!body) {+ return null;+ }++ return (+ <p+ ref={ref}+ id={formMessageId}+ className={cn("text-[0.8rem] font-medium text-destructive", className)}+ {...props}+ >+ {body}+ </p>+ );});FormMessage.displayName = "FormMessage";export {- useFormField,- Form,- FormItem,- FormLabel,- FormControl,- FormDescription,- FormMessage,- FormField,+ useFormField,+ Form,+ FormItem,+ FormLabel,+ FormControl,+ FormDescription,+ FormMessage,+ FormField,};diff --git a/apps/web/src/components/ui/input.tsx b/apps/web/src/components/ui/input.tsxindex 875315a06..7db524115 100644--- a/apps/web/src/components/ui/input.tsx+++ b/apps/web/src/components/ui/input.tsx@@ -3,19 +3,19 @@ import * as React from "react";import { cn } from "@/lib/utils";const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(- ({ className, type, ...props }, ref) => {- return (- <input- type={type}- className={cn(- "flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-base shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",- className,- )}- ref={ref}- {...props}- />- );- },+ ({ className, type, ...props }, ref) => {+ return (+ <input+ type={type}+ className={cn(+ "flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-base shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",+ className,+ )}+ ref={ref}+ {...props}+ />+ );+ },);Input.displayName = "Input";diff --git a/apps/web/src/components/ui/label.tsx b/apps/web/src/components/ui/label.tsxindex 6e126e940..a115d28af 100644--- a/apps/web/src/components/ui/label.tsx+++ b/apps/web/src/components/ui/label.tsx@@ -5,19 +5,19 @@ import * as React from "react";import { cn } from "@/lib/utils";const labelVariants = cva(- "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",+ "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",);const Label = React.forwardRef<- React.ElementRef<typeof LabelPrimitive.Root>,- React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &- VariantProps<typeof labelVariants>+ React.ElementRef<typeof LabelPrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &+ VariantProps<typeof labelVariants>>(({ className, ...props }, ref) => (- <LabelPrimitive.Root- ref={ref}- className={cn(labelVariants(), className)}- {...props}- />+ <LabelPrimitive.Root+ ref={ref}+ className={cn(labelVariants(), className)}+ {...props}+ />));Label.displayName = LabelPrimitive.Root.displayName;diff --git a/apps/web/src/fetchers/user/sign-in.ts b/apps/web/src/fetchers/user/sign-in.tsnew file mode 100644index 000000000..7a68e706b--- /dev/null+++ b/apps/web/src/fetchers/user/sign-in.ts@@ -0,0 +1,17 @@+import type { SignInFormValues } from "@/components/auth/sign-in-form";+import { api } from "@kaneo/libs";++const signIn = async ({ email, password }: SignInFormValues) => {+ const response = await api.user["sign-in"].post({+ email,+ password,+ });++ if (response.error) {+ throw new Error(response.error.value.message);+ }++ return response;+};++export default signIn;diff --git a/apps/web/src/fetchers/user/sign-up.ts b/apps/web/src/fetchers/user/sign-up.tsnew file mode 100644index 000000000..c49c208f0--- /dev/null+++ b/apps/web/src/fetchers/user/sign-up.ts@@ -0,0 +1,18 @@+import type { SignUpFormValues } from "@/components/auth/sign-up-form";+import { api } from "@kaneo/libs";++const signUp = async ({ email, password, name }: SignUpFormValues) => {+ const response = await api.user["sign-up"].post({+ email,+ password,+ name,+ });++ if (response.error) {+ throw new Error(response.error.value.message);+ }++ return response;+};++export default signUp;diff --git a/apps/web/src/hooks/theme/use-theme.tsx b/apps/web/src/hooks/theme/use-theme.tsxnew file mode 100644index 000000000..9601cbdda--- /dev/null+++ b/apps/web/src/hooks/theme/use-theme.tsx@@ -0,0 +1,22 @@+import { create } from "zustand";+import { persist } from "zustand/middleware";++interface ThemeStore {+ theme: "light" | "dark";+ toggleTheme: () => void;+}++const useTheme = create<ThemeStore>()(+ persist(+ (set) => ({+ theme: "dark",+ toggleTheme: () =>+ set((state) => ({+ theme: state.theme === "dark" ? "light" : "dark",+ })),+ }),+ { name: "theme-storage" },+ ),+);++export default useTheme;diff --git a/apps/web/src/index.css b/apps/web/src/index.cssindex bf382d385..44c7efde0 100644--- a/apps/web/src/index.css+++ b/apps/web/src/index.css@@ -2,10 +2,6 @@@tailwind components;@tailwind utilities;-@tailwind base;-@tailwind components;-@tailwind utilities;-@layer base {:root {--background: 0 0% 100%;@@ -26,13 +22,8 @@--destructive-foreground: 0 0% 98%;--border: 240 5.9% 90%;--input: 240 5.9% 90%;- --ring: 240 10% 3.9%;+ --ring: 240 5.9% 10%;--radius: 0.5rem;- --chart-1: 12 76% 61%;- --chart-2: 173 58% 39%;- --chart-3: 197 37% 24%;- --chart-4: 43 74% 66%;- --chart-5: 27 87% 67%;}.dark {@@ -55,11 +46,6 @@--border: 240 3.7% 15.9%;--input: 240 3.7% 15.9%;--ring: 240 4.9% 83.9%;- --chart-1: 220 70% 50%;- --chart-2: 160 60% 45%;- --chart-3: 30 80% 55%;- --chart-4: 280 65% 60%;- --chart-5: 340 75% 55%;}}@@ -83,12 +69,3 @@height: 6px;}}--@layer base {- * {- @apply border-border;- }- body {- @apply bg-background text-foreground;- }-}diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.tsindex ac680b303..365058ceb 100644--- a/apps/web/src/lib/utils.ts+++ b/apps/web/src/lib/utils.ts@@ -2,5 +2,5 @@ import { type ClassValue, clsx } from "clsx";import { twMerge } from "tailwind-merge";export function cn(...inputs: ClassValue[]) {- return twMerge(clsx(inputs));+ return twMerge(clsx(inputs));}diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsxindex 2109b5cbc..f68f0c9b0 100644--- a/apps/web/src/main.tsx+++ b/apps/web/src/main.tsx@@ -1,19 +1,22 @@+import queryClient from "@/query-client";+import router from "@/router";import { QueryClientProvider } from "@tanstack/react-query";import { RouterProvider } from "@tanstack/react-router";import { StrictMode } from "react";import { createRoot } from "react-dom/client";-import queryClient from "./query-client";-import router from "./router";-import "./index.css";+import "@/index.css";+import { ThemeProvider } from "./components/providers/theme-provider";const rootElement = document.getElementById("root") as HTMLElement;if (!rootElement.innerHTML) {- const root = createRoot(rootElement);- root.render(- <StrictMode>- <QueryClientProvider client={queryClient}>- <RouterProvider router={router} />- </QueryClientProvider>- </StrictMode>,- );+ const root = createRoot(rootElement);+ root.render(+ <StrictMode>+ <QueryClientProvider client={queryClient}>+ <ThemeProvider>+ <RouterProvider router={router} />+ </ThemeProvider>+ </QueryClientProvider>+ </StrictMode>,+ );}diff --git a/apps/web/src/pages/__root.tsx b/apps/web/src/pages/__root.tsxindex 5541aa9c0..a813dc02c 100644--- a/apps/web/src/pages/__root.tsx+++ b/apps/web/src/pages/__root.tsx@@ -4,17 +4,17 @@ import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";import { TanStackRouterDevtools } from "@tanstack/router-devtools";export const rootRoute = createRootRouteWithContext<{- queryClient: QueryClient;+ queryClient: QueryClient;}>()({- component: RootComponent,+ component: RootComponent,});function RootComponent() {- return (- <>- <Outlet />- <ReactQueryDevtools buttonPosition="top-right" />- <TanStackRouterDevtools position="bottom-right" />- </>- );+ return (+ <>+ <Outlet />+ <ReactQueryDevtools buttonPosition="top-right" />+ <TanStackRouterDevtools position="bottom-right" />+ </>+ );}diff --git a/apps/web/src/pages/auth/index.tsx b/apps/web/src/pages/auth/index.tsxindex c90e8589c..de599bcc7 100644--- a/apps/web/src/pages/auth/index.tsx+++ b/apps/web/src/pages/auth/index.tsx@@ -1,36 +1,36 @@+import { Logo } from "@/components/common/logo";+import { rootRoute } from "@/pages/__root";import { Outlet, createRoute } from "@tanstack/react-router";import { motion } from "framer-motion";-import { Logo } from "../../components/common/logo";-import { rootRoute } from "../__root";export const authIndexRoute = createRoute({- getParentRoute: () => rootRoute,- path: "/auth",- component: AuthIndexRouteComponent,+ getParentRoute: () => rootRoute,+ path: "/auth",+ component: AuthIndexRouteComponent,});function AuthIndexRouteComponent() {- return (- <div className="min-h-screen bg-gradient-to-b from-zinc-900 to-zinc-950 flex flex-col items-center justify-center p-4">- <motion.div- initial={{ opacity: 0, y: 20 }}- animate={{ opacity: 1, y: 0 }}- className="w-full max-w-md"- >- <div className="mb-8 text-center">- <Logo className="mx-auto mb-6" />- <h1 className="text-3xl font-bold text-zinc-100 mb-2">- Welcome back- </h1>- <p className="text-zinc-400">- Enter your credentials to access your workspace- </p>- </div>+ return (+ <div className="min-h-screen bg-gradient-to-b from-zinc-900 to-zinc-950 flex flex-col items-center justify-center p-4">+ <motion.div+ initial={{ opacity: 0, y: 20 }}+ animate={{ opacity: 1, y: 0 }}+ className="w-full max-w-md"+ >+ <div className="mb-8 text-center">+ <Logo className="mx-auto mb-6" />+ <h1 className="text-3xl font-bold text-zinc-100 mb-2">+ Welcome back+ </h1>+ <p className="text-zinc-400">+ Enter your credentials to access your workspace+ </p>+ </div>- <div className="bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-800/50 p-6">- <Outlet />- </div>- </motion.div>- </div>- );+ <div className="bg-zinc-900/50 backdrop-blur-xl rounded-xl border border-zinc-800/50 p-6">+ <Outlet />+ </div>+ </motion.div>+ </div>+ );}diff --git a/apps/web/src/pages/auth/sign-in.tsx b/apps/web/src/pages/auth/sign-in.tsxindex 478c20a26..ca13e792c 100644--- a/apps/web/src/pages/auth/sign-in.tsx+++ b/apps/web/src/pages/auth/sign-in.tsx@@ -5,23 +5,23 @@ import { AuthToggle } from "../../components/auth/toggle";import { rootRoute } from "../__root";export const signInRoute = createRoute({- getParentRoute: () => rootRoute,- path: "/auth/sign-in",- component: SignIn,+ getParentRoute: () => rootRoute,+ path: "/auth/sign-in",+ component: SignIn,});function SignIn() {- return (- <AuthLayout- title="Welcome back"- subtitle="Enter your credentials to access your workspace"- >- <SignInForm />- <AuthToggle- message="Don't have an account?"- linkText="Create account"- linkTo="/auth/sign-up"- />- </AuthLayout>- );+ return (+ <AuthLayout+ title="Welcome back"+ subtitle="Enter your credentials to access your workspace"+ >+ <SignInForm />+ <AuthToggle+ message="Don't have an account?"+ linkText="Create account"+ linkTo="/auth/sign-up"+ />+ </AuthLayout>+ );}diff --git a/apps/web/src/pages/auth/sign-up.tsx b/apps/web/src/pages/auth/sign-up.tsxindex 2c5f95e94..17d1d6ef9 100644--- a/apps/web/src/pages/auth/sign-up.tsx+++ b/apps/web/src/pages/auth/sign-up.tsx@@ -1,27 +1,27 @@+import { AuthLayout } from "@/components/auth/layout";+import { SignUpForm } from "@/components/auth/sign-up-form";+import { AuthToggle } from "@/components/auth/toggle";+import { rootRoute } from "@/pages/__root";import { createRoute } from "@tanstack/react-router";-import { AuthLayout } from "../../components/auth/layout";-import { SignInForm } from "../../components/auth/sign-in-form";-import { AuthToggle } from "../../components/auth/toggle";-import { rootRoute } from "../__root";export const signUpRoute = createRoute({- getParentRoute: () => rootRoute,- path: "/auth/sign-up",- component: SignUp,+ getParentRoute: () => rootRoute,+ path: "/auth/sign-up",+ component: SignUp,});function SignUp() {- return (- <AuthLayout- title="Create account"- subtitle="Get started with your free workspace"- >- <SignInForm />- <AuthToggle- message="Already have an account?"- linkText="Sign in"- linkTo="/auth/sign-in"- />- </AuthLayout>- );+ return (+ <AuthLayout+ title="Create account"+ subtitle="Get started with your free workspace"+ >+ <SignUpForm />+ <AuthToggle+ message="Already have an account?"+ linkText="Sign in"+ linkTo="/auth/sign-in"+ />+ </AuthLayout>+ );}diff --git a/apps/web/src/pages/dashboard/index.tsx b/apps/web/src/pages/dashboard/index.tsxnew file mode 100644index 000000000..67157e4a7--- /dev/null+++ b/apps/web/src/pages/dashboard/index.tsx@@ -0,0 +1,18 @@+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.tsxindex 91d01e512..605fa890d 100644--- a/apps/web/src/pages/index.tsx+++ b/apps/web/src/pages/index.tsx@@ -1,25 +1,32 @@+import queryClient from "@/query-client";import { api } from "@kaneo/libs";-import { useQuery } from "@tanstack/react-query";-import { createRoute } from "@tanstack/react-router";-import { Sidebar } from "../components/common/sidebar";+import { Outlet, createRoute, redirect } from "@tanstack/react-router";import { rootRoute } from "./__root";export const indexRoute = createRoute({- getParentRoute: () => rootRoute,- path: "/",- component: IndexRouteComponent,+ 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() {- const { data } = useQuery({- queryKey: ["me"],- queryFn: () => api.me.get(),- });-- return (- <div className="flex h-screen flex-col md:flex-row bg-zinc-50 dark:bg-zinc-950">- <Sidebar />- <main className="flex-1 overflow-hidden p-6">{JSON.stringify(data)}</main>- </div>- );+ 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/router/index.ts b/apps/web/src/router/index.tsindex 04ac3349a..5959a7587 100644--- a/apps/web/src/router/index.ts+++ b/apps/web/src/router/index.ts@@ -1,30 +1,32 @@+import { indexRoute } from "@/pages";+import { rootRoute } from "@/pages/__root";+import { authIndexRoute } from "@/pages/auth";+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 { createRouter } from "@tanstack/react-router";-import { indexRoute } from "../pages";-import { rootRoute } from "../pages/__root";-import { authIndexRoute } from "../pages/auth";-import { signInRoute } from "../pages/auth/sign-in";-import { signUpRoute } from "../pages/auth/sign-up";-import queryClient from "../query-client";const routeTree = rootRoute.addChildren([- indexRoute.addChildren([- authIndexRoute.addChildren([signInRoute, signUpRoute]),- ]),+ indexRoute.addChildren([+ authIndexRoute.addChildren([signInRoute, signUpRoute]),+ dashboardIndexRoute,+ ]),]);const router = createRouter({- routeTree,- defaultPreload: "intent",- defaultPreloadStaleTime: 0,- context: {- queryClient,- },+ routeTree,+ defaultPreload: "intent",+ defaultPreloadStaleTime: 0,+ context: {+ queryClient,+ },});declare module "@tanstack/react-router" {- interface Register {- router: typeof router;- }+ interface Register {+ router: typeof router;+ }}export default router;diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.jsindex a53c1ea8a..dd0ace3e9 100644--- a/apps/web/tailwind.config.js+++ b/apps/web/tailwind.config.js@@ -1,57 +1,50 @@/** @type {import('tailwindcss').Config} */export default {- darkMode: ["class"],- content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],- theme: {- extend: {- borderRadius: {- lg: "var(--radius)",- md: "calc(var(--radius) - 2px)",- sm: "calc(var(--radius) - 4px)",- },- colors: {- background: "hsl(var(--background))",- foreground: "hsl(var(--foreground))",- card: {- DEFAULT: "hsl(var(--card))",- foreground: "hsl(var(--card-foreground))",- },- popover: {- DEFAULT: "hsl(var(--popover))",- foreground: "hsl(var(--popover-foreground))",- },- primary: {- DEFAULT: "hsl(var(--primary))",- foreground: "hsl(var(--primary-foreground))",- },- secondary: {- DEFAULT: "hsl(var(--secondary))",- foreground: "hsl(var(--secondary-foreground))",- },- muted: {- DEFAULT: "hsl(var(--muted))",- foreground: "hsl(var(--muted-foreground))",- },- accent: {- DEFAULT: "hsl(var(--accent))",- foreground: "hsl(var(--accent-foreground))",- },- destructive: {- DEFAULT: "hsl(var(--destructive))",- foreground: "hsl(var(--destructive-foreground))",- },- border: "hsl(var(--border))",- input: "hsl(var(--input))",- ring: "hsl(var(--ring))",- chart: {- 1: "hsl(var(--chart-1))",- 2: "hsl(var(--chart-2))",- 3: "hsl(var(--chart-3))",- 4: "hsl(var(--chart-4))",- 5: "hsl(var(--chart-5))",- },- },- },- },- plugins: [require("tailwindcss-animate")],+ darkMode: ["class"],+ content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],+ theme: {+ extend: {+ colors: {+ border: "hsl(var(--border))",+ input: "hsl(var(--input))",+ ring: "hsl(var(--ring))",+ background: "hsl(var(--background))",+ foreground: "hsl(var(--foreground))",+ primary: {+ DEFAULT: "hsl(var(--primary))",+ foreground: "hsl(var(--primary-foreground))",+ },+ secondary: {+ DEFAULT: "hsl(var(--secondary))",+ foreground: "hsl(var(--secondary-foreground))",+ },+ destructive: {+ DEFAULT: "hsl(var(--destructive))",+ foreground: "hsl(var(--destructive-foreground))",+ },+ muted: {+ DEFAULT: "hsl(var(--muted))",+ foreground: "hsl(var(--muted-foreground))",+ },+ accent: {+ DEFAULT: "hsl(var(--accent))",+ foreground: "hsl(var(--accent-foreground))",+ },+ popover: {+ DEFAULT: "hsl(var(--popover))",+ foreground: "hsl(var(--popover-foreground))",+ },+ card: {+ DEFAULT: "hsl(var(--card))",+ foreground: "hsl(var(--card-foreground))",+ },+ },+ borderRadius: {+ lg: "var(--radius)",+ md: "calc(var(--radius) - 2px)",+ sm: "calc(var(--radius) - 4px)",+ },+ },+ },+ plugins: [require("tailwindcss-animate")],};diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.tsindex 9f45bdde2..d3bd623b2 100644--- a/apps/web/vite.config.ts+++ b/apps/web/vite.config.ts@@ -5,13 +5,13 @@ import { defineConfig } from "vite";// https://vite.dev/config/export default defineConfig({- plugins: [TanStackRouterVite(), react()],- server: {- host: true,- },- resolve: {- alias: {- "@": path.resolve(__dirname, "./src"),- },- },+ plugins: [TanStackRouterVite(), react()],+ server: {+ host: true,+ },+ resolve: {+ alias: {+ "@": path.resolve(__dirname, "./src"),+ },+ },});diff --git a/biome.json b/biome.jsonindex a441979fd..2844ec78f 100644--- a/biome.json+++ b/biome.json@@ -24,7 +24,8 @@},"javascript": {"formatter": {- "quoteStyle": "double"+ "quoteStyle": "double",+ "indentStyle": "space"}}}diff --git a/packages/libs/src/eden.ts b/packages/libs/src/eden.tsindex 500399044..e6b8ff328 100644--- a/packages/libs/src/eden.ts+++ b/packages/libs/src/eden.ts@@ -2,7 +2,7 @@ import { treaty } from "@elysiajs/eden";import type { App } from "@kaneo/api";export const api = treaty<App>("http://localhost:1337", {- fetch: {- credentials: "include",- },+ fetch: {+ credentials: "include",+ },});diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex f984f616f..c145b7fbd 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -130,6 +130,9 @@ importers:zod:specifier: link:@hookform/resolvers/zodversion: link:@hookform/resolvers/zod+ zustand:+ specifier: ^5.0.2devDependencies:'@kaneo/libs':specifier: workspace:*@@ -2653,6 +2656,24 @@ packages:resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==}+ resolution: {integrity: sha512-8qNdnJVJlHlrKXi50LDqqUNmUbuBjoKLrYQBnoChIbVph7vni+sY+YpvdjXG9YLd/Bxr6scMcR+rm5H3aSqPaw==}+ engines: {node: '>=12.20.0'}+ peerDependencies:+ '@types/react': '>=18.0.0'+ immer: '>=9.0.6'+ react: '>=18.0.0'+ use-sync-external-store: '>=1.2.0'+ peerDependenciesMeta:+ '@types/react':+ optional: true+ immer:+ optional: true+ react:+ optional: true+ use-sync-external-store:+ optional: true+snapshots:'@alloc/[email protected]': {}@@ -4711,3 +4732,9 @@ snapshots:++ [email protected](@types/[email protected])([email protected])([email protected]([email protected])):+ optionalDependencies:+ '@types/react': 18.3.18+ react: 18.3.1+ use-sync-external-store: 1.4.0([email protected])