Merge branch 'frontendstudygroup:master' into master

Author: Priyami

.dockerignore

@@ -0,0 +1,9 @@
+/node_modules
+
+/build
+
+.git
+
+*.md
+
+.gitignore

.gitignore

@@ -17,7 +17,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
-
+.env
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

.nginx/nginx.conf

@@ -0,0 +1,15 @@
+worker_processes 4;
+
+events { worker_connections 1024; }
+
+http {
+    server {
+        listen 80;
+        root  /usr/share/nginx/html;
+        include /etc/nginx/mime.types;
+
+        location / {
+            try_files $uri /index.html;
+        }
+    }
+}

Dockerfile

@@ -0,0 +1,30 @@
+# stage1 as builder
+FROM node:16-alpine as builder
+
+# copy the package.json to install dependencies
+COPY package.json package-lock.json ./
+
+# Install the dependencies and make the folder
+RUN npm install && mkdir /react-ui && mv ./node_modules ./react-ui
+
+WORKDIR /react-ui
+
+COPY . .
+
+# Build the project and copy the files
+RUN npm run build
+
+
+FROM nginx:1.20-alpine
+
+#!/bin/sh
+
+COPY ./.nginx/nginx.conf /etc/nginx/nginx.conf
+
+## Remove default nginx index page
+RUN rm -rf /usr/share/nginx/html/*
+
+# Copy from the stage 1
+COPY --from=builder /react-ui/build /usr/share/nginx/html
+
+EXPOSE 443 80

src/App.js

@@ -1,5 +1,6 @@
-import '../src/assets/css/App.css';
-import HomePage from './components/HomePage/HomePage';
+import "../src/assets/css/App.css";
+import React from "react";
+import HomePage from "./components/HomePage/HomePage";
 
 function App() {
   return (

src/components/InputField/InputField.js

@@ -1,18 +1,25 @@
 import "./InputField.css";
-
+import React from "react";
 const InputField = ({ label, placeholder, onChange, value, error, type }) => {
-    return (
-        <div className="inputfield_wrapper">
-            <label>{ label ? label : "" }</label>
-            <input type={ type ? type : "text" } id="email" placeholder={ placeholder }
-                value={ value && value }
-                onChange={onChange && onChange}
-            />
-            <p className="formContentError" >
-                { error && type === "email" ? "Please enter a valid email" : error ? "This field is required" : ""}
-            </p>
-        </div>
-    )
-}
+  return (
+    <div className="inputfield_wrapper">
+      <label>{label ? label : ""}</label>
+      <input
+        type={type ? type : "text"}
+        id="email"
+        placeholder={placeholder}
+        value={value && value}
+        onChange={onChange && onChange}
+      />
+      <p className="formContentError">
+        {error && type === "email"
+          ? "Please enter a valid email"
+          : error
+          ? "This field is required"
+          : ""}
+      </p>
+    </div>
+  );
+};
 
-export default InputField
+export default InputField;