rebuild frontend using create-react-app (#259)

.gitignore

@@ -1,7 +1,6 @@
 __pycache__/
 .coverage
 .DS_Store
-.env
 .idea/
 .minio.sys/
 .pyc

docker-compose.yml

@@ -58,17 +58,11 @@ services:
       db:
         condition: service_healthy
   web:
-    build: ./react
-    command: >
-      sh -c "npm install --legacy-peer-deps &&
-             npm start"
-    env_file:
-      - keycloak.env
-    environment: 
-      - API_BASE=http://localhost:8000
-      - ENABLE_KEYCLOAK=true
+    build: ./frontend
+    command: npm run start
     volumes:
-      - ./react:/web
+      - ./frontend:/web
+      - /web/node_modules
     ports:
       - 3000:3000
 

frontend/.dockerignore

@@ -0,0 +1 @@
+node_modules

frontend/.env

@@ -0,0 +1,5 @@
+REACT_APP_ENABLE_KEYCLOAK=true
+REACT_APP_API_BASE=http://localhost:8000
+REACT_APP_KEYCLOAK_CLIENT_ID=cthub-on-gold-cluster-3974
+REACT_APP_KEYCLOAK_REALM=standard
+REACT_APP_KEYCLOAK_URL=https://dev.loginproxy.gov.bc.ca/auth/

frontend/.gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

react/Dockerfile → frontend/Dockerfile

@@ -1,8 +1,10 @@
 FROM node:16.13
 
 WORKDIR /web
-COPY . /web/
 
+COPY package*.json /web/
 RUN npm install --legacy-peer-deps
 
+COPY . .
+
 EXPOSE 3000

react/Dockerfile-Openshift → frontend/Dockerfile-Openshift

@@ -14,7 +14,7 @@ RUN npm install
 RUN pwd && \
   ls -l && \
   ls -l node_modules
-RUN NODE_ENV=production | npm run build
+RUN yes | npm run build
 
 # Stage 2: Copy the JS React SPA into the Nginx HTML directory
 FROM artifacts.developer.gov.bc.ca/docker-remote/bitnami/nginx:1.24.0

frontend/README.md

@@ -0,0 +1,70 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
+
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
+
+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
+
+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
+
+### Analyzing the Bundle Size
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
+
+### Making a Progressive Web App
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
+
+### Advanced Configuration
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
+
+### Deployment
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
+
+### `npm run build` fails to minify
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

react/package.json → frontend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "app",
+  "name": "frontend",
   "version": "0.2.0",
   "private": true,
   "dependencies": {
@@ -16,44 +16,50 @@
     "keycloak-js": "^15.0.2",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "@testing-library/jest-dom": "^5.17.0",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^13.5.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-dropzone": "^10.2.2",
     "react-router-dom": "^5.3.0",
+    "react-scripts": "5.0.1",
     "react-table": "^7.7.0",
     "regenerator-runtime": "^0.13.9",
+    "web-vitals": "^2.1.4",
     "stream-browserify": "^3.0.0",
     "util": "^0.12.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/preset-env": "^7.15.8",
-    "@babel/preset-react": "^7.14.5",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "babel-loader": "^8.2.3",
-    "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^5.2.7",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.26.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "html-webpack-plugin": "^5.5.0",
-    "jest": "^27.3.1",
     "sass": "^1.43.4",
     "sass-loader": "^11.1.1",
     "source-map-loader": "^2.0.2",
     "style-loader": "^2.0.0",
-    "url-loader": "^4.1.1",
-    "webpack-cli": "^4.9.1",
-    "webpack": "^5.60.0",
-    "webpack-dev-server": "^3.11.2"
+    "url-loader": "^4.1.1"
   },
   "scripts": {
-    "start": "node start",
-    "build": "webpack",
-    "test": "jest --coverage"
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   }
 }

frontend/public/index.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
+    <link rel="shortcut icon" href="#">
+    <!-- Load the Openshift variables at runtime into the window. -->
+    <% if (process.env.NODE_ENV === 'production') { %>
+      <script src="%PUBLIC_URL%/static/js/config/features.js"></script>
+    <% } %>
+    <title>CTHUB</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

frontend/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

frontend/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

react/src/App.js → frontend/src/app/components/App.js

@@ -1,20 +1,17 @@
-import 'regenerator-runtime/runtime';
 import React from 'react';
 import {
   BrowserRouter as Router,
   Route,
   Switch,
 } from 'react-router-dom';
 
-import settings from './app/settings';
-import IcbcDataRouter from './icbc_data/router';
-import UploadRouter from './uploads/router';
-import DashboardContainer from './dashboard/DashboardContainer';
-import useKeycloak from './app/utilities/useKeycloak'
-import Login from './Login';
-import Layout from './app/components/Layout'
-
-const { ENABLE_KEYCLOAK } = settings;
+import IcbcDataRouter from '../../icbc_data/router';
+import UploadRouter from '../../uploads/router';
+import DashboardContainer from '../../dashboard/DashboardContainer';
+import useKeycloak from '../utilities/useKeycloak'
+import Login from './Login'
+import Layout from './Layout'
+import { ENABLE_KEYCLOAK } from '../../config';
 
 const App = () => {
   const keycloak = useKeycloak()

react/src/app/components/KeycloakProvider.js → frontend/src/app/components/KeycloakProvider.js

@@ -1,20 +1,19 @@
 import React, { useState, useEffect } from 'react'
 import { KeycloakContext } from '../../contexts'
-import settings from '../settings'
+import { ENABLE_KEYCLOAK } from '../../config'
 
 const KeycloakProvider = ({authClient, initOptions, LoadingComponent, children}) => {
-  const keycloakEnabled = settings.ENABLE_KEYCLOAK
-  const [loading, setLoading] = useState(keycloakEnabled ? true : false)
+  const [loading, setLoading] = useState(ENABLE_KEYCLOAK ? true : false)
   const [keycloak, setKeycloak] = useState({})
 
   useEffect(() => {
-    if (keycloakEnabled) {
+    if (ENABLE_KEYCLOAK) {
       authClient.init(initOptions).then(() => {
         setKeycloak(authClient)
         setLoading(false)
       })
     }
-  }, [keycloakEnabled, authClient, initOptions])
+  }, [authClient, initOptions])
 
   if (loading) {
     return <LoadingComponent/>

react/src/Login.js → frontend/src/app/components/Login.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import useKeycloak from './app/utilities/useKeycloak';
+import useKeycloak from '../../app/utilities/useKeycloak';
 
 const Login = (props) => {
   const { redirectUri } = props;

react/src/app/utilities/useAxios.js → frontend/src/app/utilities/useAxios.js

@@ -1,14 +1,14 @@
 import axios from 'axios'
-import settings from '../settings';
 import useKeycloak from './useKeycloak'
+import { API_BASE } from '../../config';
 
 const useAxios = (useDefault = false, opts = {}) => {
+  const keycloak = useKeycloak()
   if (useDefault) {
     return axios.create(opts)
   }
-  const keycloak = useKeycloak()
   const instance = axios.create({
-    baseURL: settings.API_BASE,
+    baseURL: API_BASE,
     ...opts,
   })
   instance.interceptors.request.use(async (config) => {