From f80351c770342ee0fd2dfc8ba244048c7ea30b43 Mon Sep 17 00:00:00 2001
From: Tojo Andrianomentsoaniaina <tf.andrianomentsoaniaina@geofit.fr>
Date: Wed, 4 Jan 2023 20:45:45 +0000
Subject: [PATCH] Fix/menu
---
src/components/Hero.tsx | 2 +-
src/components/core/Menu.tsx | 15 +++++++--------
src/components/core/MenuMobile.tsx | 10 +++++-----
src/pages-doc/doc/core/menu.tsx | 2 +-
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/components/Hero.tsx b/src/components/Hero.tsx
index 3f7c323..5b2994a 100644
--- a/src/components/Hero.tsx
+++ b/src/components/Hero.tsx
@@ -60,7 +60,7 @@ const Hero = (props: Props) => {
} = props
return (
- <div className="hero min-h-screen bg-[url('../images/fond.png')]">
+ <div className="hero min-h-screen bg-[url('../images/fond.png')] -z-10">
{/* <div className="hero-overlay bg-opacity-60"></div> */}
<div className="hero-content text-center text-neutral-content">
<div className="max-w-4xl">
diff --git a/src/components/core/Menu.tsx b/src/components/core/Menu.tsx
index ff25b39..ec7ab5e 100644
--- a/src/components/core/Menu.tsx
+++ b/src/components/core/Menu.tsx
@@ -33,9 +33,7 @@ const Menu = (props: Imenu) => {
query {
directus {
menus(
- filter: {
- status: { _eq: "published" }
- }
+ filter: {status: {_eq: "published"}}
) {
name
...MenusRecursive
@@ -57,8 +55,9 @@ const Menu = (props: Imenu) => {
return (
<li key={idx}>
<Link
- to="#"
- activeClassName="text-neutral-content hover:bg-submenu active:bg-allsubmenu z-50"
+ to={(itemChild.url) ? itemChild.url : ( (itemChild.page?.slug) ? itemChild.page?.slug : "#" )}
+ activeClassName="text-accent-content hover:bg-submenu active:bg-allsubmenu z-50"
+ className="text-accent-content"
>
{itemChild.name}
</Link>
@@ -72,12 +71,12 @@ const Menu = (props: Imenu) => {
return (
<>
- {/* MENU MOBILE */}
+ {/* MENU standart */}
<ul className={`menu menu-horizontal p-0 ${className}`}>
{menu?.map((item: any, key: number) => {
return (
<li key={key}>
- <Link to="#">
+ <Link to={(item.url) ? item.url : ((item.page?.slug) ? item.page?.slug : "#")}>
{item.name}
{item?.children.length > 0 && (
<svg
@@ -96,7 +95,7 @@ const Menu = (props: Imenu) => {
)
})}
</ul>
- {/* END MENU MOBILE */}
+ {/* END MENU standart */}
</>
)
}
diff --git a/src/components/core/MenuMobile.tsx b/src/components/core/MenuMobile.tsx
index dd487de..45acd05 100644
--- a/src/components/core/MenuMobile.tsx
+++ b/src/components/core/MenuMobile.tsx
@@ -54,8 +54,8 @@ const MenuMobile = () => {
return (
<li key={idx}>
<Link
- to="#"
- activeClassName="text-neutral-content hover:bg-submenu active:bg-allsubmenu z-50"
+ to={(itemChild.url) ? itemChild.url : ( (itemChild.page?.slug) ? itemChild.page?.slug : "#" )}
+ activeClassName=" hover:bg-submenu active:bg-allsubmenu z-50"
>
{itemChild.name}
</Link>
@@ -69,7 +69,7 @@ const MenuMobile = () => {
return (
<>
- {/* MENU CLASSIQUE */}
+ {/* MENU Mobile */}
<ul
tabIndex={0}
className="menu menu-compact dropdown-content mt-3 p-2 shadow bg-base-100 rounded-box w-52 z-50"
@@ -77,7 +77,7 @@ const MenuMobile = () => {
{menu.map((item: any, key: number) => {
return (
<li key={key}>
- <Link to="#">
+ <Link to={(item.url) ? item.url : ((item.page?.slug) ? item.page?.slug : "#")}>
{item.name}
{(item?.children.length > 0) && (
<svg
@@ -96,7 +96,7 @@ const MenuMobile = () => {
)
})}
</ul>
- {/* END MENU CLASSIQUE */}
+ {/* END MENU Mobile */}
</>
)
}
diff --git a/src/pages-doc/doc/core/menu.tsx b/src/pages-doc/doc/core/menu.tsx
index 8371813..dea62b1 100644
--- a/src/pages-doc/doc/core/menu.tsx
+++ b/src/pages-doc/doc/core/menu.tsx
@@ -21,7 +21,7 @@ const menu = () => {
query MyQuery {
directus {
- menus(filter: {name: {_eq: "Header"}}) {
+ menus(status: {_eq: "published"}) {
children {
url
name
--
GitLab