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

Mark 2024 FTC kickoff as complete, and update GBM information #224

Open
wants to merge 4 commits into
base: main
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
7 changes: 2 additions & 5 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { defineConfig, squooshImageService } from "astro/config";
import { defineConfig } from "astro/config";
import react from "@astrojs/react";

// https://astro.build/config
export default defineConfig({
integrations: [react()],
image: {
service: squooshImageService(),
}
});
});
12,011 changes: 3,265 additions & 8,746 deletions package-lock.json

Large diffs are not rendered by default.

36 changes: 14 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,34 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/react": "^3.6.0",
"@astrojs/react": "^3.6.2",
"@fortawesome/fontawesome-free": "^6.6.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@popperjs/core": "^2.11.8",
"@types/mapbox-gl": "^3.1.0",
"@types/react": "^18.3.3",
"@types/mapbox-gl": "^3.4.0",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"astro": "^4.11.6",
"astro": "^4.15.6",
"bootstrap": "^5.3.3",
"magic-string": "^0.30.10",
"mapbox-gl": "^3.5.1",
"magic-string": "^0.30.11",
"mapbox-gl": "^3.6.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.77.8",
"sass": "^1.78.0",
"use-prefers-color-scheme": "^1.1.3",
"vite": "^5.3.4"
"vite": "^5.4.5"
},
"devDependencies": {
"@astropub/codecs": "^0.4.4",
"@types/bootstrap": "^5.2.10",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.9.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.4.0",
"eslint-plugin-react": "^7.34.4",
"eslint-plugin-react-hooks": "^4.6.2",
"file-type": "^19.2.0",
"@typescript-eslint/eslint-plugin": "^8.5.0",
"@typescript-eslint/parser": "^8.5.0",
"file-type": "^19.5.0",
"find-cache-dir": "^5.0.0",
"object-hash": "^3.0.0",
"potrace": "^2.1.8",
"typescript": "^5.5.3",
"vitest": "^2.0.3"
"sharp": "^0.33.5",
"typescript": "^5.6.2",
"vitest": "^2.1.1"
}
}
38 changes: 16 additions & 22 deletions src/components/index/Announcements.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,18 @@ import Announcement from "./Announcement.astro";
class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4 mx-1 justify-content-center"
>
<Announcement
title="2024 FRC kickoff"
image="kickoff/2024/broadcast.png"
alt="Teams watch FIRST's kickoff broadcast during FAMNM's 2024 FRC kickoff"
title="2024 FTC kickoff"
image="ftc/2024/kickoff-livestream.png"
alt="FTC team members watch a presentation attentively in an auditorium"
links={[
{
text: "Season Resources",
link: "/events/kickoff/",
},
{
text: "FAMNM Ri3D livestreams",
link: "https://twitch.tv/famnm",
text: "Game Resources",
link: "https://www.firstinspires.org/resource-library/ftc/game-and-season-info",
},
]}
>
FAMNM kicked off the 2024 FRC season, <i>CRESCENDO</i>, on <time
datetime="2024-01-06">January 6, 2024</time
FAMNM kicked off the 2024&ndash;2025 FTC season, <i>INTO THE DEEP</i>, on <time
datetime="2024-09-07">September 7, 2024</time
> at the University of Michigan in Ann Arbor.
</Announcement>
<Announcement
Expand All @@ -47,23 +43,21 @@ import Announcement from "./Announcement.astro";
a team.
</Announcement>
<Announcement
title="2024 FRC volunteering"
image="index/announcements/Dom-FIM-States-2024.jpg"
alt="A FAMNM member volunteers as a field resetter at the FRC Michigan State Championship in 2024"
title="Interested in joining FAMNM?"
image="index/announcements/general_fall_2019.jpg"
alt="FAMNM members conduct a meeting in a classroom"
links={[
{
text: "Sign up to volunteer",
link: "https://docs.google.com/spreadsheets/d/1kDUFPgt9U2acVZzC9ucnnrpB4CG4xknzRRGcc_Sd7WU/edit#gid=0",
text: "Interest Form",
link: "https://forms.gle/nvQ9UjXtKPqzFHwt9",
tooltip: "umich.edu account required",
},
{
text: "Register with FIRST",
link: "https://drive.google.com/file/d/1KK0DTUVbxq3v1YfF9FJ_Uh-PXcA-3GdS/view?usp=drive_link",
},
]}
>
FAMNM is organizing volunteering efforts at <i>CRESCENDO</i> FRC events. Join
us!
Come to our Fall 2024 General Body Meetings <b
>every Thursday at 8 PM in FXB 1008</b
>, and fill out the interest form linked below to get added to our Slack
workspace and Google Drive.
</Announcement>
</div>
</section>
1 change: 1 addition & 0 deletions src/env.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/// <reference path="../.astro/types.d.ts" />
/// <reference types="astro/client" />
Binary file added src/images/ftc/2024/kickoff-livestream.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 12 additions & 7 deletions src/pages/events/ftc-kickoff.astro
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,31 @@ import seasonLogoDark from "../../images/ftc/2024/into-the-deep-dark.png";
FAMNM <i>FIRST<sup>&reg;</sup></i> Tech Challenge Kickoff
</h1>
<p class="mb-4">
FAMNM will host a kickoff event for the 2024&ndash;2025 season of <FIRST
FAMNM hosted a kickoff event for the 2024&ndash;2025 season of <FIRST
/> Tech Challenge, INTO THE DEEP<sup>SM</sup>, on <time
datetime="2024-09-07">September 7<sup>th</sup>, 2024</time
> at the University of Michigan's <a
href="https://goo.gl/maps/fLGy2FxVHeozWEZt6"
rel="noreferrer noopener"
target="_blank">North Campus</a
>. To attend, please register your team via the form linked below
and fill out Children on Campus forms for all participating minors.
>. Good luck, teams! 🫧
</p>
<div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
<a
class="btn btn-primary btn-lg gap-3"
href="https://docs.google.com/forms/d/e/1FAIpQLSc413Z-bqM2gSaNAPuujkJObWtHLPkARnWDYbsV1D7pUAqTOA/viewform"
href="https://youtu.be/ewlDPvRK4U4?si=uRsIvmmNIRP4Ke7Y"
rel="noreferrer noopener"
target="_blank"
>
Register
Game Animation
</a>
<a
class="btn btn-primary btn-lg gap-3"
href="https://umforms.tfaforms.net/2?CampId=701UI00000CHzY6YAL"
href="https://ftc-resources.firstinspires.org/file/ftc/game/manual"
rel="noreferrer noopener"
target="_blank"
>
Children on Campus Forms
Competition Manual
</a>
</div>
</div>
Expand All @@ -75,6 +74,12 @@ import seasonLogoDark from "../../images/ftc/2024/into-the-deep-dark.png";
<Carousel
id="image-carousel"
images={[
{
title: "FIRST Kickoff Broadcast",
description:
"Teams watch as <i>FIRST</i> reveals the 2024&ndash;2025 FTC season game, <i>INTO THE DEEP</i>, in a kickoff livestream shown at the Stamps Auditorium.",
src: "ftc/2024/kickoff-livestream.png",
},
{
title: "CENTERSTAGE Reveal",
description:
Expand Down
16 changes: 0 additions & 16 deletions src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,6 @@ const images = [
<Announcements />

<Carousel id="homepage-carousel" images={images} class="mx-0 w-100 px-0" />

<div class="container p-4">
<div class="card lead-card bg-body-secondary text-start p-4">
<h2 class="card-title">Interested in joining FAMNM?</h2>
<p class="card-text">
Come to our Winter 2024 General Body Meetings <b
>every Monday at 7 PM in EECS 3427</b
>, and fill out our
<a
href="https://forms.gle/AmDLDRvCZisRb6tcA"
rel="noreferrer noopener">Winter 2024 interest form</a
>
so that we can add you to our Slack workspace and mailing list.
</p>
</div>
</div>
</main>

<style is:global>
Expand Down