Merge branch 'master' of github.com:Peppermint-Lab/peppermint

Peppermint-Lab · May 29, 2024 · 331e0a6 · 331e0a6
2 parents d3752a4 + 4bea6d6
commit 331e0a6
Show file tree

Hide file tree

Showing 4 changed files with 10,852 additions and 15 deletions.
diff --git a/apps/client/layouts/newLayout.tsx b/apps/client/layouts/newLayout.tsx
@@ -987,7 +987,11 @@ export default function NewLayout({ children }: any) {
                     target="_blank"
                     className="hover:cursor-pointer"
                   >
-                    <Button variant="outline" className="hover:cursor-pointer">
+                    {/* <Button variant="outline" className="hover:cursor-pointer">
+                      Send Feedback
+                    </Button> */}
+
+                    <Button variant="outline" className="hover:cursor-pointer whitespace-nowrap">
                       Send Feedback
                     </Button>
                   </Link>

diff --git a/apps/client/package.json b/apps/client/package.json
@@ -44,7 +44,7 @@
     "lodash": "^4.17.21",
     "match-sorter": "^6.3.1",
     "moment": "^2.29.1",
-    "next": "13",
+    "next": "13.5.7",
     "next-remove-imports": "^1.0.6",
     "next-themes": "^0.0.15",
     "next-translate": "^1.3.4",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,34 +5,27 @@ services:
     container_name: peppermint_postgres
     image: postgres:latest
     restart: always
-    ports:
-      - 5432:5432
     volumes:
-      - pgdata:/var/lib/postgresql/data
+      - pgdata_live:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: peppermint
-      POSTGRES_PASSWORD: 1234
+      POSTGRES_PASSWORD: 12345
       POSTGRES_DB: peppermint
 
   peppermint:
     container_name: peppermint
     image: pepperlabs/peppermint:latest
     ports:
-      - 3000:3000
-      - 5003:5003
+      - 1000:3000
+      - 1001:5003
     restart: always
     depends_on:
       - peppermint_postgres
-    healthcheck:
-      test: ["CMD", "sh", "-c", "wget --spider $$API_URL"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
     environment:
       DB_USERNAME: "peppermint"
-      DB_PASSWORD: "1234"
+      DB_PASSWORD: "12345"
       DB_HOST: "peppermint_postgres"
       SECRET: 'peppermint4life'
 
 volumes:
- pgdata:
+ pgdata_live: