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

Polish admin posting pages #203

Merged
merged 15 commits into from
Mar 24, 2022
Merged

Polish admin posting pages #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3e53c61
Integrate ShiftCalendar into CreatePostingShifts
sherryhli Mar 7, 2022
7946f0a
Use reusable FormHeader component in CreatePostingShifts
sherryhli Mar 7, 2022
0e05dd6
Navigate on 'Next' in admin posting flow
sherryhli Mar 7, 2022
918216c
Remove MainPageButton
sherryhli Mar 7, 2022
86f48b3
Implement hi-fi layouts for admin posting pages
sherryhli Mar 8, 2022
13c21ec
Add temp hack fix for SideNavbar text wrapping bug
sherryhli Mar 8, 2022
54be3b2
Convert to UTC in DateTimeUtils functions
sherryhli Mar 8, 2022
058f800
Use DateTimeUtils functions in CreatePostingReview
sherryhli Mar 8, 2022
2ebe238
Adjust SideNavbar width hack
sherryhli Mar 8, 2022
1c8934a
Create and use new DateTimeUtils
sherryhli Mar 9, 2022
b509d45
Set ShiftCalendar initial date based on startDate of CreatePostingShi…
sherryhli Mar 9, 2022
f111398
Run createShifts mutation in CreatePostingReviewPage
sherryhli Mar 9, 2022
8a64dcc
Add back button to admin create posting pages
sherryhli Mar 9, 2022
a20d5f8
Remove SideNavbarDemo page
sherryhli Mar 10, 2022
51ecdcd
Remove Create Shifts and Review Posting buttons from default page
sherryhli Mar 15, 2022
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
6 changes: 0 additions & 6 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import CreatePostingShiftsPage from "./components/pages/admin/posting/CreatePost
import CreatePostingReviewPage from "./components/pages/admin/posting/CreatePostingReviewPage";
import VolunteerPostingDetails from "./components/pages/volunteer/posting/VolunteerPostingDetails";
import AdminPostingDetails from "./components/pages/admin/posting/AdminPostingDetails";
import SideNavbarDemo from "./components/pages/SideNavbarDemo";

import customTheme from "./theme";
import { AuthenticatedUser } from "./types/AuthTypes";
Expand Down Expand Up @@ -128,11 +127,6 @@ const App = (): React.ReactElement => {
path={Routes.HOOKS_PAGE}
component={HooksDemo}
/>
<PrivateRoute
exact
path={Routes.SIDE_NAVBAR_DEMO_PAGE}
component={SideNavbarDemo}
/>
<PrivateRoute
exact
path={Routes.VOLUNTEER_POSTINGS_PAGE}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/admin/ShiftCalendar/ShiftCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ type ShiftCalendarProps = {
addEvent: (newEvent: DateSelectArg) => void;
changeEvent: (event: Event, oldEvent: Event, currEvents: Event[]) => void;
deleteEvent: (currEvents: Event[]) => void;
initialDate?: string;
};

const ShiftCalendar = ({
Expand All @@ -44,6 +45,7 @@ const ShiftCalendar = ({
addEvent,
changeEvent,
deleteEvent,
initialDate,
}: ShiftCalendarProps): React.ReactElement => {
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);

Expand Down Expand Up @@ -119,6 +121,7 @@ const ShiftCalendar = ({
slotDuration="00:15:00"
slotLabelInterval="01:00"
timeZone="UTC"
initialDate={initialDate}
/>
</Box>
);
Expand Down
Loading