Merge pull request #79 from curehht/refactor/data-layer

Refactor/data layer

Author: alexbaumgertner

.cursor/rules/common.mdc

@@ -3,16 +3,19 @@ description:
 globs: 
 alwaysApply: true
 ---
-You are an expert full-stack developer proficient in TypeScript, React, Next.js, Apollo GraphQL, and PostgreSQL with drizzle ORM. 
+# Common
+
+You are an expert full-stack developer proficient in TypeScript, React, Next.js, and PostgreSQL with drizzle ORM.
 Your task is to produce the most optimized and maintainable Next.js version 15+ code, following best practices and adhering to the principles of clean code and robust architecture.
 
+## Code Style and Structure
 
-### Code Style and Structure
 - Write concise, technical TypeScript code with accurate examples.
 - Use functional and declarative programming patterns; avoid classes.
 - Favor iteration and modularization over code duplication.
 
 ### Optimization and Best Practices
+
 - Minimize the use of `'use client'`, `useEffect`, and `setState`; favor React Server Components (RSC) and Next.js SSR features.
 - Use 'use client' only when necessary for interactivity, such as:
 - Rich text editors (Tiptap, Slate)
@@ -24,36 +27,42 @@ Your task is to produce the most optimized and maintainable Next.js version 15+
 - Optimize images: use WebP format, include size data, implement lazy loading.
 
 ### Error Handling and Validation
+
 - Prioritize error handling and edge cases:
-    - Use early returns for error conditions.
-    - Implement guard clauses to handle preconditions and invalid states early.
-    - Use custom error types for consistent error handling.
+  - Use early returns for error conditions.
+  - Implement guard clauses to handle preconditions and invalid states early.
+  - Use custom error types for consistent error handling.
 
 ### UI and Styling
+
 - Do not use any UI frameworks or library.
 - Implement consistent design and responsive patterns across platforms.
 
 ### State Management and Data Fetching
+
 - Do not use any State Management
-- Use Apollo for Data Fetching
 
 ### Security and Performance
+
 - Implement proper error handling, user input validation, and secure coding practices.
 - Follow performance optimization techniques, such as reducing load times and improving rendering efficiency.
 
 ### Testing and Documentation
+
 - Write unit tests for components using Jest and React Testing Library.
 - Provide clear and concise comments for complex logic.
 
 ### Methodology
+
 1. **System 2 Thinking**: Approach the problem with analytical rigor. Break down the requirements into smaller, manageable parts and thoroughly consider each step before implementation.
 2. **Tree of Thoughts**: Evaluate multiple possible solutions and their consequences. Use a structured approach to explore different paths and select the optimal one.
 3. **Iterative Refinement**: Before finalizing the code, consider improvements, edge cases, and optimizations. Iterate through potential enhancements to ensure the final solution is robust. Finally check the TS types.
 4. Suggest a variant first let me take a look at the suggestion.
 
 **Process**:
+
 1. **Deep Dive Analysis**: Begin by conducting a thorough analysis of the task at hand, considering the technical requirements and constraints.
 2. **Planning**: Develop a clear plan that outlines the architectural structure and flow of the solution, using <PLANNING> tags if necessary.
 3. **Implementation**: Implement the solution step-by-step, ensuring that each part adheres to the specified best practices.
 4. **Review and Optimize**: Perform a review of the code, looking for areas of potential optimization and improvement.
-5. **Finalization**: Finalize the code by ensuring it meets all requirements, is secure, and is performant.
+5. **Finalization**: Finalize the code by ensuring it meets all requirements, is secure, and is performant.

.cursor/rules/database.mdc

@@ -3,7 +3,9 @@ description:
 globs: 
 alwaysApply: true
 ---
-## Tech stack
+
+# Tech stack
+
 - PostgreSQL
 - Drizzle ORM
 
@@ -13,6 +15,6 @@ Define the entire database schema in TypeScript using Drizzle ORM. The schema in
 Use drizzle-kit generate to generate SQL migration files automatically from changes in the TypeScript schema.
 Apply SQL migrations to the database at runtime (e.g., during app startup or deployment) using Drizzle’s migration API.
 
-Use apollo for data request: 
-- on the client-side use useQuery, useMutation hooks from '@apollo/client'
+## Data request
+
 - on the server-side create api in src/db/api with drizzle and use it

.gitignore

@@ -3,6 +3,9 @@
 /.pnp
 .pnp.js
 
+# build
+tsconfig.tsbuildinfo
+
 # testing
 /coverage
 
