Skip to content

Commit 6ffb57c

Browse files
arkasharmaArshMalik02veronicasalassnigdha-kansalKevin-D23
authored
Revamp ACM-W Website with Updated Events Calendar and Enhanced Home Page (#7)
* Initial commit * initial setup (#1) * Setup (#2) * initial setup * update readme * Updated README.md (#3) * fix team page (#5) * fix: removed duplicate events from events page (#6) * Hardcoded events, members for sample website * changes * index * update * padding * 0 * Added google calendar, edited events and team pages * Modified eventsPage to display past events in reverse chronological order * Updated deprecated version of actions,cache to v3 * Updated all deprecated actions * Added date to Event CardInterface * Removed unused script * Modified logo image files * Added spreadsheet ranges --------- Co-authored-by: Arsh Malik <[email protected]> Co-authored-by: veronicasalas <[email protected]> Co-authored-by: Snigdha Kansal <[email protected]> Co-authored-by: Kevin Duong <[email protected]> Co-authored-by: Iris Li <[email protected]>
1 parent cf4af77 commit 6ffb57c

36 files changed

+3797
-587
lines changed

.env.example

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

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313

1414
steps:
1515
- name: Checkout Git repo
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717

1818
- name: Use Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v2
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: ${{ matrix.node-version }}
2222

2323
- name: Cache node_modules
24-
uses: actions/cache@v2
24+
uses: actions/cache@v4
2525
with:
2626
path: '**/node_modules'
2727
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88

99
steps:
1010
- name: Checkout Git repo
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212

1313
- name: Cache node_modules
14-
uses: actions/cache@v2
14+
uses: actions/cache@v4
1515
with:
1616
path: '**/node_modules'
1717
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

components/EventCard.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ interface CardInterface {
66
header: string;
77
body: string;
88
time: string;
9+
date: string;
910
img: string;
1011
}
1112
function EventCard({ header, body, time, img }: CardInterface) {

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={120}
5151
height={40}
5252
alt="Logo"
5353
/>

components/MainLayout.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Head from 'next/head';
22
import React from 'react';
3-
import Footer from './Footer';
43
import Navbar from './Navbar';
54

65
interface LayoutProps {
@@ -22,7 +21,6 @@ export default function MainLayout(props: LayoutProps) {
2221
</Head>
2322
<Navbar />
2423
<main>{props.children}</main>
25-
<Footer />
2624
</>
2725
);
2826
}

components/Navbar.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import Image from 'next/image';
22
import Link from 'next/link';
33
import React, { useEffect, useState } from 'react';
44
import { FaTimes, FaBars } from 'react-icons/fa';
5+
import wlogo from '../public/wlogo.webp';
56
import styles from '../styles/Navbar.module.scss';
67

78
interface CommitteeData {
@@ -45,9 +46,9 @@ const Navbar = () => {
4546
<Link href="/">
4647
<a className="force-child-display-block">
4748
<Image
48-
src={committeeData[0].logoLink}
49-
width={106}
50-
height={40}
49+
src={wlogo}
50+
width={150}
51+
height={80}
5152
alt="Open Source at ACM Home"
5253
/>
5354
</a>
@@ -60,7 +61,7 @@ const Navbar = () => {
6061
>
6162
<li>
6263
<Link href="/teamPage">
63-
<a>Team</a>
64+
<a className={styles['nav-item-list']}>Team</a>
6465
</Link>
6566
</li>
6667
<li>

0 commit comments

Comments
 (0)