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.

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

Add banners to events calendar #658

Merged
merged 9 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
11 changes: 8 additions & 3 deletions components/Events/SelectedEvent.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import moment from 'moment';
import Link from 'next/link';
import React from 'react';
import {React, useEffect, useState} from 'react';

import styles from '../../styles/components/Events/SelectedEvent.module.scss';

Expand All @@ -9,12 +9,17 @@
return <p>click on an event to see more!</p>;
}
const { title, start, description, location, links, image, alt } = event;
const imageSrc = image ? image : '/images/events/default-event.png';
const [imageUrl, setImageUrl] = useState(image);

useEffect(() => {
setImageUrl(event.image);
}, [event])

Check failure on line 16 in components/Events/SelectedEvent.js

View workflow job for this annotation

GitHub Actions / lint (16.x)

Missing semicolon

return (
<div className={styles['card-container']}>
<h2 className={styles['card-header']}>event information</h2>
{/* eslint-disable-next-line @next/next/no-img-element */}
<img className={styles['card-image']} src={imageSrc} alt={alt} />
<img className={styles['card-image']} src={imageUrl} alt={alt} onError={() => setImageUrl('/images/events/default-event.png')}/>
<div className={styles['card-body']}>
<h3 className={styles['card-title']}>{title}</h3>
{/* Don't show start time if it starts at 12:00 am (missing start time in event spreadsheet) */}
Expand Down
17 changes: 10 additions & 7 deletions scripts/event-generator-sheets.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,20 @@ async function getAllEvents() {
events = [].concat(...events);

// Get all recurring events
let recurring_rows = await getGoogleSheetData('RECURRING EVENTS!A:J');
let recurring_rows = await getGoogleSheetData('RECURRING EVENTS!A:K');
for (let i = 1; i <= 10; i++) {
events = events.concat(getRecurringEventsOfWeek(recurring_rows, i));
}
return events.filter((item, index, self) => index === self.findIndex(
(other) => item.title === other.title && item.rawStart === other.rawStart),
);
events = events.filter((item, index, self) => index === self.findIndex(
(other) => item.title === other.title && item.rawStart === other.rawStart));

return events;
}

// Read single events of Week n
// Return as array of JSON objects
async function getSingleEventsOfWeek(n) {
const rows = await getGoogleSheetData('Week ' + n + '!A:H');
const rows = await getGoogleSheetData('Week ' + n + '!A:I');

const events = [];
for (const row of rows) {
Expand All @@ -68,7 +69,8 @@ async function getSingleEventsOfWeek(n) {
rawStart: row[3],
rawEnd: row[4],
date: row[2],
fblink: row[7]}));
fblink: row[7],
image: row[8],}));
} catch (err) {
// eslint-disable-next-line no-console
console.error(`Error ${err} on event ${row}`);
Expand Down Expand Up @@ -108,7 +110,8 @@ function getRecurringEventsOfWeek(rows, n) {
rawStart: row[5],
rawEnd: row[6],
date: date.toISOString().split('T')[0],
fblink: row[9]}));
fblink: row[9],
image: row[10]}));
} catch (err) {
// eslint-disable-next-line no-console
console.error(`Error ${err} on event ${row}`);
Expand Down
15 changes: 15 additions & 0 deletions scripts/lib.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
case 'board':
return 'board';
case 'teach la':
case 'teachla':
return 'teach-la';
case 'ai':
case 'cyber':
Expand Down Expand Up @@ -37,6 +38,7 @@
rawEnd,
date,
fblink,
image,
}) => {
let allDay = false;

Expand Down Expand Up @@ -81,6 +83,18 @@
ext: true,
});
}
if (image) {
if (image.includes('drive.google.com')) {
Fixed Show fixed Hide fixed
// Google drive urls need to be transformed
// 'https://drive.google.com/uc?export=view&id=' + image id (follows /d)
image = 'https://drive.google.com/uc?export=view&id=' + image.substring(image.indexOf("/d/") + 3, image.indexOf("/view"));
} else {
image = image
}
} else {
// Default image
image = '/images/events/default-event.png';
}

if (!title) {
throw new Error('Missing title');
Expand All @@ -96,6 +110,7 @@
committee,
description,
links,
image,
};
};

Expand Down
Loading