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

Commit7ba5f4a

Browse files
committed
Merge branch 'master' into CW2-5-Create-sponsors-page
2 parents6e5962d +07ab049 commit7ba5f4a

File tree

22 files changed

+2398
-1381
lines changed

22 files changed

+2398
-1381
lines changed

‎.eslintrc.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
"extends":"next/core-web-vitals"
2+
"extends": [
3+
"next/core-web-vitals",
4+
"plugin:@typescript-eslint/recommended",
5+
"plugin:prettier/recommended"
6+
],
7+
"parser":"@typescript-eslint/parser",
8+
"plugins": ["@typescript-eslint"],
9+
"rules": {
10+
"prettier/prettier": ["error", {"endOfLine":"auto" }]
11+
}
312
}

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name:CI
2+
3+
on:
4+
push:
5+
branches:[ master ]
6+
pull_request:
7+
branches:[ master ]
8+
9+
jobs:
10+
build:
11+
runs-on:ubuntu-latest
12+
13+
steps:
14+
-uses:actions/checkout@v3
15+
-name:Use Node.js 16
16+
uses:actions/setup-node@v3
17+
with:
18+
node-version:16
19+
20+
-name:Install dependencies
21+
run:npm install
22+
23+
-name:Lint code
24+
run:npm run lint
25+
26+
-name:Check types
27+
run:npm run type-check
28+
29+
-name:Build Next.js app
30+
run:npm run build

‎.prettierrc.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"semi":true,
3+
"tabWidth":2,
4+
"printWidth":100,
5+
"singleQuote":true,
6+
"trailingComma":"none"
7+
}

‎components/About/index.tsx‎

