Skip to content

Commit 1473b80

Browse files
derekxu04derekxu04
committed
Convert all pages to layout component
1 parent 105f4e1 commit 1473b80

File tree

10 files changed

+183
-207
lines changed

10 files changed

+183
-207
lines changed

Diff for: ‎frontend/src/components/About/AboutHomepage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default function AboutHomePage() {
3030
We are here to fulfil the social, personal and
3131
professional needs of CSE students, and promote computing through a variety of forms.
3232
<br/><br/>
33-
Learn more <a href="about" className="text-[#3977F9]">about us!</a>
33+
Learn more <a href="/about" className="text-[#3977F9]">about us!</a>
3434
</p>
3535

3636
</div>

Diff for: ‎frontend/src/components/About/index.tsx

-124
This file was deleted.

Diff for: ‎frontend/src/components/Footer.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ const Footer = () => {
3737
</div>
3838
</div>
3939
<div className="flex flex-col max-w-[14rem] sm:mt-0 mt-10 font-light">
40-
<p className="mb-6">
41-
<p>B03 CSE Building K17, UNSW</p>
40+
<div className="mb-6">
41+
<div>B03 CSE Building K17, UNSW</div>
4242
<a href="mailto:[email protected]" className="hover:underline">[email protected]</a>
43-
</p>
43+
</div>
4444
<p>© 2024 — CSESoc UNSW</p>
4545
</div>
4646
</div>

Diff for: ‎frontend/src/pages/about/constitution.tsx

+47-50
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,54 @@
1-
import Navbar from '@/components/Navbar';
2-
import Footer from '@/components/Footer';
1+
import Layout from "@/components/Layout";
32

43
export default function Constitution() {
54
return (
6-
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
7-
<Navbar />
8-
<section className="py-8 xl:px-24 sm:px-10 px-5" id="constitution">
9-
<div className="text-center my-10">
10-
<h1 className="font-bold text-6xl">CONSTITUTION</h1>
11-
</div>
5+
<Layout>
6+
<section className="py-8 xl:px-24 sm:px-10 px-5" id="constitution">
7+
<div className="text-center my-10">
8+
<h1 className="font-bold text-6xl">CONSTITUTION</h1>
9+
</div>
1210

13-
<div>
14-
<p className="text-xl my-5">
15-
Since the end of 2013, the constitution has been hosted on Github. The constitution by which CSESoc runs can be found here:
16-
</p>
17-
<ul className="list-disc ml-6">
18-
<li className="text-xl">
19-
<a href="https://github.com/csesoc/constitution/blob/master/README.md" className="text-blue-500 underline">
20-
Current constitution
21-
</a>
22-
</li>
23-
</ul>
11+
<div>
12+
<p className="text-xl my-5">
13+
Since the end of 2013, the constitution has been hosted on Github. The constitution by which CSESoc runs can be found here:
14+
</p>
15+
<ul className="list-disc ml-6">
16+
<li className="text-xl">
17+
<a href="https://github.com/csesoc/constitution/blob/master/README.md" className="text-blue-500 underline">
18+
Current constitution
19+
</a>
20+
</li>
21+
</ul>
2422

25-
<p className="text-xl my-5">Previous iterations of the constitution can be found here:</p>
26-
<ul className="list-disc ml-6">
27-
<li className="text-xl">
28-
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2012.pdf" className="text-blue-500 underline">
29-
2012 Constitution
30-
</a>
31-
- Version 2.3, adopted 04/10/2011
32-
</li>
33-
<li className="text-xl">
34-
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2011.pdf" className="text-blue-500 underline">
35-
2011 Constitution
36-
</a>
37-
- Version 2.2, adopted 30/09/2010
38-
</li>
39-
<li className="text-xl">
40-
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2010.pdf" className="text-blue-500 underline">
41-
2010 Constitution
42-
</a>
43-
- Version 2.1, adopted 07/10/2009
44-
</li>
45-
<li className="text-xl">
46-
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2009.pdf" className="text-blue-500 underline">
47-
2009 Constitution
48-
</a>
49-
- Version 2.0, adopted 14/10/2008
50-
</li>
51-
</ul>
52-
</div>
53-
</section>
54-
<Footer />
55-
</section>
23+
<p className="text-xl my-5">Previous iterations of the constitution can be found here:</p>
24+
<ul className="list-disc ml-6">
25+
<li className="text-xl">
26+
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2012.pdf" className="text-blue-500 underline">
27+
2012 Constitution
28+
</a>
29+
- Version 2.3, adopted 04/10/2011
30+
</li>
31+
<li className="text-xl">
32+
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2011.pdf" className="text-blue-500 underline">
33+
2011 Constitution
34+
</a>
35+
- Version 2.2, adopted 30/09/2010
36+
</li>
37+
<li className="text-xl">
38+
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2010.pdf" className="text-blue-500 underline">
39+
2010 Constitution
40+
</a>
41+
- Version 2.1, adopted 07/10/2009
42+
</li>
43+
<li className="text-xl">
44+
<a href="https://cgi.cse.unsw.edu.au/~csesoc/constitution-archive/constitution-2009.pdf" className="text-blue-500 underline">
45+
2009 Constitution
46+
</a>
47+
- Version 2.0, adopted 14/10/2008
48+
</li>
49+
</ul>
50+
</div>
51+
</section>
52+
</Layout>
5653
);
5754
}

Diff for: ‎frontend/src/pages/about/election-guide.tsx

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import Navbar from "@/components/Navbar";
2-
import Footer from "@/components/Footer";
1+
import Layout from "@/components/Layout";
32

43
const ElectionGuide = () => {
54
return (
6-
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
7-
<Navbar />
5+
<Layout>
86
<section className="py-8 xl:px-24 sm:px-10 px-5" id="election-guide">
97
<div className="text-center my-10">
108
<h1 className="font-bold text-6xl">ELECTION NOMINATION GUIDE</h1>
@@ -111,8 +109,7 @@ const ElectionGuide = () => {
111109
</div>
112110
</div>
113111
</section>
114-
<Footer />
115-
</section>
112+
</Layout>
116113
);
117114
};
118115

Diff for: ‎frontend/src/pages/about/execs-directors-subcoms.tsx

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import Navbar from '@/components/Navbar';
2-
import Footer from '@/components/Footer';
1+
import Layout from "@/components/Layout";
32

43
const ExecsDirectorsSubcommittees = () => {
54
return (
6-
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
7-
<Navbar />
5+
<Layout>
86
<section className="py-8 xl:px-24 sm:px-10 px-5" id="execs-directors-subcommittees">
97
<div className="text-center my-10">
108
<h1 className="font-bold text-6xl">EXECS, DIRECTORS & SUBCOMMITTEES</h1>
@@ -245,10 +243,9 @@ const ExecsDirectorsSubcommittees = () => {
245243
Organises approachable events targeted towards building an inclusive and welcoming community, to help build long-lasting friendships!
246244
</p>
247245
</div>
248-
</div>
246+
</div>
249247
</section>
250-
<Footer />
251-
</section>
248+
</Layout>
252249
);
253250
}
254251

Diff for: ‎frontend/src/pages/about/faqs.tsx

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import Navbar from '@/components/Navbar';
2-
import Footer from '@/components/Footer';
1+
import Layout from "@/components/Layout";
32

43
const Faqs = () => {
54
return (
6-
<section className="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
7-
<Navbar />
5+
<Layout>
86
<section className="py-8 xl:px-24 sm:px-10 px-5" id="faqs">
97
<div className="text-center my-10">
108
<h1 className="font-bold text-6xl">FREQUENTLY ASKED QUESTIONS</h1>
@@ -53,8 +51,7 @@ const Faqs = () => {
5351
</p>
5452
</div>
5553
</section>
56-
<Footer />
57-
</section>
54+
</Layout>
5855
);
5956
};
6057

0 commit comments

Comments
 (0)