Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gm updates #739

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Gm updates #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00c0dd3
basic gm page build
smalex-z Nov 27, 2024
6189e5c
loading images and past GMs
smalex-z Nov 27, 2024
42f27dd
prevent stretching of images
smalex-z Nov 27, 2024
4ed0e3b
fixed set of errors
smalex-z Dec 1, 2024
1d304ec
remove google maps border
smalex-z Dec 1, 2024
812d2cd
lint fixes
smalex-z Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ offoutput.json
townhall.json
past-townhall.json
gmData.json
past-gm.json
96 changes: 83 additions & 13 deletions pages/gm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { faFileAlt, faVideo } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { NextSeo } from 'next-seo';

import Image from 'next/image';
import Link from 'next/link';
import React from 'react';
Expand All @@ -7,6 +10,7 @@ import Countdown from 'react-countdown';
import Banner from '../components/Banner';
import Layout from '../components/Layout';
import gmData from '../gmData.json';
import pastData from '../past-gm.json';

import aiLogo from '../public/images/committees/ai_wordmark.svg';
import boardLogo from '../public/images/committees/board_wordmark.svg';
Expand All @@ -21,6 +25,11 @@ import wLogo from '../public/images/committees/w_wordmark.svg';
import fallGMgraphic from '../public/images/Fall_GM_2024_graphic.png';
import googleSlideLogo from '../public/images/slides.png';

const inlineButtonListStyle = {
display: 'inline-block',
marginBottom: '1em',
};

