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

Feature/admin optimized routes UI #59

Merged
merged 31 commits into from
Dec 14, 2024
Merged

Feature/admin optimized routes UI #59

merged 31 commits into from
Dec 14, 2024
+553 −585

Conversation

davideastmond
Copy link
Contributor

Work in progress

davideastmond and others added 27 commits December 7, 2024 10:05
@davideastmond
linting fixes
a50cac5
@davideastmond
route manager basics
f37795f
@davideastmond
basic work - add date picker. Color theme
5772882
@oldmcdonnell
updating dev
b5fe8d7
@davideastmond
google maps loader
502c31c
@davideastmond
Merge branch 'dev' into feature/admin-optimized-routes-ui
2492250
@davideastmond
Merge branch 'dev' into feature/admin-optimized-routes-ui
afdc3f3
@oldmcdonnell
Merge remote-tracking branch 'origin' into dev
04bdb6a
@davideastmond
Merge branch 'dev' into feature/admin-optimized-routes-ui
cf5388c
@oldmcdonnell
Merge remote-tracking branch 'origin' into dev
b0c62fa
@davideastmond
add spinner and busy prop to a the buttonText component
042f488
@davideastmond
update navBar logic re: getstarted button
6d0229d
@davideastmond
gsubmisson for grabs the username from session.user. Editable
9e9b101
@davideastmond
commit merge conflict fixes
37edd0f
@davideastmond
fix comment for NavBar rendering
dda94a3
@davideastmond
Merge branch 'dev' into feature/admin-optimized-routes-ui
a329d8a
@davideastmond
merge fix and install react-toastify
e994f59
@oldmcdonnell
mostly not junk, mostly
4b17c6c
@oldmcdonnell
generateRoutes, collateDailyRequests, and route-manager added an fixed
c929a97
@oldmcdonnell
Merge remote-tracking branch 'origin' into dev
3265b1f
@oldmcdonnell
Merge branch 'dev' into feature/admin-optimized-routes-ui
0f07dad
@oldmcdonnell
Merge branch 'feature/admin-optimized-routes-ui' of https://github.co…
d8fbcdc 
…m/chingu-voyages/v52-tier3-team-37 into feature/admin-optimized-routes-ui
@oldmcdonnell
another updat
ce6e04b
@oldmcdonnell
pulling dates and filtering by daye
48126c0
@oldmcdonnell
displaying route
7c3421f
@oldmcdonnell
updates list and geberate route. added type to resident request colla…
0a4499a 
…tion
@oldmcdonnell
refactoring to fix ETA but may not be part of MVP
e976755
davideastmond
davideastmond commented Dec 14, 2024
View reviewed changes
package.json Outdated Show resolved Hide resolved
n3ndor
n3ndor approved these changes Dec 14, 2024
View reviewed changes
src/components/route-manager/Route-manager.tsx Show resolved Hide resolved
src/components/route-manager/Route-manager.tsx Outdated Show resolved Hide resolved
@davideastmond davideastmond marked this pull request as ready for review December 14, 2024 21:11
@davideastmond davideastmond merged commit 66d5f0d into dev Dec 14, 2024
@davideastmond davideastmond deleted the feature/admin-optimized-routes-ui branch December 14, 2024 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@n3ndor n3ndor n3ndor approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@davideastmond @n3ndor @oldmcdonnell