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

Upcoming events page #338

Open
wants to merge 3 commits into
base: migration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
// "extends":
// "extends":
"extends": [
"next/core-web-vitals",
"next/core-web-vitals",
"prettier",
"airbnb",
"airbnb/hooks",
Expand Down Expand Up @@ -31,4 +31,4 @@
"react/no-array-index-key": "off",
"object-curly-newline": "off"
}
}
}
6 changes: 3 additions & 3 deletions .github/workflows/nextjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Deploy Next.js site to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]
branches: ['master']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -21,7 +21,7 @@ permissions:
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
group: 'pages'
cancel-in-progress: false

jobs:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: "20"
node-version: '20'
cache: ${{ steps.detect-package-manager.outputs.manager }}
- name: Setup Pages
uses: actions/configure-pages@v5
Expand Down
10 changes: 5 additions & 5 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
IllinoisWCS.github.io
=====================
# IllinoisWCS.github.io

## About

Expand All @@ -14,18 +13,17 @@ To install and set up locally, first run `npm i` and then `npm run dev`. The app

This application is built with Next.js


## Pull Requests

Please never commit to master, even if you have permission.
Run all changes by the Infrastructure Chairs. Here are the steps to making a change and solving an issue:

1) Make a branch off ```master```. Please give it a descriptive message.
1. Make a branch off `master`. Please give it a descriptive message.

2) Commit your changes onto your branch.
2. Commit your changes onto your branch.

3) Push your branch changes.
3. Push your branch changes.

4) Once you're ready, create a pull request with base as the ```master```.
4. Once you're ready, create a pull request with base as the `master`.

5) Write a descriptive title and comment. You can reference the associated issue with a #.
5. Write a descriptive title and comment. You can reference the associated issue with a #.
4 changes: 2 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
}
};

module.exports = nextConfig
module.exports = nextConfig;
80 changes: 40 additions & 40 deletions public/assets/img/favicons/manifest.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"name": "App",
"icons": [
{
"src": "\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}
"name": "App",
"icons": [
{
"src": "/android-icon-36x36.png",
"sizes": "36x36",
"type": "image/png",
"density": "0.75"
},
{
"src": "/android-icon-48x48.png",
"sizes": "48x48",
"type": "image/png",
"density": "1.0"
},
{
"src": "/android-icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"density": "1.5"
},
{
"src": "/android-icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"density": "2.0"
},
{
"src": "/android-icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"density": "3.0"
},
{
"src": "/android-icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"density": "4.0"
}
]
}
34 changes: 17 additions & 17 deletions public/assets/img/favicons/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
"name": "",
"short_name": "",
"icons": [
{
"src": "android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
9 changes: 6 additions & 3 deletions src/components/events/UpcomingEvent.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import styles from '@/styles/components/UpcomingEvent.module.css';

export default function UpcomingEvent({
title,
date,
dayOfWeek,
dayDate,
time,
location,
description,
Expand All @@ -30,7 +31,8 @@ export default function UpcomingEvent({
<div className={styles.container}>
<h3 className={styles.title}>{title}</h3>
<div className={styles.dateTime}>
<p>{date}</p>
<p>{dayOfWeek},</p>
<p>{dayDate}</p>
<p>{time}</p>
</div>
</div>
Expand All @@ -39,7 +41,8 @@ export default function UpcomingEvent({
<EventDescriptionModal
data={{
title,
date,
dayOfWeek,
dayDate,
time,
location,
description,
Expand Down
Loading