const dayToName = (day) => {
switch (day) {
case 0:
Expand Down Expand Up @@ -151,6 +160,8 @@ const GMCountdown = (props) => {
};

function gm() {

const pastGMs = [...pastData].reverse();
const data = parseGMData(gmData);
function countdownRenderer({ days, hours, minutes, seconds, completed }) {
const {dayString, hourString, minuteString, secondString} =
Expand Down Expand Up @@ -257,40 +268,99 @@ function gm() {
<h3>Committee Presentations</h3>
<p className='sub-heading'>Learn what ACM&apos;s nine committees have planned for {data.quarter} quarter.</p>
</div>
<p className='gm-program-row'><Image src= {studioLogo} alt='ACM studio'/> {data.studio}</p>
<p className='gm-program-row'><Image src= {icpcLogo} alt='ACM icpc'/> {data.icpc}</p>
<p className='gm-program-row'><Image src= {designLogo} alt='ACM design'/> {data.design}</p>
<p className='gm-program-row'><Image src= {cyberLogo} alt='ACM cyber'/> {data.cyber}</p>
<p className='gm-program-row'><Image src= {teachlaLogo} alt='ACM teachLA'/> {data.teachLA}</p>
<p className='gm-program-row'><Image src= {wLogo} alt='ACM w'/> {data.w}</p>
<p className='gm-program-row'><Image src= {aiLogo} alt='ACM ai'/> {data.ai}</p>
<p className='gm-program-row'><Image src= {cloudLogo} alt='ACM cloud'/> &nbsp;{data.cloud}</p>
<p className='gm-program-row'><Image src= {hackLogo} alt='ACM hack'/> {data.hack}</p>
<div className='gm-program-row'><Image src= {studioLogo} alt='ACM studio'/> {data.studio}</div>
<div className='gm-program-row'><Image src= {icpcLogo} alt='ACM icpc'/> {data.icpc}</div>
<div className='gm-program-row'><Image src= {designLogo} alt='ACM design'/> {data.design}</div>
<div className='gm-program-row'><Image src= {cyberLogo} alt='ACM cyber'/> {data.cyber}</div>
<div className='gm-program-row'><Image src= {teachlaLogo} alt='ACM teachLA'/> {data.teachLA}</div>
<div className='gm-program-row'><Image src= {wLogo} alt='ACM w'/> {data.w}</div>
<div className='gm-program-row'><Image src= {aiLogo} alt='ACM ai'/> {data.ai}</div>
<div className='gm-program-row'><Image src= {cloudLogo} alt='ACM cloud'/> &nbsp;{data.cloud}</div>
<div className='gm-program-row'><Image src= {hackLogo} alt='ACM hack'/> {data.hack}</div>
</div>
<div className='gm-program-section'>
<div className='section-header'>
<h3>ACM Board</h3>
<p className='sub-heading'>How to get more involved with ACM beyond attending workshops and events</p>
</div>
<p className='gm-program-row'><Image src= {boardLogo} alt='ACM board'/>&nbsp;&nbsp;External: {data.evp}</p>
<p className='gm-program-row'><Image src= {boardLogo} alt='ACM board'/>&nbsp;&nbsp;Internal: {data.ivp}</p>
<div className='gm-program-row'><Image src= {boardLogo} alt='ACM board'/>&nbsp;&nbsp;External: {data.evp}</div>
<div className='gm-program-row'><Image src= {boardLogo} alt='ACM board'/>&nbsp;&nbsp;Internal: {data.ivp}</div>
</div>
<div className='gm-program-section'>
<div className='section-header'>
<h3>ACM Initatives</h3>
<p className='sub-heading'>See exciting new programs that ACM is trying out</p>
</div>
{data.initiatives.map(item => <p key={item.id} className='gm-program-row'>{item}</p>)}
{data.initiatives.map((item, index) => (
<p key={index} className='gm-program-row'>{item}</p>
))}
</div>
<div className='gm-program-section'>
<div className='section-header'>
<h3>Tabling and Social</h3>
<p className='sub-heading'>Interact with ACM&apos;s officers and walk away with new friends!</p>
</div>
<p className='gm-program-row'>All ACM officers</p>
<div className='gm-program-row'>All ACM officers</div>
</div>
</div>
</div>
{/* Past GMs */}
<div className="content-container-medium">
<hr></hr>
<h2 className="text-center">Past General Meetings</h2>
{pastGMs.map((pastGM, index) => (
<div className="grid-tablet-2" key={index}>
<div>
<h3>{pastGM.title + ' // ' + pastGM.date}</h3>
<p>{pastGM.description}</p>
<ul className="list-unstyled">
<li style={inlineButtonListStyle}>
<Link href={pastGM.slides}>
<a
className="button"
target="_blank"
rel="noopener noreferrer"
>
<FontAwesomeIcon
icon={faFileAlt}
fixedWidth
aria-hidden={true}
/>{' '}
Event Slides
</a>
</Link>
</li>{' '}
<li style={inlineButtonListStyle}>
{pastGM.notes && pastGM.notes.trim() !== '' && (
<Link href={pastGM.notes}>
<a
className="button"
target="_blank"
rel="noopener noreferrer"
>
<FontAwesomeIcon
icon={faVideo}
fixedWidth
aria-hidden={true}
/>{' '}
Event Recording
</a>
</Link>
)}
</li>
</ul>
</div>
<div>
{/* eslint-disable-next-line @next/next/no-img-element */}
<img
src={pastGM.banner}
alt={pastGM.alt_text}
style={{ maxWidth: '100%' }}
/>
</div>
</div>
))}
</div>
</Layout>
);
}
Expand Down
7 changes: 3 additions & 4 deletions pages/town-hall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,11 @@ function TownHall() {
</ul>
</div>
<div>
<Image
{/* eslint-disable-next-line @next/next/no-img-element */}
<img
src={pastTownHall.banner}
alt={pastTownHall.alt_text}
width={800}
height={450}
quality={70}
style={{ maxWidth: '100%' }}
/>
</div>
</div>
Expand Down
18 changes: 18 additions & 0 deletions scripts/gm-generator.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,23 @@ async function fetchGMData() {
return formattedData;
}

async function fetchPastGMData() {
const data = await getGoogleSheetData('PastGMs!A2:G');

// Format the rows into an array of objects
const formattedData = data.map((row) => ({
title: row[0],
date: row[1],
description: row[2],
slides: row[3],
notes: row[4],
banner: row[5],
alt_text: row[6],
}));

return formattedData;
}

// Write data from sheets to a json file
async function writeToOutput(name, formattedData) {
const output = JSON.stringify(formattedData);
Expand All @@ -68,4 +85,5 @@ async function writeToOutput(name, formattedData) {
// Outputs all necessary json files
async function writeAllOutputs() {
writeToOutput('gmData.json', await fetchGMData());
writeToOutput('past-gm.json', await fetchPastGMData());
}
1 change: 1 addition & 0 deletions styles/components/GM.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
}

.map-frame {
border-width: 0;
height: 100%;
width: 100%;
}
Expand Down
Loading