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

Homepage about section #28

Merged
merged 24 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4b87bd7
Set up structure for homepage
angela139 Sep 5, 2023
ff51517
Merge branch 'main' into angela/homepage-setup
angela139 Sep 5, 2023
4a76537
Added landing card and restructured
angela139 Sep 5, 2023
4f0e9c2
Added starter code for components
angela139 Sep 5, 2023
15a92d7
Fixed the scroll for arrow icon + updated components template code
angela139 Sep 6, 2023
abdd176
Fixing yarn stuff
angela139 Sep 6, 2023
abaf05f
Team cards added to homepage
avVergnet Sep 11, 2023
303f258
I can't believe i'm writing frontend code
nik-dange Sep 11, 2023
42609b4
what am i doing
nik-dange Sep 13, 2023
3faf2cc
bruh
nik-dange Sep 14, 2023
a2320e6
fixed build error?
nik-dange Sep 14, 2023
f14d4a9
perhaps now
nik-dange Sep 14, 2023
4ff7be2
Merge branch 'main' of https://github.com/acmucsd/hack-website into n…
nik-dange Sep 24, 2023
b16b9b4
angela's comments minus images
nik-dange Sep 24, 2023
8f91c06
linting :(
nik-dange Sep 24, 2023
12572c0
cry
nik-dange Sep 25, 2023
f2edb21
angela is the css goat
nik-dange Sep 25, 2023
1290ddf
withering away with this css
nik-dange Sep 25, 2023
2587379
added hackschool image and reworded slightly
nik-dange Sep 26, 2023
75050c7
linting
nik-dange Sep 26, 2023
5fd6357
Merge branch 'main' of https://github.com/acmucsd/hack-website into n…
nik-dange Sep 29, 2023
c13c0f7
Merge branch 'main' of https://github.com/acmucsd/hack-website into n…
nik-dange Sep 29, 2023
f5780bb
angela css goat again
nik-dange Sep 29, 2023
21a3618
Added more consistent styling
angela139 Oct 2, 2023
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 public/assets/hackimage.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/hackschool.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/projects.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 68 additions & 1 deletion src/sections/About/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,74 @@
import styles from './style.module.css';

const About: React.FC = () => {
return <h3 className={styles.about}>About Section</h3>;
return (
<div className={styles.about}>
<h2 className={styles.title}>Welcome to ACM Hack!</h2>
<br />
nik-dange marked this conversation as resolved.
Show resolved Hide resolved
<div className={styles.main}>
<div className={styles.main_desc}>
<p>
ACM Hack is a community dedicated to software engineering and exploring what&apos;s
possible through code. Our name comes from hackathons&mdash;events where the power of
coding results in cool pieces of technology. Whether you&apos;re a seasoned developer or
just starting out, ACM Hack has a community of like-minded software engineers and events
for you! We host a number of workshops throughout the year on industry-relevant tools
and technologies, all of which are open to all skill levels and don&apos;t have
prerequisites. You can check out all of our upcoming workshops below!
</p>
</div>
<img className={styles.mainImage} src="assets/hackimage.JPG" alt="Hack School Fall 2022" />
</div>

<div className={styles.hackschool}>
<img
className={styles.hackschoolImage}
src="assets/hackschool.jpg"
alt="A Hack School event"
/>
<div className={styles.hackschool_desc}>
<p>
We&apos;re proud to host Hack School: a series of 6 workshops designed to teach students
the fundamentals of full-stack development and software engineering. We host Hack School
in-person every fall, and the Fall 2023 application is live at{' '}
<a href="https://acmurl.com/apply-hackschool" target="_blank" rel="noopener noreferrer">
angela139 marked this conversation as resolved.
Show resolved Hide resolved
acmurl.com/apply-hackschool!
</a>
. All Hack School content is open source and hosted on this website under{' '}
<a
href="https://hack.acmucsd.com/hack-school"
target="_blank"
rel="noopener noreferrer"
>
Hack School
</a>
, so feel free to check it out and learn something new!
</p>
</div>
</div>

<div className={styles.projects}>
<div className={styles.projects_desc}>
<p>
Interested in hands-on software engineering experience? ACM Hack hosts project teams
under ACM Projects! Our project teams are a great way to gain relevant experience for
your resume, learn new technologies, and work with a team. We&apos;ll provide the
mentorship and guidance, so don&apos;t worry about having any prior experience. Learn
more and apply at{' '}
<a href="https://projects.acmucsd.com" target="_blank" rel="noopener noreferrer">
projects.acmucsd.com
</a>
!
</p>
</div>
<img
className={styles.projectImage}
src="assets/projects.JPG"
alt="An ACM Hack Project Team"
/>
</div>
</div>
);
};

export default About;
64 changes: 58 additions & 6 deletions src/sections/About/style.module.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,61 @@
.about {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 30vh;
max-height: 100vh;
border-bottom: 1px solid black;
}
margin: 0 auto;
max-width: 90%;
}

.title {
padding-top: 2rem;
font-size: 3.5rem;
font-weight: 700;
text-align: center;
overflow-wrap: break-word;
word-wrap: normal;
}

.main, .hackschool, .projects {
display: grid;
grid-template-columns: repeat(2, 1fr);
align-items: center;
gap: 1rem;
margin-top: 1rem;
margin-bottom: 1rem;
}

.mainImage, .hackschoolImage, .projectImage {
/* padding: 20px; */
margin: 0 auto;
gap: 0.5rem;
margin: auto;
}

.mainImage, .hackschoolImage, .projectImage {
border-radius: 50px;
max-width: 80%;
height: auto;
}

.main_desc, .projects_desc, .hackschool_desc {
font-size: 1.15rem;
}

@media screen and (max-width: 768px) {
.main, .hackschool, .projects {
grid-template-columns: 1fr;
}
.hackschoolImage {
order: 1;
text-align: center;
}
.hackschool_desc {
order: 0;
text-align: center;
}
}

.projects {
padding-bottom: 2rem;
}


Loading