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

Merge updates into heroku beta site #24

Merged
merged 62 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
ed9b6c7
Display roles for person cards
DeveloperBlue Dec 10, 2023
553dc4b
Hide ignored roles
DeveloperBlue Dec 10, 2023
2867c4e
Implement season search bar for Sponsors
DeveloperBlue Dec 10, 2023
9aa2907
Add Instagram as a Contact option
DeveloperBlue Dec 11, 2023
9f21eb9
Change GitHub Actions to use a repository-level UPDATE_ENDPOINT url
DeveloperBlue Dec 11, 2023
b28eb6d
Add API Base URL and Calendar API Key to local .env.local.template
DeveloperBlue Dec 11, 2023
d0b9e1a
Set Calendar to pull API key from environment variables
DeveloperBlue Dec 11, 2023
0848f92
Use API_BASE url from environment variables when making API requests
DeveloperBlue Dec 11, 2023
42b0ac7
Fix parsing bug in local env file for API_BASE url
DeveloperBlue Dec 11, 2023
2bf13fe
Fix more parsing bugs in local env file for API_BASE url
DeveloperBlue Dec 11, 2023
a585b43
Change SVG props from html to react
DeveloperBlue Dec 11, 2023
80c346b
Fix Custom Button not receiving all props
DeveloperBlue Dec 11, 2023
4e668e6
Add disabled props to Custom Button
DeveloperBlue Dec 12, 2023
2060619
Implement Contact Page functionality
DeveloperBlue Dec 12, 2023
7a9fa1b
Disabled Submit button after sending a request
DeveloperBlue Dec 12, 2023
154b58c
Increase size of HomeTiles on medium sized screens
DeveloperBlue Dec 12, 2023
8ea0c4c
Show only current sponsors on Sponsors Marquee
DeveloperBlue Dec 12, 2023
e500b7e
Add Tooltip to Sponsor Marquee
DeveloperBlue Dec 12, 2023
ab6ebf0
Add Coming Soon Banner
DeveloperBlue Dec 12, 2023
219296d
Button updates and fixes
DeveloperBlue Dec 13, 2023
bdeb4b6
Update HomeTile effects
DeveloperBlue Dec 13, 2023
6e8f283
Animate HomeTiles
DeveloperBlue Dec 13, 2023
5517004
Update Tooltip style
DeveloperBlue Dec 13, 2023
da9a082
Fix tooltip over scrolling marquee item
DeveloperBlue Dec 13, 2023
080f248
Replace lorem-ipsum placeholders with content
DeveloperBlue Dec 13, 2023
e3fefb4
Add more content to home page
DeveloperBlue Dec 13, 2023
e7101b3
Add Social Media Links
DeveloperBlue Dec 13, 2023
ef87201
Add contents to AbousUs page
DeveloperBlue Dec 13, 2023
c706315
Modify Coming Soon Banner
DeveloperBlue Dec 13, 2023
d28023e
Add Coming Soon Banner to History page
DeveloperBlue Dec 13, 2023
93a7679
Move banner
DeveloperBlue Dec 13, 2023
beb5076
Add 404 Page
DeveloperBlue Dec 13, 2023
9f3ddee
Fix spacing in ComingSoonBanner
DeveloperBlue Dec 13, 2023
c3e9f0c
Fix z-index issue with Header dividers
DeveloperBlue Dec 13, 2023
9343e86
Add ComingSoonBanner to Showcases, Sponsors, Alumni, and Documents pages
DeveloperBlue Dec 13, 2023
c9de634
Add links to Footer and Navbar
DeveloperBlue Dec 13, 2023
aa65057
Fix mobile swiping bug on carousels
DeveloperBlue Dec 13, 2023
311ac34
Fix svg props
DeveloperBlue Dec 20, 2023
fc8e1b6
Force refresh cache for font
DeveloperBlue Dec 20, 2023
214c2d0
Add onComplete, renderComplete, and renderHeader parametersto Countdo…
DeveloperBlue Dec 20, 2023
40ac3ae
Fix onComplete trigger
DeveloperBlue Dec 20, 2023
c7de1c6
Change Submit Button to Subscribe on Newsletter
DeveloperBlue Dec 20, 2023
38b1fdf
Animate and add onComplete functions to Countdown Timer
DeveloperBlue Dec 20, 2023
b971c28
Set Kickoff Date
DeveloperBlue Dec 20, 2023
0ffc7be
Fix Select Dropdown
DeveloperBlue Dec 20, 2023
9e300c5
Rework Sponsors page and add Sponsorship Incentives
DeveloperBlue Dec 20, 2023
db8c824
Add url redirects to Sponsorship Incentives page
DeveloperBlue Dec 20, 2023
8741be9
Countdown changes
DeveloperBlue Dec 20, 2023
5b0d738
Fix Countdown delta
DeveloperBlue Dec 20, 2023
a31fb93
Add Goal and Vision to AboutUs page
DeveloperBlue Dec 20, 2023
6264e06
Add Loading and NoData messages to Team page
DeveloperBlue Dec 20, 2023
fdbc9e6
Change loading label for Team page
DeveloperBlue Dec 20, 2023
5b9ad08
Add NoData and EmptyData blocks for Sponsors page
DeveloperBlue Dec 20, 2023
663be32
Add Back, Previous, and Next Robots buttons to individual Robot pages
DeveloperBlue Dec 20, 2023
dceeb98
Remove paragraph indents
DeveloperBlue Dec 20, 2023
9bd7cec
Cleanup Events page
DeveloperBlue Dec 20, 2023
d3f8256
Add XRP heading
DeveloperBlue Dec 20, 2023
3e7c6b3
Fill info in on Contact page
DeveloperBlue Dec 20, 2023
578f354
Make ContactPage better on wide-screen desktop
DeveloperBlue Dec 20, 2023
93d2f86
Add mobile view for robots page
DeveloperBlue Dec 20, 2023
d55e8aa
Rework Individual Robot Page
DeveloperBlue Dec 20, 2023
10aeff0
Massive overhaul of homepage for mobile
DeveloperBlue Dec 20, 2023
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: 6 additions & 1 deletion .env.local.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# .env.local

