Merge pull request #66 from distoq/develop

Merge develop into main branch #4.
distoq · May 20, 2022 · 087590c · 087590c
2 parents b9e6f9f + 18cc30e
commit 087590c
Show file tree

Hide file tree

Showing 19 changed files with 982 additions and 530 deletions.
diff --git a/distoq-capstonem3/package.json b/distoq-capstonem3/package.json
@@ -11,12 +11,14 @@
     "@fontsource/nunito": "^4.5.8",
     "@fontsource/rubik": "^4.5.9",
     "@hookform/resolvers": "^2.8.8",
+    "@react-google-maps/api": "^2.10.3",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^13.2.1",
     "aos": "^3.0.0-beta.6",
     "axios": "^0.27.2",
     "framer-motion": "4.1.17",
+    "google-map-react": "^2.1.10",
     "jsonwebtoken": "^8.5.1",
     "lottie-react": "^2.2.1",
     "react": "^18.1.0",

diff --git a/distoq-capstonem3/src/Providers/DashboardPageController/index.js b/distoq-capstonem3/src/Providers/DashboardPageController/index.js
@@ -1,6 +1,6 @@
 import { createContext, useContext, useState } from "react";
 import { AiFillBank, AiOutlineDropbox } from "react-icons/ai";
-import { MdDeveloperMode } from "react-icons/md";
+import { MdDeliveryDining, MdDeveloperMode } from "react-icons/md";
 import {
   FaBoxes,
   FaFileInvoiceDollar,
@@ -43,6 +43,9 @@ export const DashboardPageControllerProvider = ({ children }) => {
       case "Developers":
         return <MdDeveloperMode />;
 
+      case "Entregas":
+        return <MdDeliveryDining />;
+
       default:
         break;
     }
@@ -57,6 +60,7 @@ export const DashboardPageControllerProvider = ({ children }) => {
     "Produtos",
     "Estoque",
     "Financeiro",
+    "Entregas",
     "Developers",
   ];
 

diff --git a/distoq-capstonem3/src/components/dashboard-components/ComprasPage/ComprasCard/index.jsx b/distoq-capstonem3/src/components/dashboard-components/ComprasPage/ComprasCard/index.jsx
@@ -54,11 +54,16 @@ export const CardCompras = ({ order, getOrdersList, setOrdersList, token }) => {
           OC: #{id}
         </Text>
         <Flex alignItems={"center"}>
-          <Text marginRight={"20px"} fontSize={"20px"} fontWeight="bold">
+          <Text
+            marginRight={"20px"}
+            fontSize={"20px"}
+            fontWeight="bold"
+            flexWrap={["wrap", "wrap", "wrap", "nowrap"]}
+          >
             Status:
           </Text>
           <Box
-            width={"45px"}
+            width={["30px", "30px", "30px", "45px"]}
             height={"25px"}
             borderRadius={"50%"}
             marginRight={"20px"}

diff --git a/distoq-capstonem3/src/components/dashboard-components/DashboardPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/DashboardPage/index.jsx
@@ -17,7 +17,7 @@ AOS.init();
 export const DashboardPage = () => {
   const { activeDashboardPage, setActiveDashboardPage, handleIcons, options } =
     useActivePage();
-    const userLogin = JSON.parse(localStorage.getItem("@DEStoq:user")) || ""
+  const userLogin = JSON.parse(localStorage.getItem("@DEStoq:user")) || "";
 
   const { getRootProps, getRadioProps } = useRadioGroup({
     name: "menuOptions",
@@ -69,81 +69,80 @@ export const DashboardPage = () => {
   }
   return (
     <motion.div
-      initial={{opacity:0}}
-      animate={{opacity:1}}
-      exit={{opacity:0}}
-      transition={{duration:1}}
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      exit={{ opacity: 0 }}
+      transition={{ duration: 1 }}
     >
       <Flex className="fullPage" width="100%" minHeight="calc(100vh - 80px)">
-      <VStack
-        {...group}
-        alignItems="flex-start"
-        backgroundColor={"#434343"}
-        display={["none", "none", "none", "none", "flex"]}
-      >
-        {options.map((value) => {
-          const radio = getRadioProps({ value });
-          return (
-            <RadioCard key={value} {...radio}>
-              {handleIcons(value)} {value}
-            </RadioCard>
-          );
-        })}
-      </VStack>
-      <Flex
-        className="contentContainer"
-        width="100%"
-        minHeight="100%"
-        flexDir="column"
-        alignItems={"center"}
-        backgroundImage={
-          "https://www.jeronimoburger.com.br/img/home/banner-sobre-desk.png"
-        }
-        bgRepeat="no-repeat"
-        backgroundSize="100% 100%"
-      >
+        <VStack
+          {...group}
+          alignItems="flex-start"
+          backgroundColor={"#434343"}
+          display={["none", "none", "none", "none", "flex"]}
+        >
+          {options.map((value) => {
+            const radio = getRadioProps({ value });
+            return (
+              <RadioCard key={value} {...radio}>
+                {handleIcons(value)} {value}
+              </RadioCard>
+            );
+          })}
+        </VStack>
         <Flex
-          width={"100%"}
-          height={"100%"}
+          className="contentContainer"
+          width="100%"
+          minHeight="100%"
+          flexDir="column"
           alignItems={"center"}
-          justifyContent={"center"}
+          backgroundImage={
+            "https://www.jeronimoburger.com.br/img/home/banner-sobre-desk.png"
+          }
+          bgRepeat="no-repeat"
+          backgroundSize="100% 100%"
         >
           <Flex
-            backgroundColor={"#aeaeae4e"}
-            boxShadow={"0 0 15px #464646"}
-            width={["100%", "100%", "100%", "100%", "90%"]}
-            height={["100%", "100%", "100%", "100%", "90%"]}
-            marginTop={["20px", "20px", "20px", "20px", "0px"]}
-            borderTopRadius={"15px"}
-            borderBottomRadius={["0px", "0px", "0px", "0px", "15px"]}
-            color={"white"}
+            width={"100%"}
+            height={"100%"}
+            alignItems={"center"}
+            justifyContent={"center"}
           >
-            <Flex w="100%" direction={"column"} align="center">
-              <Heading mt="40px" variant={"primary"}>
-                Bem vindo, {userLogin.name}
-              </Heading>
-              <Flex mt="10px" w="100%" justify={"center"}>
-                <Text
-                  p="10px"
-                  borderRadius="10px"
-                  border="1px solid black"
-
-                  variant="primary"
-                  boxShadow="0 0 10px gray"
-                  _hover={{ boxShadow: "0 0 10px #101010" }}
-                >
-                  Tudo aqui foi feito para você fazer sua gestão de forma
-                  simples e descomplicada.
-                </Text>
+            <Flex
+              backgroundColor={"#aeaeae4e"}
+              boxShadow={"0 0 15px #464646"}
+              width={["100%", "100%", "100%", "100%", "90%"]}
+              height={["100%", "100%", "100%", "100%", "90%"]}
+              marginTop={["20px", "20px", "20px", "20px", "0px"]}
+              borderTopRadius={"15px"}
+              borderBottomRadius={["0px", "0px", "0px", "0px", "15px"]}
+              color={"white"}
+            >
+              <Flex w="100%" direction={"column"} align="center">
+                <Heading mt="40px" variant={"primary"}>
+                  Bem vindo, {userLogin.name}
+                </Heading>
+                <Flex mt="10px" w="100%" justify={"center"}>
+                  <Text
+                    p="10px"
+                    borderRadius="10px"
+                    border="1px solid black"
+                    variant="primary"
+                    boxShadow="0 0 10px gray"
+                    _hover={{ boxShadow: "0 0 10px #101010" }}
+                  >
+                    Tudo aqui foi feito para você fazer sua gestão de forma
+                    simples e descomplicada.
+                  </Text>
+                </Flex>
+                <Box w="38%" maxW="600px">
+                  <Example />
+                </Box>
               </Flex>
-              <Box ml="40px" w="38%" maxW="600px">
-                <Example/>
-              </Box>
             </Flex>
           </Flex>
         </Flex>
       </Flex>
-      </Flex>
     </motion.div>
   );
 };