PyWorkflowApp · reelmatt · Apr 27, 2020 · Apr 27, 2020 · Apr 27, 2020 · Apr 27, 2020
diff --git a/CLI/__init__.py → back-end/CLI/__init__.py b/CLI/__init__.py → back-end/CLI/__init__.py
diff --git a/CLI/cli.py → back-end/CLI/cli.py b/CLI/cli.py → back-end/CLI/cli.py
diff --git a/CLI/setup.py → back-end/CLI/setup.py b/CLI/setup.py → back-end/CLI/setup.py
diff --git a/CLI/test.py → back-end/CLI/test.py b/CLI/test.py → back-end/CLI/test.py
diff --git a/back-end/Dockerfile b/back-end/Dockerfile
@@ -0,0 +1,18 @@
+FROM python:3.8.2
+
+WORKDIR /visual-programming/back-end
+
+COPY Pipfile Pipfile.lock ./
+COPY CLI/ ./CLI/
+COPY pyworkflow/ ./pyworkflow/
+
+RUN pip install pipenv
+RUN pipenv install --dev --ignore-pipfile
+
+COPY . ./vp/
+
+EXPOSE 8000
+
+WORKDIR /visual-programming/back-end/vp
+
+CMD pipenv run manage.py runserver 0.0.0.0:8000
diff --git a/Pipfile → back-end/Pipfile b/Pipfile → back-end/Pipfile
@@ -11,11 +11,11 @@ django = "~=3.0.4"
 pandas = "~=1.0.1"
 python-dotenv = "~=0.12.0"
 networkx = "~=2.4"
-pyworkflow = {path = "./pyworkflow",editable = true}
+pyworkflow = {path = "./pyworkflow", editable = true}
 djangorestframework = "*"
 drf-yasg = "*"
 click = "*"
-cli = {path = "./CLI",editable = true}
+cli = {path = "./CLI", editable = true}
 
 [requires]
