diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e19b81512..b03c88203 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.5.1](https://github.com/hackmcgill/dashboard/tree/2.5.1) - 2020-01-31 + +### Changed + +- Update spacing to hacker single view + +### Fixed + +- Fix toast notifs for check-in + ## [2.5.0](https://github.com/hackmcgill/dashboard/tree/2.5.0) - 2020-01-31 ### Added diff --git a/package-lock.json b/package-lock.json index 31c0f3fcb..e3de87c8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "hackerapi-frontend", - "version": "2.5.0", + "version": "2.5.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f7575039c..96915bbf4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hackerapi-frontend", "homepage": "https://app.mchacks.ca", - "version": "2.5.0", + "version": "2.5.1", "private": true, "dependencies": { "@rebass/grid": "^6.0.0-7", diff --git a/src/features/Checkin/Main.tsx b/src/features/Checkin/Main.tsx index 38ce2d742..565911a59 100644 --- a/src/features/Checkin/Main.tsx +++ b/src/features/Checkin/Main.tsx @@ -104,9 +104,9 @@ class CheckinContainer extends React.Component<{}, ICheckinState> { : hacker.accountId.id; const account = (await Account.get(accountId)).data.data; await generateHackPass(account, hacker); - if (hacker.accommodation.dietaryRestrictions.length > 0) { + if (account.dietaryRestrictions.length > 0) { toast.info( - `The user has the following dietary restrictions: ${hacker.accommodation.dietaryRestrictions.join( + `The user has the following dietary restrictions: ${account.dietaryRestrictions.join( ',' )}`, { @@ -114,7 +114,7 @@ class CheckinContainer extends React.Component<{}, ICheckinState> { } ); } - toast.info(`Shirt Size: ${hacker.accommodation.shirtSize}`, { + toast.info(`Shirt Size: ${hacker.application.accommodation.shirtSize}`, { autoClose: false, }); } catch (e) { diff --git a/src/features/HackPass/Pass.tsx b/src/features/HackPass/Pass.tsx index 46540435b..994ee7842 100644 --- a/src/features/HackPass/Pass.tsx +++ b/src/features/HackPass/Pass.tsx @@ -13,17 +13,11 @@ export const Pass: React.StatelessComponent = ( ) => { return (
- +
-

- {props.account.firstName} -

-

- {props.account.pronoun} -

-

- {props.hacker.application.general.school} -

+

{props.account.firstName}

+

{props.account.pronoun}

+

{props.hacker.application.general.school}

); diff --git a/src/features/SingleHacker/SingleHackerView.tsx b/src/features/SingleHacker/SingleHackerView.tsx index 0cd7a8ea3..a0346fb9b 100644 --- a/src/features/SingleHacker/SingleHackerView.tsx +++ b/src/features/SingleHacker/SingleHackerView.tsx @@ -79,51 +79,53 @@ class SingleHackerView extends React.Component< -

- {`${account.firstName} ${account.lastName} ${pronoun}`} -

-
- - - - - - - - -
+ +

+ {`${account.firstName} ${account.lastName} ${pronoun}`} +

+