Skip to content

Commit 7cbaeda

Browse files
authored
Merge pull request #3619 from Northeastern-Electric-Racing/green-availability
Green availability and Login instructions
2 parents ada7a07 + cd853ab commit 7cbaeda

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/frontend/src/pages/LoginPage/LoginPage.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ const LoginPage: React.FC<LoginPageProps> = ({ devSetUser, devFormSubmit, prodSu
3131
<CardContent>
3232
<Typography variant="h5">FinishLine by NER</Typography>
3333
<Typography variant="body1" sx={{ mb: 1 }}>
34-
Login Required. Students must use their Husky Google account.
34+
Students must use their Husky Google account to login.
35+
<br />
36+
<br />
37+
This means if your email is 'last.first@northeastern.edu', login to Google with the email
38+
'last.first@husky.neu.edu'
3539
</Typography>
3640
{import.meta.env.MODE === 'development' ? loginDev : googleLogin}
3741
</CardContent>

src/frontend/src/pages/SettingsPage/UserScheduleSettings/Availability/EditAvailability.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const EditAvailability: React.FC<EditAvailabilityProps> = ({
105105
<Grid container>
106106
<Grid container justifyContent="space-between" mb={1}>
107107
<Typography display={'flex'} justifyContent={'flex-start'} mt={1} variant="subtitle1">
108-
Available times in red
108+
Available times in green
109109
</Typography>
110110
<NERButton variant="outlined" sx={{ display: 'flex', justifyContent: 'flex-end' }} onClick={invertAvailabilities}>
111111
Invert Availability

src/frontend/src/utils/design-review.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export enum REVIEW_TIMES {
5050

5151
export const HOURS: number[] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
5252

53-
export const HeatmapColors = ['#D9D9D9', '#E0C0C1', '#E89A9B', '#E4797A', '#EF4345', '#D70C0F'];
53+
export const HeatmapColors = ['#D9D9D9', '#C1E0C1', '#9BE89B', '#7AE47A', '#45EF45', '#0FD70F'];
5454

5555
export const NUMBER_OF_TIME_SLOTS = enumToArray(REVIEW_TIMES).length * enumToArray(DAY_NAMES).length;
5656

0 commit comments

Comments
 (0)