-python_version = "3.8"
+python_version = "3.8.2"
diff --git a/Pipfile.lock → back-end/Pipfile.lock b/Pipfile.lock → back-end/Pipfile.lock
diff --git a/pyworkflow/pyworkflow/__init__.py → back-end/pyworkflow/pyworkflow/__init__.py b/pyworkflow/pyworkflow/__init__.py → back-end/pyworkflow/pyworkflow/__init__.py
diff --git a/pyworkflow/pyworkflow/node.py → back-end/pyworkflow/pyworkflow/node.py b/pyworkflow/pyworkflow/node.py → back-end/pyworkflow/pyworkflow/node.py
diff --git a/pyworkflow/pyworkflow/node_factory.py → ...end/pyworkflow/pyworkflow/node_factory.py b/pyworkflow/pyworkflow/node_factory.py → ...end/pyworkflow/pyworkflow/node_factory.py
diff --git a/pyworkflow/pyworkflow/nodes/__init__.py → ...d/pyworkflow/pyworkflow/nodes/__init__.py b/pyworkflow/pyworkflow/nodes/__init__.py → ...d/pyworkflow/pyworkflow/nodes/__init__.py
diff --git a/...pyworkflow/nodes/flow_control/__init__.py → ...pyworkflow/nodes/flow_control/__init__.py b/...pyworkflow/nodes/flow_control/__init__.py → ...pyworkflow/nodes/flow_control/__init__.py
diff --git a/...rkflow/nodes/flow_control/string_input.py → ...rkflow/nodes/flow_control/string_input.py b/...rkflow/nodes/flow_control/string_input.py → ...rkflow/nodes/flow_control/string_input.py
diff --git a/pyworkflow/pyworkflow/nodes/io/__init__.py → ...yworkflow/pyworkflow/nodes/io/__init__.py b/pyworkflow/pyworkflow/nodes/io/__init__.py → ...yworkflow/pyworkflow/nodes/io/__init__.py
diff --git a/pyworkflow/pyworkflow/nodes/io/read_csv.py → ...yworkflow/pyworkflow/nodes/io/read_csv.py b/pyworkflow/pyworkflow/nodes/io/read_csv.py → ...yworkflow/pyworkflow/nodes/io/read_csv.py
diff --git a/pyworkflow/pyworkflow/nodes/io/write_csv.py → ...workflow/pyworkflow/nodes/io/write_csv.py b/pyworkflow/pyworkflow/nodes/io/write_csv.py → ...workflow/pyworkflow/nodes/io/write_csv.py
diff --git a/...pyworkflow/nodes/manipulation/__init__.py → ...pyworkflow/nodes/manipulation/__init__.py b/...pyworkflow/nodes/manipulation/__init__.py → ...pyworkflow/nodes/manipulation/__init__.py
diff --git a/...w/pyworkflow/nodes/manipulation/filter.py → ...w/pyworkflow/nodes/manipulation/filter.py b/...w/pyworkflow/nodes/manipulation/filter.py → ...w/pyworkflow/nodes/manipulation/filter.py
diff --git a/...low/pyworkflow/nodes/manipulation/join.py → ...low/pyworkflow/nodes/manipulation/join.py b/...low/pyworkflow/nodes/manipulation/join.py → ...low/pyworkflow/nodes/manipulation/join.py
diff --git a/...ow/pyworkflow/nodes/manipulation/pivot.py → ...ow/pyworkflow/nodes/manipulation/pivot.py b/...ow/pyworkflow/nodes/manipulation/pivot.py → ...ow/pyworkflow/nodes/manipulation/pivot.py
diff --git a/pyworkflow/pyworkflow/parameters.py → back-end/pyworkflow/pyworkflow/parameters.py b/pyworkflow/pyworkflow/parameters.py → back-end/pyworkflow/pyworkflow/parameters.py
diff --git a/pyworkflow/pyworkflow/tests/test_workflow.py → ...orkflow/pyworkflow/tests/test_workflow.py b/pyworkflow/pyworkflow/tests/test_workflow.py → ...orkflow/pyworkflow/tests/test_workflow.py
diff --git a/pyworkflow/pyworkflow/workflow.py → back-end/pyworkflow/pyworkflow/workflow.py b/pyworkflow/pyworkflow/workflow.py → back-end/pyworkflow/pyworkflow/workflow.py
diff --git a/pyworkflow/setup.py → back-end/pyworkflow/setup.py b/pyworkflow/setup.py → back-end/pyworkflow/setup.py
diff --git a/vp/manage.py → back-end/vp/manage.py b/vp/manage.py → back-end/vp/manage.py
@@ -3,12 +3,8 @@
 import os
 import sys
 
-import dotenv
-
 
 def main():
-    dotenv.load_dotenv(".environment")
-
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vp.settings')
     try:
         from django.core.management import execute_from_command_line

diff --git a/vp/node/__init__.py → back-end/vp/node/__init__.py b/vp/node/__init__.py → back-end/vp/node/__init__.py
diff --git a/vp/node/admin.py → back-end/vp/node/admin.py b/vp/node/admin.py → back-end/vp/node/admin.py
diff --git a/vp/node/apps.py → back-end/vp/node/apps.py b/vp/node/apps.py → back-end/vp/node/apps.py
diff --git a/vp/node/migrations/__init__.py → back-end/vp/node/migrations/__init__.py b/vp/node/migrations/__init__.py → back-end/vp/node/migrations/__init__.py
diff --git a/vp/node/models.py → back-end/vp/node/models.py b/vp/node/models.py → back-end/vp/node/models.py
diff --git a/vp/node/tests.py → back-end/vp/node/tests.py b/vp/node/tests.py → back-end/vp/node/tests.py
diff --git a/vp/node/urls.py → back-end/vp/node/urls.py b/vp/node/urls.py → back-end/vp/node/urls.py
diff --git a/vp/node/views.py → back-end/vp/node/views.py b/vp/node/views.py → back-end/vp/node/views.py
diff --git a/vp/vp/__init__.py → back-end/vp/vp/__init__.py b/vp/vp/__init__.py → back-end/vp/vp/__init__.py
diff --git a/vp/vp/asgi.py → back-end/vp/vp/asgi.py b/vp/vp/asgi.py → back-end/vp/vp/asgi.py
diff --git a/vp/vp/settings.py → back-end/vp/vp/settings.py b/vp/vp/settings.py → back-end/vp/vp/settings.py
@@ -76,12 +76,10 @@
 
 SESSION_ENGINE = 'django.contrib.sessions.backends.file'
 
