Skip to content

[CW2-33] Organise Landing Page #19

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

Merged
merged 20 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from 15 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
1 change: 0 additions & 1 deletion frontend/src/components/About/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const About = () => {
return (
<section className="py-8 xl:px-24 sm:px-10 px-5" id="about">
<div className="text-center my-10">
<p className="text-[#3977F8] font-game text-xl">01</p>
<h2 className="font-bold text-6xl">ABOUT</h2>
</div>
<div className="flex justify-center items-center">
Expand Down
10 changes: 8 additions & 2 deletions frontend/src/components/Event/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@ const Event = () => {
return (
<section className="py-8 xl:px-24 sm:px-10 px-5" id="events">
<div className="text-center my-10">
<p className="text-[#3977F8] font-game text-xl">02</p>
<h1 className="font-bold text-6xl">EVENTS</h1>
<h1 className="font-bold text-6xl">UPCOMING EVENTS</h1>
</div>
<div className="flex items-center">
<div className="flex flex-col">
<p className="text-center text-3xl">
We run a wide-variety of events for fun, learning new skills and careers. For full
listings, check out the CSESoc Discord or our Facebook page!
</p>
<a href="events">
<button className="mt-10 bg-white border text-[#3977F8] border-[#A7A6E5] text-lg rounded-xl w-[100%] xl:h-12 h-10">
See all events
</button>
</a>
</div>
<div className="bg-blue-500 w-4/5 h-96 ml-80">Placeholder</div>
</div>
</section>
Expand Down
16 changes: 0 additions & 16 deletions frontend/src/components/Landing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,6 @@ const Landing = () => {
<p>{'</h2>'}</p>
</div>
</div>
<div className="w-72 font-semibold text-xl lg:block hidden">
<p className="font-bold bg-[#3977F8] inline px-3 py-1">STATS</p>
<hr className="mb-3 mt-5" />
<div className="flex justify-between">
<p>323,000</p>
<p>Members</p>
</div>
<div className="flex justify-between">
<p>300</p>
<p>Team Members</p>
</div>
<div className="flex justify-between">
<p>52</p>
<p>Events held</p>
</div>
</div>
</div>
</section>
);
Expand Down
17 changes: 6 additions & 11 deletions frontend/src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,21 @@ const Navbar = () => {
<p className="mt-3 text-xs">C:\INTERNAL STRUCTURE\{path}</p>
</Link>
<div>
<div className="md:flex xl:gap-36 lg:gap-20 md:gap-10 text-right font-bold hidden">
<div className="md:flex xl:gap-18 lg:gap-10 md:gap-5 text-right font-bold hidden">
<Link href="/about">
<p className="text-[0.6rem] text-[#C4C5C8]">01</p>
<div>{'//'} about us</div>
<div className="text-xl">{'//'} about us</div>
</Link>
<Link href="/events">
<p className="text-[0.6rem] text-[#C4C5C8]">02</p>
<div>{'//'} events</div>
<div className="text-xl">{'//'} events</div>
</Link>
<Link href="/resources">
<p className="text-[0.6rem] text-[#C4C5C8]">03</p>
<div>{'//'} resources</div>
<div className="text-xl">{'//'} resources</div>
</Link>
<Link href="/sponsors">
<p className="text-[0.6rem] text-[#C4C5C8]">04</p>
<div>{'//'} sponsors</div>
<div className="text-xl">{'//'} sponsors</div>
</Link>
<Link href="/contact-us">
<p className="text-[0.6rem] text-[#C4C5C8]">05</p>
<div>{'//'} contact us</div>
<div className="text-xl">{'//'} contact us</div>
</Link>
</div>
<div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/Sponsors/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const Sponsors = () => {
id="sponsors"
>
<div className="text-center">
<p className="text-[#3977F8] font-game text-xl">04</p>
<h2 className="font-bold text-6xl">SUPPORT CSESOC</h2>
</div>
<div className="flex-1 flex justify-center items-center my-20">
Expand Down
8 changes: 3 additions & 5 deletions frontend/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ import Landing from '@/components/Landing';
import Sponsors from '@/components/Sponsors/index';
import About from '@/components/About';
import Event from '@/components/Event';
import Resources from '@/components/Resources';

export default function Home() {
return (
<section>
<Landing/>
<About/>
<Event/>
<Resources />
<Landing />
<About />
<Event />
<Sponsors />
</section>
);
Expand Down
Loading