working on nginx for frontend

Author: Dan Kelley

src/client/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:13.12.0-alpine
+FROM node:13.12.0-alpine as builder
 
 # set working directory
 WORKDIR /app
@@ -13,8 +13,13 @@ COPY package-lock.json ./
 
 RUN npm install --silent
 
+COPY public ./public
+COPY src ./src
+
+RUN npm run build
 # add app
-COPY . ./
+FROM nginx AS host
+
+COPY nginx-client.conf /etc/nginx/conf.d/default.conf
 
-# start app
-CMD ["npm", "start"]
+COPY --from=builder /app/build/ /usr/share/nginx/html

src/client/src/pages/About.js

@@ -5,10 +5,10 @@ export default function About(props){
   return (
 <Container>
 <Container style={{"padding":"1em"}}>
-  <h1><a href="phillypaws.org">
+  <h1><a href="https://phillypaws.org/">
     The Philadelphia Animal Welfare Society(PAWS)
   </a></h1>
-  <p>As the city’s largest animal rescue partner and no-kill animal shelter, the <a href="phillypaws.org">Philadelphia
+  <p>As the city’s largest animal rescue partner and no-kill animal shelter, the <a href="https://phillypaws.org/">Philadelphia
       Animal Welfare Society (PAWS)</a> is working to make Philadelphia a place where every healthy and treatable pet is
     guaranteed a home. Since inception over 10 years ago, PAWS has rescued and placed 27,000+ animals in adoptive and
     foster homes, and has worked to prevent pet homelessness by providing 86,000+ low-cost spay/neuter services and

src/docker-compose.yml

@@ -28,7 +28,7 @@ services:
     build: ./client
     container_name: paws-compose-client
     ports:
-      - "3000:3000"
+      - "3000:80"
     depends_on:
       - server
     environment:

src/server/api/admin_api.py

@@ -26,8 +26,9 @@ def __allowed_file(filename):
 # file upload tutorial
 @admin_api.route("/api/file", methods=["POST"])
 def uploadCSV():
+    current_app.logger.info("Uploading CSV")
     if "file" not in request.files:
-        return redirect(request.url)
+        return jsonify({"error": "no file supplied"});
 
     for file in request.files.getlist("file"):
         if __allowed_file(file.filename):
@@ -38,7 +39,7 @@ def uploadCSV():
             finally:
                 file.close()
 
-    return redirect("/")
+    return jsonify({"success": "uploaded file"});
 
 
 @admin_api.route("/api/files/<destination>", methods=["GET"])