Merge branch 'main' into dependabot/npm_and_yarn/lucide-react-0.468.0

README.md

@@ -31,6 +31,7 @@ To learn more about Next.js, take a look at the following resources:
 - [ShadCN](https://shadcn.com/) - UI components
 - [better-auth](https://better-auth.com/) - Authentication
 - [prisma](https://prisma.io/) - Database ORM
+- [pino](https://github.com/pinojs/pino) - Logging
 
 ## 🚧 Commit Message Guidelines
 

commitlint.config.js

@@ -1,22 +1,22 @@
 export default {
-  extends: ['@commitlint/config-conventional'],
+  extends: ["@commitlint/config-conventional"],
   rules: {
-    'type-enum': [
+    "type-enum": [
       2,
-      'always',
+      "always",
       [
-        'ci',
-        'chore',
-        'docs',
-        'ticket',
-        'feat',
-        'fix',
-        'perf',
-        'refactor',
-        'revert',
-        'style',
+        "ci",
+        "chore",
+        "docs",
+        "ticket",
+        "feat",
+        "fix",
+        "perf",
+        "refactor",
+        "revert",
+        "style",
       ],
     ],
-    'header-max-length': [2, 'always', 150],
+    "header-max-length": [2, "always", 200],
   },
 };

docker-compose.yml

@@ -2,10 +2,11 @@ services:
   nextjs:
     build: .
     ports:
-      - '3000:3000'
+      - "3000:3000"
     environment:
       - NODE_ENV=production
     restart: always
+
   postgres:
     image: postgres:16
     restart: always
@@ -14,7 +15,7 @@ services:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DB=${POSTGRES_DB}
     ports:
-      - '5432:5432'
+      - "5432:5432"
     volumes:
       - postgres-data:/var/lib/postgresql/data
 

documentation/erd.md

@@ -22,7 +22,7 @@ erDiagram
     Subscription ||--o{ Invoice : generates
 
     Account {
-        BigInt id PK
+        String id PK
         String email
         String password
         Boolean activated
@@ -32,7 +32,7 @@ erDiagram
     }
 
     Profile {
-        BigInt id PK
+        String id PK
         BigInt accountId FK
         String name
         BigInt profileImage
@@ -43,7 +43,7 @@ erDiagram
     }
 
     Content {
-        BigInt id PK
+        String id PK
         String title
         DateTime duration
         DateTime releaseDate
@@ -54,7 +54,7 @@ erDiagram
     }
 
     ContentMetadata {
-        BigInt id PK
+        String id PK
         BigInt contentId FK
         BigInt genreId FK
         BigInt languageId FK
@@ -68,28 +68,28 @@ erDiagram
     }
 
     Genre {
-        BigInt id PK
+        String id PK
         String name
     }
 
     Language {
-        BigInt id PK
+        String id PK
         String language
     }
 
     Subtitle {
-        BigInt id PK
+        String id PK
         BigInt languageId FK
         String content
     }
 
     ContentRating {
-        BigInt id PK
+        String id PK
         String ratingType
     }
 
     Subscription {
-        BigInt id PK
+        String id PK
         BigInt accountId FK
         BigInt subscriptionTypeId FK
         BigInt referralId FK
@@ -100,35 +100,35 @@ erDiagram
     }
 
     SubscriptionType {
-        BigInt id PK
+        String id PK
         String type
         Int priceInEuroCents
     }
 
     Invoice {
-        BigInt id PK
+        String id PK
         BigInt subscriptionId FK
         PaymentStatus isPaid
         DateTime createdAt
         DateTime updatedAt
     }
 
     ViewingHistory {
-        BigInt id PK
+        String id PK
         BigInt profileId FK
         BigInt contentId FK
         DateTime watchDate
         Float progressPercentage
     }
 
     Watchlist {
-        BigInt id PK
+        String id PK
         BigInt profileId FK
         BigInt contentId FK
     }
 
     PreviousPasswordHash {
-        BigInt id PK
+        String id PK
         BigInt accountId FK
         String passwordHash
         DateTime createdAt

eslint.config.mjs

@@ -1,40 +1,42 @@
-import antfu from '@antfu/eslint-config';
-import pluginQuery from '@tanstack/eslint-plugin-query';
+import antfu from "@antfu/eslint-config";
+import nextPlugin from "@next/eslint-plugin-next";
+import pluginQuery from "@tanstack/eslint-plugin-query";
 
 export default antfu(
   {
-    type: 'app',
+    type: "app",
     typescript: true,
     formatters: true,
     stylistic: {
       indent: 2,
       semi: true,
-      quotes: 'single',
+      quotes: "single",
     },
     plugins: {
-      '@tanstack/query': pluginQuery,
+      "@tanstack/query": pluginQuery,
+      "@next/next": nextPlugin,
     },
-    extends: ['next/core-web-vitals', 'next/typescript'],
+    extends: ["next/core-web-vitals", "next/typescript"],
   },
   {
     rules: {
-      'no-console': ['warn'],
-      '@tanstack/query/exhaustive-deps': ['error'],
-      'antfu/no-top-level-await': ['off'],
-      'node/prefer-global/process': ['off'],
-      'node/no-process-env': ['error'],
-      'unused-imports/no-unused-vars': ['off'],
-      'perfectionist/sort-imports': [
-        'error',
+      "no-console": ["warn"],
+      "@tanstack/query/exhaustive-deps": ["error"],
+      "antfu/no-top-level-await": ["off"],
+      "node/prefer-global/process": ["off"],
+      "node/no-process-env": ["error"],
+      "unused-imports/no-unused-vars": ["off"],
+      "perfectionist/sort-imports": [
+        "error",
         {
-          internalPattern: ['@/**'],
+          internalPattern: ["@/**"],
         },
       ],
-      'unicorn/filename-case': [
-        'error',
+      "unicorn/filename-case": [
+        "error",
         {
-          case: 'kebabCase',
-          ignore: ['README.md', '.*classes.*'],
+          case: "kebabCase",
+          ignore: ["README.md", ".*classes.*"],
         },
       ],
     },

next.config.ts

@@ -1,7 +1,11 @@
-import type { NextConfig } from 'next';
+import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
-  output: 'standalone',
+  output: "standalone",
+  serverExternalPackages: ["pino", "pino-pretty"],
+  experimental: {
+    // typedRoutes: true,
+  },
 };
 
 export default nextConfig;

package.json

@@ -5,46 +5,65 @@
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",
-    "build": "next build",
+    "build": "bun run lint:fix && prisma generate && next build",
     "start": "next start",
     "lint": "eslint .",
-    "lint:fix": "eslint \"**/*.{ts,tsx}\" --fix",
+    "lint:fix": "eslint \"src/**/*.{ts,tsx}\" --fix",
     "format": "prettier --write .",
     "prepare": "husky"
   },
   "dependencies": {
+    "@hookform/resolvers": "^3.9.1",
     "@prisma/client": "^6.0.1",
+    "@radix-ui/react-checkbox": "^1.1.3",
+    "@radix-ui/react-label": "^2.1.1",
+    "@radix-ui/react-slot": "^1.1.1",
+    "@scalar/nextjs-api-reference": "^0.4.105",
     "@tanstack/react-query": "^5.60.5",
+    "@types/jest": "^29.5.14",
+    "@types/jstoxml": "^2.0.4",
     "better-auth": "^1.0.18",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^12.0.1",
     "lucide-react": "^0.468.0",
-    "next": "15.0.4",
+    "http-status-codes": "^2.3.0",
+    "jstoxml": "^5.0.2",
+    "next": "15.1.0",
+    "next-themes": "^0.4.4",
+    "nextjs-routes": "^2.2.4",
+    "openapi-types": "^12.1.3",
     "pg": "^8.13.1",
+    "pino": "^9.5.0",
+    "pino-pretty": "^13.0.0",
     "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.8",
     "react": "19.0.0",
-    "react-dom": "19.0.0-rc.1",
+    "react-dom": "19.0.0",
+    "react-hook-form": "^7.54.1",
     "sharp": "^0.33.5",
+    "sonner": "^1.7.1",
     "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",
-    "zod": "^3.23.8"
+    "ts-jest": "^29.2.5",
+    "zod": "^3.23.8",
+    "zod-to-json-schema": "^3.22.3"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^3.9.1",
     "@commitlint/cli": "^19.6.0",
     "@commitlint/config-conventional": "^19.6.0",
     "@eslint-react/eslint-plugin": "^1.16.1",
+    "@next/eslint-plugin-next": "^15.1.0",
     "@tanstack/eslint-plugin-query": "^5.60.1",
     "@types/node": "^22.9.1",
     "@types/pg": "^8.11.10",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.2",
     "commitlint": "^19.6.0",
     "eslint": "^9.15.0",
-    "eslint-config-next": "15.0.3",
+    "eslint-config-next": "15.1.0",
     "eslint-plugin-format": "^0.1.2",
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.14",