From 63d98ac1048e7be7bbc52c57e33cf492326c79d2 Mon Sep 17 00:00:00 2001 From: Helashow Date: Thu, 19 May 2022 13:37:33 -0300 Subject: [PATCH 01/11] fix :bug: dashboard filter running in all pages --- .../PedidosPage/index.jsx | 595 +++++++++--------- 1 file changed, 301 insertions(+), 294 deletions(-) diff --git a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx index 49a7ec4..b8974c1 100644 --- a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx +++ b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx @@ -24,7 +24,7 @@ import { import * as yup from "yup"; import { useForm } from "react-hook-form"; import { yupResolver } from "@hookform/resolvers/yup"; -import { useEffect, useState } from "react"; +import { useEffect, useState, useContext } from "react"; import { motion } from "framer-motion"; import { GoSearch } from "react-icons/go"; @@ -33,6 +33,7 @@ import { useActivePage } from "../../../Providers/DashboardPageController"; import { useToken } from "../../../Providers/Token"; import api from "../../../services/api"; import { CardPedidos } from "./TicketCard"; +import { DashFilterContext } from "../../../Providers/DashboardFilter"; export const PedidosPage = () => { const { activeDashboardPage, setActiveDashboardPage, handleIcons, options } = @@ -54,13 +55,19 @@ export const PedidosPage = () => { const [ticketsList, setTicketList] = useState([]); + const { inputSearch } = useContext(DashFilterContext); + const filteredTicketsList = ticketsList.filter((item) => + item.status.toLowerCase().includes(inputSearch.toLowerCase()) || + item.id.toString().toLowerCase().includes(inputSearch.toLowerCase()) + ); + const [stockList, setStockList] = useState([]); const getStockList = () => { api.get(`/stock`).then((resp) => setStockList(resp.data)); }; - console.log(stockList); + //console.log(stockList); const getProductsList = () => { api @@ -127,8 +134,8 @@ export const PedidosPage = () => { ticketProducts: [...ticketItensList], status: "Realizado", }; - console.log(data); - console.log(ticketData); + //console.log(data); + //console.log(ticketData); api .post(`/tickets`, ticketData, { @@ -193,44 +200,38 @@ export const PedidosPage = () => { } return ( - - {options.map((value) => { - const radio = getRadioProps({ value }); - return ( - - {handleIcons(value)} {value} - - ); - })} - - + + {options.map((value) => { + const radio = getRadioProps({ value }); + return ( + + {handleIcons(value)} {value} + + ); + })} + { justifyContent={"center"} > - - - + + - Pedidos - - + Pedidos + + - Adicionar Novo Pedido - - - - + Adicionar Novo Pedido + + + - {ticketsList?.map((ele) => ( - - ))} - - - + {filteredTicketsList?.map((ele) => ( + + ))} + + - - Adicionar Pedido - - {errors.client && ( - - {errors.client.message} - - )} - + Adicionar Pedido - + {errors.client.message} + + )} + - - { - setTicketItemQuantity(e.target.value); + setTicketItemId(e.target.value); }} + > + {productsList?.map((product) => ( + + ))} + + + + { + setTicketItemQuantity(e.target.value); + }} + /> + + + {ticketItensList?.map((ele, index) => ( + + {index + 1}. {ele.name} - {ele.quantity} un. + Total: R$ + {(+ele.quantity * +ele.price).toFixed(2)} + + + ))} + + {showError && ( + + Adicione ao menos um produto! + + )} + + + + + - {ticketItensList?.map((ele, index) => ( - - {index + 1}. {ele.name} - {ele.quantity} un. - Total: R$ - {(+ele.quantity * +ele.price).toFixed(2)} - - - ))} - - {showError && ( - - Adicione ao menos um produto! - - )} - - - - - - - - - - - - + + + + + + - ); }; -export default PedidosPage; \ No newline at end of file +export default PedidosPage; From dbbc5e1d860fa408af4c7a8494fa7318ae8650aa Mon Sep 17 00:00:00 2001 From: Acauan Nascimento Date: Thu, 19 May 2022 17:02:57 -0300 Subject: [PATCH 02/11] fix :bug: mobile dashboard header --- .../DashboardPage/index.jsx | 127 +++++++++--------- .../components/header-components/index.jsx | 10 +- 2 files changed, 70 insertions(+), 67 deletions(-) diff --git a/distoq-capstonem3/src/components/dashboard-components/DashboardPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/DashboardPage/index.jsx index 1e6858e..1fd1743 100644 --- 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 ( - - {options.map((value) => { - const radio = getRadioProps({ value }); - return ( - - {handleIcons(value)} {value} - - ); - })} - - + + {options.map((value) => { + const radio = getRadioProps({ value }); + return ( + + {handleIcons(value)} {value} + + ); + })} + - - - Bem vindo, {userLogin.name} - - - - Tudo aqui foi feito para você fazer sua gestão de forma - simples e descomplicada. - + + + + Bem vindo, {userLogin.name} + + + + Tudo aqui foi feito para você fazer sua gestão de forma + simples e descomplicada. + + + + + - - - - ); }; diff --git a/distoq-capstonem3/src/components/header-components/index.jsx b/distoq-capstonem3/src/components/header-components/index.jsx index a6b08b7..82f0f59 100644 --- a/distoq-capstonem3/src/components/header-components/index.jsx +++ b/distoq-capstonem3/src/components/header-components/index.jsx @@ -115,13 +115,17 @@ const DashboardHeader = () => { > - DEStoq logo + DEStoq logo { - + - From bf235259aaf4c6187af7112fc6bb551ca571de1a Mon Sep 17 00:00:00 2001 From: Acauan Nascimento Date: Thu, 19 May 2022 17:17:50 -0300 Subject: [PATCH 04/11] fix :bug: alignItems adjusted --- .../PedidosPage/index.jsx | 580 +++++++++--------- 1 file changed, 290 insertions(+), 290 deletions(-) diff --git a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx index 49a7ec4..e030d54 100644 --- a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx +++ b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx @@ -193,44 +193,38 @@ export const PedidosPage = () => { } return ( - - {options.map((value) => { - const radio = getRadioProps({ value }); - return ( - - {handleIcons(value)} {value} - - ); - })} - - + + {options.map((value) => { + const radio = getRadioProps({ value }); + return ( + + {handleIcons(value)} {value} + + ); + })} + { justifyContent={"center"} > - - - + + - Pedidos - - + Pedidos + + - Adicionar Novo Pedido - - - - + Adicionar Novo Pedido + + + - {ticketsList?.map((ele) => ( - - ))} - - - + {ticketsList?.map((ele) => ( + + ))} + + - - Adicionar Pedido - - {errors.client && ( - - {errors.client.message} - - )} - + Adicionar Pedido - + {errors.client.message} + + )} + - - { - setTicketItemQuantity(e.target.value); + setTicketItemId(e.target.value); }} + > + {productsList?.map((product) => ( + + ))} + + + + { + setTicketItemQuantity(e.target.value); + }} + /> + + + {ticketItensList?.map((ele, index) => ( + + {index + 1}. {ele.name} - {ele.quantity} un. + Total: R$ + {(+ele.quantity * +ele.price).toFixed(2)} + + + ))} + + {showError && ( + + Adicione ao menos um produto! + + )} + + + + + - {ticketItensList?.map((ele, index) => ( - - {index + 1}. {ele.name} - {ele.quantity} un. - Total: R$ - {(+ele.quantity * +ele.price).toFixed(2)} - - - ))} - - {showError && ( - - Adicione ao menos um produto! - - )} - - - - - - - - - - - - + + + + + + - ); }; -export default PedidosPage; \ No newline at end of file +export default PedidosPage; From 90d33ba2fa401cb4a13b409c2ae32d4a01881882 Mon Sep 17 00:00:00 2001 From: Rafhael Mallorga Date: Thu, 19 May 2022 17:51:20 -0300 Subject: [PATCH 05/11] feat :sparkles: created new page (Maps Page / Delivery) --- distoq-capstonem3/package.json | 1 + .../DashboardPageController/index.js | 6 +- .../EntregasPage/MapsComponent/index.jsx | 209 ++++++++++++++++++ .../EntregasPage/index.jsx | 123 +++++++++++ .../src/pages/dashboard/index.jsx | 23 +- distoq-capstonem3/yarn.lock | 56 ++++- 6 files changed, 405 insertions(+), 13 deletions(-) create mode 100644 distoq-capstonem3/src/components/dashboard-components/EntregasPage/MapsComponent/index.jsx create mode 100644 distoq-capstonem3/src/components/dashboard-components/EntregasPage/index.jsx diff --git a/distoq-capstonem3/package.json b/distoq-capstonem3/package.json index 25c3d76..e8101c5 100644 --- a/distoq-capstonem3/package.json +++ b/distoq-capstonem3/package.json @@ -11,6 +11,7 @@ "@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", diff --git a/distoq-capstonem3/src/Providers/DashboardPageController/index.js b/distoq-capstonem3/src/Providers/DashboardPageController/index.js index 3365bb1..b4d1a96 100644 --- 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 ; + case "Entregas": + return ; + default: break; } @@ -57,6 +60,7 @@ export const DashboardPageControllerProvider = ({ children }) => { "Produtos", "Estoque", "Financeiro", + "Entregas", "Developers", ]; diff --git a/distoq-capstonem3/src/components/dashboard-components/EntregasPage/MapsComponent/index.jsx b/distoq-capstonem3/src/components/dashboard-components/EntregasPage/MapsComponent/index.jsx new file mode 100644 index 0000000..fee5a51 --- /dev/null +++ b/distoq-capstonem3/src/components/dashboard-components/EntregasPage/MapsComponent/index.jsx @@ -0,0 +1,209 @@ +import { + Button, + Flex, + Heading, + Input, + InputGroup, + InputRightAddon, + SkeletonText, + Text, +} from "@chakra-ui/react"; +import { + GoogleMap, + useJsApiLoader, + Marker, + DirectionsRenderer, + DirectionsService, +} from "@react-google-maps/api"; +import { useEffect } from "react"; +import { useState } from "react"; + +export const MapPage = () => { + const { isLoaded } = useJsApiLoader({ + // id: "google-map-script", + googleMapsApiKey: "AIzaSyBI_YF6Rs6l6uDAaWXt6PIrU602GxVAk7w", + }); + + const [directionsResponse, setDirectionsResponse] = useState(null); + const [distance, setDistance] = useState(0); + const [duration, setDuration] = useState(0); + + const [showMenu, setShowMenu] = useState(true); + + // console.log(distance); + // console.log(duration); + console.log(directionsResponse); + + if (!isLoaded) { + return ; + } + + const center = { lat: -25.436711733148506, lng: -49.30843817585168 }; + + const calculateRoute = async () => { + //eslint-disable-next-line no-undef + const directionsService = new google.maps.DirectionsService(); + const results = await directionsService.route({ + origin: center, + destination: center, + //eslint-disable-next-line no-undef + travelMode: google.maps.TravelMode.DRIVING, + waypoints: [ + { location: "Av. Olavo Fontoura, Sao Paulo", stopover: true }, + { location: "Rua Bela Vista de Goias, Guarulhos", stopover: true }, + ], + optimizeWaypoints: true, + drivingOptions: { + departureTime: new Date(), + trafficModel: "pessimistic", + }, + }); + setDirectionsResponse(results); + + // const time = + // console.log(time); + setDuration( + results?.routes[0].legs.reduce((acc, leg) => acc + leg.duration.value, 0) + ); + + // const totalDistance = + setDistance( + results?.routes[0].legs.reduce((acc, leg) => acc + leg.distance.value, 0) + ); + }; + + const clearRoute = () => { + setDirectionsResponse(null); + setDistance(0); + setDuration(0); + }; + + return ( + + {isLoaded ? ( + + + + {directionsResponse && ( + + )} + + + + Pedidos aguardando entrega:{" "} + + 2 + + + + + + + + + + + + Tempo total:{" "} + + + + + + + + + Distancia:{" "} + + + + + + + + + ) : ( + <> + )} + + ); +}; diff --git a/distoq-capstonem3/src/components/dashboard-components/EntregasPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/EntregasPage/index.jsx new file mode 100644 index 0000000..61b1072 --- /dev/null +++ b/distoq-capstonem3/src/components/dashboard-components/EntregasPage/index.jsx @@ -0,0 +1,123 @@ +import { + Box, + Flex, + Heading, + Stack, + Text, + useRadio, + useRadioGroup, + VStack, +} from "@chakra-ui/react"; +import { motion } from "framer-motion"; +import { GoSearch } from "react-icons/go"; +import { useActivePage } from "../../../Providers/DashboardPageController"; +import { useUser } from "../../../Providers/Users"; +import AOS from "aos"; +import "aos/dist/aos.css"; +import Example from "../../lottie/lottie"; +import { MapPage } from "./MapsComponent"; +AOS.init(); + +export const EntregasPage = () => { + const { activeDashboardPage, setActiveDashboardPage, handleIcons, options } = + useActivePage(); + const { userLogin } = useUser(); + + const { getRootProps, getRadioProps } = useRadioGroup({ + name: "menuOptions", + defaultValue: activeDashboardPage, + onChange: setActiveDashboardPage, + }); + + const group = getRootProps(); + + function RadioCard(props) { + const { getInputProps, getCheckboxProps } = useRadio(props); + + const input = getInputProps(); + const checkbox = getCheckboxProps(); + + return ( + + + + {props.children} + + + ); + } + return ( + + + + {options.map((value) => { + const radio = getRadioProps({ value }); + return ( + + {handleIcons(value)} {value} + + ); + })} + + + + + + + + + ); +}; + +export default EntregasPage; diff --git a/distoq-capstonem3/src/pages/dashboard/index.jsx b/distoq-capstonem3/src/pages/dashboard/index.jsx index d96781f..b8b3c7a 100644 --- a/distoq-capstonem3/src/pages/dashboard/index.jsx +++ b/distoq-capstonem3/src/pages/dashboard/index.jsx @@ -11,19 +11,18 @@ import DevelopersPage from "../../components/dashboard-components/DevelopersPage import { useActivePage } from "../../Providers/DashboardPageController"; import { useNavigate } from "react-router-dom"; import { useJwt } from "react-jwt"; -import { motion } from 'framer-motion'; +import { motion } from "framer-motion"; import { useToken } from "../../Providers/Token"; +import EntregasPage from "../../components/dashboard-components/EntregasPage"; const Dashboard = () => { const { activeDashboardPage } = useActivePage(); const userLogin = JSON.parse(localStorage.getItem("@DEStoq:user")) || ""; - const {token} = useToken(); + const { token } = useToken(); const { decodedToken, isExpired } = useJwt(token); const navigate = useNavigate(); - const isAdmin = userLogin.userId - - + const isAdmin = userLogin.userId; if (isAdmin != "1") { return navigate("/"); @@ -33,7 +32,7 @@ const Dashboard = () => { switch (value) { case "Dashboard": return ; - + case "Pedidos": return ; @@ -55,6 +54,9 @@ const Dashboard = () => { case "Financeiro": return ; + case "Entregas": + return ; + case "Developers": return ; @@ -65,11 +67,10 @@ const Dashboard = () => { return ( {handlePageRender(activeDashboardPage)} diff --git a/distoq-capstonem3/yarn.lock b/distoq-capstonem3/yarn.lock index 86f91c7..e674e4b 100644 --- a/distoq-capstonem3/yarn.lock +++ b/distoq-capstonem3/yarn.lock @@ -1864,6 +1864,21 @@ resolved "https://registry.npmjs.org/@fontsource/rubik/-/rubik-4.5.9.tgz" integrity sha512-atF0Mvh6woVFPX2p2MdVO0JIqw6DSjrb82EQJ9UaHnJeJ79SfaTUFxRoQMF3yF6ehaY5el3SgynSX5w02O3lqQ== +"@googlemaps/js-api-loader@1.14.2": + version "1.14.2" + resolved "https://registry.yarnpkg.com/@googlemaps/js-api-loader/-/js-api-loader-1.14.2.tgz#c07c7259d9b86e6ccf72a8426784dbee9dfa8e6b" + integrity sha512-Kx9mc4cRKsh122Rdd0v0987qjkwfqic0Go6j9W+KbRaM1GqQUG5UDiOLtZSQRfu0kB2Te+MV0OBa0gHeAg6GNA== + dependencies: + fast-deep-equal "^3.1.3" + +"@googlemaps/markerclusterer@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@googlemaps/markerclusterer/-/markerclusterer-2.0.6.tgz#f3c157e24f5c95ab1748710c5a584ae1fae51d61" + integrity sha512-kO8Q77V3aqR2tVZ3SDXs9ycCiWYpd+FadxIJVtDKlO9LlMs415GS686+XvDLMLorR/RvwQHkquHZM8RbZ3bCrg== + dependencies: + fast-deep-equal "^3.1.3" + supercluster "^7.1.3" + "@hookform/resolvers@^2.8.8": version "2.8.8" resolved "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.8.tgz" @@ -2186,6 +2201,28 @@ resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz" integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== +"@react-google-maps/api@^2.10.3": + version "2.10.3" + resolved "https://registry.yarnpkg.com/@react-google-maps/api/-/api-2.10.3.tgz#7c6392a756730eb474c9413583d9c1807566f2c0" + integrity sha512-tSzlaflzhVhkrGuaAf5XefnSQAPD25K57kYgA1WOQUFPSi8+zVp2DGm/UuyywN5Z/dhqXO/D0xU21NP0YcY5RA== + dependencies: + "@googlemaps/js-api-loader" "1.14.2" + "@googlemaps/markerclusterer" "2.0.6" + "@react-google-maps/infobox" "2.10.1" + "@react-google-maps/marker-clusterer" "2.10.1" + "@types/google.maps" "3.48.8" + invariant "2.2.4" + +"@react-google-maps/infobox@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@react-google-maps/infobox/-/infobox-2.10.1.tgz#e07e0fcfdf1641c5a7ee2dba69e646c6633d3e43" + integrity sha512-IaiAdUo7CFlunmcYJknr8UVchAjKuyVepvlduj2YRVj6ZZaGFM7+ZNpAynmwVXfIxTpMK7ff0Dcf0Gdu8D2wKw== + +"@react-google-maps/marker-clusterer@2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@react-google-maps/marker-clusterer/-/marker-clusterer-2.10.1.tgz#c03a2b7088d338ae98d7c3154d66b55fb6043d76" + integrity sha512-IeLrAj/CLq1ng3/fPOkxo/DS+B8T6RbLUfAKvr1oJFuJzHRhaIZHmcBCov+lpge7Yr5w+knf/DF7nKz6zARTng== + "@rollup/plugin-babel@^5.2.0": version "5.3.1" resolved "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz" @@ -2572,6 +2609,11 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/google.maps@3.48.8": + version "3.48.8" + resolved "https://registry.yarnpkg.com/@types/google.maps/-/google.maps-3.48.8.tgz#54025ff2352122283a7ccfc1213ab7fcc1dde838" + integrity sha512-//H3NjhH8GqWOdSecsodAc1FtcGWZKTi45q59Ym/sV0F8bituz4JcPicLRhSvdSLi9fjZKNUUdjXwgJeWv/M5w== + "@types/graceful-fs@^4.1.2": version "4.1.5" resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz" @@ -5837,7 +5879,7 @@ internmap@^1.0.0: resolved "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz" integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== -invariant@^2.2.4: +invariant@2.2.4, invariant@^2.2.4: version "2.2.4" resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -6717,6 +6759,11 @@ jws@^3.2.2: jwa "^1.4.1" safe-buffer "^5.0.1" +kdbush@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0" + integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew== + kind-of@^6.0.2: version "6.0.3" resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" @@ -9279,6 +9326,13 @@ stylis@4.0.13: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== +supercluster@^7.1.3: + version "7.1.5" + resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3" + integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg== + dependencies: + kdbush "^3.0.0" + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" From bfb8d1e8c437f320b680293e0e448bc0c8aae0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20C=C3=A2ndido?= Date: Thu, 19 May 2022 17:59:29 -0300 Subject: [PATCH 06/11] fix :bug: fixing bug into token user --- .../components/dashboard-components/PedidosPage/index.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx index a1834a9..53880c2 100644 --- a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx +++ b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx @@ -27,7 +27,6 @@ import { motion } from "framer-motion"; import { useActivePage } from "../../../Providers/DashboardPageController"; - import api from "../../../services/api"; import { CardPedidos } from "./TicketCard"; @@ -35,7 +34,7 @@ export const PedidosPage = () => { const { activeDashboardPage, setActiveDashboardPage, handleIcons, options } = useActivePage(); - const userToken = JSON.parse(localStorage.getItem("@DEStoq:token")) || "" + const userToken = JSON.parse(localStorage.getItem("@DEStoq:token")) || "" const [clientsList, setClientsList] = useState([]); const [productsList, setProductsList] = useState([]); @@ -345,7 +344,7 @@ export const PedidosPage = () => { ticket={ele} getTicketsList={getTicketsList} setTicketList={setTicketList} - token={token} + token={userToken} /> ))} From 951e19c249f24e51f292d805db253948eb899fde Mon Sep 17 00:00:00 2001 From: Acauan Nascimento Date: Thu, 19 May 2022 20:17:40 -0300 Subject: [PATCH 07/11] fix :bug: styled mobile from PedidosPage and fixed homeFilter --- distoq-capstonem3/package.json | 1 + .../PedidosPage/TicketCard/index.jsx | 28 ++++++++++++++----- .../PedidosPage/index.jsx | 27 ++++++++++-------- .../home-components/HomeFilter/index.jsx | 2 +- distoq-capstonem3/yarn.lock | 26 +++++++++++++++-- 5 files changed, 63 insertions(+), 21 deletions(-) diff --git a/distoq-capstonem3/package.json b/distoq-capstonem3/package.json index e8101c5..02f7ce4 100644 --- a/distoq-capstonem3/package.json +++ b/distoq-capstonem3/package.json @@ -18,6 +18,7 @@ "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/components/dashboard-components/PedidosPage/TicketCard/index.jsx b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/TicketCard/index.jsx index 91be1fd..2a66a18 100644 --- a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/TicketCard/index.jsx +++ b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/TicketCard/index.jsx @@ -81,7 +81,7 @@ export const CardPedidos = ({ > Pedido: #{id} - - + + Status: - + Cliente #{clientInfo.id} - + Nome: {clientInfo.name} diff --git a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx index 035fb7c..904e0a8 100644 --- a/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx +++ b/distoq-capstonem3/src/components/dashboard-components/PedidosPage/index.jsx @@ -35,7 +35,7 @@ export const PedidosPage = () => { const { activeDashboardPage, setActiveDashboardPage, handleIcons, options } = useActivePage(); - const userToken = JSON.parse(localStorage.getItem("@DEStoq:token")) || "" + const userToken = JSON.parse(localStorage.getItem("@DEStoq:token")) || ""; const [clientsList, setClientsList] = useState([]); const [productsList, setProductsList] = useState([]); @@ -52,9 +52,10 @@ export const PedidosPage = () => { const [ticketsList, setTicketList] = useState([]); const { inputSearch } = useContext(DashFilterContext); - const filteredTicketsList = ticketsList.filter((item) => - item.status.toLowerCase().includes(inputSearch.toLowerCase()) || - item.id.toString().toLowerCase().includes(inputSearch.toLowerCase()) + const filteredTicketsList = ticketsList.filter( + (item) => + item.status.toLowerCase().includes(inputSearch.toLowerCase()) || + item.id.toString().toLowerCase().includes(inputSearch.toLowerCase()) ); const [stockList, setStockList] = useState([]); @@ -167,7 +168,7 @@ export const PedidosPage = () => { // borderWidth="1px" borderRadius="md" fontWeight="bold" - fontSize="26px" + fontSize={["18px", "18px", "18px", "26px", "26px"]} color="white" alignItems="center" // boxShadow="md" @@ -259,7 +260,7 @@ export const PedidosPage = () => { { { spacing={3} width="400px" maxWidth={"90%"} - height={"100%"} + height={["120%", "120%", "120%", "120%", "100%"]} display="flex" flexDir={"column"} alignItems="center" @@ -385,7 +386,12 @@ export const PedidosPage = () => { boxShadow="0 0 10px grey" color={"black"} > - Adicionar Pedido + + {" "} + Adicionar Pedido +