modify for peerly

squi-ddy · Mar 21, 2024 · a86db0e · a86db0e
1 parent d786908
commit a86db0e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 105 deletions.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: Clone repository to local
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Copy env file
         run: cp ../.env ./backend/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,4 +13,10 @@ services:
     build: ./frontend
     restart: unless-stopped
     ports:
-      - "3001:8000"
+      - "3001:8000"
+    depends_on:
+      - peerly-frontend
+      - peerly-backend
+
+include:
+  - peerly/docker-compose.yml
diff --git a/frontend/nginx.conf b/frontend/nginx.conf
@@ -5,7 +5,10 @@ server {
         try_files $uri /dyslexicon/index.html;
     }
     location /peerly {
-        try_files $uri /peerly/index.html;
+        proxy_pass http://peerly-frontend:3000;
+    }
+    location /peerly-api {
+        proxy_pass http://peerly-backend:3001/;
     }
     location / {
         try_files $uri /index.html;

diff --git a/frontend/public/peerly/assets/index-fJI82kLt.js b/frontend/public/peerly/assets/index-fJI82kLt.js
diff --git a/frontend/public/peerly/assets/index-fyz-CSax.css b/frontend/public/peerly/assets/index-fyz-CSax.css
diff --git a/frontend/public/peerly/favicon.ico b/frontend/public/peerly/favicon.ico
diff --git a/frontend/public/peerly/index.html b/frontend/public/peerly/index.html
diff --git a/peerly b/peerly
+1 −1		backend/package.json
+1 −1		backend/src/db.ts
+1 −1		backend/src/index.ts
+29 −0		docker-compose.dev.yml
+6 −10		docker-compose.yml
+3 −1		frontend/Dockerfile
+1 −1		frontend/nginx.conf
+5 −5		frontend/src/api.ts
+1 −6		frontend/src/components/BasePage.tsx
+16 −18		frontend/src/components/ProfilePage.tsx
+1 −1		frontend/src/settings.ts