Merge pull request #46 from AlexandrePereon/fix/global

Fix/global
AlexandrePereon · Apr 11, 2024 · 4cfafb3 · 4cfafb3
2 parents 24ed40a + 4f0e057
commit 4cfafb3
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 18 deletions.
diff --git a/src/components/Card/card.js b/src/components/Card/card.js
@@ -3,14 +3,12 @@ import React from "react";
 const Card = ({isLoading, image, title, description, price, children}) => {
 
     return(
-        <div className="card bg-base-100 shadow-xl mr-1 w-fit">
-            <figure className={`${isLoading && "skeleton"} h-40`}>
-               {!isLoading && <img src={image} alt="" className="w-x-large h-auto" />}
-            </figure>
-            <div className={`${isLoading && "skeleton"} card-body indicator`}>
+        <div className="card bg-base-100 shadow-xl mr-1">
+               {!isLoading && <img src={image} alt="" className="rounded-t-xl w-full h-36 object-cover" />}
+            <div className={`${isLoading && "skeleton"} m-auto card-body indicator`}>
                 {price >= 0 && <span className="text-white indicator-item indicator-top p-2 w-fit h-fit indicator-center badge">{price} €</span>}
                 <h2 className={`${isLoading && "skeleton"} `}>{title}</h2>
-                <p className={`${isLoading && "skeleton"} text-xs`}>{description}</p>
+                <p className={`${isLoading && "skeleton"} text-xs w-36`}>{description}</p>
                 <div className="card-actions justify-end">
                     {children}
                 </div>

diff --git a/src/components/CardList/cardList.js b/src/components/CardList/cardList.js
@@ -5,7 +5,7 @@ const CardList = ({children, pagination, handleSetPagination, maxPagination, typ
 
     return(
         <Fragment>
-            <div className="flex overflow-x-auto lg:overflow-x-visible ">
+            <div className="flex sm:justify-center overflow-x-auto lg:overflow-x-visible ">
                 {children}
             </div>
             <Pagination 

diff --git a/src/components/ModificationProductForm/modificationProductForm.js b/src/components/ModificationProductForm/modificationProductForm.js
@@ -65,7 +65,7 @@ const ModificationProductForm = ({restaurantId, productData, formData, handleSet
                 {alertBanner && alertBanner}
                 {modificationProductFormInput}
                 <div className="mt-6 flex items-center justify-end gap-x-6 pb-2">
-                    <ButtonValidationForm size={"w-small"} title={"Valider"} isLoading={isLoading}/>
+                    <ButtonValidationForm size={"w-fit"} title={"Valider"} isLoading={isLoading}/>
                 </div>
             </form>
     )

diff --git a/src/components/MyAccountForm/myAccountForm.js b/src/components/MyAccountForm/myAccountForm.js
@@ -74,7 +74,7 @@ const MyAccountForm = ({userInfosData}) => {
                 </div>
                 {!isEditable && <div>Vous avez parrainé {userInfosData.partnerNumber} personne{userInfosData.partnerNumber>1 && "s"}</div>}
                {isEditable && <div className="mt-6 flex items-center justify-end gap-x-6">
-                    <ButtonValidationForm isLoading={isLoadingModificationUserInfos} size={"w-small"} title={"Sauvegarder"}/>
+                    <ButtonValidationForm isLoading={isLoadingModificationUserInfos} size={"w-fit"} title={"Sauvegarder"}/>
                 </div>}
             </form>
         </Fragment>

diff --git a/src/components/MyAccountForm/myRestaurantAccountForm.js b/src/components/MyAccountForm/myRestaurantAccountForm.js
@@ -71,7 +71,7 @@ const MyRestaurantAccountForm = ({restaurantId}) => {
                     {inputs}
                 </div>
                {isEditable && <div className="mt-6 flex items-center justify-end gap-x-6">
-                    <ButtonValidationForm isLoading={isLoadingModificationRestaurantInfos} size={"w-small"} title={"Sauvegarder"}/>
+                    <ButtonValidationForm isLoading={isLoadingModificationRestaurantInfos} size={"w-fit"} title={"Sauvegarder"}/>
                 </div>}
             </form>
         </Fragment>

diff --git a/src/components/ProductRestaurantForm/productRestaurantForm.js b/src/components/ProductRestaurantForm/productRestaurantForm.js
@@ -71,7 +71,7 @@ const ProductRestaurantForm = ({restaurantId}) => {
         }
     };
     return(
-        <div className="sm:w-3/4 m-auto">
+        <Fragment>
             <TitleFade title="Liste articles :"/>
             {maxPageArticles === null ? "Aucun article" : <CardList 
                 pagination={paginationArticles}
@@ -82,7 +82,7 @@ const ProductRestaurantForm = ({restaurantId}) => {
                 {articlesData && articlesData.map((item, index)=>
                     <Card
                     title={item.name}
-                    description={item.description}
+                    description={item.description.length > 100 ? item.description.substring(0, 100) + "..." : item.description}
                     image={item.image}
                     price={item.price}
                     key={index}
@@ -106,7 +106,7 @@ const ProductRestaurantForm = ({restaurantId}) => {
                 {menusData && menusData.map((item, index)=>
                     <Card
                     title={item.name}
-                    description={item.description}
+                    description={item.description.length > 100 ? item.description.substring(0, 100) + "..." : item.description}
                     image={item.image}
                     price={item.price}
                     key={index}
@@ -124,7 +124,7 @@ const ProductRestaurantForm = ({restaurantId}) => {
                     order={shoppingCart} 
                     restaurantId={restaurantId}
                 />
-        </div>
+        </Fragment>
     );
 }
 

diff --git a/src/components/SubmissionTunnel/submissionTunnel.js b/src/components/SubmissionTunnel/submissionTunnel.js
@@ -113,7 +113,7 @@ const SubmissionTunnel = ({restaurantId}) => {
                 {submissionTunnelFormInput}
             </div>
             <div className="mt-6 flex items-center justify-end gap-x-6 pb-2">
-                <ButtonValidationForm title="Ajouter" isLoading={isLoading} size={"w-small"}/> 
+                <ButtonValidationForm title="Ajouter" isLoading={isLoading} size={"w-fit"}/> 
             </div>
         </form>
     )

diff --git a/src/formData/userInfosFormData.js b/src/formData/userInfosFormData.js
@@ -27,7 +27,7 @@ const userInfosFormData = [
     {
     title : "Code parrain",
     type : "partnerCode",
-    size : "w-small",
+    size : "w-medium",
     id : "partnerCode"}
 ]
 

diff --git a/src/pages/RestaurantPages/restaurantPage.js b/src/pages/RestaurantPages/restaurantPage.js
@@ -30,8 +30,8 @@ const RestaurantPage = () => {
                 <div className="sm:w-page m-auto pb-10">
                     <TitleFade title={restaurantData.name}/>
                     <p className="text-black">{restaurantData.description}</p>
-                </div>
                 <ProductRestaurantForm restaurantId={id}/> 
+                </div>
 
             </Fragment>  
             }

diff --git a/src/pages/restaurantsSelectionPage.js b/src/pages/restaurantsSelectionPage.js
@@ -43,7 +43,7 @@ const RestaurantsSelectionPage = () => {
                             restaurantsData && restaurantsData.map((item, index)=>
                             <Card
                             title={item.name}
-                            description={item.description}
+                            description={item.description.length > 100 ? item.description.substring(0, 100) + "..." : item.description}
                             image={item.image}
                             key={index}
                             >