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.

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

Home component description jason #67

Merged
merged 4 commits into from
Jul 30, 2024
+113 −0
Merged

Home component description jason #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82cdf82
Rough content added - still have to do CSS
jaspeng6 Jul 27, 2024
e93bd8a
left-column designed
jaspeng6 Jul 29, 2024
4daee65
implemented home component
jaspeng6 Jul 29, 2024
7b9a960
Merge remote-tracking branch 'origin/main' into home-component-descri…
ylei532 Jul 30, 2024
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
Binary file added frontend/public/ASPA Title.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions frontend/src/app/home/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import PastEvents from "@/ui/PastEvents";
import Description from "@/ui/home/Description";

export default function Home() {
return (
<div>
<section id="description">
<Description/>
</section>
<section id="past-events">
<PastEvents/>
</section>
Expand Down
84 changes: 84 additions & 0 deletions frontend/src/ui/home/Description.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
.container {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 30px;
color: #FBF5F0;
width: 75%;
margin: 0 auto;
margin-top: 90px;
}

.leftColumn {
display: flex;
flex-direction: column;
overflow: hidden;
}

.rightColumn {
display: flex;
flex-direction: column;
align-items: center;
}

.title {
font-size: 60px;
margin-bottom: 15px;
font-weight: bold;
line-height: 1.1;
overflow: hidden;
}

.image {
width: 100%;
height: auto;
margin-bottom: 16px;

}

.buttonContainer {
display: flex;
justify-content: space-between;
width: 75%;
font-size: 20px;
}

.eventsButton {
padding: 8px 16px;
cursor: pointer;
border-radius: 20px;
background-color: #DD995B;
font-weight: 600;
margin: 15px 0;
color: #FBF5F0;
}

.horizontalAligned {
display: flex;
gap: 20px;
align-items: center;
color: #DD995B;
}

.regButton {
padding: 8px 16px;
cursor: pointer;
border-radius: 20px;
background-color: #87562A;
margin: 15px 0;
color: #FBF5F0;
width: 150px;
border-width: 2PX;

}

.logButton {
padding: 8px 16px;
cursor: pointer;
border-radius: 20px;
background-color: #DD995B;
margin: 15px 0;
color: #FBF5F0;
width: 150px;
border-width: 2PX;
}

25 changes: 25 additions & 0 deletions frontend/src/ui/home/Description.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import styles from "./Description.module.css";

export default function Description() {
return (
<div className={styles.container}>
<div className={styles.leftColumn}>
<h1 className={styles.title}>Welcome to Auckland Student Pool Association!</h1>
<p>
Leque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, Leque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, Leque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur,
</p>
<div className={styles.horizontalAligned}>
<button className={styles.eventsButton}>Current Events</button>
<p>dolor sit amet, consectetur,</p>
</div>
</div>
<div className={styles.rightColumn}>
<img src="/ASPA Title.png" alt="Association Image" className={styles.image}/>
<div className={styles.buttonContainer}>
<button className={styles.regButton}>REGISTER</button>
<button className={styles.logButton}>LOGIN</button>
</div>
</div>
</div>
);
}
Loading