GOOGLE_CALENDAR_API=""
# Base API URL
# Note: Do not include quotes, slashes, or semicolons at the end of baseURL
NEXT_PUBLIC_API_BASE=https://beta.team5599.com

# Google Calendar API Key
NEXT_PUBLIC_GOOGLE_CALENDAR_API=""

# All .env variables are loaded in heroku's production environment. These exist only to help with local development.
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
id: request
uses: tyrrrz/action-http-request@master
with:
url: https://beta.team5599.com/api/v2/Update
url: ${{vars.FRONTEND_UPDATE_ENDPOINT}}
method: POST
headers: |
Content-Type: application/json
Expand Down
13 changes: 8 additions & 5 deletions app/AboutUs/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,28 @@ export default function AboutUs() {
</SubheaderShape>
<div className='container' style={{display: 'flex', flexDirection : 'column', gap : 20, paddingTop : 80, paddingBottom : 120, textAlign : 'justify'}}>
<h2 style={{textAlign : 'center'}}>
TITLE
WHO WE ARE
</h2>
<p>
The Sentinels are Benjamin N. Cardozo High School's Robotics Team. We compete in various annual robotics competitions against high schools across the globe, raising awareness for Science, Technology, Engineering, and Mathematics (STEM), along with teaching students aspects behind business and marketing, logistics, and media. We also participate in various community and school events.
</p>
<p>
FRC Team 5599, participates in the annual FIRST® Robotics Competition (FRC). In a six week time span, we raise funds, design, and construct a fully-functional robot.
</p>
<p>
In 2014, the team was awarded the Future Glory Award at the Brunswick Eruption 2014 off-season competition. In 2015, the team took home the Rookie Inspiration Award from the New York City 2015 Regional Competition. In 2017, the team was the leading alliance in finals at the Hudson Valley Rally off-season competition in Yonkers, New York. In 2018, the team played in the quarter-finals in the New York City 2018 Regional Competition on an alliance with specialized school Brooklyn Technical High School and Long Island City High School. At the time Vice-Captain and Director of Marketing, Danielle Louie, was a Dean's Lists Award semi-finalist. At the 2019 SBPLI Long Island Regional Competition (#2), Nazifa Prapti was a Dean's List Award semi-finalist, and was also awarded the MVP Achievement in recognition of their "Individual excellence, contribution, and achievement" during the competition season. At the New York City 2019 Regional, Nazifa was a Dean's List Award finalist, one of the highest acclaimed awards in the entire FIRST Robotics program. The team placed in the semi-finals during the 2019 Half Hallow Hills Robotics Invitational off-season event.
</p>
<div className={styles.teamPhotoContainer}>

</div>
<h2 style={{textAlign : 'center'}}>
MISSION
<h2 style={{textAlign : 'center', marginTop : 80}}>
OUR MISSION
</h2>
<p>
The Sentinels are Benjamin N. Cardozo High School's Robotics Team. We compete in various annual robotics competitions against high schools across the globe, raising awareness for Science, Technology, Engineering, and Mathematics (STEM), along with teaching students aspects behind business and marketing, logistics, and media. We also participate in various community and school events.
Our mission is to inspire leadership through hands-on projects and activities while fostering a passion for fields in STEM and providing invaluable skills in networking, communication, problem-solving, and teamwork in a fun and engaging environment.
</p>
<p>
FRC Team 5599, participates in the annual FIRST® Robotics Competition (FRC). In a six week time span, we raise funds, design, and construct a fully-functional robot.
We envision a world where everyone is provided with the opportunities to learn and develop a passion in STEM in a uplifting environment through hands-on projects and collaboration.
</p>
<div
className={styles.buttonSection}
Expand Down
27 changes: 27 additions & 0 deletions app/Alumni/page.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import styles from './page.module.css'

import Navbar from '@components/Navbar/Navbar'
import Footer from '@components/Footer/Footer'
import Header from '@components/Header/Header'
import ComingSoonBanner from '@components/ComingSoonBanner/ComingSoonBanner'

export default function Alumni() {
return (
<div
style={{
backgroundColor : 'black'
}}
>
<Navbar/>
<Header size='md' imageClass={styles.headerOne} masked={true} divider={true}>
<div className='container restrictHeader' style={{color : '#fff'}}>
<h2>
ALUMNI OUTREACH
</h2>
</div>
</Header>
<ComingSoonBanner/>
<Footer/>
</div>
)
}
5 changes: 5 additions & 0 deletions app/Alumni/page.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.headerOne {
background-image : url('/images/headers/header.jpg');
background-position: 50% 80%;
filter: brightness(75%) contrast(115%);
}
2 changes: 1 addition & 1 deletion app/Calendar/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Footer from '@components/Footer/Footer'

import GoogleCalendar from "@ericz1803/react-google-calendar";

const API_KEY = ""
const API_KEY = process.env.NEXT_PUBLIC_GOOGLE_CALENDAR_API;
const calendars = [
{
calendarID : '[email protected]'
Expand Down
Loading
Loading