-WSGI_APPLICATION = 'vp.wsgi.application'
-
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-### Not yet setup
+# Not yet setup
 DATABASES = {}
 
 MEDIA_ROOT = '/tmp'

diff --git a/vp/vp/urls.py → back-end/vp/vp/urls.py b/vp/vp/urls.py → back-end/vp/vp/urls.py
diff --git a/vp/vp/views.py → back-end/vp/vp/views.py b/vp/vp/views.py → back-end/vp/vp/views.py
diff --git a/vp/vp/wsgi.py → back-end/vp/vp/wsgi.py b/vp/vp/wsgi.py → back-end/vp/vp/wsgi.py
diff --git a/vp/workflow/__init__.py → back-end/vp/workflow/__init__.py b/vp/workflow/__init__.py → back-end/vp/workflow/__init__.py
diff --git a/vp/workflow/admin.py → back-end/vp/workflow/admin.py b/vp/workflow/admin.py → back-end/vp/workflow/admin.py
diff --git a/vp/workflow/apps.py → back-end/vp/workflow/apps.py b/vp/workflow/apps.py → back-end/vp/workflow/apps.py
diff --git a/vp/workflow/middleware.py → back-end/vp/workflow/middleware.py b/vp/workflow/middleware.py → back-end/vp/workflow/middleware.py
diff --git a/vp/workflow/migrations/__init__.py → back-end/vp/workflow/migrations/__init__.py b/vp/workflow/migrations/__init__.py → back-end/vp/workflow/migrations/__init__.py
diff --git a/vp/workflow/models.py → back-end/vp/workflow/models.py b/vp/workflow/models.py → back-end/vp/workflow/models.py
diff --git a/vp/workflow/tests.py → back-end/vp/workflow/tests.py b/vp/workflow/tests.py → back-end/vp/workflow/tests.py
diff --git a/vp/workflow/urls.py → back-end/vp/workflow/urls.py b/vp/workflow/urls.py → back-end/vp/workflow/urls.py
diff --git a/vp/workflow/views.py → back-end/vp/workflow/views.py b/vp/workflow/views.py → back-end/vp/workflow/views.py
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,25 @@
+version: "3.8"
+services:
+  back-end:
+    build: ./back-end
+    volumes:
+      - ./backend:/visual-programming/back-end
+    ports:
+      - "8000:8000"
+    env_file: ./backend/.env
+    stdin_open: true
+    tty: true
+    command: cd vp && pipenv run python manage.py runserver 0.0.0.0:8000
+  front-end:
+    build: ./front-end
+    volumes:
+      - ./front-end:/visual-programming/front-end
+      # One-way volume to use node_modules from inside image
+      - /visual-programming/front-end/node_modules
+    ports:
+      - "3000:3000"
+    environment:
+      - NODE_ENV=development
+    depends_on:
+      - back-end
+    command: npm start
diff --git a/front-end/Dockerfile b/front-end/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:current-slim
+
+WORKDIR /visual-programming/front-end
+
+COPY package.json .
+
+RUN npm install
+
+COPY . .
+
+EXPOSE 3000
+
+CMD npm start
diff --git a/vp/db.sqlite3 b/vp/db.sqlite3