diff --git a/src/components/Category/index.tsx b/src/components/Category/index.tsx index 8db5cd4..dfe0a13 100644 --- a/src/components/Category/index.tsx +++ b/src/components/Category/index.tsx @@ -2,11 +2,10 @@ import Edit from "../../assets/icons/edit.png"; import Editsub from "../../assets/icons/editsub.png"; import Drop from "../../assets/icons/drop.png"; -import Plus from "../../assets/icons/sum.png"; +import Plus from "../../assets/icons/sum-yellow.png"; import trash from "../../assets/icons/trash-white.png"; import imgSum from "../../assets/icons/sum-yellowbig.png"; import imgSumy from "../../assets/icons/sum-yellow.png"; -import Plus from "../../assets/icons/Vector.png"; import { useRef, useState } from "react"; import { useForm, SubmitHandler } from "react-hook-form"; import NewItemModal from "../NewItemModal"; @@ -40,12 +39,12 @@ export default function Category() { return ( <> -
-

Categorias

+
+

Categorias

-
+
{cards.map((card) => ( - @@ -55,17 +54,17 @@ export default function Category() { className="bg-[#001B42] shadow-md flex w-full max-w-[160px] rounded-lg p-[30px] gap-1 items-center object-cover " > - + Adicionar Categorias{" "} - +
-
+
setEstablishmentName(e.target.value)} @@ -76,12 +75,12 @@ export default function Category() {
-
+
{subcards.map((subcard) => ( -
-
+
+
+ + +
diff --git a/src/components/avatar/index.tsx b/src/components/avatar/index.tsx index 0509bf4..786f79c 100644 --- a/src/components/avatar/index.tsx +++ b/src/components/avatar/index.tsx @@ -13,7 +13,7 @@ export default function Avatar() { setImage(e.target?.result?.toString()); }; reader.readAsDataURL(file); - } + reader.readAsDataURL(file) diff --git a/src/pages/MenuPage/index.tsx b/src/pages/MenuPage/index.tsx index b720a00..6a7ca5c 100644 --- a/src/pages/MenuPage/index.tsx +++ b/src/pages/MenuPage/index.tsx @@ -1,14 +1,24 @@ - -import MenuHeader from "../../components/MenuHeader"; +import Item from "../../components/Item"; +import imgPen from "../../assets/icons/pen.png"; +import { SubCategory } from "../../components/Subcategory"; import Category from "../../components/Category"; +import MenuHeader from "../../components/MenuHeader"; +import { ButtonDelete } from "../../components/Delete"; +import AddCategory from "../../components/AddCategory"; export default function MenuPage() { return (
+
+ + + +
+
); -} \ No newline at end of file +} diff --git a/src/pages/homepage/index.tsx b/src/pages/homepage/index.tsx index 4cbbb33..8446301 100644 --- a/src/pages/homepage/index.tsx +++ b/src/pages/homepage/index.tsx @@ -1,4 +1,4 @@ -import FormButton from "../../components/button"; + import { useContext } from "react"; import { AuthContext } from "../../contexts/Auth/AuthLogin/AuthContext"; import { useNavigate } from "react-router-dom"; diff --git a/src/pages/menu/index.tsx b/src/pages/menu/index.tsx index 89f57c3..833f0ef 100644 --- a/src/pages/menu/index.tsx +++ b/src/pages/menu/index.tsx @@ -1,12 +1,35 @@ - +import Item from "../../components/Item"; +import imgPen from "../../assets/icons/pen.png"; +import { SubCategory } from "../../components/Subcategory"; import Category from "../../components/Category"; +import MenuHeader from "../../components/MenuHeader"; +import { ButtonDelete } from "../../components/Delete"; + +export default function Menu() { + return ( +
+ + +
+ + +
-export default function MenuPage(){ - return( - <> - - - - - ) + +
+ +
+ +
+
+ +
+
+ ); } \ No newline at end of file diff --git a/src/pages/signup/index.tsx b/src/pages/signup/index.tsx index 9453868..12ff0db 100644 --- a/src/pages/signup/index.tsx +++ b/src/pages/signup/index.tsx @@ -1,9 +1,8 @@ import { useForm, SubmitHandler } from "react-hook-form"; import { Link } from "react-router-dom"; -import { FormButtonBack } from "../../components/button/ButtonBack"; -import FormButtonForward from "../../components/button/ButtonForward"; import { segmentsArray } from "./data"; + type FormValues = { name: string; email: string; diff --git a/src/routes/index.tsx b/src/routes/index.tsx index aad9ddf..7c1470e 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -1,12 +1,11 @@ import { Routes, Route, Link } from "react-router-dom"; import { RequireAuth } from "../contexts/Auth/AuthLogin/RequireAuth"; -import FirstStablishmentSignup from "../pages/firstStablishmentSignup"; -import Home from "../pages/Homepage"; +import Home from "../pages/homepage"; import Login from "../pages/Login"; import MenuPage from "../pages/MenuPage"; -import SecondStablishmentSignup from "../pages/SecondStablishmentSignup"; +import SecondStablishmentSignup from "../pages/secondStablishmentSignup"; import Signup from "../pages/Signup"; -import SuccessfulRegistration from "../pages/SuccessfulRegistration"; +import SuccessfulRegistration from "../pages/successfulRegistration"; export default function RoutesComponent() { return ( @@ -33,4 +32,4 @@ export default function RoutesComponent() { }> ); -} +} \ No newline at end of file