From bbe7332f46549665b29e959b1e6c1bb833776385 Mon Sep 17 00:00:00 2001
From: Haris Razis <xaris.ws98@gmail.com>
Date: Mon, 14 Dec 2020 11:22:26 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20Add=20docker-compose?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml              | 39 ++++++++------------------------
 server/Dockerfile                | 11 +++++++++
 server/actions/influx_actions.js |  2 +-
 server/config/keys.js            |  4 ++--
 server/docker-compose.yml        | 23 +++++++++++++++++++
 server/index.js                  |  4 ++--
 6 files changed, 49 insertions(+), 34 deletions(-)
 create mode 100644 server/Dockerfile
 create mode 100644 server/docker-compose.yml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d8a6482..b0a3955 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,21 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80e06aae-4dff-458a-b9ec-91597c82e21b" name="Default Changelist" comment="➕ Add .idea config">
-      <change afterPath="$PROJECT_DIR$/client/package-lock.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/client/services/socket.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/database/influx.sh" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/database/redis.sh" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server/config/keys.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server/connections/redis_conn.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server/services/redis.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/server/services/socket.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/client/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/client/package.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/server/Dockerfile" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/server/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/server/actions/influx_actions.js" beforeDir="false" afterPath="$PROJECT_DIR$/server/actions/influx_actions.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server/connections/db_conn.js" beforeDir="false" afterPath="$PROJECT_DIR$/server/connections/influx_conn.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server/config/keys.js" beforeDir="false" afterPath="$PROJECT_DIR$/server/config/keys.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/server/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/server/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/server/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/server/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/server/package.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -54,7 +45,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="javascript.nodejs.core.library.configured.version" value="15.4.0" />
     <property name="javascript.nodejs.core.library.typings.version" value="14.14.13" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/server" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/server/docker-compose.yml" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -73,9 +64,10 @@
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/server" />
+      <recent name="$PROJECT_DIR$" />
     </key>
   </component>
-  <component name="RunManager" selected="Docker.server/Dockerfile">
+  <component name="RunManager" selected="Docker.Server_compose">
     <configuration name="redis.sh" type="ShConfigurationType" temporary="true">
       <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
       <option name="SCRIPT_PATH" value="$PROJECT_DIR$/database/redis.sh" />
@@ -89,7 +81,7 @@
       <envs />
       <method v="2" />
     </configuration>
-    <configuration name="server: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" temporary="true" server-name="Docker">
+    <configuration name="Server_compose" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
       <deployment type="docker-compose.yml">
         <settings>
           <option name="sourceFilePath" value="server/docker-compose.yml" />
@@ -97,15 +89,6 @@
       </deployment>
       <method v="2" />
     </configuration>
-    <configuration name="server/Dockerfile" type="docker-deploy" factoryName="dockerfile" temporary="true" server-name="Docker">
-      <deployment type="dockerfile">
-        <settings>
-          <option name="buildOnly" value="true" />
-          <option name="sourceFilePath" value="server/Dockerfile" />
-        </settings>
-      </deployment>
-      <method v="2" />
-    </configuration>
     <configuration default="true" type="js.build_tools.npm">
       <package-json value="$PROJECT_DIR$/client/package.json" />
       <command value="run" />
@@ -117,18 +100,15 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Docker.server: Compose Deployment" />
+      <item itemvalue="Docker.Server_compose" />
       <item itemvalue="npm.run client" />
       <item itemvalue="npm.run server" />
       <item itemvalue="npm.dev server" />
       <item itemvalue="npm.dev client" />
       <item itemvalue="Shell Script.redis.sh" />
-      <item itemvalue="Docker.server/Dockerfile" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Docker.server: Compose Deployment" />
-        <item itemvalue="Docker.server/Dockerfile" />
         <item itemvalue="Shell Script.redis.sh" />
       </list>
     </recent_temporary>
@@ -149,6 +129,7 @@
       <workItem from="1607799462544" duration="4751000" />
       <workItem from="1607859056050" duration="4042000" />
       <workItem from="1607880047378" duration="8064000" />
+      <workItem from="1607929943703" duration="6226000" />
     </task>
     <task id="LOCAL-00001" summary="📜 Update README.md">
       <created>1607333101556</created>
diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 0000000..8abf7f6
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:latest
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN npm install
+COPY . .
+
+EXPOSE 6000
+CMD [ "npm", "run", "run" ]
\ No newline at end of file
diff --git a/server/actions/influx_actions.js b/server/actions/influx_actions.js
index 44c7e54..c7edb1e 100644
--- a/server/actions/influx_actions.js
+++ b/server/actions/influx_actions.js
@@ -35,7 +35,7 @@ query = (timeFrame, filter) => {
         .then(async (result) => {
         })
         .catch(() => {
-            return [{Error: 'Error occured'}];
+            return [{Error: 'Error occurred'}];
         });
 }
 
diff --git a/server/config/keys.js b/server/config/keys.js
index 21957a8..e2f2414 100644
--- a/server/config/keys.js
+++ b/server/config/keys.js
@@ -5,6 +5,6 @@ module.exports = {
     influx_bucket: '',
     redis_user: '',
     redis_password: '',
-    redis_host: '0.0.0.0',
-    redis_port: '7001'
+    redis_host: 'redis',
+    redis_port: '6379'
 }
\ No newline at end of file
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
new file mode 100644
index 0000000..c59e068
--- /dev/null
+++ b/server/docker-compose.yml
@@ -0,0 +1,23 @@
+version: "3.9"
+services:
+  redis:
+    image: "redis:alpine"
+    networks:
+      - backend
+  influx:
+    image: "influxdb:alpine"
+    networks:
+      - backend
+    volumes:
+      - /home/xrazis/Documents/random_code/database/influx/:/var/lib/influxdb
+  backend:
+    build: ""
+    ports:
+      - "6000:6000"
+    networks:
+      - backend
+    depends_on:
+      - redis
+      - influx
+networks:
+  backend:
diff --git a/server/index.js b/server/index.js
index 902fb4c..b535d0c 100644
--- a/server/index.js
+++ b/server/index.js
@@ -10,5 +10,5 @@ const measurementRoute = require('./routes/data')
 
 app.use(measurementRoute)
 
-server.listen(3000);
-console.log(chalk.green.bold('Server listening on port 3000!'));
\ No newline at end of file
+server.listen(6000);
+console.log(chalk.green.bold('Server listening on port 6000!'));
\ No newline at end of file