Skip to content

Commit 83168dc

Browse files
committed
add a basic landing page text
1 parent f727980 commit 83168dc

File tree

3 files changed

+36
-26
lines changed

3 files changed

+36
-26
lines changed

src/ui/components/AppShell/index.tsx

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -194,26 +194,28 @@ const AcmAppShell: React.FC<AcmAppShellProps> = ({
194194
<AppShell.Header>
195195
<HeaderNavbar />
196196
</AppShell.Header>
197-
<AppShell.Navbar p="sm">
198-
<AppShell.Section grow>
199-
<SidebarNavItems items={navItems} visible={showSidebar} active={active} />
200-
<br />
201-
<Divider label="Other Services" />
202-
<SidebarNavItems items={extLinks} visible={showSidebar} active={active} />
203-
<Group hiddenFrom="sm">
204-
<Divider />
205-
<AuthenticatedProfileDropdown userData={userData || {}} />
206-
</Group>
207-
</AppShell.Section>
208-
<AppShell.Section>
209-
<Text size="xs" fw={500}>
210-
&copy; {new Date().getFullYear()} ACM @ UIUC
211-
</Text>
212-
<Text size="xs" fw={500}>
213-
Revision <code>{getCurrentRevision()}</code>
214-
</Text>
215-
</AppShell.Section>
216-
</AppShell.Navbar>
197+
{showSidebar && (
198+
<AppShell.Navbar p="sm">
199+
<AppShell.Section grow>
200+
<SidebarNavItems items={navItems} visible={showSidebar} active={active} />
201+
<br />
202+
<Divider label="Other Services" />
203+
<SidebarNavItems items={extLinks} visible={showSidebar} active={active} />
204+
<Group hiddenFrom="sm">
205+
<Divider />
206+
<AuthenticatedProfileDropdown userData={userData || {}} />
207+
</Group>
208+
</AppShell.Section>
209+
<AppShell.Section>
210+
<Text size="xs" fw={500}>
211+
&copy; {new Date().getFullYear()} ACM @ UIUC
212+
</Text>
213+
<Text size="xs" fw={500}>
214+
Revision <code>{getCurrentRevision()}</code>
215+
</Text>
216+
</AppShell.Section>
217+
</AppShell.Navbar>
218+
)}
217219
<AppShell.Main>
218220
{showLoader ? (
219221
<LoadingOverlay

src/ui/components/Navbar/Logo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const LogoBadge: React.FC<LogoBadgeProps> = ({ size, linkTo, showText })
4545
/>
4646
{showText
4747
? isNonProd && runEnv
48-
? `Management Portal ${runEnv.toUpperCase()} ENV`
48+
? `Management Portal ${runEnv.toUpperCase().replace('LOCAL-DEV', 'DEV')} ENV`
4949
: 'Management Portal'
5050
: null}
5151
</Link>

src/ui/pages/Home.page.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
import React from 'react';
22

33
import { AcmAppShell } from '@ui/components/AppShell';
4+
import { Title, Text } from '@mantine/core';
5+
import { useAuth } from '@ui/components/AuthContext';
46

5-
export const HomePage: React.FC = () => (
6-
<>
7-
<AcmAppShell>{null}</AcmAppShell>
8-
</>
9-
);
7+
export const HomePage: React.FC = () => {
8+
const { userData } = useAuth();
9+
return (
10+
<>
11+
<AcmAppShell showSidebar={true}>
12+
<Title order={1}>Welcome, {userData?.name?.split(' ')[0]}!</Title>
13+
<Text>Navigate the ACM @ UIUC Management Portal using the links in the menu bar.</Text>
14+
</AcmAppShell>
15+
</>
16+
);
17+
};

0 commit comments

Comments
 (0)