From 8ef0ea17d4fcd4dfe524a08dccf05e0c3d0f8221 Mon Sep 17 00:00:00 2001 From: Micha Date: Wed, 14 May 2025 17:22:01 +0200 Subject: [PATCH] feat: set up prisma db --- .env.example | 2 +- .gitignore | 3 ++ package.json | 16 +++++-- prisma/schema.prisma | 14 +++--- src/auth.ts | 6 ++- src/prisma.ts | 7 +++ yarn.lock | 104 ++++++++++++++++++++++++++++++++++--------- 7 files changed, 119 insertions(+), 33 deletions(-) create mode 100644 src/prisma.ts diff --git a/.env.example b/.env.example index 6f53284..1feabf8 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -DATABASE_URL= +DATABASE_URL="file:./dev.db" AUTH_SECRET= # Added by `npx auth`. Read more: https://cli.authjs.dev diff --git a/.gitignore b/.gitignore index 7b8da95..aa118f3 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts + +# database +/prisma/dev.db \ No newline at end of file diff --git a/package.json b/package.json index 0cc1236..c6b5642 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,21 @@ "build": "prettier --check . && next build", "start": "next start", "lint": "next lint", - "format": "prettier --write ." + "format": "prettier --write .", + "prisma:migrate": "dotenv -e .env.local -- prisma migrate dev", + "prisma:generate": "dotenv -e .env.local -- prisma generate", + "prisma:studio": "dotenv -e .env.local -- prisma studio", + "prisma:db:push": "dotenv -e .env.local -- prisma db push", + "prisma:migrate:reset": "dotenv -e .env.local -- prisma migrate reset" }, "dependencies": { + "@auth/prisma-adapter": "^2.9.1", "@fortawesome/fontawesome-svg-core": "^6.7.2", "@fortawesome/free-brands-svg-icons": "^6.7.2", "@fortawesome/free-regular-svg-icons": "^6.7.2", "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/react-fontawesome": "^0.2.2", + "@prisma/client": "^6.7.0", "@radix-ui/react-dropdown-menu": "^2.1.14", "@radix-ui/react-hover-card": "^1.1.13", "@radix-ui/react-label": "^2.1.6", @@ -40,14 +47,15 @@ "@types/node": "22.15.19", "@types/react": "19.1.4", "@types/react-dom": "19.1.5", + "dotenv-cli": "^8.0.0", "eslint": "9.27.0", "eslint-config-next": "15.3.2", "eslint-config-prettier": "10.1.5", "postcss": "8.5.3", "prettier": "3.5.3", - "prisma": "6.8.2", - "tailwindcss": "4.1.7", - "tw-animate-css": "1.3.0", + "prisma": "^6.7.0", + "tailwindcss": "4.1.6", + "tw-animate-css": "1.2.9", "typescript": "5.8.3" }, "packageManager": "yarn@4.9.1" diff --git a/prisma/schema.prisma b/prisma/schema.prisma index d91b48c..2197012 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -5,13 +5,13 @@ // Try Prisma Accelerate: https://pris.ly/cli/accelerate-init generator client { - provider = "prisma-client-js" - output = "../generated/prisma" + provider = "prisma-client-js" + output = "../generated/prisma" } datasource db { - provider = "postgresql" - url = env("DATABASE_URL") + provider = "sqlite" + url = env("DATABASE_URL") } enum participant_status { @@ -102,12 +102,12 @@ model Account { type String provider String providerAccountId String @map("provider_account_id") - refresh_token String? @db.Text - access_token String? @db.Text + refresh_token String? + access_token String? expires_at Int? token_type String? scope String? - id_token String? @db.Text + id_token String? session_state String? user User @relation(fields: [userId], references: [id], onDelete: Cascade) diff --git a/src/auth.ts b/src/auth.ts index 09a5065..6a04a1f 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -5,6 +5,9 @@ import Credentials from 'next-auth/providers/credentials'; import Authentik from 'next-auth/providers/authentik'; +import { PrismaAdapter } from '@auth/prisma-adapter'; +import { prisma } from '@/prisma'; + const providers: Provider[] = [ !process.env.DISABLE_PASSWORD_LOGIN && Credentials({ @@ -33,7 +36,8 @@ export const providerMap = providers .filter((provider) => provider.id !== 'credentials'); export const { handlers, signIn, signOut, auth } = NextAuth({ - providers, + providers: [], + adapter: PrismaAdapter(prisma), session: { strategy: 'jwt', }, diff --git a/src/prisma.ts b/src/prisma.ts new file mode 100644 index 0000000..b5cc446 --- /dev/null +++ b/src/prisma.ts @@ -0,0 +1,7 @@ +import { PrismaClient } from "@prisma/client" + +const globalForPrisma = globalThis as unknown as { prisma: PrismaClient } + +export const prisma = globalForPrisma.prisma || new PrismaClient() + +if (process.env.NODE_ENV !== "production") globalForPrisma.prisma = prisma \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index fdfb635..12be6fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,7 +46,18 @@ __metadata: languageName: node linkType: hard -"@emnapi/core@npm:^1.4.0, @emnapi/core@npm:^1.4.3": +"@auth/prisma-adapter@npm:^2.9.1": + version: 2.9.1 + resolution: "@auth/prisma-adapter@npm:2.9.1" + dependencies: + "@auth/core": "npm:0.39.1" + peerDependencies: + "@prisma/client": ">=2.26.0 || >=3 || >=4 || >=5 || >=6" + checksum: 10c0/615ee7c02f690e35ccac8206607a4345ca6455c322a741ddd4dbd52e7a068ace9e5c46c4d8a50fe471ca2c2fb6a5b4bb9924cbd2e911613f671fe929c33278d4 + languageName: node + linkType: hard + +"@emnapi/core@npm:^1.4.3": version: 1.4.3 resolution: "@emnapi/core@npm:1.4.3" dependencies: @@ -525,13 +536,13 @@ __metadata: linkType: hard "@napi-rs/wasm-runtime@npm:^0.2.9": - version: 0.2.9 - resolution: "@napi-rs/wasm-runtime@npm:0.2.9" + version: 0.2.10 + resolution: "@napi-rs/wasm-runtime@npm:0.2.10" dependencies: - "@emnapi/core": "npm:^1.4.0" - "@emnapi/runtime": "npm:^1.4.0" + "@emnapi/core": "npm:^1.4.3" + "@emnapi/runtime": "npm:^1.4.3" "@tybys/wasm-util": "npm:^0.9.0" - checksum: 10c0/1cc40b854b255f84e12ade634456ba489f6bf90659ef8164a16823c515c294024c96ee2bb81ab51f35493ba9496f62842b960f915dbdcdc1791f221f989e9e59 + checksum: 10c0/4dce9bbb94a8969805574e1b55fdbeb7623348190265d77f6507ba32e535610deeb53a33ba0bb8b05a6520f379d418b92e8a01c5cd7b9486b136d2c0c26be0bd languageName: node linkType: hard @@ -648,6 +659,21 @@ __metadata: languageName: node linkType: hard +"@prisma/client@npm:^6.7.0": + version: 6.8.2 + resolution: "@prisma/client@npm:6.8.2" + peerDependencies: + prisma: "*" + typescript: ">=5.1.0" + peerDependenciesMeta: + prisma: + optional: true + typescript: + optional: true + checksum: 10c0/5ce12e4a83ece542df80195f6642e24224de8f94c2f2fd26527ca6b3a2573ea9798b5d23eac8518d8f268be19f3856516ad4e08c9bc0a4df4356a5faab879db6 + languageName: node + linkType: hard + "@prisma/config@npm:6.8.2": version: 6.8.2 resolution: "@prisma/config@npm:6.8.2" @@ -1915,11 +1941,11 @@ __metadata: linkType: hard "aria-hidden@npm:^1.2.4": - version: 1.2.4 - resolution: "aria-hidden@npm:1.2.4" + version: 1.2.6 + resolution: "aria-hidden@npm:1.2.6" dependencies: tslib: "npm:^2.0.0" - checksum: 10c0/8abcab2e1432efc4db415e97cb3959649ddf52c8fc815d7384f43f3d3abf56f1c12852575d00df9a8927f421d7e0712652dd5f8db244ea57634344e29ecfc74a + checksum: 10c0/7720cb539497a9f760f68f98a4b30f22c6767aa0e72fa7d58279f7c164e258fc38b2699828f8de881aab0fc8e9c56d1313a3f1a965046fc0381a554dbc72b54a languageName: node linkType: hard @@ -2376,6 +2402,34 @@ __metadata: languageName: node linkType: hard +"dotenv-cli@npm:^8.0.0": + version: 8.0.0 + resolution: "dotenv-cli@npm:8.0.0" + dependencies: + cross-spawn: "npm:^7.0.6" + dotenv: "npm:^16.3.0" + dotenv-expand: "npm:^10.0.0" + minimist: "npm:^1.2.6" + bin: + dotenv: cli.js + checksum: 10c0/000469632758b7b44aaaa80cbbbd7f0c94dc170ec02e51aa8d8280341a0108fb7407954c23054257b77235b064033efdb8745836633eb6fd1586924953cf0528 + languageName: node + linkType: hard + +"dotenv-expand@npm:^10.0.0": + version: 10.0.0 + resolution: "dotenv-expand@npm:10.0.0" + checksum: 10c0/298f5018e29cfdcb0b5f463ba8e8627749103fbcf6cf81c561119115754ed582deee37b49dfc7253028aaba875ab7aea5fa90e5dac88e511d009ab0e6677924e + languageName: node + linkType: hard + +"dotenv@npm:^16.3.0": + version: 16.5.0 + resolution: "dotenv@npm:16.5.0" + checksum: 10c0/5bc94c919fbd955bf0ba44d33922a1e93d1078e64a1db5c30faeded1d996e7a83c55332cb8ea4fae5a9ca4d0be44cbceb95c5811e70f9f095298df09d1997dd9 + languageName: node + linkType: hard + "dunder-proto@npm:^1.0.0, dunder-proto@npm:^1.0.1": version: 1.0.1 resolution: "dunder-proto@npm:1.0.1" @@ -3747,12 +3801,14 @@ __metadata: version: 0.0.0-use.local resolution: "meetup@workspace:." dependencies: + "@auth/prisma-adapter": "npm:^2.9.1" "@eslint/eslintrc": "npm:3.3.1" "@fortawesome/fontawesome-svg-core": "npm:^6.7.2" "@fortawesome/free-brands-svg-icons": "npm:^6.7.2" "@fortawesome/free-regular-svg-icons": "npm:^6.7.2" "@fortawesome/free-solid-svg-icons": "npm:^6.7.2" "@fortawesome/react-fontawesome": "npm:^0.2.2" + "@prisma/client": "npm:^6.7.0" "@radix-ui/react-dropdown-menu": "npm:^2.1.14" "@radix-ui/react-hover-card": "npm:^1.1.13" "@radix-ui/react-label": "npm:^2.1.6" @@ -3768,6 +3824,7 @@ __metadata: "@types/react-dom": "npm:19.1.5" class-variance-authority: "npm:^0.7.1" clsx: "npm:^2.1.1" + dotenv-cli: "npm:^8.0.0" eslint: "npm:9.27.0" eslint-config-next: "npm:15.3.2" eslint-config-prettier: "npm:10.1.5" @@ -3777,12 +3834,12 @@ __metadata: next-themes: "npm:^0.4.6" postcss: "npm:8.5.3" prettier: "npm:3.5.3" - prisma: "npm:6.8.2" + prisma: "npm:^6.7.0" react: "npm:^19.0.0" react-dom: "npm:^19.0.0" tailwind-merge: "npm:^3.2.0" - tailwindcss: "npm:4.1.7" - tw-animate-css: "npm:1.3.0" + tailwindcss: "npm:4.1.6" + tw-animate-css: "npm:1.2.9" typescript: "npm:5.8.3" languageName: unknown linkType: soft @@ -4223,7 +4280,7 @@ __metadata: languageName: node linkType: hard -"prisma@npm:6.8.2": +"prisma@npm:^6.7.0": version: 6.8.2 resolution: "prisma@npm:6.8.2" dependencies: @@ -4300,8 +4357,8 @@ __metadata: linkType: hard "react-remove-scroll@npm:^2.6.3": - version: 2.6.3 - resolution: "react-remove-scroll@npm:2.6.3" + version: 2.7.0 + resolution: "react-remove-scroll@npm:2.7.0" dependencies: react-remove-scroll-bar: "npm:^2.3.7" react-style-singleton: "npm:^2.2.3" @@ -4314,7 +4371,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 10c0/068e9704ff26816fffc4c8903e2c6c8df7291ee08615d7c1ab0cf8751f7080e2c5a5d78ef5d908b11b9cfc189f176d312e44cb02ea291ca0466d8283b479b438 + checksum: 10c0/cf8b9a1b0808cafe9f2b1fbb2ab56e3efff7f311fba847f26154b972a681c003c288af517cf48d0b68704c2be0d3d73152e7ec2cc8590fa495135b0aac07a871 languageName: node linkType: hard @@ -4848,6 +4905,13 @@ __metadata: languageName: node linkType: hard +"tailwindcss@npm:4.1.6": + version: 4.1.6 + resolution: "tailwindcss@npm:4.1.6" + checksum: 10c0/de5a442d23d20872bfccb2b451720e8031dde27e1984a1ccb1d8c7308915213f1b3b62724ce5176d1b7031fbedc6a75fe844b73e3f13443141c11739447d8808 + languageName: node + linkType: hard + "tailwindcss@npm:4.1.7": version: 4.1.7 resolution: "tailwindcss@npm:4.1.7" @@ -4923,10 +4987,10 @@ __metadata: languageName: node linkType: hard -"tw-animate-css@npm:1.3.0": - version: 1.3.0 - resolution: "tw-animate-css@npm:1.3.0" - checksum: 10c0/c72a2c189d6aebd6cc31189c3ca1cf4cf2c3f37f005d0879cd40cfdd6550bfb665384e9a50b91dfc9befe9860ff09adb536a7f7431bf18132aef7e04734a02f2 +"tw-animate-css@npm:1.2.9": + version: 1.2.9 + resolution: "tw-animate-css@npm:1.2.9" + checksum: 10c0/ffbd6dfbb34490a8752b185b40192168ce4bfa69949d153dc831d9471dec2758501f27f1784b6615de7da73a546d01d7201ed691f5220fe3e0a53694cb275a3a languageName: node linkType: hard