Skip to content

Commit f3cfb71

Browse files
authored
Merge pull request #1 from uclaacm/setup
initial setup
2 parents 0f85b36 + 8262739 commit f3cfb71

File tree

9 files changed

+21
-9
lines changed

9 files changed

+21
-9
lines changed

components/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const Footer = () => {
4747
<a>
4848
<Image
4949
src={committeeData[0].logoLink}
50-
width={100}
50+
width={165}
5151
height={40}
5252
alt="Logo"
5353
/>

components/MainLayout.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ export default function MainLayout(props: LayoutProps) {
1212
<>
1313
<Head>
1414
<meta charSet="UTF-8" />
15-
<meta name="title" content="next acm project at ucla" />
15+
<meta name="title" content="official website of acm cloud at ucla" />
1616
<meta name="description" content="Generated by create next app" />
1717
<meta
1818
name="viewport"
1919
content="width=device-width, initial-scale=1, minimum-scale=1"
2020
/>
2121
<title>ACM {vars.committee}</title>
22-
<link rel="icon" href="/favicon.svg" />
22+
<link rel="icon" href="/acm_cloud_svg.svg" />
2323
</Head>
2424
<Navbar />
2525
<main>{props.children}</main>

components/Navbar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ const Navbar = () => {
4646
<a className="force-child-display-block">
4747
<Image
4848
src={committeeData[0].logoLink}
49-
width={106}
49+
width={165}
5050
height={40}
51-
alt="Open Source at ACM Home"
51+
alt="acm cloud at ucla home"
5252
/>
5353
</a>
5454
</Link>

getOfficers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export default async function getOfficerData(
4646
['ICPC', 'icpc'],
4747
['Teach LA', 'teachla'],
4848
['W', 'w'],
49+
['Cloud', 'cloud'],
4950
]);
5051
// // Store officer data
5152
const officers: object[] = []; // list of officers in desired committee

public/acm_cloud_svg.svg

Lines changed: 9 additions & 0 deletions
Loading

public/output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"committee":"ICPC","name":"ICPC","subtitle":"testing testing","description":"icpc is so icpc","logoLink":"https://drive.google.com/uc?export=download&id=19mgOEZ92Ye_VHY6rUDMDth6XYQ9nWLN5","dcLink":"https://google.com","igLink":"https://instagram.com/eliizabethkim","email":"[email protected]","favicon":"https://drive.google.com/file/d/1oAd4HxRhn4c2l4EFCJzoVXLuKDd-xHRJ/view?usp=sharing","backgroundImg":"https://drive.google.com/uc?export=download&id=19GvTskjsX4xlJ2Pf8CLeYpJZn9uNGohT"}]
1+
[{"committee":"Cloud","name":"Cloud","subtitle":"Official website of ACM Cloud at UCLA","description":"On cloud nine :)","logoLink":"https://drive.google.com/uc?export=download&id=1ISqKZCYaX7apYAV8YQujcB-yscHmb_wL","dcLink":"https://discord.gg/acm-at-ucla-702801010426511373","igLink":"https://www.instagram.com/acm.ucla/","email":"[email protected]","favicon":"https://drive.google.com/file/d/1A0_SzEKIpMGc39072iYw8RaWPBkDiPSR/view?usp=sharing","backgroundImg":"https://drive.google.com/uc?export=download&id=1fzyrsmtAVhqNbHdo5MplR5OAyz6JDgUR"}]

scripts/global-variables.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const committee = 'ICPC';
1+
const committee = 'Cloud';
22
module.exports = {
33
committee: committee,
44
};

scripts/lib.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const getCssStringFromCommittee = (committee) => {
1616
case 'icpc':
1717
case 'studio':
1818
case 'w':
19+
case 'cloud':
1920
return committee.toLowerCase();
2021
default:
2122
throw new Error(`Unrecognized string ${committee}`);
@@ -137,6 +138,7 @@ const generateCommittee = ({
137138
} else if (logoLink.includes('drive.google.com')) {
138139
const fileID = logoLink.match(/\/file\/d\/(.+?)\//)[1];
139140
logoLink = `https://drive.google.com/uc?export=download&id=${fileID}`;
141+
console.log(logoLink);
140142
}
141143

142144
return {

styles/global_variables.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// to use variables across other scss files, do a @import "global_variables"
22
$acm-blue: #1e6cff;
3-
$committee-color: #FF8383;
4-
$committee: ICPC;
3+
$committee-color: #8a7de4;
4+
$committee: Cloud;
55

66
:export {
77
committee: $committee;

0 commit comments

Comments
 (0)