Syncing to latest updates.

.eslintrc.js

@@ -0,0 +1,30 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+  },
+  extends: [
+    'airbnb',
+    'eslint:recommended',
+    'plugin:react/recommended',
+  ],
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+  },
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  plugins: [
+    'react',
+  ],
+  rules: {
+    'linebreak-style': 'off',
+  },
+};

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+exclude = node_modules/*, dataAnalysis/*

.github/workflows/Continuous_Delivery.yml

@@ -19,17 +19,17 @@ jobs:
     - name: Install Packages
       run: npm install
     - name: Build project
-      run: npm run-script build
+      run: npm run build
     - name: Run Tests
       run: export CI=true && npm run test -- --coverage
       env:
         MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
     # DISABLING DEPLOYMENT TO PRESERVE "PRODUCTION"
-    # - name: Deploy to GH pages
-    #   uses: JamesIves/github-pages-deploy-action@master
-    #   env:
-    #     ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-    #     BASE_BRANCH: master # The branch the action should deploy from.
-    #     BRANCH: gh-pages # The branch the action should deploy to.
-    #     FOLDER: build # The folder the action should deploy.
-    #     BUILD_SCRIPT: echo REACT_APP_MAPBOX_TOKEN=${{secrets.MAPBOX_TOKEN}} > .env && npm rebuild node-sass && npm install && npm run-script build  # The build script the action should run prior to deploying.
+    - name: Deploy to GH pages
+      uses: JamesIves/github-pages-deploy-action@master
+      env:
+        ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+        BASE_BRANCH: master # The branch the action should deploy from.
+        BRANCH: gh-pages # The branch the action should deploy to.
+        FOLDER: dist # The folder the action should deploy.
+        BUILD_SCRIPT: echo REACT_APP_MAPBOX_TOKEN=${{secrets.MAPBOX_TOKEN}} > .env && npm rebuild node-sass && npm install && npm run-script build  # The build script the action should run prior to deploying.

.github/workflows/Continuous_Integration_Backend.yml

@@ -1,26 +1,28 @@
 name: Dev_CI_Backend
-on:
-  push:
-    branches-ignore:
-      - master
+on: [pull_request]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 11.x]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
       with:
-        node-version: ${{ matrix.node-version }}
-    - name: Install Packages
-      run: npm install
-    - name: Build project
-      run: npm run-script build
-    - name: Run Tests
-      run: export CI=true && npm run test -- --coverage
-      env:
-        MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        sudo apt install libpq-dev python3-dev
+        python -m pip install --upgrade pip
+        pip install -r server/requirements.txt
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: pytest server

.github/workflows/Continuous_Integration_Frontend.yml

@@ -1,8 +1,5 @@
 name: Dev_CI_Frontend
-on:
-  push:
-    branches-ignore:
-      - master
+on: [pull_request]
 
 jobs:
   build:
@@ -19,8 +16,8 @@ jobs:
     - name: Install Packages
       run: npm install
     - name: Build project
-      run: npm run-script build
+      run: npm run build
     - name: Run Tests
-      run: npm run-script test -- --coverage
+      run: npm run test -- --coverage
       env:
         MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}

.gitignore

@@ -33,11 +33,15 @@ config.js
 .env
 settings.cfg
 
+docker-compose.yml
 Orchestration/docker-compose.yml
 
 __pycache__/
 
-# csv files
-/dataAnalysis/rawdata
-/dataAnalysis/ryanAnalysis.ipynb
+# csv files 
+/dataAnalysis/datasets
+/server/src/static
+
+# checkpoints
 /dataAnalysis/.ipynb_checkpoints
+server/src/static/temp

Dockerfile

@@ -1,20 +1,14 @@
-# base image
 FROM node:12.2.0-alpine
 RUN npm install webpack webpack-cli -g
-
 WORKDIR /tmp
 COPY package.json /tmp/
 RUN npm config set registry http://registry.npmjs.org/ && npm install
-
-WORKDIR /app
-COPY . /app/
-RUN cp -a /tmp/node_modules /app/
-
+WORKDIR /usr/src/app
+COPY . /usr/src/app/
+RUN cp -a /tmp/node_modules /usr/src/app/
 RUN webpack
-
 ENV NODE_ENV=production
-ENV PORT=8080
+ENV PORT=3000
 RUN ls
-CMD [ "npm", "run-script", "dev" ]
-
-EXPOSE 8080
+CMD [ "node", "server.js" ]
+EXPOSE 3000