@@ -30,3 +33,4 @@ yarn-error.log*
 # editors
 .idea/
 .vercel
+.env*.local

.prettierrc

@@ -0,0 +1,22 @@
+{
+  "endOfLine": "auto",
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "printWidth": 100,
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrder": [
+    "^react$",
+    "<THIRD_PARTY_MODULES>",
+    "",
+    "^@/utils/(.*)$",
+    "^@/database/(.*)$",
+    "^@/db/(.*)$",
+    "@/auth",
+    "^@/components/(.*)$",
+    "^@/controllers/(.*)$",
+    "",
+    "^[./]"
+  ]
+}

.prettierrc.json

@@ -1,4 +1,12 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
-  "githubPullRequests.ignoredPullRequestBranches": ["dev"]
-}
+  "githubPullRequests.ignoredPullRequestBranches": [
+    "dev"
+  ],
+  "cSpell.words": [
+    "Baumgertner",
+    "neondatabase",
+    "Osler",
+    "Rendu"
+  ]
+}

.vscode/settings.json

@@ -1,20 +1,21 @@
-## О проекте
-Сайт русскоязыного сообщества поддержки пациентов с болезнью Рандю-Ослера-Вебера.
+# About the Project
 
+A website for the Russian-speaking community supporting patients with [Osler–Weber–Rendu](https://en.wikipedia.org/wiki/Hereditary_hemorrhagic_telangiectasia) disease.
 
-### Технологии
-- [Next.js 15](https://nextjs.org/) - React фреймворк для создания веб-приложений
-- [React 19](https://react.dev/) - JavaScript библиотека для создания пользовательских интерфейсов
-- [TypeScript](https://www.typescriptlang.org/) - Типизированный JavaScript
-- [Apollo Client](https://www.apollographql.com/docs/react/) - GraphQL клиент для работы с API
-- [NextAuth.js](https://next-auth.js.org/) - Аутентификация и авторизация
-- [Drizzle ORM](https://orm.drizzle.team/) - ORM для работы с базой данных
-- [Vercel Postgres](https://vercel.com/storage/postgres) - База данных PostgreSQL
-- [Vercel Blob](https://vercel.com/storage/blob) - Хранилище файлов
-- [Vercel Analytics & Speed Insights](https://vercel.com/analytics) - Аналитика и мониторинг производительности
-- [ESLint](https://eslint.org/) & [Prettier](https://prettier.io/) - Линтинг и форматирование кода
+## Technologies
 
-## Добавить поле в базу данных
-1. Добавить поле в схему
-2. Запустить `drizzle-kit generate`
-3. Запустить `drizzle-kit migrate`
+- [Next.js 15](https://nextjs.org/) - React framework for building web applications
+- [React 19](https://react.dev/) - JavaScript library for building user interfaces
+- [TypeScript](https://www.typescriptlang.org/) - Typed JavaScript
+- [NextAuth.js](https://next-auth.js.org/) - Authentication and authorization
+- [Drizzle ORM](https://orm.drizzle.team/) - ORM for working with the database
+- [Vercel Postgres](https://vercel.com/storage/postgres) - PostgreSQL database
+- [Vercel Blob](https://vercel.com/storage/blob) - File storage
+- [Vercel Analytics & Speed Insights](https://vercel.com/analytics) - Analytics and performance monitoring
+- [ESLint](https://eslint.org/) & [Prettier](https://prettier.io/) - Code linting and formatting
+
+## Add a Field to the Database
+
+1. Add the field to the schema
+2. Run `drizzle-kit generate`
+3. Run `drizzle-kit migrate`

README.md

@@ -1,6 +1,7 @@
 # ROADMAP
 
 ## Deploy
-Оставить одну ветку dev, с нее деплоить на beta.curehht-ru.org
-curehht-ru.org деплоить из api beta.curehht-ru.org как статический сайт, раз в сутки/неделю
-Добавить карту учатников
+
+Keep a single branch "dev", deploy from it to beta.curehht-ru.org
+Deploy curehht-ru.org as a static site generated from the beta.curehht-ru.org API once per day/week
+Add a participant map

ROADMAP.md

@@ -0,0 +1,21 @@
+services:
+  postgres:
+    image: postgres:16-alpine
+    container_name: curehht-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: curehht
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  postgres_data:

docker-compose.yml

@@ -1 +1 @@
-ALTER TABLE "pages" ADD COLUMN "description" text;
+ALTER TABLE "pages" ADD COLUMN IF NOT EXISTS "description" text;