Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbc4ae19

Browse files
authored
Merge branch 'master' into CW2-7-move-social-media-to-footer
2 parentsda9b438 +d2fc2d6 commitbc4ae19

File tree

11 files changed

+84
-43
lines changed

11 files changed

+84
-43
lines changed

‎components/About/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const About = () => {
55
<sectionclassName="py-8 xl:px-24 sm:px-10 px-5"id="about">
66
<divclassName="text-center my-10">
77
<pclassName="text-[#3977F8] font-game text-xl">01</p>
8-
<h1className="font-bold text-6xl">ABOUT</h1>
8+
<h2className="font-bold text-6xl">ABOUT</h2>
99
</div>
1010
<divclassName="flex justify-center items-center">
1111
<divclassName="lg:grid grid-cols-6 flex-1 max-w-[90rem]">
@@ -14,7 +14,7 @@ const About = () => {
1414
<divclassName="flex items-center justify-center">
1515
<Imagesrc="/assets/csesoc_icon.svg"alt="CSESoc Icon"width={150}height={150}/>
1616
</div>
17-
<h1className="mt-10 text-3xl font-extrabold">CSESoc</h1>
17+
<h2className="mt-10 text-3xl font-extrabold">CSESoc</h2>
1818
<pclassName="text-[#727B8C] font-medium">unsw-computer-science-soc</p>
1919
<buttonclassName="bg-[#444F6F] w-full my-5 py-2 rounded">Follow</button>
2020
<p>
@@ -40,7 +40,7 @@ const About = () => {
4040
</div>
4141
{/* RIGHT SIDE */}
4242
<divclassName="col-span-4 lg:mt-0 mt-10">
43-
<divclassName="rounded border border-[#595F6D] p-5 2xl:h-80 xl:h-64 lg:h-48 sm:h-36 h-32 h-full">
43+
<divclassName="rounded border border-[#595F6D] p-5 2xl:h-80 xl:h-64 lg:h-48 sm:h-36 h-full">
4444
<pclassName="text-xs">
4545
csesoc/README<spanclassName="text-[#7A8192]">.md</span>
4646
</p>

‎components/Footer.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
importImagefrom'next/image';
12
importLinkfrom'next/link';
23
importImagefrom'next/image';
34
import{socialLinks}from'../public/data/data';

‎components/Landing/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Landing = () => {
1313
<div>
1414
<divclassName="font-semibold">
1515
<p>{'<h1>'}</p>
16-
<h1className="font-black 2xl:text-8xl lg:text-6xl text-4xl">Hello World!</h1>
16+
<h2className="font-black 2xl:text-8xl lg:text-6xl text-4xl">Hello World!</h2>
1717
<p>{'</h1>'}</p>
1818
</div>
1919
<divclassName="font-semibold mt-10">

‎components/Navbar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const Navbar = () => {
2424
</Link>
2525
<div>
2626
<divclassName="md:flex xl:gap-36 lg:gap-20 md:gap-10 text-right font-bold hidden">
27-
<Linkhref="about us">
27+
<Linkhref="about">
2828
<pclassName="text-[0.6rem] text-[#C4C5C8]">01</p>
2929
<div>{'//'} about us</div>
3030
</Link>

‎components/ResourcesAndContacts/index.tsx‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const ResourcesAndContacts = () => {
1515

1616
<divclassName="text-center my-10">
1717
<pclassName="text-[#3977F8] font-game text-xl">03</p>
18-
<h1className="font-bold text-6xl">RESOURCES&CONTACTS</h1>
18+
<h2className="font-bold text-6xl">RESOURCES&CONTACTS</h2>
1919
</div>
2020

2121
<divclassName="py-8 bg-no-repeat bg-center">
@@ -122,23 +122,41 @@ const ResourcesAndContacts = () => {
122122
<divclassName="md:mt-10 mt-5">
123123
<divclassName="grid grid-cols-3 1 gap-x-9 gap-y-5 mb-10">
124124
<ahref="https://bit.ly/CSESocDiscord"target="_blank"className={socialsBoxStyling}>
125-
<Imagesrc="assets/discord_logo.svg"alt=""width={25}height={25}className="mr-1"/>
125+
<Image
126+
src="assets/discord_logo.svg"
127+
alt="discord logo"
128+
width={25}
129+
height={25}
130+
className="mr-1"
131+
/>
126132
<pclassName="text-xl font-bold m-2">DISCORD</p>
127133
</a>
128134
<a
129135
href="https://www.facebook.com/csesoc/"
130136
target="_blank"
131137
className={socialsBoxStyling}
132138
>
133-
<Imagesrc="assets/fb_logo.svg"alt=""width={25}height={25}className="mr-1"/>
139+
<Image
140+
src="assets/fb_logo.svg"
141+
alt="facebook logo"
142+
width={25}
143+
height={25}
144+
className="mr-1"
145+
/>
134146
<pclassName="text-xl font-bold m-2">FACEBOOK</p>
135147
</a>
136148
<a
137149
href="https://www.facebook.com/groups/csesoc"
138150
target="_blank"
139151
className={socialsBoxStyling}
140152
>
141-
<Imagesrc="assets/group_icon.svg"alt=""width={25}height={25}className="mr-1"/>
153+
<Image
154+
src="assets/group_icon.svg"
155+
alt="facebook group"
156+
width={25}
157+
height={25}
158+
className="mr-1"
159+
/>
142160
<pclassName="text-xl font-bold m-2">FACEBOOK GROUP</p>
143161
</a>
144162
</div>

‎components/Sponsors/sponsorlinks.tsx‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@ import { diamondLinks, goldLinks, silverLinks } from '../../public/data/data';
22
//import '/styles/sponsorLinks.module.css';
33
constlogostyle='h-14';
44
constlogodiv='block gap-y-8 h-14';
5-
constbackground=
6-
'radial-gradient(50% 50% at 50% 50%, rgba(235, 1, 255, 0.6) 0%, rgba(121, 73, 255, 0.6) 48.96%, rgba(57, 119, 248, 0.6) 100%)';
5+
constbackground='rgba(57, 119, 248, 0.6)';
76
// const outer = 'rounded-[4rem] w-[90rem] flex flex-col pl-14 py-14 gap-16';
87

98
functionSponsorLinks(){
109
return(
1110
<divclassName="flex justify-center items-center my-20">
1211
<divclassName="w-100 flex flex-col gap-16">
1312
<div
14-
style={{backgroundImage:`${background}`}}
15-
className="flex rounded-[1rem] pl-14 py-14 gap-16 items-center"
13+
style={{backgroundColor:`${background}`}}
14+
className="flexflex-wraprounded-[1rem] pl-14 py-14 gap-16 items-center"
1615
>
1716
<h2className="text-4xl font-black">Diamond Sponsors</h2>
1817
{diamondLinks.map((item,index)=>{
@@ -24,23 +23,21 @@ function SponsorLinks() {
2423
})}
2524
</div>
2625
<div
27-
style={{backgroundImage:`${background}`}}
28-
className="flex rounded-[1rem] px-14 py-14"
26+
style={{backgroundColor:`${background}`}}
27+
className="flexflex-wraprounded-[1rem] px-14 py-14 gap-16 items-center"
2928
>
30-
<h2className="text-4xl font-black pr-16">Gold Sponsors</h2>
31-
<divclassName="grid grid-cols-5 gap-16 items-center">
32-
{goldLinks.map((item,index)=>{
33-
return(
34-
<akey={index}className=""href={item.href}>
35-
<imgclassName="h-6"src={item.svg}alt={item.alt}/>
36-
</a>
37-
);
38-
})}
39-
</div>
29+
<h2className="text-4xl font-black">Gold Sponsors</h2>
30+
{goldLinks.map((item,index)=>{
31+
return(
32+
<akey={index}className=""href={item.href}>
33+
<imgclassName="h-6"src={item.svg}alt={item.alt}/>
34+
</a>
35+
);
36+
})}
4037
</div>
4138
<div
42-
style={{backgroundImage:`${background}`}}
43-
className="grid grid-cols-5 rounded-[1rem]pl-14 py-14 gap-16 items-center"
39+
style={{backgroundColor:`${background}`}}
40+
className="flex flex-wrap rounded-[1rem]px-14 py-14 gap-16 items-center"
4441
>
4542
<h2className="text-4xl font-black">Silver Sponsors</h2>
4643
{silverLinks.map((item,index)=>{

‎components/Sponsors/subpage.tsx‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎pages/about.tsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
importNavbarfrom'@/components/Navbar';
2+
importFooterfrom'@/components/Footer';
3+
importAboutfrom'@/components/About';
4+
5+
exportdefaultfunctionAboutPage(){
6+
return(
7+
<sectionclassName="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
8+
<Navbar/>
9+
<About/>
10+
<Footer/>
11+
</section>
12+
);
13+
}

‎pages/events.tsx‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
importNavbarfrom'@/components/Navbar';
2+
importFooterfrom'@/components/Footer';
3+
4+
exportdefaultfunctionEventsPage(){
5+
return(
6+
<sectionclassName="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
7+
<Navbar/>
8+
<div>Events</div>
9+
<Footer/>
10+
</section>
11+
);
12+
}

‎pages/resources.tsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
importNavbarfrom'@/components/Navbar';
2+
importFooterfrom'@/components/Footer';
3+
importResourcesAndContactsfrom'@/components/ResourcesAndContacts';
4+
5+
exportdefaultfunctionResourcesPage(){
6+
return(
7+
<sectionclassName="flex flex-col min-h-screen justify-between py-8 xl:px-24 md:px-10 px-5 relative overflow-hidden">
8+
<Navbar/>
9+
<ResourcesAndContacts/>
10+
<Footer/>
11+
</section>
12+
);
13+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp