fix docker-compose-dev env file

Author: nadav867

client/src/containers/Test.tsx

@@ -1,6 +1,16 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
 
 const Test = () => {
+  const [testMsg, setTestMsg] = useState<string>('');
+
+  useEffect(() => {
+    (async () => {
+      const res = await axios.get('/api/test');
+      setTestMsg(res.data.msg);
+    })();
+  }, []);
+
   return (
     <div
       style={{
@@ -9,10 +19,11 @@ const Test = () => {
         display: 'flex',
         alignItems: 'center',
         justifyContent: 'center',
-        fontSize: '2rem'
+        fontSize: '2rem',
+        fontWeight: 'bold'
       }}
     >
-      This is A router Test
+      {`${testMsg} ${process.env.REACT_APP_TEST_ENV}`}
     </div>
   );
 };

docker-compose-dev.yml

@@ -8,7 +8,8 @@ services:
       - webapp
     ports:
       - 5500:5500
-    env_file: ./server/.env
+    env_file:
+      - ./server/.env
     volumes:
       - ./server/src:/app/src
     restart: always
@@ -18,7 +19,8 @@ services:
     build:
       context: ./client
       dockerfile: Dockerfile.dev
-    env_file: ./client/.env
+    env_file:
+      - ./client/.env
     volumes:
       - ./client/src:/app/src
       - ./client/public:/app/public

server/package.json

@@ -14,10 +14,7 @@
   "scripts": {
     "test": "jest --coverage",
     "build": "cd config && tsc -p tsconfig.release.json",
-    "test:watch": "jest --watch",
-    "react-start": "cd ../client && npm start",
-    "start": "nodemon",
-    "dev": " concurrently \"npm run start\" \"npm run react-start\" "
+    "test:watch": "jest --watch"
   },
   "author": "Nadav Podjarski",
   "dependencies": {

server/src/index.ts

@@ -12,6 +12,10 @@ app.get('/api/start', (req, res) => {
   res.json({ msg: 'Start building your Postgres-Express-React Application' });
 });
 
+app.get('/api/test', (req, res) => {
+  res.json({ msg: 'This is a react router test' });
+});
+
 const PORT = process.env.PORT || 5500;
 
 app.listen(PORT, () => {