Lines changed: 95 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,95 @@
1-
importImagefrom"next/image";
2-
3-
constAbout=()=>{
4-
return(
5-
<sectionclassName="py-8 xl:px-24 sm:px-10 px-5"id="about">
6-
<divclassName="text-center my-10">
7-
<pclassName="text-[#3977F8] font-game text-xl">01</p>
8-
<h1className="font-bold text-6xl">ABOUT</h1>
9-
</div>
10-
<divclassName="flex justify-center items-center">
11-
<divclassName="lg:grid grid-cols-6 flex-1 max-w-[90rem]">
12-
{/* LEFT SIDE */}
13-
<divclassName="col-span-2 md:mx-5">
14-
<divclassName="flex items-center justify-center">
15-
<Imagesrc="/assets/csesoc_icon.svg"alt="CSESoc Icon"width={150}height={150}/>
16-
</div>
17-
<h1className="mt-10 text-3xl font-extrabold">CSESoc</h1>
18-
<pclassName="text-[#727B8C] font-medium">unsw-computer-science-soc</p>
19-
<buttonclassName="bg-[#444F6F] w-full my-5 py-2 rounded">Follow</button>
20-
<p>We are one of the biggest and most active societies at UNSW, catering to over 3500 CSE students spanning across degrees in Computer Science, Software Engineering, Bioinformatics and Computer Engineering.</p>
21-
<divclassName="my-4 flex gap-5">
22-
<Imagesrc="/assets/people_icon.svg"alt="People"width={20}height={20}/>
23-
<div>
24-
432<spanclassName="text-[#727B8C]">members</span> · 342<spanclassName="text-[#727B8C]">subcom</span>
25-
</div>
26-
</div>
27-
<divclassName="my-4 flex gap-5">
28-
<Imagesrc="/assets/location_icon.svg"alt="Location"width={20}height={20}/>
29-
Sydney, Australia
30-
</div>
31-
<divclassName="flex gap-5">
32-
<Imagesrc="/assets/mail_icon.svg"alt="Mail"width={20}height={20}/>
33-
info@csesoc.org.au
34-
</div>
35-
</div>
36-
{/* RIGHT SIDE */}
37-
<divclassName="col-span-4 lg:mt-0 mt-10">
38-
<divclassName="rounded border border-[#595F6D] p-5 2xl:h-80 xl:h-64 lg:h-48 sm:h-36 h-32 h-full">
39-
<pclassName="text-xs">
40-
csesoc/README<spanclassName="text-[#7A8192]">.md</span>
41-
</p>
42-
<pclassName="mt-5">Lorem Ipsum</p>
43-
</div>
44-
<divclassName="mt-10">
45-
Pinned
46-
<divclassName="sm:flex my-5">
47-
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
48-
<divclassName="flex text-[#3A76F8]">
49-
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
50-
csesoc.unsw.edu.au/<spanclassName="font-semibold">events</span>
51-
</div>
52-
<divclassName="my-5">CSESoc&apos;s recent events</div>
53-
<divclassName="rounded-full bg-[#CC5421] w-3 h-3"/>
54-
</div>
55-
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
56-
<divclassName="flex text-[#3A76F8]">
57-
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
58-
csesoc.unsw.edu.au/<spanclassName="font-semibold">socials</span>
59-
</div>
60-
<divclassName="my-5">Follow us on all socials</div>
61-
<divclassName="rounded-full bg-[#566ACE] w-3 h-3"/>
62-
</div>
63-
</div>
64-
<divclassName="sm:flex">
65-
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
66-
<divclassName="flex text-[#3A76F8]">
67-
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
68-
csesoc.unsw.edu.au/<spanclassName="font-semibold">join-us</span>
69-
</div>
70-
<divclassName="my-5">Get involved!</div>
71-
<divclassName="rounded-full bg-[#E7E923] w-3 h-3"/>
72-
</div>
73-
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
74-
<divclassName="flex text-[#3A76F8]">
75-
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
76-
csesoc.unsw.edu.au/<spanclassName="font-semibold">contact</span>
77-
</div>
78-
<divclassName="my-5">Contact us via email</div>
79-
<divclassName="rounded-full bg-[#CC5421] w-3 h-3"/>
80-
</div>
81-
</div>
82-
</div>
83-
</div>
84-
</div>
85-
</div>
86-
</section>
87-
);
88-
};
89-
90-
exportdefaultAbout;
1+
importImagefrom'next/image';
2+
3+
constAbout=()=>{
4+
return(
5+
<sectionclassName="py-8 xl:px-24 sm:px-10 px-5"id="about">
6+
<divclassName="text-center my-10">
7+
<pclassName="text-[#3977F8] font-game text-xl">01</p>
8+
<h1className="font-bold text-6xl">ABOUT</h1>
9+
</div>
10+
<divclassName="flex justify-center items-center">
11+
<divclassName="lg:grid grid-cols-6 flex-1 max-w-[90rem]">
12+
{/* LEFT SIDE */}
13+
<divclassName="col-span-2 md:mx-5">
14+
<divclassName="flex items-center justify-center">
15+
<Imagesrc="/assets/csesoc_icon.svg"alt="CSESoc Icon"width={150}height={150}/>
16+
</div>
17+
<h1className="mt-10 text-3xl font-extrabold">CSESoc</h1>
18+
<pclassName="text-[#727B8C] font-medium">unsw-computer-science-soc</p>
19+
<buttonclassName="bg-[#444F6F] w-full my-5 py-2 rounded">Follow</button>
20+
<p>
21+
We are one of the biggest and most active societies at UNSW, catering to over 3500 CSE
22+
students spanning across degrees in Computer Science, Software Engineering,
23+
Bioinformatics and Computer Engineering.
24+
</p>
25+
<divclassName="my-4 flex gap-5">
26+
<Imagesrc="/assets/people_icon.svg"alt="People"width={20}height={20}/>
27+
<div>
28+
432<spanclassName="text-[#727B8C]">members</span> · 342{' '}
29+
<spanclassName="text-[#727B8C]">subcom</span>
30+
</div>
31+
</div>
32+
<divclassName="my-4 flex gap-5">
33+
<Imagesrc="/assets/location_icon.svg"alt="Location"width={20}height={20}/>
34+
Sydney, Australia
35+
</div>
36+
<divclassName="flex gap-5">
37+
<Imagesrc="/assets/mail_icon.svg"alt="Mail"width={20}height={20}/>
38+
info@csesoc.org.au
39+
</div>
40+
</div>
41+
{/* RIGHT SIDE */}
42+
<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">
44+
<pclassName="text-xs">
45+
csesoc/README<spanclassName="text-[#7A8192]">.md</span>
46+
</p>
47+
<pclassName="mt-5">Lorem Ipsum</p>
48+
</div>
49+
<divclassName="mt-10">
50+
Pinned
51+
<divclassName="sm:flex my-5">
52+
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
53+
<divclassName="flex text-[#3A76F8]">
54+
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
55+
csesoc.unsw.edu.au/<spanclassName="font-semibold">events</span>
56+
</div>
57+
<divclassName="my-5">CSESoc&apos;s recent events</div>
58+
<divclassName="rounded-full bg-[#CC5421] w-3 h-3"/>
59+
</div>
60+
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
61+
<divclassName="flex text-[#3A76F8]">
62+
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
63+
csesoc.unsw.edu.au/<spanclassName="font-semibold">socials</span>
64+
</div>
65+
<divclassName="my-5">Follow us on all socials</div>
66+
<divclassName="rounded-full bg-[#566ACE] w-3 h-3"/>
67+
</div>
68+
</div>
69+
<divclassName="sm:flex">
70+
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
71+
<divclassName="flex text-[#3A76F8]">
72+
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
73+
csesoc.unsw.edu.au/<spanclassName="font-semibold">join-us</span>
74+
</div>
75+
<divclassName="my-5">Get involved!</div>
76+
<divclassName="rounded-full bg-[#E7E923] w-3 h-3"/>
77+
</div>
78+
<divclassName="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
79+
<divclassName="flex text-[#3A76F8]">
80+
<Imagesrc="/assets/book_icon.svg"alt="Book"width={20}height={20}/>
81+
csesoc.unsw.edu.au/<spanclassName="font-semibold">contact</span>
82+
</div>
83+
<divclassName="my-5">Contact us via email</div>
84+
<divclassName="rounded-full bg-[#CC5421] w-3 h-3"/>
85+
</div>
86+
</div>
87+
</div>
88+
</div>
89+
</div>
90+
</div>
91+
</section>
92+
);
93+
};
94+
95+
exportdefaultAbout;

