Changeset 55ed171 for frontend/src/screens

Timestamp:

10/15/22 15:28:57 (21 months ago)

Author:

Nace Gjorgjievski <nace.gorgievski123@…>

Branches:

master

Children:

113029b

Parents:

ee05663

Message:

Full Admin Functionality Added

Location:

frontend/src/screens

Files:

• AdminAddProductScreen.js (added)
• AdminDashboardScreen.js (added)
• AdminEditProductScreen.js (added)
• AdminOrderScreen.js (added)
• AdminOrdersScreen.js (added)
• AdminProductsScreen.js (added)
• CardPaymentScreen.js (modified) (5 diffs)
• OrderHistoryScreen.js (modified) (3 diffs)
• OrderScreen.js (modified) (1 diff)
• PlaceOrderScreen.js (modified) (1 diff)
• ProductScreen.js (modified) (1 diff)
• ProductScreenBootstrap.js (modified) (1 diff)
• SigninScreen.js (modified) (1 diff)

frontend/src/screens/CardPaymentScreen.js

@@ -41 +41 @@
   cart.totalPrice = cart.itemsPrice + cart.shippingPrice;
 
+  const [cardNumber, setCardNumber] = useState("");
+  const handleChange = (event) => {
+    const result = event.target.value.replace(/[^0-9]/gi, "");
+    setCardNumber(result);
+  };
+  const [ccvNumber, setCcvNumber] = useState("");
+  const handleChangeCCV = (event) => {
+    const result = event.target.value.replace(/[^0-9]/gi, "");
+    console.log(event.currentTarget.validity.valid);
+
+    setCcvNumber(result);
+  };
   const paymentHandler = async (event) => {
     event.preventDefault();
     const form = event.currentTarget;
     if (form.checkValidity() === false) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    if (cardNumber.length !== 16) {
       event.preventDefault();
       event.stopPropagation();
@@ -63 +79 @@
             isPaid: true,
             paidAt: Date.now(),
+            isConfirmed: true,
+            contactNumber: userInfo.contact,
           },
           {
@@ -95 +113 @@
           <Form.Group id="nameInput">
             <Form.Label>Име и Презиме</Form.Label>
-            <Form.Control
-              type="text"
-              //value={holderName}
-              // onChange={(e) => setHolderName(e.target.value)}
-              required
-            ></Form.Control>
+            <Form.Control type="text" required></Form.Control>
           </Form.Group>
           <Form.Group>
@@ -106 +119 @@
             <Form.Control
               type="text"
-              //value={cardNumber}
-              //onChange={(e) => setCardNumber(e.target.value)}
+              minLength="16"
+              maxLength="16"
+              value={cardNumber}
+              onChange={handleChange}
               required
             ></Form.Control>
@@ -115 +130 @@
             <Form.Control
               type="text"
-              //value={cvv}
-              //onChange={(e) => setCvv(e.target.value)}
+              minLength={3}
+              maxLength={3}
+              value={ccvNumber}
+              onChange={handleChangeCCV}
               required
             ></Form.Control>

frontend/src/screens/OrderHistoryScreen.js

@@ -10 +10 @@
 import CheckIcon from "@mui/icons-material/Check";
 import ClearIcon from "@mui/icons-material/Clear";
+import PhonePausedIcon from "@mui/icons-material/PhonePaused";
+import LocalShippingIcon from "@mui/icons-material/LocalShipping";
 const reducer = (state, action) => {
   switch (action.type) {
@@ -49 +51 @@
 
   return (
-    <div className="pageContainer shipPC">
+    <div className="pageContainer shipPC" style={{ justifyContent: "normal" }}>
       <Helmet>
         <title>Историја на нарачки</title>
@@ -82 +84 @@
                   {order.isDelivered ? (
                     <CheckIcon></CheckIcon>
+                  ) : order.isShipped ? (
+                    <LocalShippingIcon></LocalShippingIcon>
                   ) : (
-                    <ClearIcon></ClearIcon>
+                    <PhonePausedIcon></PhonePausedIcon>
                   )}
                 </td>

frontend/src/screens/OrderScreen.js

@@ -84 +84 @@
                   Доставено на {order.deliveredAt}
                 </MessageBox>
+              ) : order.isShipped ? (
+                <MessageBox variant="primary">
+                  Вашата нарачка е испратена.
+                </MessageBox>
+              ) : order.isConfirmed ? (
+                <MessageBox variant="primary">
+                  Вашата нарачка се процесира.
+                </MessageBox>
               ) : (
-                <MessageBox variant="danger">Не е доставено</MessageBox>
+                <MessageBox variant="danger">
+                  Потребно е да ја потврдите нарачката. Ќе бидете контактирани
+                  преку телефонскиот број оставен за контакт.
+                </MessageBox>
               )}
             </Card.Body>

frontend/src/screens/PlaceOrderScreen.js

@@ -60 +60 @@
           shippingPrice: cart.shippingPrice,
           totalPrice: cart.totalPrice,
+          isConfirmed: false,
+          contactNumber: userInfo.contact,
         },
         {

frontend/src/screens/ProductScreen.js

@@ -72 +72 @@
                 <img src={product.sideImage} alt={product.name}></img>
               </div>
+              <div className="sideImg">
+                <img src={product.sideImage2} alt={product.name}></img>
+              </div>
             </div>
           </div>

frontend/src/screens/ProductScreenBootstrap.js

@@ -165 +165 @@
                   onClick={changePhoto}
                 ></img>
+
+                <img
+                  id="sec"
+                  src={product.sideImage2}
+                  alt={product.name}
+                  onClick={changePhoto}
+                ></img>
               </Row>
 

frontend/src/screens/SigninScreen.js

@@ -32 +32 @@
       ctxDispatch({ type: "USER_SIGNIN", payload: data });
       localStorage.setItem("userInfo", JSON.stringify(data));
-      navigate(redirect || "/");
+      if (data.isAdmin) navigate("/admin/dashboard");
+      else navigate(redirect || "/");
     } catch (err) {
       toast.error(getError(err));