From 6b6067bbaa3a34aa9b2c5be200fb86a7008c828a Mon Sep 17 00:00:00 2001 From: James He <28793743+he-james@users.noreply.github.com> Date: Sun, 5 Dec 2021 19:09:24 -0700 Subject: [PATCH 1/2] Staging (#71) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * Hotfix/dates change (#56) * Staging (#43) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * changes the dates to the correct dates on the homepage * removed storybook-static Co-authored-by: James He Co-authored-by: Franco Reda * Dev/55 staff app form (#59) * Feature/4 school registration (#63) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Feature/4 school registration (#64) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log Co-authored-by: Steven Mungovan <55511406+sdmungov@users.noreply.github.com> Co-authored-by: sdmungov * Feature/4 school registration (#65) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log * added v1.0 of the mobile friendly top nav bar Co-authored-by: James He * Feature/jh nov general enhancements (#68) * staff apps (#61) * Release - School Registration (#66) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * Hotfix/dates change (#56) * Staging (#43) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * changes the dates to the correct dates on the homepage * removed storybook-static Co-authored-by: James He Co-authored-by: Franco Reda * Dev/55 staff app form (#59) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Feature/4 school registration (#63) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log * Feature/4 school registration (#64) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log Co-authored-by: Steven Mungovan <55511406+sdmungov@users.noreply.github.com> Co-authored-by: sdmungov * added v1.0 of the mobile friendly top nav bar Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov * Update homepage * Update footer and header * Update school registration form * Update school registration image * Remove blank pages * Add TODO * Add global style to use pointer on hover with a elements * Add error message when forms fail to load * Scale and align Logo with flex * Center logo for mobile * Fix flexbox safari compatibility issue * Fix nav button alignment issue Co-authored-by: Steven Mungovan <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov * Create SECURITY.md (#62) * Create SECURITY.md * Replace redirect with submission recceived copy (#70) * nov21 release (#69) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * Hotfix/dates change (#56) * Staging (#43) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * changes the dates to the correct dates on the homepage * removed storybook-static Co-authored-by: James He Co-authored-by: Franco Reda * Dev/55 staff app form (#59) * Feature/4 school registration (#63) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Feature/4 school registration (#64) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log Co-authored-by: Steven Mungovan <55511406+sdmungov@users.noreply.github.com> Co-authored-by: sdmungov * Feature/4 school registration (#65) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log * added v1.0 of the mobile friendly top nav bar Co-authored-by: James He * Feature/jh nov general enhancements (#68) * staff apps (#61) * Release - School Registration (#66) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * Hotfix/dates change (#56) * Staging (#43) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2b vercel sponsorship (#31) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Release/2021/sprint 1 (#39) * Dev/2 vercel sponsorship (#20) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/1 jh deployment rebase (#27) * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * created the jumbotron component for the landing of the home page and put it in a components folder and imported it into pages/index, set up fonts and colors files and some early global styles but those will be changed over to styled components based off a decision after this code was written (#22) * installed and set up some basic styled-components, converted parts of jumbotron component and main page ot use some styled components (#24) * Use utm params for vercel redirects * Readme changes Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> * #18 Initialize New Footer Component * Add FontAwesome * Add new footer and associated storybook/styles * Improved storybook setup * Dev/2b vercel sponsorship (#30) * Dev/2 vercel sponsorship (#20) (#21) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * Dev/2b vercel sponsorship (#29) * Dev/2 vercel sponsorship (#20) (#25) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Dev/2 vercel sponsorship (#20) (#25) (#26) * Add LICENSE * Update gitignore * Update vercel footer * Add Vercel banner to README * Add divider for style points * Update links and copy Deploy on Vercel README section * Small README adjustment * Update readme * Update readme * Update readme * #18 Refine Header * #18 Good for now * Header Nav Component (#32) * created the header nav component with only logo and home for the first release, the rest of the links will come when those pages have content, also made landing pages for about and conference links, added a breakpoints file to help with media query styling with styled components * made the requested change from review * Add and update vercel assets * Small negative space enhancements * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Optimize Footer Image and Header text * update gitignore * ope * Homepage Info Section (#35) * added the first draft of the info section of the home page and is fairly responsive * added styling to info cards * Dev/17 jh info cards (#36) * Defeat Megatron (#34) * Switch out hero svg for image * Defeated megatron * Incredibly unnecessary header styling * Small style and copy changes * Adjust per comments * Adjust per comments * Adjust mobile view and justify text * Somehow enhanced the margins * Add extra title breakpoint * I love this breakpoint function - Update subtitle for mobile * Adjust brightness of jumbotron in a scuffed manner * Add breakpoint for SubTitle width Co-authored-by: James He * First Hotfix. Memories (#42) Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda * changes the dates to the correct dates on the homepage * removed storybook-static Co-authored-by: James He Co-authored-by: Franco Reda * Dev/55 staff app form (#59) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Feature/4 school registration (#63) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log * Feature/4 school registration (#64) * staff apps (#61) * added school registration form page and updated nav bar, mobile friendle nav bar to come soon * school registration form * Sort fields by index before rendering * Add asterisk for required fields * Remove console log Co-authored-by: Steven Mungovan <55511406+sdmungov@users.noreply.github.com> Co-authored-by: sdmungov * added v1.0 of the mobile friendly top nav bar Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov * Update homepage * Update footer and header * Update school registration form * Update school registration image * Remove blank pages * Add TODO * Add global style to use pointer on hover with a elements * Add error message when forms fail to load * Scale and align Logo with flex * Center logo for mobile * Fix flexbox safari compatibility issue * Fix nav button alignment issue Co-authored-by: Steven Mungovan <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov * Create SECURITY.md (#62) * Create SECURITY.md Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov * Replace redirect with submission recceived copy * Allow inject custom submission type to form submitted message * More CTAs on Homepage * Fix ref to PDF * Some whitespace improvements, I guess * Update Announce.tsx * Add and update scheduling information Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov Co-authored-by: sdmungov <55511406+sdmungov@users.noreply.github.com> Co-authored-by: Franco Reda Co-authored-by: sdmungov --- components/Announce.tsx | 34 ++++++++ .../elements/AnnouncementBar.elements.tsx | 21 +++++ components/footer/index.tsx | 9 ++ components/headerNav/index.tsx | 4 +- components/infoColumns/index.tsx | 26 +++++- components/stepped-form/index.tsx | 38 +++++++-- pages/index.tsx | 77 +++++++++--------- pages/school-registration/index.tsx | 2 +- pages/staff-apps/index.tsx | 2 +- public/schedule.pdf | Bin 0 -> 211592 bytes 10 files changed, 159 insertions(+), 54 deletions(-) create mode 100644 components/Announce.tsx create mode 100644 components/elements/AnnouncementBar.elements.tsx create mode 100644 public/schedule.pdf diff --git a/components/Announce.tsx b/components/Announce.tsx new file mode 100644 index 0000000..3b04d71 --- /dev/null +++ b/components/Announce.tsx @@ -0,0 +1,34 @@ +import Link from 'next/link'; +import React from 'react'; +import { Body } from '../styles/typography'; +import AnnouncementBar from "./elements/AnnouncementBar.elements"; +import {colors} from "../styles/colors"; + +const RegistrationOpen = () => { + return ( + + + Want to bring your school to CIMUN XVIII? You're in luck! + {" - "} + + Register Now + + {" - "} + + More Information + + + + ) +}; + +const Announce = { + RegistrationOpen +}; + +export default Announce; diff --git a/components/elements/AnnouncementBar.elements.tsx b/components/elements/AnnouncementBar.elements.tsx new file mode 100644 index 0000000..95ca46a --- /dev/null +++ b/components/elements/AnnouncementBar.elements.tsx @@ -0,0 +1,21 @@ +import styled from "styled-components"; +import {colors} from "../../styles/colors"; + +interface AnnouncementBarProps { + backgroundColor?: string; + fontColor?: string; +} + +const AnnouncementBar = styled.span` + display: flex; + place-content: center; + width: 100%; + + background-color: ${ + (props: AnnouncementBarProps) => props.backgroundColor + ? props.backgroundColor + : colors.accentRed + }; +`; + +export default AnnouncementBar; \ No newline at end of file diff --git a/components/footer/index.tsx b/components/footer/index.tsx index e414c59..b9c4205 100644 --- a/components/footer/index.tsx +++ b/components/footer/index.tsx @@ -34,6 +34,15 @@ const Footer: React.FC = () => ( Pricing & Registration + diff --git a/components/headerNav/index.tsx b/components/headerNav/index.tsx index 6d01c25..d763047 100644 --- a/components/headerNav/index.tsx +++ b/components/headerNav/index.tsx @@ -143,12 +143,9 @@ const Burger = styled.button` display: none; @media screen and (max-width: 768px) { height: 2.8125vw; - margin-top: 0.46875vw; ${breakpoints("height", "px", [{ 1200: 35 }, { 800: 30 }])}; - ${breakpoints("margin-top", "px", [{ 1200: 5 }, { 800: 7.5 }])}; display: flex; position: absolute; - top: 0; right: 3vw; z-index: 10; align-items: center; @@ -236,3 +233,4 @@ const HeaderNav = () => { export default HeaderNav; +export {Anchor}; diff --git a/components/infoColumns/index.tsx b/components/infoColumns/index.tsx index 0caaf95..2bf0c9e 100644 --- a/components/infoColumns/index.tsx +++ b/components/infoColumns/index.tsx @@ -3,6 +3,7 @@ import { SubTitle, Body } from "../../styles/typography"; import { colors } from "../../styles/colors"; import { InfoColumnWrapper, CardWrapper, CardContainer } from "./infoColumns.styles"; import LetterElement from "./letter.element"; +import React from "react"; export default function InfoColumns(): JSX.Element { return ( @@ -45,6 +46,21 @@ export default function InfoColumns(): JSX.Element { > February 3rd - 6th, 2022 + + + [See Full Schedule Here] + + - Begins January 16, 2022 + Opening soon, due January 30, 2022 - [Click Here] + [Register Now] + + {" "}|{" "} + + [Pricing & More Info] @@ -229,7 +249,7 @@ export default function InfoColumns(): JSX.Element { join our amazing team!
- [Click Here] + [Click Here To Apply] diff --git a/components/stepped-form/index.tsx b/components/stepped-form/index.tsx index 5ea805d..23dcc84 100644 --- a/components/stepped-form/index.tsx +++ b/components/stepped-form/index.tsx @@ -1,4 +1,5 @@ import React, { useEffect, useState } from "react"; +import Link from 'next/link'; import { SubTitle, Body } from "../../styles/typography"; import { ComponentWrapper } from "../../styles/containers"; import styled from "styled-components"; @@ -12,7 +13,6 @@ import { SubmitFormDto, } from "../../services/axiosHandler"; import { ApiFormData, FormField } from "./form-interfaces"; -import { useRouter } from "next/router"; const Form = styled.form` display: flex; @@ -24,6 +24,7 @@ const Form = styled.form` ${breakpoints("margin", "", [{ 800: "3vh 0" }])}; padding: 0; `; + const SeggsyInput = styled.input` width: 100%; height: 56px; @@ -164,15 +165,15 @@ const Icon = styled(FontAwesomeIcon)` interface OwnProps { confId: string; formId: string; + submissionType?: string; } const SteppedForm = (props: OwnProps) => { const { confId, formId } = props; const [formData, setFormData] = useState(); const [loading, setLoading] = useState(true); - // #TODO - why doesn't this work correctly lol const [errorMessage, setErrors] = useState(""); - const router = useRouter(); + const [submitted, setSubmitted] = useState(false); const initForm = async () => { setLoading(true); @@ -263,8 +264,8 @@ const SteppedForm = (props: OwnProps) => { const request = new SubmitFormDto(); request.responses = responses; // Submit! - await postFormSubmission(confId, formId, { responses }).then(res => { - router.replace("/"); + await postFormSubmission(confId, formId, { responses }).then(() => { + setSubmitted(true) }) .catch(err => { setErrors(`Couldn't submit application. ${ err.response.data.error }`); @@ -429,12 +430,12 @@ const SteppedForm = (props: OwnProps) => { return ( - {!loading && formData !== null && formData !== undefined && ( + {!loading && formData !== null && formData !== undefined && !submitted && ( {formData.sections[0].intro} )} - {!loading && formData !== null && formData !== undefined && ( + {!loading && formData !== null && formData !== undefined && !submitted &&(
{formData.sections[0].fields.sort((a, b) => { return a.index - b.index @@ -445,7 +446,7 @@ const SteppedForm = (props: OwnProps) => { )} - {!loading && !formData && ( + {!loading && !formData && !submitted && ( Something went wrong while attempting to retrieve this form. Please try again in a few minutes.

If this issue persists, @@ -454,6 +455,27 @@ const SteppedForm = (props: OwnProps) => { and we will be able to assist you. Thank you for your cooperation. )} + {submitted && ( + <> + + Your {props.submissionType ? props.submissionType : "submission"} has + been received! Thank you so much for your interest in CIMUN XVIII. +

+ We will be in touch with you after reviewing your { + props.submissionType + ? props.submissionType + : "submission"}. In the + meantime, if you have any further inquiries, you are welcome to + reach out to our Steering Committee at + sc@cimun.org + for assistance. +

+ Once again, thank you so much for your interest in CIMUN. We hope to + see you there! + + + )}
); }; diff --git a/pages/index.tsx b/pages/index.tsx index 4ce1669..594ba00 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,49 +1,50 @@ import Head from "next/head"; -import Image from "next/image"; import HeaderNav from "../components/headerNav"; import Jumbotron from "../components/jumbotron"; import InfoColumns from "../components/infoColumns"; import Footer from "../components/footer"; +import Announce from "../components/Announce" import { Wrapper } from "../styles/containers"; export default function Home() { return ( - - - Chicago International Model UN - + + Chicago International Model UN + + + + + + + + + + + + - - - - - - - - - - - -