Skip to content

Feat/refactor UI #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oxdev03 merged 2 commits into from
Jun 28, 2026
Merged

Feat/refactor UI #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190f9f5
refactor: remove CSS modules in favor of native Mantine components an…
oxdev03 Jun 28, 2026
20ee354
lint and format
oxdev03 Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions apps/dashboard/components/layouts/Dashboard.module.css
View file
Open in desktop

This file was deleted.

35 changes: 18 additions & 17 deletions apps/dashboard/components/layouts/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
import { AppShell } from "@mantine/core";
import { AppShell, Container } from "@mantine/core";
import { useDisclosure } from "@mantine/hooks";
import { ReactNode } from "react";

import { Head } from "../partials/Head";
import { Nav } from "../partials/Nav";
import classes from "./Dashboard.module.css";

export function Dashboard({ children }: { children: ReactNode }) {
const [mobileOpened, { toggle: toggleMobile }] = useDisclosure();

return (
<>
<AppShell
classNames={{
root: classes.appShellRoot,
main: classes.appShellMain,
}}
header={{ height: { base: 40, xs: 60 } }}
navbar={{ width: { base: 40, xs: 75 }, breakpoint: "" }}
padding="md"
>
<Head />
<Nav />
<AppShell.Main>{children}</AppShell.Main>
</AppShell>
</>
<AppShell
header={{ height: 64 }}
navbar={{ width: 80, breakpoint: "sm", collapsed: { mobile: !mobileOpened } }}
padding="xl"
bg="var(--mantine-color-body)"
>
<Head mobileOpened={mobileOpened} toggleMobile={toggleMobile} />
<Nav />
<AppShell.Main display="flex" style={{ flexDirection: "column", minHeight: "100vh" }}>
<Container size="xl" w="100%" flex={1} display="flex" style={{ flexDirection: "column" }}>
{children}
</Container>
</AppShell.Main>
</AppShell>
);
}
42 changes: 0 additions & 42 deletions apps/dashboard/components/partials/Head.module.css
View file
Open in desktop

This file was deleted.

85 changes: 36 additions & 49 deletions apps/dashboard/components/partials/Head.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActionIcon, AppShell, Box, Center, Flex, Group, Modal, rem, Stack } from "@mantine/core";
import { ActionIcon, AppShell, Box, Burger, Center, Flex, Group, Modal, rem, Stack } from "@mantine/core";
import { useDisclosure } from "@mantine/hooks";
import { IProcess } from "@pm2.web/typings";
import { IconCircleFilled, IconDatabaseCog, IconFilterCog, IconLock, IconServerCog } from "@tabler/icons-react";
Expand All @@ -9,9 +9,8 @@ import Access from "@/utils/access";

import { useSelected } from "../context/SelectedProvider";
import { CustomMultiSelect, IItem } from "../misc/MultiSelect/CustomMultiSelect";
import classes from "./Head.module.css";

export function Head() {
export function Head({ mobileOpened, toggleMobile }: { mobileOpened?: boolean; toggleMobile?: () => void }) {
const { servers, selectItem, selectedItem } = useSelected();
const { data: session } = useSession();
const [opened, { open, close }] = useDisclosure(false);
Expand All @@ -36,7 +35,7 @@ export function Head() {
value: server._id,
label: server.name,
status: new Date(server.updatedAt).getTime() > Date.now() - 1000 * 60 ? "online" : "offline",
disabled: !server.processes.some((process) => hasAccess(server._id, process._id)), // check whether user has access to any process
disabled: !server.processes.some((process) => hasAccess(server._id, process._id)),
})) || []
}
onChange={(values) => {
Expand All @@ -45,15 +44,9 @@ export function Head() {
itemComponent={itemComponent}
placeholder="Select Server"
searchable
w={{
md: "25rem",
}}
radius={"md"}
classNames={{
pillsList: classes.values,
}}
w={{ md: "15rem", base: "100%" }}
radius="md"
hidePickedOptions
// zIndex={204}
/>
<CustomMultiSelect
leftSection={<IconDatabaseCog />}
Expand All @@ -79,23 +72,13 @@ export function Head() {
}}
placeholder="Select Process"
searchable
w={{
md: "25rem",
}}
w={{ md: "15rem", base: "100%" }}
maxValues={4}
radius={"md"}
radius="md"
withScrollArea
maxDropdownHeight={200}
classNames={{
pillsList: classes.values,
}}
style={{
zIndex: 204,
}}
comboboxProps={{
position: "bottom",
middlewares: { flip: false, shift: false },
}}
style={{ zIndex: 204 }}
comboboxProps={{ position: "bottom", middlewares: { flip: false, shift: false } }}
hidePickedOptions
/>
</>
Expand All @@ -105,32 +88,36 @@ export function Head() {

return (
<AppShell.Header>
<Modal opened={opened} onClose={close} title="Server/Process Filter" className={classes.modal} zIndex={200}>
<Stack
style={{
zIndex: 203,
}}
>
{MultiSelectItems}
</Stack>
<Modal opened={opened} onClose={close} title="Server/Process Filter" zIndex={200}>
<Stack style={{ zIndex: 203 }}>{MultiSelectItems}</Stack>
</Modal>
<Flex h={"100%"} justify={"space-between"}>
<Group h={"100%"}>
<Center
w={{
base: rem(42),
xs: rem(70),
}}
>
<Image alt="logo" src="/logo.png" width={25} height={25} />
<Flex h="100%" justify="space-between" align="center" pr="xl">
<Group h="100%" gap={0}>
{toggleMobile && <Burger opened={mobileOpened} onClick={toggleMobile} hiddenFrom="sm" size="sm" ml="md" />}
<Center w={80} h="100%">
<Image
alt="logo"
src="/logo.png"
width={30}
height={30}
style={{ filter: "drop-shadow(0px 0px 8px rgba(0,0,0,0.5))" }}
/>
</Center>
</Group>
<Group h={"100%"} justify="right" px={"lg"} className={classes.defaultSelectGroup}>
{MultiSelectItems}
</Group>
<Group h={"100%"} justify="right" px={"xs"} className={classes.filterIcon}>
<ActionIcon variant="light" color="blue" onClick={open}>
<IconFilterCog size={"1.2rem"} />

<Group h="100%" justify="right" gap="md">
<Group display={{ base: "none", lg: "flex" }} gap="md">
{MultiSelectItems}
</Group>
<ActionIcon
variant="light"
color="cyan"
onClick={open}
size="lg"
radius="md"
display={{ base: "flex", lg: "none" }}
>
<IconFilterCog size="1.2rem" />
</ActionIcon>
</Group>
</Flex>
Expand Down
67 changes: 0 additions & 67 deletions apps/dashboard/components/partials/Nav.module.css
View file
Open in desktop

This file was deleted.

Loading
Loading