From 6f12848e209926da33748c3777c47cc67bf518bf Mon Sep 17 00:00:00 2001 From: fpunny Date: Tue, 23 Nov 2021 19:33:49 -0500 Subject: [PATCH 01/11] task: Added vaccination check to form --- .../Application/Application.module.scss | 18 +++++++++++++++ src/sections/Application/Consent/index.jsx | 23 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/sections/Application/Application.module.scss b/src/sections/Application/Application.module.scss index 0e52a97..374399a 100644 --- a/src/sections/Application/Application.module.scss +++ b/src/sections/Application/Application.module.scss @@ -1,3 +1,21 @@ +@use '@htv/ui-kit/styles/mixins'; +@use '@htv/ui-kit/styles/colors'; + +.link { + @include mixins.transition(color); + color: colors.css-color(lime); + text-decoration: none; + + &:hover, + &:focus { + color: colors.css-color(lime, hover); + } + + &:active { + color: colors.css-color(lime, active); + } +} + .fieldset { margin-top: 2rem; border: none; diff --git a/src/sections/Application/Consent/index.jsx b/src/sections/Application/Consent/index.jsx index be2e0e7..f6c6fe0 100644 --- a/src/sections/Application/Consent/index.jsx +++ b/src/sections/Application/Consent/index.jsx @@ -2,7 +2,7 @@ import Text from '@htv/ui-kit/components/Text'; import { graphql, useStaticQuery } from 'gatsby'; import Checkbox from '../../../components/Checkbox'; -import { layout, fieldset, legend, full_col } from '../Application.module.scss'; +import { layout, fieldset, legend, link, full_col } from '../Application.module.scss'; import { useForm } from '../Form/FormContext'; export default function Consent() { @@ -50,6 +50,27 @@ export default function Consent() { className={full_col} label='I agree' /> + + If I intend to attend the event in person, I agree that I will be fully + vaccinated based on local guidelines. Vaccines must be in the approved + list by Health Canada (Proof of Vaccination will be required to enter the event) + + ); From 666dde41c65f24d729398cb2f66c2adb5057699f Mon Sep 17 00:00:00 2001 From: fpunny Date: Fri, 10 Dec 2021 01:37:30 -0500 Subject: [PATCH 02/11] task: Fixed sponsor image resizing, added description to inputs --- package-lock.json | 50 +++++++++++-------- package.json | 6 +-- src/components/Input/index.jsx | 3 +- .../InputLayout/InputLayout.module.scss | 2 +- src/components/InputLayout/index.jsx | 10 +++- src/components/Select/index.jsx | 2 + src/sections/Application/Personal/index.jsx | 1 + .../Home/Sponsors/Sponsors.module.scss | 2 +- src/sections/Register/index.jsx | 6 ++- 9 files changed, 51 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2e82646..640703a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4636,12 +4636,12 @@ } }, "color": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz", - "integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/color/-/color-4.1.0.tgz", + "integrity": "sha512-o2rkkxyLGgYoeUy1OodXpbPAQNmlNBrirQ8ODO8QutzDiDMNdezSOZLNnusQ6pUpCQJUsaJIo9DZJKqa2HgH7A==", "requires": { "color-convert": "^2.0.1", - "color-string": "^1.6.0" + "color-string": "^1.9.0" }, "dependencies": { "color-convert": { @@ -4673,9 +4673,9 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz", - "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", + "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -9976,6 +9976,11 @@ "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz", "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==" }, + "immutable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", + "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==" + }, "import-all.macro": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-all.macro/-/import-all.macro-3.1.0.tgz", @@ -12918,23 +12923,23 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, "yargs": { - "version": "17.2.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz", - "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==", + "version": "17.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.3.0.tgz", + "integrity": "sha512-GQl1pWyDoGptFPJx9b9L6kmR33TGusZvXIZUT+BOz9f7X2L94oeAskFYLEg/FkhV06zZPBYLvLZRWeYId29lew==", "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.0.0" } }, "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==" } } }, @@ -15711,9 +15716,9 @@ } }, "restful-react": { - "version": "15.9.2", - "resolved": "https://registry.npmjs.org/restful-react/-/restful-react-15.9.2.tgz", - "integrity": "sha512-N9JZVIyH7y8YcdKfkK4gTA9Z8hYITHI8zcKXpMnafA/05uaEKd1FsWOTPf6BsHi0Pw1kkbcGbN9wSj86j/WGCg==", + "version": "15.9.3", + "resolved": "https://registry.npmjs.org/restful-react/-/restful-react-15.9.3.tgz", + "integrity": "sha512-Eda9UyHgcsmO5GLmw+qprfeaHh5LgGlK4X+IWRZG/s45PM8/LXVfVz/3Y+46Z3kTugex9TmUKH0z9D8LacK7eA==", "requires": { "case": "^1.6.2", "chalk": "^3.0.0", @@ -16005,11 +16010,12 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.43.4", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz", - "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz", + "integrity": "sha512-0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw==", "requires": { - "chokidar": ">=3.0.0 <4.0.0" + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0" } }, "sass-loader": { diff --git a/package.json b/package.json index 821ee81..3a269e7 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "babel-plugin-dev-expression": "^0.2.2", "babel-preset-gatsby": "^1.12.0", "classnames": "^2.3.1", - "color": "^4.0.1", + "color": "^4.1.0", "eslint-config-react-app": "^6.0.0", "gatsby": "^3.14.2", "gatsby-plugin-image": "^1.14.1", @@ -39,8 +39,8 @@ "react-helmet": "^6.1.0", "react-hot-toast": "^2.1.0", "react-icons": "^4.3.1", - "restful-react": "^15.9.0", - "sass": "^1.43.2", + "restful-react": "^15.9.3", + "sass": "^1.44.0", "string-similarity": "^4.0.4" }, "devDependencies": { diff --git a/src/components/Input/index.jsx b/src/components/Input/index.jsx index 0c24e61..8b317b5 100644 --- a/src/components/Input/index.jsx +++ b/src/components/Input/index.jsx @@ -1,9 +1,10 @@ import InputLayout from '../InputLayout'; import { input } from '../InputLayout/InputLayout.module.scss'; -export default function Input({ className, error, label, ...props }) { +export default function Input({ className, error, description, label, ...props }) { return ( {children} + {description && ( + + {description} + + )} {!disabled && errorMessage && ( - + {errorMessage} )} diff --git a/src/components/Select/index.jsx b/src/components/Select/index.jsx index 68ea67d..4a6ffe7 100644 --- a/src/components/Select/index.jsx +++ b/src/components/Select/index.jsx @@ -21,6 +21,7 @@ import { export default function Select({ options = [], placeholder, + description, className, error, label, @@ -48,6 +49,7 @@ export default function Select({ return ( ({ }); function reducer(state, update) { - if (!update) return initState(); + if (!update) { + const { _errors, ...newState } = initState(false); + return newState; + } + return { ...state, ...update }; } From d3cde98393eab6543da2410ae4c44accf4628a8c Mon Sep 17 00:00:00 2001 From: Frederic Pun Date: Thu, 6 Jan 2022 21:42:26 -0500 Subject: [PATCH 03/11] Close Apps --- gatsby-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-config.js b/gatsby-config.js index 6242e70..129bf69 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -12,7 +12,7 @@ module.exports = { keywords, featureFlags: { mlh: true, - open: true, + open: false, discord: false, rsvp: true, schedule: false, From 44de21dd8270484e092e6f4e83425af8bc253f66 Mon Sep 17 00:00:00 2001 From: Frederic Pun Date: Tue, 15 Feb 2022 13:40:27 -0500 Subject: [PATCH 04/11] Update index.jsx --- src/sections/Home/Splash/index.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/sections/Home/Splash/index.jsx b/src/sections/Home/Splash/index.jsx index a26fa87..acdc05a 100644 --- a/src/sections/Home/Splash/index.jsx +++ b/src/sections/Home/Splash/index.jsx @@ -47,11 +47,7 @@ export default function Splash() {
- > {site.siteMetadata.startDate} - {site.siteMetadata.endDate} - - - > In-person (To be confirmed), brought to you by the University - of Toronto Scarborough + > HTV POSTPONED TO FALL 2022 Date: Tue, 19 Apr 2022 21:43:09 -0400 Subject: [PATCH 05/11] toggle sponsors (#55) --- gatsby-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-config.js b/gatsby-config.js index 129bf69..315349d 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -16,7 +16,7 @@ module.exports = { discord: false, rsvp: true, schedule: false, - sponsors: true, + sponsors: false, }, }, plugins: [ From 1d7be942c02ea5329a96cc83e5319b47c60059c8 Mon Sep 17 00:00:00 2001 From: fpunny Date: Thu, 9 Jun 2022 02:57:31 -0400 Subject: [PATCH 06/11] fix: Disable airtable until data exist --- src/sections/Home/Sponsors/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sections/Home/Sponsors/index.jsx b/src/sections/Home/Sponsors/index.jsx index 5a28e1d..68ccdcf 100644 --- a/src/sections/Home/Sponsors/index.jsx +++ b/src/sections/Home/Sponsors/index.jsx @@ -10,8 +10,8 @@ import { ReactComponent as SponsorBackground } from '../../../images/sponsor.svg import * as styles from './Sponsors.module.scss'; export default function Sponsors() { - const { sponsors, site } = useStaticQuery(query); - const sponsorsEnabled = site.siteMetadata.featureFlags.sponsors; + // const { sponsors, site } = useStaticQuery(query); + const sponsorsEnabled = false; // site.siteMetadata.featureFlags.sponsors; return (
Date: Thu, 16 Jun 2022 20:41:38 -0400 Subject: [PATCH 07/11] changed date to oct. 14-16, 2022 (#56) --- gatsby-config.js | 4 ++-- src/sections/Home/About/index.jsx | 2 +- src/sections/Home/Splash/index.jsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gatsby-config.js b/gatsby-config.js index 315349d..201ab4e 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -4,8 +4,8 @@ require('dotenv').config(); module.exports = { siteMetadata: { siteUrl: process.env.URL || `http://localhost`, - startDate: new Date(2022, 1, 25), - endDate: new Date(2022, 1, 27), + startDate: new Date(2022, 9, 14), + endDate: new Date(2022, 9, 16), title: `Hack the Valley 6`, author: author.name, description, diff --git a/src/sections/Home/About/index.jsx b/src/sections/Home/About/index.jsx index 3a51771..67563d7 100644 --- a/src/sections/Home/About/index.jsx +++ b/src/sections/Home/About/index.jsx @@ -75,7 +75,7 @@ export default function About() { color='lime' type='body2' > - COMING SOON Winter 2022 + STARTING Oct. 14-16, 2022
diff --git a/src/sections/Home/Splash/index.jsx b/src/sections/Home/Splash/index.jsx index acdc05a..06fd8f7 100644 --- a/src/sections/Home/Splash/index.jsx +++ b/src/sections/Home/Splash/index.jsx @@ -47,7 +47,7 @@ export default function Splash() {
- > HTV POSTPONED TO FALL 2022 + > Oct. 14-16, 2022 Date: Thu, 16 Jun 2022 20:43:22 -0400 Subject: [PATCH 08/11] Change FAQ ('What will I need to bring?' & 'Where is it?') (#58) * changed 'What do I need to bring' section * added 'where is it' section and prettier formatting --- src/sections/Home/Faq/data.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/sections/Home/Faq/data.js b/src/sections/Home/Faq/data.js index d269986..baf93aa 100644 --- a/src/sections/Home/Faq/data.js +++ b/src/sections/Home/Faq/data.js @@ -15,14 +15,15 @@ export const Faqs = [ You'll need:  - A laptop and charger. + A laptop and charger. We’d also recommend a sleeping bag if you plan + to stay the night at the venue.

Everything else is optional.

- You'll need:  + You don’t need:  - An idea, or a team. + An idea and a team.

You can create your own team (teams of 4 recommended) during the @@ -81,6 +82,21 @@ export const Faqs = [ ), }, + { + title: ( + <> + Where is it? + + ), + content: ( +

+ Hack the Valley 6 will be held at the University of Toronto Scarborough + campus in the IC building. All event activities will be hosted in the + building, and participants will be able to stay in the building for the + entire duration of the weekend (including overnight). +

+ ), + }, { title: ( <> From 752d899e8d03561f5d9b4cf06d1140a1fcf62e03 Mon Sep 17 00:00:00 2001 From: Benjamin Saobuppha <65824672+BenjaminSao@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:44:34 -0400 Subject: [PATCH 09/11] changed footer's twitter link and header (#57) --- src/components/Footer/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index aad30b1..08c6d4b 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -23,8 +23,8 @@ const links = [ }, { img: TwitterIcon, - to: 'https://twitter.com/hackthevalley5', - name: ' hackthevalley5 ', + to: 'https://twitter.com/hackthevalley6', + name: ' hackthevalley6 ', }, { img: InstagramIcon, From cecc36c49a3b0e98221721214c124fe01d5144c3 Mon Sep 17 00:00:00 2001 From: Amanda Tang Date: Sat, 23 Jul 2022 16:43:21 -0400 Subject: [PATCH 10/11] toggle MLH flag --- gatsby-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-config.js b/gatsby-config.js index 201ab4e..d76e082 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -11,7 +11,7 @@ module.exports = { description, keywords, featureFlags: { - mlh: true, + mlh: false, open: false, discord: false, rsvp: true, From b1719f55b771fb26fc4043663990678becc7159b Mon Sep 17 00:00:00 2001 From: Nishil Kapadia Date: Sun, 24 Jul 2022 02:25:19 +0530 Subject: [PATCH 11/11] Sticky Header (#61) * sticky navigation bar * spacing Co-authored-by: Amanda Tang --- .../Navigation/NavigationBar/NavigationBar.module.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Navigation/NavigationBar/NavigationBar.module.scss b/src/components/Navigation/NavigationBar/NavigationBar.module.scss index 02cd5a4..64e02de 100644 --- a/src/components/Navigation/NavigationBar/NavigationBar.module.scss +++ b/src/components/Navigation/NavigationBar/NavigationBar.module.scss @@ -6,11 +6,14 @@ display: grid; z-index: 100; height: 5rem; + position: fixed; } .section { grid-template-columns: repeat(auto-fit, minmax(1px, max-content)); align-items: center; + margin-left: 2rem; + margin-right: 2rem; grid-gap: 1rem; display: grid;