From 629dd8fec178740316f55d1cd2defcdc2d9569a3 Mon Sep 17 00:00:00 2001 From: Ryan Hodge Date: Tue, 14 Jan 2025 13:22:06 -0500 Subject: [PATCH] Fixing the warnings Fixing the yaml runner --- .github/workflows/node.js.yml | 10 +++------- package.json | 3 ++- src/pages/general/navigation/Navigation.tsx | 5 +++-- src/pages/meet-the-leads/MeetTheLeadsStyles.tsx | 16 +++++++--------- src/pages/sponsors/Sponsors.tsx | 16 ++++++---------- src/pages/sponsors/SponsorsStyles.tsx | 8 ++++++++ 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 8adddfa..65ebb8a 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -3,11 +3,7 @@ name: Node.js CI -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] +on: [push] jobs: build: @@ -16,7 +12,7 @@ jobs: strategy: matrix: - node-version: [16.x] + node-version: [20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: @@ -26,6 +22,6 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - - run: npm ci --legacy-peer-deps + - run: npm i - run: npm run build --if-present - run: npm test diff --git a/package.json b/package.json index 1a18cc2..b14bfea 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "react-toastify": "^9.0.8", "styled-components": "^5.3.5", "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.9.3" + "webpack-dev-server": "^4.9.3", + "@babel/plugin-proposal-private-property-in-object": "^7.21.11" } } diff --git a/src/pages/general/navigation/Navigation.tsx b/src/pages/general/navigation/Navigation.tsx index 7847f37..b74c3d8 100644 --- a/src/pages/general/navigation/Navigation.tsx +++ b/src/pages/general/navigation/Navigation.tsx @@ -40,7 +40,6 @@ const Navigation = (): React.ReactElement => { - location.href = TEAMS}>Teams Home Events @@ -48,7 +47,9 @@ const Navigation = (): React.ReactElement => { Robotics RockSat NASA Ballooning - Meet Our Robotics Leads + + Meet Our Robotics Leads + diff --git a/src/pages/meet-the-leads/MeetTheLeadsStyles.tsx b/src/pages/meet-the-leads/MeetTheLeadsStyles.tsx index f3a20f7..1089268 100644 --- a/src/pages/meet-the-leads/MeetTheLeadsStyles.tsx +++ b/src/pages/meet-the-leads/MeetTheLeadsStyles.tsx @@ -6,8 +6,8 @@ export default class MeetTheLeadsStyles { static readonly MeetTheLeadsContainer = styled.div` display: grid; grid-template-columns: 100%; - grid-template-rows: - calc(var(--vh) * .2) /* Intro heading */ + grid-template-rows: + calc(var(--vh) * .2) /* Intro heading */ calc(var(--vh) * 2.39) /* Outreach gallery and photo gallery */ max(calc(var(--vh) * .15), 100px); /* Contact info */ justify-content: center; @@ -16,8 +16,8 @@ export default class MeetTheLeadsStyles { @media (max-width: 718px) { display: grid; grid-template-columns: 100%; - grid-template-rows: - calc(var(--vh) * .2) /* Intro heading */ + grid-template-rows: + calc(var(--vh) * .2) /* Intro heading */ calc(var(--vh) * 2.65) /* Outreach gallery and photo gallery */ max(calc(var(--vh) * .15), 100px); /* Contact info */ justify-content: center; @@ -25,7 +25,7 @@ export default class MeetTheLeadsStyles { } - + ` static readonly TitleContainer = styled.div` @@ -45,7 +45,7 @@ export default class MeetTheLeadsStyles { //grid of leads text and img squares display: grid; grid-template-columns: repeat(2 , minmax(0, 1fr)); - grid-template-rows: calc(var(--vh) * .4) repeat(6, minmax(0, 1fr)); + grid-template-rows: calc(var(--vh) * .4) repeat(6, minmax(0, 1fr)); row-gap: 20px; column-gap: 4%; justify-items: center; @@ -102,8 +102,6 @@ export default class MeetTheLeadsStyles { justify-items: center; align-items: center; - - ` - + ` } diff --git a/src/pages/sponsors/Sponsors.tsx b/src/pages/sponsors/Sponsors.tsx index b987c16..c6e15b0 100644 --- a/src/pages/sponsors/Sponsors.tsx +++ b/src/pages/sponsors/Sponsors.tsx @@ -22,12 +22,9 @@ const Sponsors = (): React.ReactElement => {

Sponsors

- -
+

Current Sponsors

-
@@ -36,9 +33,8 @@ const Sponsors = (): React.ReactElement => {
- -
+ +

Previous Sponsors

@@ -52,9 +48,9 @@ const Sponsors = (): React.ReactElement => {
{/*
- call amtrak image here, make sure it has been transerred into an svg + call amtrak image here, make sure it has been transerred into an svg
*/} - + diff --git a/src/pages/sponsors/SponsorsStyles.tsx b/src/pages/sponsors/SponsorsStyles.tsx index 4eb976a..b089920 100644 --- a/src/pages/sponsors/SponsorsStyles.tsx +++ b/src/pages/sponsors/SponsorsStyles.tsx @@ -42,6 +42,14 @@ export default class SponsorsStyles { text-align: center; } + .centered-img { + background: #000000a0; + display: 'flex'; + justify-content: 'center'; + align-items: 'center'; + flex-direction: 'column'; + row-gap: '3rem'; + } `