From 031a73c57c2baa58acc4b5688afa075927f02f96 Mon Sep 17 00:00:00 2001 From: Adeel Durrani Date: Wed, 4 Oct 2023 00:45:53 -0400 Subject: [PATCH 1/4] Added a link to NJTransit so Hackers can get redirected (#590) * Added a link to NJTransit so Hackers can get redirected * fix linting issues --------- Co-authored-by: Kevin Monisit --- package-lock.json | 6 ------ .../_Landing/sections/sponsors/Sponsors.tsx | 12 +++++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 520d6671..db22306d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15773,12 +15773,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "peer": true - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/src/components/_Landing/sections/sponsors/Sponsors.tsx b/src/components/_Landing/sections/sponsors/Sponsors.tsx index bba1c649..3aca396a 100644 --- a/src/components/_Landing/sections/sponsors/Sponsors.tsx +++ b/src/components/_Landing/sections/sponsors/Sponsors.tsx @@ -34,9 +34,15 @@ function Sponsors() { Echo 3D - NJ Transit + + + NJ Transit + + Merck From 3657e4cc67ce0d8b421cb3d27469859d3f722c2b Mon Sep 17 00:00:00 2001 From: avsomers25 <67980093+avsomers25@users.noreply.github.com> Date: Wed, 4 Oct 2023 00:47:23 -0400 Subject: [PATCH 2/4] =?UTF-8?q?added=20mlh=20badge,=20on=20left=20side=20s?= =?UTF-8?q?ince=20navbar=20is=20forced=20into=20top=20right=20c=E2=80=A6?= =?UTF-8?q?=20(#594)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added mlh badge, on left side since navbar is forced into top right corner and changing that would take a bit * Adjustments to MLH badge --------- Co-authored-by: Kevin Monisit --- public/tailwind-output-f23.css | 24 +++++++++++++++++++ .../_Landing/sections/hero/Navbar.tsx | 17 ++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/public/tailwind-output-f23.css b/public/tailwind-output-f23.css index 528f452f..1ae93a10 100644 --- a/public/tailwind-output-f23.css +++ b/public/tailwind-output-f23.css @@ -715,6 +715,10 @@ video { bottom: 8rem; } +.left-32 { + left: 8rem; +} + .left-4 { left: 1rem; } @@ -799,6 +803,14 @@ video { top: 95rem; } +.right-24 { + right: 6rem; +} + +.right-28 { + right: 7rem; +} + .z-0 { z-index: 0; } @@ -920,6 +932,10 @@ video { margin-top: 8rem; } +.mr-24 { + margin-right: 6rem; +} + .block { display: block; } @@ -1393,6 +1409,10 @@ video { padding-right: 0.5rem; } +.pr-20 { + padding-right: 5rem; +} + .pr-4 { padding-right: 1rem; } @@ -1425,6 +1445,10 @@ video { padding-top: 2rem; } +.pr-24 { + padding-right: 6rem; +} + .text-left { text-align: left; } diff --git a/src/components/_Landing/sections/hero/Navbar.tsx b/src/components/_Landing/sections/hero/Navbar.tsx index d486cf04..13f49f12 100644 --- a/src/components/_Landing/sections/hero/Navbar.tsx +++ b/src/components/_Landing/sections/hero/Navbar.tsx @@ -25,7 +25,6 @@ function MenuItem(props: { sectionName: string }) { function OtherPageMenuItem(props: { sectionName: string }) { const { sectionName } = props; const history = useHistory(); - return ( {({ active }) => ( @@ -48,7 +47,7 @@ function OtherPageMenuItem(props: { sectionName: string }) { function CollapsedMenu() { return ( -
+
@@ -97,10 +96,22 @@ function Navbar() { yellow hackru logo + + + + Major League Hacking 2024 Hackathon Season + +
+ text-lg pt-8 pr-20 z-40 bg-gradient-to-b from-f23-lightGreen w-[100%] justify-end"> {!isContactPage && (<> { From d407f8087f406b089533eb137e9118bac21bd2c3 Mon Sep 17 00:00:00 2001 From: avsomers25 <67980093+avsomers25@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:01:26 -0400 Subject: [PATCH 3/4] 587 changes to the form section (#593) * removed question about virtual hackathons * frontend country of residence * fixing lint errors --- package.json | 1 + .../UserProfileForm/ProfileCards/About.jsx | 47 ++++++++++++++----- .../ProfileCards/Questions.jsx | 13 +---- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index ecc04c31..43d98ed8 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "react-scroll-parallax": "^1.3.5", "react-scrollable-anchor": "^0.6.1", "react-select": "^2.1.2", + "react-select-country-list": "^2.2.3", "react-spinners": "^0.9.0", "react-toggle": "^4.1.1", "react-window": "^1.8.5", diff --git a/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/About.jsx b/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/About.jsx index e2da9103..837fdf11 100644 --- a/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/About.jsx +++ b/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/About.jsx @@ -10,9 +10,11 @@ import { ProfileType } from "../../../../Profile"; import PropTypes from "prop-types"; import { PulseLoader } from "react-spinners"; +import countryList from "react-select-country-list"; + class About extends Component { - // constructor(props) { + // constructor(props) {npm // super(props); // this.updateUser = this.updateUser.bind(this); // } @@ -50,7 +52,8 @@ class About extends Component { update_user.gender = this.state.user.gender; update_user.ethnicity = this.state.user.ethnicity; update_user.hackathon_count = this.state.user.hackathon_count; - + update_user.country_of_residence = this.state.user.country_of_residence; + this.props.profile.Set(update_user) .then(res => { this.setState({ @@ -90,7 +93,8 @@ class About extends Component { required: { value: true, errorMessage: "Invalid first name" }, pattern: { value: "^[A-Za-z0-9]+$", errorMessage: "Invalid character" }, minLength: { value: 1, errorMessage: "Invalid length" }, - maxLength: { value: 100, errorMessage: "Invalid length" } }} /> + maxLength: { value: 100, errorMessage: "Invalid length" } + }} /> + maxLength: { value: 100, errorMessage: "Invalid length" } + }} /> @@ -115,8 +120,9 @@ class About extends Component { value={user.phone_number} onChange={(e) => { user.phone_number = e.target.value; this.updateUser(user); }} validate={{ - required: { value: true, errorMessage: "Invalid number"}, - pattern: { value: "^[\\+]?[0-9]{0,3}?[-\\s\\.]?[(]?[0-9]{3}[)]?[-\\s\\.]?[0-9]{3}[-\\s\\.]?[0-9]{4,6}$", errorMessage: "Invalid number" } }} /> + required: { value: true, errorMessage: "Invalid number" }, + pattern: { value: "^[\\+]?[0-9]{0,3}?[-\\s\\.]?[(]?[0-9]{3}[)]?[-\\s\\.]?[0-9]{3}[-\\s\\.]?[0-9]{4,6}$", errorMessage: "Invalid number" } + }} /> + } + }} /> + validate={{ required: { value: true, errorMessage: "Invalid input" } }}>
+ + +
+ { user.country_of_residence = e.value; this.updateUser(user); }} + options={countryList().getData()} /> +
+ + { user.hackathon_count = e.target.value; this.updateUser(user); }} validate={{ required: { value: true, errorMessage: "Invalid hackathon count" }, - min: { value: 0, errorMessage: "Hackathon count must be non-negative" } }} /> + min: { value: 0, errorMessage: "Hackathon count must be non-negative" } + }} /> {message}
+ type="submit"> {this.state.loading ? : "Update"}
); @@ -205,7 +226,7 @@ class About extends Component { color: theme.disabled[0], padding: 5, minHeight: 35 }; let field = (text) => { - return

{(text) ? text : unanswered }

; + return

{(text) ? text : unanswered}

; }; return (
@@ -250,6 +271,10 @@ class About extends Component { {field(user.ethnicity)} + + + {field(user.country_of_residence)} + {field(user.hackathon_count)} diff --git a/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/Questions.jsx b/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/Questions.jsx index 8b9bd7e1..17618017 100644 --- a/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/Questions.jsx +++ b/src/components/Dashboard/Forms/UserProfileForm/ProfileCards/Questions.jsx @@ -123,14 +123,7 @@ class Questions extends Component { value={user.short_answer} onChange={(e) => { user.short_answer = e.target.value; this.updateUser(user); }} /> - - - { user.virtual_short_answer = e.target.value; this.updateUser(user); }} /> - + What are you hoping to experience at HackRU? {field(user.short_answer)} - - - {field(user.virtual_short_answer)} - {field(user.special_needs)} From a886edbf44d27b8be85513215c8417b4665b1992 Mon Sep 17 00:00:00 2001 From: dchaudhari0811 <136735426+dchaudhari0811@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:09:04 -0400 Subject: [PATCH 4/4] Navbar changes (#596) * Navbar changes * Linting fix and Home button now works --------- Co-authored-by: Kevin Monisit --- src/components/_Landing/Landing.tsx | 22 ++++++++++++++----- .../_Landing/sections/hero/hero.tsx | 4 +++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/components/_Landing/Landing.tsx b/src/components/_Landing/Landing.tsx index e65eb83a..23998721 100644 --- a/src/components/_Landing/Landing.tsx +++ b/src/components/_Landing/Landing.tsx @@ -34,16 +34,26 @@ function LandingPage(props: any) { /> - +
+ +
- +
+ +
- - +
+ +
- - +
+ +