Skip to content
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.

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

Filter Admin Only Cards for Home Page #651

Merged
merged 1 commit into from
Oct 8, 2024
Merged
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
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
.content {
margin-left: 2rem;
margin-right: 2rem;
padding-top: 2rem;
}

@media (max-width: 900px) {
.cardsContainer {
display: flex;
Expand Down
46 changes: 22 additions & 24 deletions frontend/src/components/Common/NavigationCard/NavigationCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,28 @@ export default function NavigationCard({ testID, items }: Props): JSX.Element {

return (
<div data-testid={testID}>
<div className={styles.content}>
<Card.Group className={styles.cardsContainer}>
{items.map(
({ header, description, link, adminOnly }) =>
(!isProduction || !adminOnly || hasAdminPermission) && (
<Card key={link}>
<Card.Content>
<Card.Header>{header}</Card.Header>
<Card.Description>{description}</Card.Description>
</Card.Content>
<Card.Content extra>
<div className="ui one buttons">
<Link href={link}>
<Button basic color="blue">
Go To
</Button>
</Link>
</div>
</Card.Content>
</Card>
)
)}
</Card.Group>
</div>
<Card.Group className={styles.cardsContainer}>
{items.map(
({ header, description, link, adminOnly }) =>
(!isProduction || !adminOnly || hasAdminPermission) && (
<Card key={link}>
<Card.Content>
<Card.Header>{header}</Card.Header>
<Card.Description>{description}</Card.Description>
</Card.Content>
<Card.Content extra>
<div className="ui one buttons">
<Link href={link}>
<Button basic color="blue">
Go To
</Button>
</Link>
</div>
</Card.Content>
</Card>
)
)}
</Card.Group>
</div>
);
}
27 changes: 1 addition & 26 deletions frontend/src/components/Homepage/Homepage/Homepage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,18 @@
}

.sectionDescription {
min-height: 6rem;
min-height: 4rem;
margin-bottom: 1rem;
}

.card {
display: flex;
width: 40%;
margin-left: 2rem;
margin-bottom: 2rem;
}

.devCard {
margin-left: 2rem;
margin-bottom: 2rem;
}

@media (max-width: 900px) {
.quickActions {
display: flex;
flex-direction: column;
}

.card {
display: flex;
width: 100%;
margin-top: 2rem;
margin-bottom: 0;
}

.sectionDescription {
min-height: 0;
margin-bottom: 1rem;
}

.quick {
display: flex;
flex-direction: column;
align-items: center;
}
}
41 changes: 4 additions & 37 deletions frontend/src/components/Homepage/Homepage/Homepage.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Link from 'next/link';
import React from 'react';
import { Button, Card, Divider } from 'semantic-ui-react';
import { Divider } from 'semantic-ui-react';
import styles from './Homepage.module.css';

import { NavigationCardItem } from '../../Common/NavigationCard/NavigationCard';
import NavigationCard, { NavigationCardItem } from '../../Common/NavigationCard/NavigationCard';

const everyoneItems: readonly NavigationCardItem[] = [
{
Expand Down Expand Up @@ -37,31 +37,6 @@ const devItems: readonly NavigationCardItem[] = [
}
];

const NavCard = ({
className,
header,
description,
link
}: NavigationCardItem & { className?: string }): JSX.Element => (
<div className={className ? `styles[${className}]` : styles.card}>
<Card key={link}>
<Card.Content>
<Card.Header>{header}</Card.Header>
<Card.Description>{description}</Card.Description>
</Card.Content>
<Card.Content extra>
<div className="ui one buttons">
<Link href={link}>
<Button basic color="blue">
Go To
</Button>
</Link>
</div>
</Card.Content>
</Card>
</div>
);

const Homepage: React.FC = () => (
<div className={styles.Homepage} data-testid="Homepage">
<div className={styles.content}>
Expand All @@ -88,11 +63,7 @@ const Homepage: React.FC = () => (
<p className={styles.sectionDescription}>
Check out your profile or log your attendance at a DTI event!
</p>
<Card.Group className={styles.quick}>
{everyoneItems.map((item) => (
<NavCard key={item.link} {...item} />
))}
</Card.Group>
<NavigationCard items={everyoneItems} />
</div>

<div>
Expand All @@ -105,11 +76,7 @@ const Homepage: React.FC = () => (
profile you use for your subteam.
</b>
</p>
<Card.Group className={styles.quick}>
{devItems.map((item) => (
<NavCard className={styles.devCard} key={item.link} {...item} />
))}
</Card.Group>
<NavigationCard items={devItems} />
</div>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/pages/admin/index.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.content {
margin-left: 2rem;
margin-right: 2rem;
padding-top: 2rem;
}
8 changes: 7 additions & 1 deletion frontend/src/pages/admin/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import NavigationCard, {
NavigationCardItem
} from '../../components/Common/NavigationCard/NavigationCard';

import styles from './index.module.css';

const navCardItems: readonly NavigationCardItem[] = [
{
header: 'Member Information Review',
Expand Down Expand Up @@ -65,5 +67,9 @@ const navCardItems: readonly NavigationCardItem[] = [
}
];

const AdminIndex = (): JSX.Element => <NavigationCard items={navCardItems} />;
const AdminIndex = (): JSX.Element => (
<div className={styles.content}>
<NavigationCard items={navCardItems} />
</div>
);
export default AdminIndex;
5 changes: 5 additions & 0 deletions frontend/src/pages/forms/index.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.content {
margin-left: 2rem;
margin-right: 2rem;
padding-top: 2rem;
}
8 changes: 7 additions & 1 deletion frontend/src/pages/forms/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import NavigationCard, {
NavigationCardItem
} from '../../components/Common/NavigationCard/NavigationCard';

import styles from './index.module.css';

const navCardItems: readonly NavigationCardItem[] = [
{ header: 'Sign-In Form', description: 'Sign in to an event!', link: '/forms/signin' },
{
Expand Down Expand Up @@ -32,5 +34,9 @@ const navCardItems: readonly NavigationCardItem[] = [
}
];

const FormsIndex = (): JSX.Element => <NavigationCard items={navCardItems} />;
const FormsIndex = (): JSX.Element => (
<div className={styles.content}>
<NavigationCard items={navCardItems} />
</div>
);
export default FormsIndex;
Loading