diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 00000000..256ccbd2 --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,19 @@ +name: Check +on: + push: + paths: + - '**' +jobs: + check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: oven-sh/setup-bun@v1 + with: + bun-version: latest + - name: Install dependencies + run: bun install + - name: 🔦 Run linter + run: bun run lint + - name: 🪐 Check TypeScript + run: bun run typecheck \ No newline at end of file diff --git a/README.md b/README.md index e2a9c271..350c476a 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,10 @@ bun dev:web // starts the web app in development mode bun dev:app // starts the app in development mode bun dev:api // starts the api in development mode bun dev:email // starts the email app in development mode + +// Database +bun migrate // run migrations +bun seed // run seed ``` ## How to use diff --git a/apps/api/package.json b/apps/api/package.json index 481e4544..846760b3 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -3,7 +3,11 @@ "private": true, "scripts": { "dev": "supabase start", - "login": "supabase login" + "login": "supabase login", + "migrate": "supabase migration up", + "seed": "supabase db seed generate && supabase db seed run", + "reset": "supabase db reset", + "generate": "supabase gen types --lang=typescript --local --schema public > ../../packages/supabase/src/types/db.ts" }, "dependencies": { "supabase": "^1.191.3" diff --git a/apps/api/supabase/migrations/.gitkeep b/apps/api/supabase/migrations/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/api/supabase/migrations/20240901155537_create_auth_users_triggers.sql b/apps/api/supabase/migrations/20240901155537_create_auth_users_triggers.sql new file mode 100644 index 00000000..b46bcef4 --- /dev/null +++ b/apps/api/supabase/migrations/20240901155537_create_auth_users_triggers.sql @@ -0,0 +1,19 @@ +create function public.handle_new_user() returns trigger +language plpgsql security definer set search_path = '' +as $$ +begin + insert into public.users (id, email, full_name) + values ( + new.id, + new.email, + new.raw_user_meta_data ->> 'full_name' + ); + return new; +end; +$$; + +-- trigger the function every time a user is created +create trigger on_auth_user_created +after insert on auth.users +for each row +execute function public.handle_new_user(); \ No newline at end of file diff --git a/apps/api/supabase/migrations/20240901155538_create_users_table.sql b/apps/api/supabase/migrations/20240901155538_create_users_table.sql new file mode 100644 index 00000000..237026b4 --- /dev/null +++ b/apps/api/supabase/migrations/20240901155538_create_users_table.sql @@ -0,0 +1,35 @@ +-- create users table +create table public.users ( + id uuid primary key, + email text unique not null, + full_name text, + avatar_url text, + created_at timestamp with time zone default now(), + updated_at timestamp with time zone default now(), + constraint fk_auth_user foreign key (id) references auth.users(id) on delete cascade +); + +-- enable row level security (rls) +alter table public.users enable row level security; + +-- create a trigger to update the updated_at column +create or replace function update_updated_at() +returns trigger as $$ +begin + new.updated_at = now(); + return new; +end; +$$ language plpgsql; + +create trigger users_updated_at +before update on public.users +for each row +execute function update_updated_at(); + +-- create a policy to allow users to read their own profile +create policy select_own_profile on public.users +for select using (auth.uid() = id); + +-- create a policy to allow users to update their own profile +create policy update_own_profile on public.users +for update using (auth.uid() = id); \ No newline at end of file diff --git a/apps/api/supabase/migrations/20240901165124_create_posts_table.sql b/apps/api/supabase/migrations/20240901165124_create_posts_table.sql new file mode 100644 index 00000000..00abcb03 --- /dev/null +++ b/apps/api/supabase/migrations/20240901165124_create_posts_table.sql @@ -0,0 +1,61 @@ +-- create posts table +create table posts ( + id uuid primary key default gen_random_uuid(), + user_id uuid not null, + title text not null, + content text not null, + created_at timestamptz not null default now(), + updated_at timestamptz not null default now() +); + +-- add foreign key constraint +alter table + posts +add + constraint fk_posts_user foreign key (user_id) references public.users(id) on +delete + cascade; + +-- create index for faster queries +create index idx_posts_user_id on posts(user_id); + +-- add rls policies +alter table + posts enable row level security; + +-- policy to allow read access for all authenticated users +create policy "allow read access for all authenticated users" on posts for +select + to authenticated + using (true); + +-- policy to allow users to insert their own posts +create policy "allow insert for authenticated users" on posts for +insert + with check (auth.uid() = user_id); + +-- policy to allow users to update their own posts +create policy "allow update for post owners" on posts for +update + using (auth.uid() = user_id); + +-- policy to allow users to delete their own posts +create policy "allow delete for post owners" on posts for +delete + using (auth.uid() = user_id); + +-- function to update the updated_at timestamp +create +or replace function update_updated_at() returns trigger as $$ begin + new.updated_at = now(); + +return new; + +end; + +$$ language plpgsql; + +-- trigger to call the update_updated_at function +create trigger update_posts_updated_at before +update + on posts for each row execute function update_updated_at(); \ No newline at end of file diff --git a/apps/api/supabase/seed.sql b/apps/api/supabase/seed.sql new file mode 100644 index 00000000..65559367 --- /dev/null +++ b/apps/api/supabase/seed.sql @@ -0,0 +1,122 @@ +INSERT INTO + auth.users ( + instance_id, + id, + aud, + role, + email, + encrypted_password, + email_confirmed_at, + invited_at, + confirmation_token, + confirmation_sent_at, + recovery_token, + recovery_sent_at, + email_change_token_new, + email_change, + email_change_sent_at, + last_sign_in_at, + raw_app_meta_data, + raw_user_meta_data, + is_super_admin, + created_at, + updated_at, + phone, + phone_confirmed_at, + phone_change, + phone_change_token, + phone_change_sent_at, + email_change_token_current, + email_change_confirm_status, + banned_until, + reauthentication_token, + reauthentication_sent_at, + is_sso_user, + deleted_at, + is_anonymous + ) +VALUES + ( + '00000000-0000-0000-0000-000000000000', + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + 'authenticated', + 'authenticated', + 'user@example.com', + '$2a$10$nnqTShcTX48N6QWWjbPUee.wrGz1kGx/uq5lORviCm.fn04W1BeRe', + '2024-09-01 17:21:01.462788+00', + NULL, + '', + NULL, + '', + NULL, + '', + '', + NULL, + NULL, + '{"provider": "email", "providers": ["email"]}', + '{"username": "username", "full_name": "Test User"}', + NULL, + '2024-09-01 17:21:01.455486+00', + '2024-09-01 17:21:01.46295+00', + NULL, + NULL, + '', + '', + NULL, + '', + 0, + NULL, + '', + NULL, + false, + NULL, + false + ); + +INSERT INTO + auth.identities ( + provider_id, + user_id, + identity_data, + provider, + last_sign_in_at, + created_at, + updated_at, + id + ) +VALUES + ( + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + '{"sub": "aec53558-767e-4408-b4d6-1c1e6f17ffe5", "email": "user@example.com", "email_verified": false, "phone_verified": false}', + 'email', + '2024-09-01 17:21:01.459821+00', + '2024-09-01 17:21:01.459849+00', + '2024-09-01 17:21:01.459849+00', + 'c5e81668-437b-47c2-83e2-84b8566b3018' + ); + +-- Seed data for posts +INSERT INTO + posts (user_id, title, content) +VALUES + ( + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + 'React Server Components: A Game Changer', + 'React Server Components are revolutionizing how we build React applications. They allow for better performance and smaller bundle sizes by running components on the server. This new paradigm is especially powerful when combined with frameworks like Next.js 13+.' + ), + ( + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + 'The Rise of Bun: A New JavaScript Runtime', + 'Bun is gaining traction as a fast all-in-one JavaScript runtime. It aims to replace Node.js, npm, yarn, and more. With its focus on performance and developer experience, Bun is definitely worth keeping an eye on in 2024.' + ), + ( + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + 'TypeScript 5.0: What''s New and Exciting', + 'TypeScript 5.0 brings several new features and improvements, including decorators, const type parameters, and more. These enhancements continue to make TypeScript an essential tool for building robust JavaScript applications.' + ), + ( + 'aec53558-767e-4408-b4d6-1c1e6f17ffe5', + 'The State of JavaScript Frameworks in 2024', + 'While React remains dominant, frameworks like Svelte and Solid are gaining popularity for their performance and simplicity. Meanwhile, meta-frameworks like Next.js and Remix are becoming increasingly important in the React ecosystem.' + ); \ No newline at end of file diff --git a/apps/app/src/actions/user/update-user-action.ts b/apps/app/src/actions/user/update-post-action.ts similarity index 100% rename from apps/app/src/actions/user/update-user-action.ts rename to apps/app/src/actions/user/update-post-action.ts diff --git a/apps/app/src/app/[locale]/(dashboard)/posts/page.tsx b/apps/app/src/app/[locale]/(dashboard)/posts/page.tsx new file mode 100644 index 00000000..94d4a923 --- /dev/null +++ b/apps/app/src/app/[locale]/(dashboard)/posts/page.tsx @@ -0,0 +1,15 @@ +import { PostsLoading } from "@/components/posts/posts.loading"; +import { PostsServer } from "@/components/posts/posts.server"; +import { Suspense } from "react"; + +export const metadata = { + title: "Posts", +}; + +export default function Page() { + return ( + }> + + + ); +} diff --git a/apps/app/src/app/[locale]/(dashboard)/settings/page.tsx b/apps/app/src/app/[locale]/(dashboard)/settings/page.tsx deleted file mode 100644 index ab6488c0..00000000 --- a/apps/app/src/app/[locale]/(dashboard)/settings/page.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { UsersLoading } from "@/components/users.loading"; -import { UsersServer } from "@/components/users.server"; -import type { Metadata } from "next"; -import { Suspense } from "react"; - -export const metadata: Metadata = { - title: "Settings", - description: "Settings", -}; - -export default function Page() { - return ( -
- }> - - -
- ); -} diff --git a/apps/app/src/components/users.loading.tsx b/apps/app/src/components/posts/posts.loading.tsx similarity index 50% rename from apps/app/src/components/users.loading.tsx rename to apps/app/src/components/posts/posts.loading.tsx index 240a1644..995046ed 100644 --- a/apps/app/src/components/users.loading.tsx +++ b/apps/app/src/components/posts/posts.loading.tsx @@ -1,3 +1,3 @@ -export function UsersLoading() { +export function PostsLoading() { return
Loading...
; } diff --git a/apps/app/src/components/posts/posts.server.tsx b/apps/app/src/components/posts/posts.server.tsx new file mode 100644 index 00000000..cfe1696d --- /dev/null +++ b/apps/app/src/components/posts/posts.server.tsx @@ -0,0 +1,13 @@ +import { getPosts } from "@v1/supabase/queries"; + +export async function PostsServer() { + const { data } = await getPosts(); + + return ( +
+ {data?.map((post) => ( +
{post.title}
+ ))} +
+ ); +} diff --git a/apps/app/src/components/users.server.tsx b/apps/app/src/components/users.server.tsx deleted file mode 100644 index 75c005e8..00000000 --- a/apps/app/src/components/users.server.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { getUsers } from "@v1/supabase/queries"; - -export async function UsersServer() { - const { data } = await getUsers(); - - return ( -
- {data?.map((user) => ( -
{user.name}
- ))} -
- ); -} diff --git a/bun.lockb b/bun.lockb index b809cac9..dde60c88 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index eb940fcb..734067b1 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "lint:repo:fix": "bunx sherif@latest --fix", "typecheck": "turbo typecheck" }, - "devDependencies": { + "dependencies": { "@biomejs/biome": "1.8.3", "@manypkg/cli": "^0.21.4", "@t3-oss/env-nextjs": "^0.11.1", diff --git a/packages/supabase/package.json b/packages/supabase/package.json index 831f906f..77dd1f4e 100644 --- a/packages/supabase/package.json +++ b/packages/supabase/package.json @@ -6,8 +6,7 @@ "clean": "rm -rf .turbo node_modules", "lint": "biome check .", "format": "biome format --write .", - "typecheck": "tsc --noEmit", - "db:generate": "supabase gen types --lang=typescript --project-id $PROJECT_ID --schema public > src/types/db.ts" + "typecheck": "tsc --noEmit" }, "dependencies": { "@supabase/ssr": "^0.5.1", diff --git a/packages/supabase/src/mutations/index.ts b/packages/supabase/src/mutations/index.ts index e20c0736..d09be30a 100644 --- a/packages/supabase/src/mutations/index.ts +++ b/packages/supabase/src/mutations/index.ts @@ -1,7 +1,8 @@ import { logger } from "@v1/logger"; import { createClient } from "@v1/supabase/server"; +import type { Database, Tables, TablesUpdate } from "../types"; -export async function updateUser(userId: string, data: unknown) { +export async function updateUser(userId: string, data: TablesUpdate<"users">) { const supabase = createClient(); try { diff --git a/packages/supabase/src/queries/index.ts b/packages/supabase/src/queries/index.ts index 2cfcc96d..13a38a3c 100644 --- a/packages/supabase/src/queries/index.ts +++ b/packages/supabase/src/queries/index.ts @@ -15,16 +15,15 @@ export async function getUser() { } } -export async function getUsers() { +export async function getPosts() { const supabase = createClient(); try { - const result = await supabase.from("users").select("*"); + const result = await supabase.from("posts").select("*"); return result; } catch (error) { logger.error(error); - throw error; } } diff --git a/packages/supabase/src/types/db.ts b/packages/supabase/src/types/db.ts index 2066a59b..ab8242bc 100644 --- a/packages/supabase/src/types/db.ts +++ b/packages/supabase/src/types/db.ts @@ -1,3 +1,178 @@ +export type Json = + | string + | number + | boolean + | null + | { [key: string]: Json | undefined } + | Json[]; + export type Database = { - public: unknown; + public: { + Tables: { + posts: { + Row: { + content: string; + created_at: string; + id: string; + title: string; + updated_at: string; + user_id: string; + }; + Insert: { + content: string; + created_at?: string; + id?: string; + title: string; + updated_at?: string; + user_id: string; + }; + Update: { + content?: string; + created_at?: string; + id?: string; + title?: string; + updated_at?: string; + user_id?: string; + }; + Relationships: [ + { + foreignKeyName: "fk_posts_user"; + columns: ["user_id"]; + isOneToOne: false; + referencedRelation: "users"; + referencedColumns: ["id"]; + }, + ]; + }; + users: { + Row: { + avatar_url: string | null; + created_at: string | null; + email: string; + full_name: string | null; + id: string; + updated_at: string | null; + }; + Insert: { + avatar_url?: string | null; + created_at?: string | null; + email: string; + full_name?: string | null; + id: string; + updated_at?: string | null; + }; + Update: { + avatar_url?: string | null; + created_at?: string | null; + email?: string; + full_name?: string | null; + id?: string; + updated_at?: string | null; + }; + Relationships: [ + { + foreignKeyName: "fk_auth_user"; + columns: ["id"]; + isOneToOne: true; + referencedRelation: "users"; + referencedColumns: ["id"]; + }, + ]; + }; + }; + Views: { + [_ in never]: never; + }; + Functions: { + [_ in never]: never; + }; + Enums: { + [_ in never]: never; + }; + CompositeTypes: { + [_ in never]: never; + }; + }; }; + +type PublicSchema = Database[Extract]; + +export type Tables< + PublicTableNameOrOptions extends + | keyof (PublicSchema["Tables"] & PublicSchema["Views"]) + | { schema: keyof Database }, + TableName extends PublicTableNameOrOptions extends { schema: keyof Database } + ? keyof (Database[PublicTableNameOrOptions["schema"]]["Tables"] & + Database[PublicTableNameOrOptions["schema"]]["Views"]) + : never = never, +> = PublicTableNameOrOptions extends { schema: keyof Database } + ? (Database[PublicTableNameOrOptions["schema"]]["Tables"] & + Database[PublicTableNameOrOptions["schema"]]["Views"])[TableName] extends { + Row: infer R; + } + ? R + : never + : PublicTableNameOrOptions extends keyof (PublicSchema["Tables"] & + PublicSchema["Views"]) + ? (PublicSchema["Tables"] & + PublicSchema["Views"])[PublicTableNameOrOptions] extends { + Row: infer R; + } + ? R + : never + : never; + +export type TablesInsert< + PublicTableNameOrOptions extends + | keyof PublicSchema["Tables"] + | { schema: keyof Database }, + TableName extends PublicTableNameOrOptions extends { schema: keyof Database } + ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"] + : never = never, +> = PublicTableNameOrOptions extends { schema: keyof Database } + ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends { + Insert: infer I; + } + ? I + : never + : PublicTableNameOrOptions extends keyof PublicSchema["Tables"] + ? PublicSchema["Tables"][PublicTableNameOrOptions] extends { + Insert: infer I; + } + ? I + : never + : never; + +export type TablesUpdate< + PublicTableNameOrOptions extends + | keyof PublicSchema["Tables"] + | { schema: keyof Database }, + TableName extends PublicTableNameOrOptions extends { schema: keyof Database } + ? keyof Database[PublicTableNameOrOptions["schema"]]["Tables"] + : never = never, +> = PublicTableNameOrOptions extends { schema: keyof Database } + ? Database[PublicTableNameOrOptions["schema"]]["Tables"][TableName] extends { + Update: infer U; + } + ? U + : never + : PublicTableNameOrOptions extends keyof PublicSchema["Tables"] + ? PublicSchema["Tables"][PublicTableNameOrOptions] extends { + Update: infer U; + } + ? U + : never + : never; + +export type Enums< + PublicEnumNameOrOptions extends + | keyof PublicSchema["Enums"] + | { schema: keyof Database }, + EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database } + ? keyof Database[PublicEnumNameOrOptions["schema"]]["Enums"] + : never = never, +> = PublicEnumNameOrOptions extends { schema: keyof Database } + ? Database[PublicEnumNameOrOptions["schema"]]["Enums"][EnumName] + : PublicEnumNameOrOptions extends keyof PublicSchema["Enums"] + ? PublicSchema["Enums"][PublicEnumNameOrOptions] + : never; diff --git a/packages/ui/package.json b/packages/ui/package.json index 6483b07a..c5bc2865 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "autoprefixer": "^10.4.20", - "postcss": "^8.4.41", + "postcss": "^8.4.43", "react": "^18.3.1", "react-dom": "^18.3.1", "tailwindcss": "^3.4.10", @@ -34,7 +34,7 @@ "@radix-ui/react-slot": "^1.1.0", "@radix-ui/react-tooltip": "^1.1.2", "class-variance-authority": "^0.7.0", - "lucide-react": "^0.436.0", + "lucide-react": "^0.438.0", "tailwind-merge": "^2.5.2", "tailwindcss-animate": "^1.0.7" }