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.

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

Notification Setup PR #10

Merged
merged 17 commits into from
Mar 22, 2025
Merged

Notification Setup PR #10

merged 17 commits into from
Mar 22, 2025

Conversation

OmniaAlam
Copy link
Collaborator

@OmniaAlam OmniaAlam commented Mar 19, 2025

  • In-person activity filter added.
  • Book functionality added with the calendar for all the activities.
  • Modified calendar to show upcoming activities.

@OmniaAlam
Copy link
Collaborator Author

OmniaAlam commented Mar 22, 2025

@thanhpd and @younesnouri please review the PR for the below changes:
Inperson activity filter added.
Book functionality added with the calendar for all the activities.
Modified calendar to show upcoming activities

@younesnouri I am not working to integrate the payment system with all the bookings, please work on them in the meantime I will work on push notifications.

@thanhpd thanhpd requested a review from Copilot March 22, 2025 13:43
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR introduces new booking and calendar functionalities while refactoring several UI components. Key changes include:

  • New BookingSlotModal and BookingTimeModal components to support date/time selection.
  • Integration of push notifications and calendar events.
  • Updates to activity listings and category filtering in several screens.

Reviewed Changes

Copilot reviewed 27 out of 27 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
client/components/BookingSlotModal.tsx Added booking modal with calendar and date disable logic
client/components/BookingTimeModal.tsx Added time slot selection modal for bookings
client/components/PushNotification.tsx New push notification setup with Expo
client/components/ui/ActivityList.tsx Updated activity list and modal-based booking details
client/app/(tabs)/booking.tsx and others Refactored navigation, calendar integration, and styling
client/app/nutrition.tsx, online.tsx, etc. Adjusted booking flows and UI components for consistency
client/components/ui/CalendarComponent.tsx Enhanced calendar event rendering with multi-dot marking
client/constants/types.ts Updated type definitions for Activity and CalendarEvent
Other miscellaneous files Minor UI and prop updates, removal of legacy InPersonActivityList
Comments suppressed due to low confidence (1)

client/components/ui/CalendarComponent.tsx:53

  • The duplicate check compares 'dot.key' (a UUID string) with 'event.activity' (an object), which will always fail. Consider using a unique identifier (like event.activity.title or a dedicated id) for proper duplicate detection.
const isDuplicate = acc[event.date].dots.some((dot: any) => dot.key === event.activity);

@thanhpd thanhpd merged commit d331b4c into main Mar 22, 2025
@thanhpd thanhpd deleted the dev/omnia(notification_setup) branch March 22, 2025 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants