Merge branch 'main' of https://github.com/code100x/cms

.gitignore

@@ -6,6 +6,9 @@
 .pnp.js
 .yarn/install-state.gz
 
+# docker volume
+/postgres-data/
+
 # testing
 /coverage
 

docker-compose.yml

@@ -11,10 +11,12 @@ services:
       - .:/usr/src/app
       - /usr/src/app/node_modules
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   db:
     image: postgres:9.6
+    container_name: db
     restart: always
     environment:
       POSTGRES_USER: postgres
@@ -23,4 +25,9 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - /postgres-data:/var/lib/postgresql/data
+      - ./postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: [ 'CMD-SHELL', 'pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}' ]
+      interval: 10s
+      timeout: 5s
+      retries: 5

package.json

@@ -25,6 +25,7 @@
     "@auth/prisma-adapter": "^1.0.6",
     "@discordjs/core": "^1.1.1",
     "@discordjs/next": "^0.1.1-dev.1673526225-a580768.0",
+    "@icons-pack/react-simple-icons": "^9.4.0",
     "@prisma/client": "^5.6.0",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-avatar": "^1.0.4",

prisma/schema.prisma

@@ -173,6 +173,7 @@ model Comment {
   createdAt    DateTime    @default(now())
   updatedAt    DateTime    @updatedAt
   votes        Vote[]
+  isPinned     Boolean     @default(false)
 }
 
 model Vote {
@@ -196,3 +197,4 @@ enum CommentType {
   INTRO
   DEFAULT
 }
+