Merge pull request #40 from AlexandrePereon/fix/global

fix/cancel
AlexandrePereon · Apr 10, 2024 · 06f3aa3 · 06f3aa3
2 parents 394cf88 + 0847506
commit 06f3aa3
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 10 deletions.
diff --git a/src/components/BrandCard/brandCard.js b/src/components/BrandCard/brandCard.js
@@ -32,7 +32,7 @@ import React from "react";
               </div>
 
 
-              <div className=" items-center justify-center p-2.5 sm:flex xl:p-5">
+              <div className="items-center justify-center p-2.5 sm:flex xl:p-5">
                  {children}
               </div>
             </div>

diff --git a/src/components/Collapse/collapse.js b/src/components/Collapse/collapse.js
@@ -37,7 +37,7 @@ const Collapse = ({title, handleOnChange, submissionTunnelFormListArticle, resta
         <p>Aucun article</p> 
 
     return(
-        <div className="collapse collapse-plus rounded-sm border border-stroke bg-white px-5 pt-6 pb-2.5 shadow-default sm:px-7.5 xl:pb-1">
+        <div className="collapse collapse-plus rounded-sm border border-stroke bg-white sm:px-5 pt-6 pb-2.5 shadow-default sm:px-7.5 xl:pb-1">
             <input type="checkbox" /> 
             <div className="collapse-title mb-6 text-xl font-semibold text-black">
                 {title}

diff --git a/src/components/MyAccountForm/MyProductsAccountList.js b/src/components/MyAccountForm/MyProductsAccountList.js
@@ -19,6 +19,8 @@ const MyProductsAccountList = ({restaurantId}) => {
     const handleSetPagination = (value, type) => {
         if((value>0) && (value<=maxPageArticles)){
             type === "article" &&  setPaginationArticles(value)
+        }
+        if((value>0) && (value<=maxPageMenus)){
             type === "menu" &&  setPaginationMenus(value)
         }
     }

diff --git a/src/components/SubmissionTunnel/submissionTunnel.js b/src/components/SubmissionTunnel/submissionTunnel.js
@@ -4,7 +4,6 @@ import Tab from "../../components/Tab/tab";
 import TitleFade from "../../components/TitleFade/titleFade";
 import Collapse from "../../components/Collapse/collapse";
 import Input from "../../components/Input/input";
-import Loader from "../../components/Loader/loader";
 import usePostRestaurantArticle from "../../hooks/data/post/usePostRestaurantArticle";
 import usePostRestaurantMenu from "../../hooks/data/post/usePostRestaurantMenu";
 import productFormData from "../../formData/productFormData";
@@ -75,6 +74,7 @@ const SubmissionTunnel = ({restaurantId}) => {
                     <Input 
                         title={item.title[steps]} 
                         handleOnChange={handleInputChange} 
+                        defaultValue={item.value}
                         id={item.id} 
                         type={item.type} 
                         size={item.size}
@@ -113,7 +113,7 @@ const SubmissionTunnel = ({restaurantId}) => {
                 {submissionTunnelFormInput}
             </div>
             <div className="mt-6 flex items-center justify-end gap-x-6 pb-2">
-                {isLoading ? <Loader/> : <ButtonValidationForm title="Ajouter" isLoading={isLoading} size={"w-small"}/>} 
+                <ButtonValidationForm title="Ajouter" isLoading={isLoading} size={"w-small"}/> 
             </div>
         </form>
     )

diff --git a/src/hooks/data/post/useCancelOrder.js b/src/hooks/data/post/useCancelOrder.js
@@ -9,7 +9,7 @@ const useCancelOrder = () => {
     const handleCancelOrder = async (orderId, refetch) => {
         setIsLoading(true);
         try {
-            const response = await axiosReq.put(`${process.env.REACT_APP_API_PREFIX_ORDER}cancel/`,{
+            const response = await axiosReq.delete(`${process.env.REACT_APP_API_PREFIX_ORDER}cancel/`,{
                 orderId : orderId
             });
             if (response) {

diff --git a/src/hooks/data/post/usePostRestaurantArticle.js b/src/hooks/data/post/usePostRestaurantArticle.js
@@ -13,7 +13,7 @@ const usePostRestaurantArticle = () => {
     const [isLoading, setIsLoading] = useState(false);
     const [message, setMessage] = useState({ code: null, description: null });
 
-    const handleSubmitArticle = async (formData) => {
+    const handleSubmitArticle = async (formData, resetFormData) => {
         setIsLoading(false);
         try {
             const response = await axiosReq.post(`${process.env.REACT_APP_API_PREFIX_RESTAURANT}article/create`, {
@@ -25,6 +25,7 @@ const usePostRestaurantArticle = () => {
             if (response) {
                 setMessage({ code: response.status, description: response.data.message });
                 setIsLoading(false);
+                window.location.reload();
             }
         } catch (error) {
             setMessage({ code: error.response.status, description: error.response.data.message });

diff --git a/src/hooks/data/post/usePostRestaurantMenu.js b/src/hooks/data/post/usePostRestaurantMenu.js
@@ -13,7 +13,7 @@ const usePostRestaurantMenu = () => {
     const [isLoading, setIsLoading] = useState(false);
     const [message, setMessage] = useState({ code: null, description: null });
 
-    const handleSubmitMenu = async (formData) => {
+    const handleSubmitMenu = async (formData, resetFormData) => {
         setIsLoading(false);
         try {
             const response = await axiosReq.post(`${process.env.REACT_APP_API_PREFIX_RESTAURANT}menu/create`, {
@@ -26,6 +26,7 @@ const usePostRestaurantMenu = () => {
             if (response) {
                 setMessage({ code: response.status, description: response.data.message });
                 setIsLoading(false);
+                window.location.reload();
             }
         } catch (error) {
             setMessage({ code: error.response.status, description: error.response.data.message });

diff --git a/src/pages/RestaurantPages/addProductPage.js b/src/pages/RestaurantPages/addProductPage.js
@@ -15,7 +15,7 @@ const AddProductPage = () => {
     return (
         <Fragment>
             <Header role={userInfosFromSessionStorage?.role}/>
-            <div className="w-4/6 m-auto">
+            <div className="sm:w-4/6 m-auto">
                 <SubmissionTunnel restaurantId={userInfosFromSessionStorage.restaurant || userInfosData?.restaurant}/>
             </div>
             <Footer/>

diff --git a/src/pages/historyOrderPage.js b/src/pages/historyOrderPage.js
@@ -48,7 +48,7 @@ const HistoryOrderPage = () => {
     return (
         <Fragment>
             <Header role={userInfos?.role}/>
-            <div className="sm:w-page m-auto pb-10 h-screen">
+            <div className="lg:w-page m-auto pb-10 h-screen">
                 <Tab partsName={parts} steps={steps} handleOnSwitchSteps={handleOnSwitchSteps}/>
                 {content[steps]}
             </div>

diff --git a/src/pages/myAccountPage.js b/src/pages/myAccountPage.js
@@ -36,7 +36,7 @@ const MyAccountPage = () => {
     return (
         <Fragment>
             <Header role={userInfosData?.role}/>
-            <div className="sm:w-page m-auto pb-10 h-screen">
+            <div className="sm:w-page m-auto pb-10 h-min-screen">
             {userInfosData?.role === "restaurant" && 
                 <Tab 
                     steps={steps}
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ import React from "react"; @@
                   </div>
-                  <div className=" items-center justify-center p-2.5 sm:flex xl:p-5">
+                  <div className="items-center justify-center p-2.5 sm:flex xl:p-5">
                      {children}
                   </div>
                 </div>
@@ Expand Down @@