refactor code to improve readability and maintainability + redesigned announcement bar

This commit is contained in:
daniel31x13
2024-05-22 20:56:56 -04:00
parent 811628a952
commit a498f3a10d
22 changed files with 319 additions and 171 deletions
+13 -20
View File
@@ -1,5 +1,5 @@
import Navbar from "@/components/Navbar";
import AnnouncementBar from "@/components/AnnouncementBar";
import Announcement from "@/components/Announcement";
import Sidebar from "@/components/Sidebar";
import { ReactNode, useEffect, useState } from "react";
import getLatestVersion from "@/lib/client/getLatestVersion";
@@ -33,27 +33,20 @@ export default function MainLayout({ children }: Props) {
};
return (
<>
<div className="flex" data-testid="dashboard-wrapper">
{showAnnouncement ? (
<AnnouncementBar toggleAnnouncementBar={toggleAnnouncementBar} />
<Announcement toggleAnnouncementBar={toggleAnnouncementBar} />
) : undefined}
<div className="flex" data-testid="dashboard-wrapper">
<div className="hidden lg:block">
<Sidebar
className={`fixed ${showAnnouncement ? "top-10" : "top-0"}`}
/>
</div>
<div
className={`w-full sm:pb-0 pb-20 flex flex-col min-h-${
showAnnouncement ? "full" : "screen"
} lg:ml-80 ${showAnnouncement ? "mt-10" : ""}`}
>
<Navbar />
{children}
</div>
<div className="hidden lg:block">
<Sidebar className={`fixed top-0`} />
</div>
</>
<div
className={`w-full sm:pb-0 pb-20 flex flex-col min-h-screen lg:ml-80`}
>
<Navbar />
{children}
</div>
</div>
);
}