Commit Graph

53 Commits

Author SHA1 Message Date
9dd76e1dac Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/main.dart
2025-10-29 17:12:05 +05:30
Vinayakkadge04
c771ce335c Changed serch_city_bottomsheet navigation 2025-10-29 17:11:07 +05:30
ede130224e working on make booking page 2025-10-29 17:09:04 +05:30
Vinayakkadge04
f93ba6dad2 Worked on Search city bottomsheet 2025-10-29 17:07:27 +05:30
abca972ba5 Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/main.dart
2025-10-29 16:13:43 +05:30
92ce97b553 working on my pass section 2025-10-29 16:13:10 +05:30
Vinayakkadge04
a8a3a618eb Completed offer pass view 2025-10-29 14:49:41 +05:30
Vinayakkadge04
167f85ad22 Updated card View 2025-10-29 13:01:57 +05:30
Vinayakkadge04
b42812f0c2 Updated itinerary creation view 2025-10-28 19:54:12 +05:30
85c17595f2 changes in main 2025-10-28 15:54:38 +05:30
548c4e2638 Merge remote-tracking branch 'origin/vinayak' into dinesh 2025-10-28 15:53:48 +05:30
5c4ffb1686 Postcard changes done 2025-10-28 15:53:26 +05:30
Vinayakkadge04
93749af445 Taken pull from origin/dinesh 2025-10-28 11:19:23 +05:30
Vinayakkadge04
c28d6a96af Merge remote-tracking branch 'origin/dinesh' into vinayak
# Conflicts:
#	lib/core/route_constants.dart
#	lib/main.dart
2025-10-28 11:18:07 +05:30
489a42d68c Itineary navigation 2025-10-27 19:45:47 +05:30
Vinayakkadge04
8edc5eec20 Changed in Buy a Pass View 2025-10-27 19:13:01 +05:30
Vinayakkadge04
69046649aa Completed purchase detail bottomsheet & add details screen 2025-10-27 18:45:57 +05:30
Vinayakkadge04
362b8d92e5 Completed coupon bottom sheet 2025-10-27 16:47:54 +05:30
66f9abe4e0 Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/core/app_router.dart
#	lib/main.dart
2025-10-27 15:47:54 +05:30
7c146c9f1e working on my pass section 2025-10-27 15:44:13 +05:30
Vinayakkadge04
9b79fb6db7 Completed Offer with Flexi Card Screen 2025-10-27 15:27:21 +05:30
4e7e2cad0e Merged vinayak's code. 2025-10-27 11:53:27 +05:30
a1d81ea31c Merge remote-tracking branch 'origin/vinayak' into dinesh 2025-10-27 11:46:07 +05:30
9042cd57d5 Completed the postcard section. 2025-10-26 19:34:41 +05:30
Vinayakkadge04
54cf642732 Completed By a Pass & Checkout View 2025-10-25 14:17:56 +05:30
Vinayakkadge04
94c91abf32 completed the attraction details screen with share bottom sheet. 2025-10-24 15:23:08 +05:30
Vinayakkadge04
741036188d Merge remote-tracking branch 'origin/dinesh' into vinayak
# Conflicts:
#	lib/main.dart
2025-10-24 11:36:19 +05:30
4956b9ea50 worked postcard section 2025-10-24 11:33:24 +05:30
Vinayakkadge04
c54f80626a Implemented bloc in itinerary creation screen 2025-10-24 11:18:56 +05:30
ba7ecd8a3c Merged vinayak's code 2025-10-16 20:13:42 +05:30
4ccf4e57ca Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/main.dart
2025-10-16 20:06:45 +05:30
ca26dd528b Started with post card creation tab 2025-10-16 20:06:04 +05:30
Vinayakkadge04
56e7613323 Merge remote-tracking branch 'origin/dinesh' into vinayak
# Conflicts:
#	lib/main.dart
2025-10-16 19:13:11 +05:30
Vinayakkadge04
672f984f3f Completed ESIM & Hotel offer view 2025-10-16 19:12:06 +05:30
fe4ed84c3f attractin details page added and added completed the registered_user_home_page.dart 2025-10-16 19:09:38 +05:30
Vinayakkadge04
34262fb63d Merge remote-tracking branch 'origin/dinesh' into vinayak 2025-10-16 14:59:43 +05:30
Vinayakkadge04
9af8ffe71c completed esim_offer_screen UI... 2025-10-16 14:58:06 +05:30
7f358b26d1 folder restructure 2025-10-16 13:24:26 +05:30
b20e8a10a1 Merge remote-tracking branch 'origin/vinayak' into dinesh 2025-10-16 13:07:16 +05:30
Vinayakkadge04
255556597d Completed Itinerary Creation Model 2025-10-15 20:30:49 +05:30
0e0495132d Worked on registered user home page 2025-10-15 19:53:42 +05:30
Vinayakkadge04
f0cde5d827 Updated Home & Profile Screens by using screen_util package 2025-10-15 12:21:55 +05:30
Vinayakkadge04
f7a6199332 Completed language selection bottomSheet in profile with bloc state management 2025-10-15 11:22:54 +05:30
f6aaf121ca Added bloc navigation for bottom navbar and added bottom navbar to the home page 2025-10-14 19:02:13 +05:30
ad5709e6bd added common app bar in edit_profile_view.dart and shifted every common packages to common_packages folder 2025-10-14 17:58:35 +05:30
b32443d9d6 Merge remote-tracking branch 'origin/vinayak' into dinesh
# Conflicts:
#	lib/home/views/home_page_view.dart
2025-10-14 17:40:39 +05:30
b78d8616c5 Created a common app bar and added the white logo in the app bar as per condition 2025-10-14 17:37:54 +05:30
Vinayakkadge04
77e677b4f8 worked on profile-module 2025-10-14 17:31:59 +05:30
4264ddd623 Completed home page and added routes also added bloc's package in pubspec.yaml 2025-10-14 15:47:16 +05:30
a9447fc869 Started working on homepage and created assets folder 2025-10-14 11:20:25 +05:30