Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 15 additions & 21 deletions js/src/app/_component/AboutUs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export default function AboutUs() {
};

return (
<>
<Flex direction={"row"} h={"92vh"} w={"98vw"} visibleFrom="lg">
<Box mx="-lg">
<Flex direction={"row"} h={"92vh"} w={"100%"} visibleFrom="lg">
<Flex
align={"center"}
justify={"center"}
Expand All @@ -51,11 +51,7 @@ export default function AboutUs() {
Level Up Your Coding with
</Title>
<Title order={3}>Patina's LeetCode Challenge!</Title>
<div
style={{
padding: "1rem",
}}
>
<Box p="xs">
<Center>
<Group gap="sm">
<Button variant="white" onClick={scrollToSection}>
Expand All @@ -66,7 +62,7 @@ export default function AboutUs() {
</Link>
</Group>
</Center>
</div>
</Box>
</Flex>
<Flex
align={"center"}
Expand All @@ -81,8 +77,8 @@ export default function AboutUs() {
</Box>
</Flex>
</Flex>
<Flex h={"80vh"} w={"100vw"} hiddenFrom="lg">
<Stack align={"center"} justify={"center"} h={"100%"} w={"100vw"}>
<Flex h={"80vh"} w={"100%"} hiddenFrom="lg">
<Stack align={"center"} justify={"center"} h={"100%"} w={"100%"}>
<Badge
variant={"gradient"}
gradient={{ from: "green", to: "cyan", deg: 90 }}
Expand All @@ -91,15 +87,11 @@ export default function AboutUs() {
>
Celebrating CodeBloom's 1 Year Anniversary! 🎉
</Badge>
<Title order={5} style={{ color: "#4cffb0", alignItems: "center" }}>
<Title order={5} style={{ color: "#4cffb0" }}>
Level Up Your Coding with
</Title>
<Title order={5}>Patina's LeetCode Challenge!</Title>
<div
style={{
padding: "1rem",
}}
>
<Box p="1rem">
<Center>
<Group gap="sm">
<Button variant="white" onClick={scrollToSection}>
Expand All @@ -110,17 +102,19 @@ export default function AboutUs() {
</Link>
</Group>
</Center>
</div>
</Box>
</Stack>
</Flex>
<Container hiddenFrom={"lg"}>
<CurrentLeaderboardMetadata showClock syntaxStripSize={"lg"} />
<MiniLeaderboardMobile />
</Container>
<SchoolSection />
<div ref={targetSectionRef} style={{ padding: "2rem" }}>
<Box px="lg">
<SchoolSection />
</Box>
<Box p="2rem" ref={targetSectionRef}>
<OurFeatures />
</div>
</>
</Box>
</Box>
);
}
56 changes: 25 additions & 31 deletions js/src/app/dashboard/Dashboard.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import DocumentTitle from "@/components/ui/title/DocumentTitle";
import Toast from "@/components/ui/toast/Toast";
import ToastWithRedirect from "@/components/ui/toast/ToastWithRedirect";
import { useAuthQuery } from "@/lib/api/queries/auth";
import { Center, Flex, Loader, Title } from "@mantine/core";
import { Center, Flex, Loader, Title, Box } from "@mantine/core";
import { useMediaQuery } from "@mantine/hooks";

export default function DashboardPage() {
Expand Down Expand Up @@ -52,38 +52,32 @@ export default function DashboardPage() {
<DocumentDescription
description={`CodeBloom - Refresh your latest submissions`}
/>
<Flex
p={"32px"}
direction={"column"}
gap={"lg"}
style={{
width: "98vw",
minHeight: "90vh",
}}
>
<Center>
<Title order={2}>Dashboard</Title>
</Center>
<Center>
{!data.user.leetcodeUsername ?
<OnboardingLeetcodeUser />
: <RefreshSubmissions schoolRegistered={schoolRegistered} />}
</Center>
<Flex direction={smallPhone ? "row" : "column"} gap={"md"}>
<Flex direction={"column"} flex={1}>
<ProblemOfTheDay />
</Flex>
<Flex direction={"column"} flex={1}>
<DashboardLeaderboard
userId={data.user.id}
userTags={data.user.tags}
/>
</Flex>
<Flex direction={"column"} flex={1}>
<RecentSubmissions userId={data.user.id} />
<Box mx="-lg">
<Flex p={"32px"} direction={"column"} gap={"lg"} w="100%" mih="90vh">
<Center>
<Title order={2}>Dashboard</Title>
</Center>
<Center>
{!data.user.leetcodeUsername ?
<OnboardingLeetcodeUser />
: <RefreshSubmissions schoolRegistered={schoolRegistered} />}
</Center>
<Flex direction={smallPhone ? "row" : "column"} gap={"md"}>
<Flex direction={"column"} flex={1}>
<ProblemOfTheDay />
</Flex>
<Flex direction={"column"} flex={1}>
<DashboardLeaderboard
userId={data.user.id}
userTags={data.user.tags}
/>
</Flex>
<Flex direction={"column"} flex={1}>
<RecentSubmissions userId={data.user.id} />
</Flex>
</Flex>
</Flex>
</Flex>
</Box>
</>
);
}