From 83ec13bdcc5a386a80e9b44684f992e62f890546 Mon Sep 17 00:00:00 2001
From: swve <bdswve@gmail.com>
Date: Sat, 19 Aug 2023 16:08:22 +0200
Subject: [PATCH] feat: menu changes

---
 .../app/orgs/[orgslug]/(withmenu)/layout.tsx  |  5 +-
 front/components/Objects/Menu/Menu.tsx        | 58 +++++++++----------
 .../components/Security/HeaderProfileBox.tsx  |  1 -
 3 files changed, 31 insertions(+), 33 deletions(-)

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 (
     <>
       <AuthProvider>
-        <Menu orgslug={params.orgslug}></Menu>
+        <Menu orgslug={params?.orgslug}></Menu>
         {children}
       </AuthProvider>
     </>
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) => {
                 }}></div>
 
             </div>
-            <div className="backdrop-blur-lg bg-white/90  fixed flex top-0 left-0 right-0 h-[60px] ring-1 ring-inset ring-gray-500/10 items-center px-16 space-x-5 shadow-[0px_4px_16px_rgba(0,0,0,0.03)] z-50">
-                <div className="logo flex ">
-                    <Link href={getUriWithOrg(orgslug, "/")}>
-                        <div className="flex w-auto h-9 rounded-md items-center m-auto py-1 justify-center" >
-                            {org?.logo ? (
-                                <img
-                                    src={`${getOrgLogoMediaDirectory(org.org_id, org?.logo)}`}
-                                    alt="Learnhouse"
-                                    style={{ width: "auto", height: "100%" }}
-                                    className="rounded-md"
-                                />
-                            ) : (
-                                <LearnHouseLogo></LearnHouseLogo>
-                            )}
-                        </div>
-                    </Link>
-                </div>
-                <div className="links flex grow">
-                    <ClientComponentSkeleton>
-                        <MenuLinks orgslug={orgslug} />
-                    </ClientComponentSkeleton>
+            <div className="backdrop-blur-lg bg-white/90  fixed flex top-0 left-0 right-0 h-[60px] ring-1 ring-inset ring-gray-500/10 items-center space-x-5 shadow-[0px_4px_16px_rgba(0,0,0,0.03)] z-50">
+                <div className="flex items-center space-x-5 w-full max-w-screen-2xl mx-auto px-16">
+                    <div className="logo flex ">
+                        <Link href={getUriWithOrg(orgslug, "/")}>
+                            <div className="flex w-auto h-9 rounded-md items-center m-auto py-1 justify-center" >
+                                {org?.logo ? (
+                                    <img
+                                        src={`${getOrgLogoMediaDirectory(org.org_id, org?.logo)}`}
+                                        alt="Learnhouse"
+                                        style={{ width: "auto", height: "100%" }}
+                                        className="rounded-md"
+                                    />
+                                ) : (
+                                    <LearnHouseLogo></LearnHouseLogo>
+                                )}
+                            </div>
+                        </Link>
+                    </div>
+                    <div className="links flex grow">
+                        <ClientComponentSkeleton>
+                            <MenuLinks orgslug={orgslug} />
+                        </ClientComponentSkeleton>
 
-                </div>
-                <div className="profile flex">
-                    <ClientComponentSkeleton>
-                        <HeaderProfileBox />
-                    </ClientComponentSkeleton>
+                    </div>
+                    <div className="profile flex">
+                        <ClientComponentSkeleton>
+                            <HeaderProfileBox />
+                        </ClientComponentSkeleton>
+                    </div>
                 </div>
             </div>
 
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;