‎components/Background.tsx‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
importSplinefrom"@splinetool/react-spline";
2-
3-
constBackground=()=>{
4-
return<SplineclassName="absolute "scene="https://prod.spline.design/thPGkOvNXu8XjGlk/scene.splinecode"/>;
5-
};
6-
7-
exportdefaultBackground;
1+
importSplinefrom'@splinetool/react-spline';
2+
3+
constBackground=()=>{
4+
return(
5+
<Spline
6+
className="absolute "
7+
scene="https://prod.spline.design/thPGkOvNXu8XjGlk/scene.splinecode"
8+
/>
9+
);
10+
};
11+
12+
exportdefaultBackground;

‎components/Event/index.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
constEvent=()=>{
2-
return<section></section>;
3-
};
4-
5-
exportdefaultEvent;
1+
constEvent=()=>{
2+
return<section></section>;
3+
};
4+
5+
exportdefaultEvent;

‎components/Footer.tsx‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
1-
importLinkfrom"next/link";
1+
importLinkfrom'next/link';
22

33
constFooter=()=>{
44
return(
55
<section>
6-
<divclassName="sm:flex justify-between">
7-
<divclassName="flex items-center">
8-
<imgsrc="assets/csesoc_logo_white.svg"alt="CSESoc Logo"/>
9-
<Linkhref="/flag/ollie_is_hiding.png"target="_blank"className="sm:hidden block">
10-
<imgsrc="/flag/ollie_is_hiding.png"alt="Ollie"draggable="false"width={60}height={60}className="ml-10"/>
11-
</Link>
12-
<imgsrc="/flag/ollie_is_hiding.png"alt="Ollie"draggable="false"width={60}height={60}className="ml-10 sm:block hidden"/>
13-
</div>
14-
<divclassName="flex flex-col max-w-[14rem] sm:mt-0 mt-10 font-light">
15-
<pclassName="mb-6">B03 CSE Building K17, UNSW csesoc@csesoc.org.au</p>
16-
<p>© 2021 — CSESoc UNSW</p>
17-
</div>
6+
<divclassName="sm:flex justify-between">
7+
<divclassName="flex items-center">
8+
<imgsrc="assets/csesoc_logo_white.svg"alt="CSESoc Logo"/>
9+
<Linkhref="/flag/ollie_is_hiding.png"target="_blank"className="sm:hidden block">
10+
<img
11+
src="/flag/ollie_is_hiding.png"
12+
alt="Ollie"
13+
draggable="false"
14+
width={60}
15+
height={60}
16+
className="ml-10"
17+
/>
18+
</Link>
19+
<img
20+
src="/flag/ollie_is_hiding.png"
21+
alt="Ollie"
22+
draggable="false"
23+
width={60}
24+
height={60}
25+
className="ml-10 sm:block hidden"
26+
/>
1827
</div>
19-
<imgsrc="assets/sponsors_backdrop.svg"alt="Sponsors backdrop"className="absolute bottom-0 left-0 w-screen -z-10"/>
28+
<divclassName="flex flex-col max-w-[14rem] sm:mt-0 mt-10 font-light">
29+
<pclassName="mb-6">B03 CSE Building K17, UNSW csesoc@csesoc.org.au</p>
30+
<p>© 2021 — CSESoc UNSW</p>
31+
</div>
32+
</div>
33+
<img
34+
src="assets/sponsors_backdrop.svg"
35+
alt="Sponsors backdrop"
36+
className="absolute bottom-0 left-0 w-screen -z-10"
37+
/>
2038
</section>
2139
);
2240
};
2341

24-
exportdefaultFooter;
42+
exportdefaultFooter;

0 commit comments

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