[AFP-12] Fix merge conflict

package.json

@@ -11,6 +11,8 @@
     "react": "^17.0.2",
     "react-bootstrap": "^1.5.2",
     "react-dom": "^17.0.2",
+    "react-hook-form": "^7.4.1",
+    "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.3",
     "web-vitals": "^1.0.1"

src/component/Main.jsx

-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect } from "react";
 import { Redirect, Switch } from "react-router";
 import AuthRoute from "./AuthRoute";
 import ProductForm from "./ProductForm";
 import ProductGrid from "./ProductGrid";
 import SearchResults from "./SearchResults";
 import {getAllProducts} from "../actions/apiRequests.js"
+import PromotionNewFormComponent from "./promotionforms/PromotionNewFormComponent";
 
 export default function Main() {
   const [productData, setproductData] = useState([]);
@@ -16,24 +17,29 @@ export default function Main() {
   const loadProducts = async (event) => {
     const data = await getAllProducts();
     setproductData(data);
-  }
+  };
 
   return (
     <div>
       <Switch>
       <AuthRoute path="/searchResults"><SearchResults /></AuthRoute>
         <AuthRoute exact path="/products/new">
-          <ProductForm />
+          <ProductForm method="POST" />
         </AuthRoute>
-        <AuthRoute exact path="/promos/new">NEW PROMO</AuthRoute>
-        <AuthRoute exact path="/products">
-          <ProductGrid productData={productData} />
+        <AuthRoute exact path="/products/edit/:sku">
+          <ProductForm method="PUT" />
         </AuthRoute>
+        <AuthRoute
+          exact
+          path="/promos/new"
+          component={PromotionNewFormComponent}
+        ></AuthRoute>
+        <AuthRoute exact path="/products" component={ProductGrid}></AuthRoute>
         <AuthRoute path="/promos">PROMOS</AuthRoute>
         <AuthRoute exact path="/">
           <Redirect to="/products" />
         </AuthRoute>
-        <AuthRoute >404 PAGE</AuthRoute>
+        <AuthRoute>404 PAGE</AuthRoute>
       </Switch>
     </div>
   );

src/component/Product.jsx

-import React from 'react'
-import './../styles/Product.css'
+import React, { useState } from "react";
+import "./../styles/Product.css";
+import { Modal, Button, Alert } from "react-bootstrap";
 
-export default function Product({product}) {
+export default function Product({ product }) {
+  const [show, setShow] = useState(false);
+  const [showConfirm, setShowConfirm] = useState(false);
+
+  const handleClose = () => {
+    setShow(false);
+    handleCloseConfirm();
+  };
+  const handleShow = () => setShow(true);
+  const handleShowConfirm = () => setShowConfirm(true);
+  const handleCloseConfirm = () => setShowConfirm(false);
 
   return (
     <div>
-        <div className="img-container">
-            <img src={product.productImageUrl} alt={product.productName}/>
-        </div>
-        <div className="prod-info">
-            <h5>{product.productName}</h5>
-            {product.sku}<br/>
-            ${product.price}<br/>
-            In Stock: {product.stock}
-        </div>		
+      <div className="img-container" onClick={handleShow}>
+        <img
+          className="grid-img"
+          src={product.productImageUrl}
+          alt={product.productName}
+        />
+      </div>
+      <div className="prod-info">
+        <h5>{product.productName}</h5>
+        {product.sku}
+        <br />${product.price}
+        <br />
+        In Stock: {product.stock}
+      </div>
+
+      <Modal show={show} onHide={handleClose}>
+        <Modal.Header closeButton>
+          <Modal.Title>{product.productName}</Modal.Title>
+        </Modal.Header>
+
+        <Modal.Body>
+          <div className="modal-img">
+            <img src={product.productImageUrl} alt={product.productName} />
+          </div>
+          <h5>{product.sku}</h5>${product.price}
+          <br />
+          {product.productDescription}
+          <br />
+          In Stock: {product.stock}
+        </Modal.Body>
+
+        <Modal.Footer>
+          <Button
+            variant="danger"
+            className="float-left"
+            onClick={handleShowConfirm}
+          >
+            Delete product
+          </Button>
+
+          <Button variant="primary" href={`/products/edit/${product.sku}`}>
+            Edit Product
+          </Button>
+
+          <Alert show={showConfirm} variant="danger">
+            <h5> Are you sure?</h5>
+            <Button variant="secondary" onClick={handleCloseConfirm}>
+              Cancel
+            </Button>
+            &nbsp;&nbsp;
+            <Button variant="danger">Yes, delete</Button>
+          </Alert>
+        </Modal.Footer>
+      </Modal>
     </div>
-  )
+  );
 }

src/component/ProductForm.jsx

-import React, { useState } from "react";
-import { useHistory, useLocation } from "react-router";
+import React, { useEffect, useState } from "react";
+import { useHistory, useParams } from "react-router";
+import Config from "../config";
 
 const emptyForm = {
   sku: "",
@@ -11,7 +12,7 @@ const emptyForm = {
   availableStock: 0,
   productDescription: "",
   productImageUrl: "",
-  productImage: ""
+  productImage: "",
 };
 
 ProductForm.defaultProps = {
@@ -19,10 +20,23 @@ ProductForm.defaultProps = {
 };
 
 export default function ProductForm(props) {
-  const { product } = props;
-  const [form, setForm] = useState(product);
+  const { method } = props;
+  const [form, setForm] = useState(emptyForm);
   const [errors, setErrors] = useState([]);
   const history = useHistory();
+  const { sku } = useParams();
+
+  useEffect(() => {
+    fetch(`${Config.inventoryUrl}/${sku}`).then((res) => {
+      if (res.ok) {
+        res
+          .json()
+          .then((data) =>
+            setForm({ ...data, availableStock: data.stock, productImage: "" })
+          );
+      }
+    });
+  }, [sku]);
 
   const validate = () => {
     setErrors([]);
@@ -59,8 +73,12 @@ export default function ProductForm(props) {
 
     if (errors.length === 0) {
       // console.log(form);
-      fetch("http://localhost:8080/api/products", {
-        method: "POST",
+      const url =
+        method === "PUT"
+          ? `${Config.inventoryUrl}/${sku}`
+          : `${Config.inventoryUrl}`;
+      fetch(url, {
+        method,
         headers: {
           "Content-Type": "application/json",
         },
@@ -100,6 +118,7 @@ export default function ProductForm(props) {
               SKU
             </label>
             <input
+              disabled={method === "PUT" ? true : false}
               required
               name="sku"
               type="text"
@@ -137,7 +156,9 @@ export default function ProductForm(props) {
                 className="form-control"
                 id="productName"
                 value={form.productName}
-                onChange={(e) => setForm({ ...form, productName: e.target.value })}
+                onChange={(e) =>
+                  setForm({ ...form, productName: e.target.value })
+                }
               />
             </div>
             <div>
@@ -180,7 +201,9 @@ export default function ProductForm(props) {
               rows="7"
               className="form-control"
               value={form.productDescription}
-              onChange={(e) => setForm({ ...form, productDescription: e.target.value })}
+              onChange={(e) =>
+                setForm({ ...form, productDescription: e.target.value })
+              }
             ></textarea>
           </div>
         </div>
@@ -204,13 +227,16 @@ export default function ProductForm(props) {
               Stock
             </label>
             <input
+              disabled={method === "PUT" ? true : false}
               required
               name="stock"
               type="number"
               className="form-control"
               id="stock"
               value={form.availableStock}
-              onChange={(e) => setForm({ ...form, availableStock: e.target.value })}
+              onChange={(e) =>
+                setForm({ ...form, availableStock: e.target.value })
+              }
             />
           </div>
         </div>
@@ -225,7 +251,13 @@ export default function ProductForm(props) {
             type="url"
             placeholder="Enter image URL here or upload image below..."
             value={form.productImageUrl}
-            onChange={(e) => setForm({ ...form, productImageUrl: e.target.value, productImage:""})}
+            onChange={(e) =>
+              setForm({
+                ...form,
+                productImageUrl: e.target.value,
+                productImage: "",
+              })
+            }
           ></input>
           <input
             id="productImage"
@@ -233,7 +265,13 @@ export default function ProductForm(props) {
             className="form-control form-control-lg"
             type="file"
             value={form.productImage}
-            onChange={(e) => setForm({ ...form, productImage: e.target.value, productImageUrl:"" })}
+            onChange={(e) =>
+              setForm({
+                ...form,
+                productImage: e.target.value,
+                productImageUrl: "",
+              })
+            }
           ></input>
         </div>
 

src/component/ProductGrid.jsx

-import React from "react";
+import React, { useEffect, useState } from "react";
 import Product from "./Product.jsx";
 import { Col, Container, Row } from "react-bootstrap";
 import "./../styles/ProductGrid.css";
+import Config from "../config.js";
+import { set } from "react-hook-form";
 export default function ProductGrid({ productData }) {
+  const [products, setProducts] = useState([]);
+
+  const fetchProducts = async () => {
+    const res = await fetch(`${Config.inventoryUrl}`);
+    if (res.ok) {
+      const data = await res.json();
+      setProducts([...data]);
+    }
+  };
+
+  useEffect(() => fetchProducts(), []);
+
   return (
     <div>
-      <h1 id="title" className="text-center" >Inventory</h1>
+      <h1 id="title" className="text-center">
+        Inventory
+      </h1>
       <Container id="prod-grid" className="mt-3">
         <Row xs={1} sm={2} md={3} lg={4}>
-          {productData.map((product) => {
+          {products.map((product) => {
             return (
               <Col key={product.sku}>
                 <Product product={product} />

src/component/promotionforms/PromotionNewFormComponent.jsx

+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import "./promoStyle.css";
+import { NavLink } from 'react-router-dom';
+import Config from '../../config';
+import { useHistory } from 'react-router'
+
+export default function PromotionNewFormComponent () {
+    const { register, handleSubmit, formState: { errors } } = useForm();
+    const history = useHistory();
+    const [serverErrors, setErrors] = useState([]);
+
+    const onSubmit = (data) => {
+        console.log(data)
+
+        fetch(`${Config.promotionsUrl}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify(data),
+            })
+            .then(res => res.ok ? history.push("/promos") : setErrors(["There is already an existing Promotion Id"]))
+            .catch(err => setErrors([err.message]))
+    };
+
+    return (
+        <div>
+            <div className="promo-container">
+                <div className="promo-form-container">
+                    <h1 className="promo-form-title">Add Promotion</h1>
+                
+                <form className="promo-form" onSubmit={handleSubmit(onSubmit)}>
+                        {serverErrors.length ? <p className="form-error">{serverErrors}</p> : ""}
+
+                <div className="form-group">
+                    <label>Promotion Id</label>
+                    <input 
+                        {...register("promotionId", {
+                            required: "promotion id is required",
+                            maxLength: { value: 10, message: "You exceeded the maximum value" }
+                        })}
+                        id="promotionId"
+                        className="form-control"
+                                placeholder="eg. PROMO-403"
+                    />
+                            
+                            {errors.promotionId && <p className="form-error">{errors.promotionId.message}</p>}
+                            
+                </div>
+                <div className="form-group">
+                    <label>Product Sku</label>
+                    <input
+                        {...register("productSku", {
+                            required: "product sku required",
+                            maxLength: { value: 10, message: "You exceeded the maximum value" }
+                        })}
+                        id="productSku"
+                        className="form-control"
+                                placeholder="eg. SKU-39SD"
+                    />
+                            {errors.productSku && <p className="form-error">{errors.productSku.message}</p>}
+                    <br></br>
+                </div>
+
+                <div className="form-group">
+                    <label>Enter % off</label>
+                    <div className="input-group">
+                    
+                            <div className="input-group-prepend">
+                    <span className="input-group-text">%</span></div>
+                    <input
+                        {...register("discountPercentage", {
+                            valueAsNumber: true,
+                            required: "% off required",
+                            min: { value: 0, message: "% must be greater than or equal to 0" },
+                            max: { value: 100, message: "% must be less than or equal to 100" },
+                        })}
+                        id="discountPercentage"
+                        className="form-control"
+                                placeholder="20"
+                                type="number"
+                    />
+                            </div>
+                        {errors.discountPercentage && <p className="form-error">{errors.discountPercentage.message}</p>}
+
+                </div>
+
+                <div className="form-group">
+                    <label>Applies at Minimum Quantity</label>
+                    <input 
+                        {...register("minimumQuantity", {
+                            valueAsNumber: true,
+                            required: "minimum quantity is required",
+                            min: { value: 1, message: "discount percentage must be greater than 0" },
+
+                        })}
+                        id="minimumQuantity"
+                        className="form-control"
+                        type="number"
+                        min="1"
+                        placeholder="1"
+                    />
+                            {errors.minimumQuantity && <p className="form-error">{errors.minimumQuantity.message}</p>}
+                    </div>
+                        <input className="promo-submit" type="submit" value="Save Promotion" />
+                        <NavLink className="promo-cancel" to="/promos">Cancel</NavLink>
+            </form>
+                </div>
+            </div>
+        </div>
+    );
+}
+

src/component/promotionforms/promoStyle.css

+.promo-container {
+    
+    margin: 0px auto;
+    padding: 50px;
+    border-radius: 3px;
+    
+    
+}
+
+.promo-form-title {
+    text-align: center;
+    background-color: #212529;
+    color: white;
+    padding: 8px;
+}
+
+.promo-form-container {
+       border: 1px solid #212529;
+}
+
+.promo-form {
+    padding: 50px;
+    
+}
+
+.form-group {
+    padding: 5px;
+}
+
+.promo-submit {
+    background-color: #212529;
+    border: 1px solid black;
+    border-radius: 4px;
+    color: white;
+    min-width: 180px;
+    height: 45px;
+    text-align: center;
+    margin-left: 5px;
+    margin-top: 15px;
+}
+
+.promo-submit:hover {
+    background-color: #212529;
+    filter: brightness(90%);
+}
+
+.promo-cancel {
+    margin-left: 15px;
+}
+
+.form-error {
+    color: red;
+}
\ No newline at end of file

src/config.js

@@ -3,4 +3,4 @@ class Config {
     static promotionsUrl = "http://localhost:8081/api/promos";
 }
 
-export default Config;
\ No newline at end of file
+export default Config;

src/styles/Product.css

+img {
+    max-width: 100%;
+    max-height: 250px;
+}
+
 .img-container{
     position:relative;
     overflow:hidden;
     padding-bottom:100%;
 }
-img {
+.grid-img {
     position: absolute;
     max-width: 100%;
     max-height: 100%;
     top: 50%;
     left: 50%;
     transform: translateX(-50%) translateY(-50%);
+}
+
+.modal-img {
+    display: flex;
+    justify-content: center;
+}
+
+.alert{
+    width: 100%;
 }
\ No newline at end of file