From 3e1098429b312df4ed4ccb6d66c5991e54d14c4a Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Sat, 4 Jun 2022 00:39:23 +0300
Subject: [PATCH] upd nginx & docker-compose config

---
 .gitignore         |  1 +
 README.md          |  2 ++
 docker-compose.yml |  5 +++--
 educt-client       |  2 +-
 educt-server       |  2 +-
 nginx/default.conf | 20 +++++++++-----------
 6 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..600d2d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.vscode
\ No newline at end of file
diff --git a/README.md b/README.md
index 8e4d1ac..c8307a4 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Educt learning management system (LMS) is an application where you can create an
 
 - Backend (AdonisJS)
 - Frontend (ReactJS)
+- ChakraUI (React component library)
 - Database (PostgreSQL & Redis)
 - Web server (nginx)
 - Socket.IO for chat
@@ -36,6 +37,7 @@ Educt learning management system (LMS) is an application where you can create an
 - Editing your profile personal data (password, mail, contacts)
 - Deployment with Docker
 - Adaptive design
+- Night/Light theme
 
 <!-- ## Demo
 
diff --git a/docker-compose.yml b/docker-compose.yml
index cca0450..136e044 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,8 +20,9 @@ services:
       context: ./educt-client
       target: production
       dockerfile: Dockerfile
-    environment:
-      - VITE_API_URL=http://api:3333
+      args:
+        - API_URL=http://api.localhost
+        - WS_URL=ws://api.localhost
     ports:
       - 5000:5000
     depends_on:
diff --git a/educt-client b/educt-client
index 57bb798..d366c05 160000
--- a/educt-client
+++ b/educt-client
@@ -1 +1 @@
-Subproject commit 57bb798eff6dedb4b3de5a7408d0ca843c6888b7
+Subproject commit d366c05d559b46f80193096d66b287883cfea3c4
diff --git a/educt-server b/educt-server
index 5a01acd..5171f65 160000
--- a/educt-server
+++ b/educt-server
@@ -1 +1 @@
-Subproject commit 5a01acdb214addb1e18b5c368b9af0b88897da2c
+Subproject commit 5171f654296b488d6d9702bf3ed2d687904e8486
diff --git a/nginx/default.conf b/nginx/default.conf
index 0778a4c..f793e67 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -1,21 +1,19 @@
+# Frontend
 server {
   listen 80;
-
   server_name localhost;
 
   location / {
     proxy_pass http://client:5000;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection 'upgrade';
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_cache_bypass $http_upgrade;
   }
+}
 
-  location /api {
+# Backend
+server {
+  listen 80;
+  server_name api.localhost;
+
+  location / {
     proxy_pass http://api:3333;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
@@ -26,4 +24,4 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_cache_bypass $http_upgrade;
   }
-}
+}
\ No newline at end of file