Oz pol 7.24 #34
Merged
Oz pol 7.24 #34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…include the data needed for Booking implementation.
…move the Footer to the bottom of the pages, and added a simple style. -Booking Calendar - Date picker is added to the CustomerProfile. -Currently implementing a credit system for booking services - to avoid unnecessary expenses. -Added a view details button to service detail card. - Added a Service Provider Set Availability Calendar component, and updated the Availability Calender for Customer viewing. -Updated the DB Schemas and models to incorporate Booking data objects.
…mpted refactor to improve modularity, deferring until all features are implemented. - Corrected parameter passing in 'BookingForm' component and related components to resolve compilation errors. - Fixed issues with fetching and displaying service details in the 'ServiceDetails' component. - Restored functionality for viewing and booking services from the customer profile. - Fixed navigation between customer profile tabs and service details works correctly.
…ion and time range setting. - Fixed navigation through tabs and back button in Provider Profile. - Created and integrated a payment (partially - using a coupon system for now, to avoid real payments) confirmation page. -Removed AuthContext to fix errors, and handling the "isLoggedIn" Logic within the components instead. -Added the Availability Collection to appwrite DB and types
"Property 'providerID' does not exist on type 'IntrinsicAttributes & ServiceCardProps'. Did you mean 'providerId'?"
Type error: Type '{}' is missing the following properties from type 'BookingFormProps': providerId, serviceId
Type error: Type '{ onServiceClick: Dispatch<SetStateAction<Service | null>>; }' is not assignable to type 'IntrinsicAttributes'.
…confirmation - Fetch provider availability correctly and display on the availability calendar in the customer profile (highlighted yellow) - Allow customers to select an available date, which auto-populates the booking form date field. - Remove start and end time fields from the booking form as they are not required for customer booking. - Enable customers to enter booking details and submit the form. - Save the booking to the database with a status of 'pending'. - Route customers to the booking confirmation page upon successful booking. - Display the booking ID and amount on the confirmation page (amount display to be improved when payment is integrated). - Prepare for next steps including provider approval workflow.
Added selectedDate to BookingFormProps interface. Ensured selectedDate is passed correctly from ServiceDetails and CustomerBooking components. Added validation to ensure selectedDate is provided before form submission. Updated BookingForm to handle the selectedDate and render the form correctly.
…ack to Profile' button (instead of generic landing page) - Updated BookingForm to redirect to confirmation page after booking. - Modified confirmation page to include a Back to Profile button. - the Back to Profile button routes the user back to their profile page.
…enable them to navigate back to their profile.
- Added dynamic content for logged-in customers and providers on the home page. - Customers now see a section encouraging them to explore popular services in their area. (This will need to be further developed - currently, if clicked on, the buttons will route to 404) - Providers see a section with tips and best practices along with sample blog post cards ( This will need to be further developed) - Removed the logout button from the middle of the home page for logged-in users. - handle Link components to avoid invalid nesting errors.
- Implemented CustomerViewBookings component to display customer's bookings with options to delete. - Implemented ServiceViewBookings component to display provider's bookings with options to approve or reject. - Added API endpoints to fetch bookings for customers and providers. - Updated booking creation process to set initial status to "pending" and added approval/rejection functionality for providers.
…ookings - ViewBookings Tab - Added EditBookingForm component for editing bookings. - Enhanced CustomerViewBookings to handle booking edits and deletions. - Implemented fetchBookings to refresh the booking list after updates. - Improved UI with edit and delete buttons for each booking.
- Updated the Footer component to ensure proper positioning and styling - Added CSS styles to position the footer at the bottom of the page. - the footer content is centered and spaced correctly - preserved Ben's admin login sequence logic for keyboard input.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.