Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug Batch 3 Fixes #74

Merged
merged 5 commits into from
Apr 16, 2024
Merged

Bug Batch 3 Fixes #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ea59b0
Create a pull trequest for branch 73-Bug-Batch-3
ctc-devops Apr 9, 2024
8eb5464
Bug fixes
lanaramadan Apr 9, 2024
ef45525
Fixed bug in published schedule where season selected was incorrect
lanaramadan Apr 9, 2024
77d9420
modal message changes
ThatMegamind Apr 16, 2024
f5f5ec9
Merge branch 'dev' into 73-Bug-Batch-3
ThatMegamind Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 src/Logo.svg → public/Logo.svg
View file
Open in desktop
File renamed without changes
8 changes: 4 additions & 4 deletions src/components/Catalog/DeleteEventModal/DeleteEventModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ const DeleteEventModal = ({ isOpen, onClose, deleteItemId, setDataShouldRevalida
<Modal isOpen={isOpen} onClose={onClose}>
<ModalOverlay />
<ModalContent>
<ModalHeader>Confirm Delete</ModalHeader>
<ModalHeader>Remove Event?</ModalHeader>
<ModalCloseButton />
<ModalBody>Are you sure you want to delete this row?</ModalBody>
<ModalBody>Are you sure you want to delete this event? You cannot undo this action afterward.</ModalBody>
<ModalFooter>
<Button onClick={() => handleConfirmDelete(deleteItemId)}>Delete</Button>
<Button onClick={onClose}>Cancel</Button>
<Button onClick={onClose} mr={2}>Cancel</Button>
<Button onClick={() => handleConfirmDelete(deleteItemId)} colorScheme='red'>Delete</Button>
</ModalFooter>
</ModalContent>
</Modal>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const Navbar = ({ hasLoaded, isAdmin }) => {
position={'sticky'}
as={'nav'}
>
<Image src="src/Logo.svg" marginRight={'48px'}></Image>
<Image src="/Logo.svg" marginRight={'48px'}></Image>
{makeNavTabs('Schedule', '/publishedSchedule')}
{makeNavTabs('Catalog', '/catalog')}
{makeNavTabs('Accounts', '/accounts')}
Expand All @@ -68,7 +68,7 @@ const Navbar = ({ hasLoaded, isAdmin }) => {
position={'sticky'}
as={'nav'}
>
<Image src="src/Logo.svg" marginRight={'48px'}></Image>
<Image src="/Logo.svg" marginRight={'48px'}></Image>
{makeNavTabs('Schedule', '/publishedSchedule')}

<Spacer />
Expand Down
3 changes: 1 addition & 2 deletions src/components/Planner/PlannerEvents/PlannerEvents.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,8 @@ const PlannerEvents = ({ onClose }) => {
isDisabled={!plannedEvents.length}
onClick={closeModal}
>
Finish Day
Save and Exit
</Button>
<Button onClick={closeModal} mr="1rem">Cancel</Button>
</Flex>
</Box>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/PublishedSchedule/PublishedSchedule.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import AUTH_ROLES from '../../utils/auth_config.js';
import { useAuthContext } from '../../common/AuthContext.jsx';

import { useEffect, useState } from 'react';
const { ADMIN_ROLE, USER_ROLE } = AUTH_ROLES.AUTH_ROLES;
const { ADMIN_ROLE } = AUTH_ROLES.AUTH_ROLES;
import { Box, Select, Text } from '@chakra-ui/react';

const PublishedSchedule = () => {
Expand Down Expand Up @@ -38,7 +38,7 @@ const PublishedSchedule = () => {
data.unshift(curSeason);
}

setSelectedSeason(currentUser.type === USER_ROLE ? curSeason : data[0]); // We assume the current season is the first one in the list
setSelectedSeason(curSeason);

const seasonOrder = ['Fall', 'Summer', 'Spring'];
data.sort((a, b) => {
Expand All @@ -54,7 +54,7 @@ const PublishedSchedule = () => {

};
renderTable();
}, [currentUser]);
}, [currentUser, curSeason]);

//update chakra table container accordingly
return (
Expand Down
Loading