diff --git a/front/app/orgs/[orgslug]/(withmenu)/layout.tsx b/front/app/orgs/[orgslug]/(withmenu)/layout.tsx index f26f3813..2237ed06 100644 --- a/front/app/orgs/[orgslug]/(withmenu)/layout.tsx +++ b/front/app/orgs/[orgslug]/(withmenu)/layout.tsx @@ -2,12 +2,11 @@ import "@styles/globals.css"; import { Menu } from "@components/Objects/Menu/Menu"; import AuthProvider from "@components/Security/AuthProvider"; -export default async function RootLayout({ children, params }: { children: React.ReactNode , params:any}) { - +export default async function RootLayout({ children, params }: { children: React.ReactNode , params :any}) { return ( <> - + {children} diff --git a/front/components/Objects/Menu/Menu.tsx b/front/components/Objects/Menu/Menu.tsx index 8a54f404..441703cb 100644 --- a/front/components/Objects/Menu/Menu.tsx +++ b/front/components/Objects/Menu/Menu.tsx @@ -1,12 +1,10 @@ 'use client'; import React from "react"; -import useSWR from "swr"; import Link from "next/link"; -import { getAPIUrl, getBackendUrl, getUriWithOrg } from "@services/config/config"; +import { getUriWithOrg } from "@services/config/config"; import { getOrganizationContextInfo } from "@services/organizations/orgs"; import ClientComponentSkeleton from "@components/Utils/ClientComp"; import { HeaderProfileBox } from "@components/Security/HeaderProfileBox"; -import { swrFetcher } from "@services/utils/ts/requests"; import MenuLinks from "./MenuLinks"; import { getOrgLogoMediaDirectory } from "@services/media/media"; @@ -23,33 +21,35 @@ export const Menu = async (props: any) => { }}> -
-
- -
- {org?.logo ? ( - Learnhouse - ) : ( - - )} -
- -
-
- - - +
+
+
+ +
+ {org?.logo ? ( + Learnhouse + ) : ( + + )} +
+ +
+
+ + + -
-
- - - +
+
+ + + +
diff --git a/front/components/Security/HeaderProfileBox.tsx b/front/components/Security/HeaderProfileBox.tsx index bb7eea94..441f72ca 100644 --- a/front/components/Security/HeaderProfileBox.tsx +++ b/front/components/Security/HeaderProfileBox.tsx @@ -43,7 +43,6 @@ export const HeaderProfileBox = () => { }; const AccountArea = styled.div` - padding-right: 20px; display: flex; place-items: center;