Server milestone update

docker-compose.yml

@@ -35,6 +35,22 @@ services:
         max-size: "1m"
         max-file: "3"
 
+  server3:
+    build: server3
+    depends_on:
+      - postgres
+    ports:
+      - "4505:4505"
+    working_dir: /server3
+    volumes:
+        - ./server3:/server3
+    env_file:
+        - ./server/.env.twitter
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
+
         
   imgparser:
     build: imgparser
@@ -88,6 +104,30 @@ services:
       options:
         max-size: "1m"
         max-file: "3"
+
+  sigcrafting:
+    build: 
+        context: sigcrafting
+        dockerfile: Dockerfile
+    restart: on-failure
+    depends_on:
+      - postgres
+      - server
+    ports:
+      - "3001:3001"
+    environment:
+      - CHOKIDAR_USEPOLLING=true
+    stdin_open: true
+    working_dir: /sigcrafting
+    env_file:
+        - ./sigcrafting/.env
+    volumes:
+        - /app/node_modules
+        - ./sigcrafting:/sigcrafting
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
         
       
 #  prod-frontend:

frontend/src/setupProxy.js

@@ -8,6 +8,13 @@ module.exports = function(app) {
           changeOrigin: true,
         })
         );*/
+	app.use(
+		"/sigcrafting",
+		createProxyMiddleware({
+			target: 'http://server:3001',
+			changeOrigin: true,
+		})
+		);
 	app.use(
 		"/ngsplanner/class",
 		createProxyMiddleware({

server2

@@ -1 +1 @@
-Subproject commit 8b1b559adb0951c36854dec6f54968e1ce017a87
+Subproject commit 4fc4179476328d449a20e471089dd1aba4d34a31

server3

@@ -0,0 +1 @@
+Subproject commit bbbce91146ace85c3df6f6e35a42615d7988ef7a

sigcrafting

@@ -0,0 +1 @@
+Subproject commit a86c4035242ef46e468fca8ac30c6d2c6173c5ad