chore: deploy scheme ready

.gitignore

@@ -3,7 +3,9 @@
 .env
 flower
 
+
 # Folders
+.yarn
 .venv
 node_modules
 __pycache__

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

apps/client/src/lib/api.tsx

@@ -1,8 +1,5 @@
 import axios from "axios";
 
 export const api = axios.create({
-  baseURL:
-    typeof window === "undefined"
-      ? "http://server:3002/api/v1"
-      : "http://localhost:3002/api/v1"
+  baseURL: process.env.NEXT_PUBLIC_BACKEND_URL
 });

apps/server/server/celery.py

@@ -1,7 +1,6 @@
 # Create a Celery instance
 from celery import Celery
 
-
 celery = Celery(
     "visualdynamics",
     broker="redis://localhost:6379/0",

apps/server/server/config.py

@@ -5,7 +5,11 @@
 
 class Config(object):
     SECRET_KEY = os.environ.get("VISUAL_DYNAMICS_SECRET_KEY")
-    UPLOAD_FOLDER = os.path.abspath("/VDfiles")
+    UPLOAD_FOLDER = (
+        os.path.abspath(os.path.join(basedir, "../../..", "VDfiles"))
+        if os.environ.get("FLASK_DEBUG")
+        else os.path.abspath(os.path.join(os.path.expanduser("~"), "VDfiles"))
+    )
     STATIC_FOLDER = os.path.abspath(os.path.join(basedir, "static"))
     MDP_LOCATION_FOLDER = os.path.abspath(os.path.join(STATIC_FOLDER, "mdp"))
     SOCK_SERVER_OPTIONS = {"ping_interval": 25}

apps/server/server/resources/run/__init__.py

@@ -14,7 +14,7 @@ def post(self):
 
         args = parser.parse_args()
 
-        url = "VDWEB:3001"
+        url = "localhost:3001"
 
         # Get absolute path to run folder
         folder = os.path.abspath(args["folder"])

docker-compose.yml

@@ -22,29 +22,10 @@ services:
     build:
       context: ./apps/client
       target: builder
-    networks:
-      - def
     depends_on:
       - database
     ports:
       - "3001:3001"
-  server:
-    container_name: VDSRV
-    restart: always
-    build:
-      context: ./apps/server
-      target: runner
-    depends_on:
-      - mq
-    networks:
-      - def
-    volumes:
-      - $HOME/VDfiles:/VDfiles
-    ports:
-      - "3002:3002"
 volumes:
   mq:
-    driver: local
-networks:
-  def:
-    driver: bridge
+    driver: local

ecosystem.config.js

@@ -2,7 +2,7 @@ module.exports = {
   apps: [
     {
       name: "server",
-      script: "poetry run flask run --host=0.0.0.0 --port=8081",
+      script: "poetry run flask run --host=0.0.0.0 --port=3002",
       cwd: "./apps/server",
       autorestart: true,
       watch: false,

package.json

@@ -5,16 +5,16 @@
   "private": true,
   "scripts": {
     "storybook": "yarn client storybook",
-
     "client": "yarn workspace client",
     "server": "yarn workspace server",
-
     "dev": "concurrently --kill-others \"yarn:client dev\" \"yarn:server dev\""
   },
   "prisma": {
     "schema": "apps/client/prisma/schema.prisma"
   },
-  "workspaces": ["apps/*"],
+  "workspaces": [
+    "apps/*"
+  ],
   "keywords": [],
   "author": "",
   "license": "ISC",