Skip to content

Commit 629dd8f

Browse files
author
Ryan Hodge
committed
Fixing the warnings
Fixing the yaml runner
1 parent 879b0f6 commit 629dd8f

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

.github/workflows/node.js.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33

44
name: Node.js CI
55

6-
on:
7-
push:
8-
branches: [ "master" ]
9-
pull_request:
10-
branches: [ "master" ]
6+
on: [push]
117

128
jobs:
139
build:
@@ -16,7 +12,7 @@ jobs:
1612

1713
strategy:
1814
matrix:
19-
node-version: [16.x]
15+
node-version: [20.x]
2016
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2117

2218
steps:
@@ -26,6 +22,6 @@ jobs:
2622
with:
2723
node-version: ${{ matrix.node-version }}
2824
cache: 'npm'
29-
- run: npm ci --legacy-peer-deps
25+
- run: npm i
3026
- run: npm run build --if-present
3127
- run: npm test

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"react-toastify": "^9.0.8",
8080
"styled-components": "^5.3.5",
8181
"webpack-cli": "^4.10.0",
82-
"webpack-dev-server": "^4.9.3"
82+
"webpack-dev-server": "^4.9.3",
83+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
8384
}
8485
}

src/pages/general/navigation/Navigation.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,16 @@ const Navigation = (): React.ReactElement => {
4040
<Navbar.Toggle aria-controls='basic-navbar-nav' />
4141
<Navbar.Collapse className='basic-navbar-links'>
4242
<Styles.NavbarLinks variant='pills' toggle={ width < Constants.MOBILE_SIZE ? 1 : 0 }>
43-
4443
<NavLink eventKey='7' as={Link} to={Constants.PATHS.HOME} onClick={() => location.href = TEAMS}>Teams</NavLink>
4544
<NavLink eventKey='1' as={Link} to={Constants.PATHS.HOME} onClick={scrollToTop}>Home</NavLink>
4645
<NavLink eventKey='2' as={Link} to={Constants.PATHS.EVENTS} onClick={scrollToTop}>Events</NavLink>
4746
<NavLink eventKey='3' as={Link} to={Constants.PATHS.SPONSORS} onClick={scrollToTop}>Sponsors</NavLink>
4847
<NavLink eventKey='4' as={Link} to={Constants.PATHS.ROBOTICS} onClick={scrollToTop}>Robotics</NavLink>
4948
<NavLink eventKey='5' as={Link} to={Constants.PATHS.ROCKSAT} onClick={scrollToTop}>RockSat</NavLink>
5049
<NavLink eventKey='6' as={Link} to={Constants.PATHS.BALLOONING} onClick={scrollToTop}>NASA Ballooning</NavLink>
51-
<NavLink eventKey='8' as={Link} to={Constants.PATHS.MEETTHELEADS} onClick={scrollToTop}>Meet Our Robotics Leads</NavLink>
50+
<NavLink eventKey='8' as={Link} to={Constants.PATHS.MEETTHELEADS} onClick={scrollToTop}>
51+
Meet Our Robotics Leads
52+
</NavLink>
5253
</Styles.NavbarLinks>
5354
</Navbar.Collapse>
5455
</Styles.NavigationBar>

src/pages/meet-the-leads/MeetTheLeadsStyles.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export default class MeetTheLeadsStyles {
66
static readonly MeetTheLeadsContainer = styled.div`
77
display: grid;
88
grid-template-columns: 100%;
9-
grid-template-rows:
10-
calc(var(--vh) * .2) /* Intro heading */
9+
grid-template-rows:
10+
calc(var(--vh) * .2) /* Intro heading */
1111
calc(var(--vh) * 2.39) /* Outreach gallery and photo gallery */
1212
max(calc(var(--vh) * .15), 100px); /* Contact info */
1313
justify-content: center;
@@ -16,16 +16,16 @@ export default class MeetTheLeadsStyles {
1616
@media (max-width: 718px) {
1717
display: grid;
1818
grid-template-columns: 100%;
19-
grid-template-rows:
20-
calc(var(--vh) * .2) /* Intro heading */
19+
grid-template-rows:
20+
calc(var(--vh) * .2) /* Intro heading */
2121
calc(var(--vh) * 2.65) /* Outreach gallery and photo gallery */
2222
max(calc(var(--vh) * .15), 100px); /* Contact info */
2323
justify-content: center;
2424
align-content: center;
2525
2626
}
2727
28-
28+
2929
`
3030

3131
static readonly TitleContainer = styled.div`
@@ -45,7 +45,7 @@ export default class MeetTheLeadsStyles {
4545
//grid of leads text and img squares
4646
display: grid;
4747
grid-template-columns: repeat(2 , minmax(0, 1fr));
48-
grid-template-rows: calc(var(--vh) * .4) repeat(6, minmax(0, 1fr));
48+
grid-template-rows: calc(var(--vh) * .4) repeat(6, minmax(0, 1fr));
4949
row-gap: 20px;
5050
column-gap: 4%;
5151
justify-items: center;
@@ -102,8 +102,6 @@ export default class MeetTheLeadsStyles {
102102
justify-items: center;
103103
align-items: center;
104104
105-
106-
`
107105
108-
106+
`
109107
}

src/pages/sponsors/Sponsors.tsx

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ const Sponsors = (): React.ReactElement => {
2222
<h2 className='title'>Sponsors</h2>
2323
<AiOutlineDash/>
2424
</Styles.TitleContainer>
25-
26-
<div className='img-container' style={{background: '#000000a0', display: 'flex', justifyContent: 'center', alignItems: 'center', flexDirection: 'column',
27-
rowGap: '3rem',
28-
}}>
25+
<div className='img-container centered-img'>
2926
<h1 className='title'>Current Sponsors</h1>
30-
<Button source={'https://forms.gle/pAfv3VBYJJXooiU38'}
27+
<Button source={'https://forms.gle/pAfv3VBYJJXooiU38'}
3128
text='become a sponsor' size='large' className='becomeSponsor'/>
3229
</div>
3330
<div className='img-container' style={{background: '#053a92'}}>
@@ -36,9 +33,8 @@ const Sponsors = (): React.ReactElement => {
3633
<div className='img-container' style={{background: 'white'}}>
3734
<Amtrack/>
3835
</div>
39-
40-
<div className='img-container' style={{background: '#000000b5', display: 'flex', justifyContent: 'center', alignItems: 'center', flexDirection: 'column',
41-
rowGap: '3rem'}}>
36+
37+
<div className='img-container centered-img'>
4238
<h1 className='title'>Previous Sponsors</h1>
4339
</div>
4440

@@ -52,9 +48,9 @@ const Sponsors = (): React.ReactElement => {
5248
<img src={SponsorImages.hillock} style={{width: '60%'}}/>
5349
</div>
5450
{/* <div className='img-container' style={{background: 'wihte'}}>
55-
call amtrak image here, make sure it has been transerred into an svg
51+
call amtrak image here, make sure it has been transerred into an svg
5652
</div> */}
57-
53+
5854

5955
<Contact/>
6056
</Styles.SponsorContainer>

src/pages/sponsors/SponsorsStyles.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ export default class SponsorsStyles {
4242
text-align: center;
4343
}
4444
45+
.centered-img {
46+
background: #000000a0;
47+
display: 'flex';
48+
justify-content: 'center';
49+
align-items: 'center';
50+
flex-direction: 'column';
51+
row-gap: '3rem';
52+
}
4553
`
4654

4755

0 commit comments

Comments
 (0)