Update envar flow

.env.development

@@ -1,2 +0,0 @@
-PORT=52026
-REACT_APP_CAIRO_URL=http://localhost:52000

.env.production

@@ -1 +0,0 @@
-REACT_APP_CAIRO_URL=http://cairo.dunestorm.net:52000

.gitignore

@@ -2,3 +2,6 @@
 build/
 node_modules/
 package-lock.json
+# Env files
+.env
+.env.development

docker-compose.yml

@@ -1,34 +1,12 @@
 version: "3"
 services:
-  cairo.dunestorm.net:
-    image: cairo.dunestorm.net
-    ports:
-      - "52000:52000"
-    environment:
-      - ALEXANDRIA_DATABASE_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-
-  nubian.dunestorm.net:
-    image: nubian.dunestorm.net
-    ports:
-      - "52001:52001"
-    environment:
-      - ALEXANDRIA_DATABASE_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-      - CAIRO_URL=http://cairo.dunestorm.net:52000
-
   khufu.dunestorm.net:
     image: khufu.dunestorm.net
     build: .
     ports:
       - "80:52026"
-
+    networks:
-  alexandria.dunestorm.net:
+      - dunestorm_dev
-    image: mongo
+networks:
-    environment:
+  dunestorm_dev:
-      - MONGO_INITDB_ROOT_USERNAME=admin
+    external: true
-      - MONGO_INITDB_ROOT_PASSWORD=${ALEXANDRIA_DATABASE_PASSWORD}
-    volumes:
-      - /home/dunemask/Documents/dev/Dunestorm/mongodb/database:/data/db
-    ports:
-      - "27017:27017"
-    restart: unless-stopped
-    command: --quiet

package.json

@@ -46,8 +46,8 @@
   },
   "nodemonConfig": {
     "env": {
-      "CAIRO_URL": "http://localhost:52000",
+      "CAIRO_PUBLIC_URL": "http://localhost:52000",
-      "NUBIAN_URL": "http://localhost:52001"
+      "NUBIAN_INTERNAL_URL": "http://localhost:52001"
     }
   }
 }

src/setupProxy.js

@@ -1,6 +1,6 @@
 const { createProxyMiddleware } = require("http-proxy-middleware");
-const cairoUrl = process.env.CAIRO_URL ?? "http://cairo.dunestorm.net:52000";
+const cairoUrl = process.env.REACT_APP_CAIRO_PUBLIC_URL;
-const nubianUrl = process.env.NUBIAN_URL ?? "http://nubian.dunestorm.net:52001";
+const nubianUrl = process.env.NUBIAN_INTERNAL_URL;
 module.exports = (app) => {
   // Cairo Proxy
   app.use("/cairo", createProxyMiddleware({ target: cairoUrl }));