yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'cleanup work' (#421) from chore/fixes into main

Browse Source
This commit is contained in:
clan-bot
2023-10-08 15:26:08 +00:00
parent 2874cf3bdb 5483018783
commit 4fa2056834
3 changed files with 20 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/ui/src/app/layout.tsx
View File

@@ -20,7 +20,6 @@ import { darkTheme, lightTheme } from "./theme/themes";
import Background from "@/components/background"; import Background from "@/components/background";
import { AppContext, WithAppState } from "@/components/hooks/useAppContext"; import { AppContext, WithAppState } from "@/components/hooks/useAppContext";
// import { usePathname, redirect } from "next/navigation";
const roboto = localFont({ const roboto = localFont({
src: [ src: [
@@ -37,17 +36,6 @@ axios.defaults.baseURL = "http://localhost:2979";
// add negative margin for smooth transition to fill the space of the sidebar // add negative margin for smooth transition to fill the space of the sidebar
const translate = tw`lg:-ml-64 -ml-14`; const translate = tw`lg:-ml-64 -ml-14`;
// const AutoRedirectEffect = () => {
// const { isLoading, data } = useAppState();
// const pathname = usePathname();
// React.useEffect(() => {
// if (!isLoading && !data.isJoined && pathname !== "/") {
// redirect("/");
// }
// }, [isLoading, data, pathname]);
// return <></>;
// };
export default function RootLayout({ export default function RootLayout({
children, children,
}: { }: {
@@ -55,38 +43,15 @@ export default function RootLayout({
}) { }) {
const userPrefersDarkmode = useMediaQuery("(prefers-color-scheme: dark)"); const userPrefersDarkmode = useMediaQuery("(prefers-color-scheme: dark)");
// const theme = useTheme({});
// const is_small = useMediaQuery(theme.breakpoints.down("sm"));
// const [useDarkTheme, setUseDarkTheme] = useState(false);
const [showSidebar, setShowSidebar] = React.useState(true); const [showSidebar, setShowSidebar] = React.useState(true);
// If the screen is small, hide the sidebar
// useEffect(() => {
// if (is_small) {
// setShowSidebar(false);
// } else {
// setShowSidebar(true);
// }
// }, [is_small]);
// useEffect(() => {
// if (useDarkTheme !== userPrefersDarkmode) {
// // Enable dark theme if the user prefers dark mode
// setUseDarkTheme(userPrefersDarkmode);
// }
// }, [userPrefersDarkmode, useDarkTheme, setUseDarkTheme]);
// const changeThemeHandler = (target: ChangeEvent, currentValue: boolean) => {
// setUseDarkTheme(currentValue);
// };
return ( return (
<html lang="en"> <html lang="en">
<head> <head>
<title>Clan.lol</title> <title>Clan.lol</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="Clan.lol - build your own network" /> <meta name="description" content="Clan.lol - build your own network" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="favicon.ico" sizes="any" />
</head> </head>
<StyledEngineProvider injectFirst> <StyledEngineProvider injectFirst>
<ThemeProvider theme={userPrefersDarkmode ? darkTheme : lightTheme}> <ThemeProvider theme={userPrefersDarkmode ? darkTheme : lightTheme}>
@@ -141,7 +106,6 @@ export default function RootLayout({
<div className="px-1"> <div className="px-1">
<div className="relative flex h-full flex-1 flex-col"> <div className="relative flex h-full flex-1 flex-col">
<main> <main>
{/* <AutoRedirectEffect /> */}
<Button <Button
fullWidth fullWidth
onClick={() => { onClick={() => {

5
pkgs/ui/src/app/machines/layout.tsx Normal file
View File

@@ -0,0 +1,5 @@
import { MachineContextProvider } from "@/components/hooks/useMachines";
export default function Layout({ children }: { children: React.ReactNode }) {
return <MachineContextProvider>{children}</MachineContextProvider>;
}

31
pkgs/ui/src/app/page.tsx
View File

@@ -6,7 +6,6 @@ import { Notifications } from "@/components/dashboard/notifications";
import { QuickActions } from "@/components/dashboard/quickActions"; import { QuickActions } from "@/components/dashboard/quickActions";
import { TaskQueue } from "@/components/dashboard/taskQueue"; import { TaskQueue } from "@/components/dashboard/taskQueue";
import { useAppState } from "@/components/hooks/useAppContext"; import { useAppState } from "@/components/hooks/useAppContext";
import { MachineContextProvider } from "@/components/hooks/useMachines";
import { LoadingOverlay } from "@/components/join/loadingOverlay"; import { LoadingOverlay } from "@/components/join/loadingOverlay";
import JoinPrequel from "@/views/joinPrequel"; import JoinPrequel from "@/views/joinPrequel";
@@ -55,24 +54,22 @@ export default function Dashboard() {
} }
if (data.isJoined) { if (data.isJoined) {
return ( return (
<MachineContextProvider> <div className="flex w-full">
<div className="flex w-full"> <div className="grid w-full grid-flow-row grid-cols-3 gap-4">
<div className="grid w-full grid-flow-row grid-cols-3 gap-4"> <div className="row-span-2">
<div className="row-span-2"> <NetworkOverview />
<NetworkOverview />
</div>
<div className="col-span-2">
<AppOverview />
</div>
<div className="row-span-2">
<RecentActivity />
</div>
<QuickActions />
<Notifications />
<TaskQueue />
</div> </div>
<div className="col-span-2">
<AppOverview />
</div>
<div className="row-span-2">
<RecentActivity />
</div>
<QuickActions />
<Notifications />
<TaskQueue />
</div> </div>
</MachineContextProvider> </div>
); );
} }
} }