49 Commits

Author SHA1 Message Date
ede130224e working on make booking page 2025-10-29 17:09:04 +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
77db7a547d Added figma link in the README.md 2025-10-13 18:54:45 +05:30
901835ccb3 Dinesh branch 2025-10-13 17:57:31 +05:30
258 changed files with 18244 additions and 55 deletions

View File

@@ -14,3 +14,24 @@ A few resources to get you started if this is your first Flutter project:
For help getting started with Flutter development, view the
[online documentation](https://docs.flutter.dev/), which offers tutorials,
samples, guidance on mobile development, and a full API reference.
<h1>Figma Link</h1>
https://www.figma.com/design/CEtQ1M0ASsTbr7kSj2tAoU/Customer-app-UI?node-id=379-3445&t=jj895DcApPxIPPrC-0
Doctor summary (to see all details, run flutter doctor -v):
[!] Flutter (Channel [user-branch], 3.35.2, on macOS 15.3.2 24D81 darwin-x64, locale en-GB)
! Flutter version 3.35.2 on channel [user-branch] at /Users/macbookpro/Downloads/flutter
Currently on an unknown channel. Run `flutter channel` to switch to an official channel.
If that doesn't fix the issue, reinstall Flutter by following instructions at https://flutter.dev/setup.
! Upstream repository unknown source is not a standard remote.
Set environment variable "FLUTTER_GIT_URL" to unknown source to dismiss this error.
[✓] Android toolchain - develop for Android devices (Android SDK version 35.0.0)
[✓] Xcode - develop for iOS and macOS (Xcode 16.4)
[✓] Chrome - develop for the web
[✓] Android Studio (version 2025.1)
[✓] Android Studio (version 2025.1)
[✓] VS Code (version 1.92.0)
[✓] Connected device (5 available)
! Error: Browsing on the local area network for Bilal_WDI_Iphone. Ensure the device is unlocked and attached with a cable or associated with the same local area network as this Mac.
The device must be opted into Developer Mode to connect wirelessly. (code -27)
[✓] Network resources

View File

@@ -1,4 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<application
android:label="citycards_customer"

BIN
assets/dummy/dummy_1.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

BIN
assets/dummy/dummy_2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

BIN
assets/dummy/dummy_3.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

BIN
assets/dummy/dummy_4.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

BIN
assets/dummy/dummy_5.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

BIN
assets/gif/empty_cart.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 616 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 486 KiB

BIN
assets/gif/goto_school.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

BIN
assets/icons/active.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
assets/icons/adult.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/icons/adventure.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
assets/icons/arrow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 566 B

BIN
assets/icons/balanced.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
assets/icons/bus.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/icons/bx_qr.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 469 B

BIN
assets/icons/calender.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/icons/clock.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
assets/icons/contact_us.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
assets/icons/edit_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
assets/icons/esim_phone.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
assets/icons/exclusive.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 957 B

BIN
assets/icons/explore.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
assets/icons/facebook.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 956 B

BIN
assets/icons/faq.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/icons/halal.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
assets/icons/hi_rate1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
assets/icons/hi_rate2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
assets/icons/hi_rate3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/icons/hi_rate4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
assets/icons/indeed.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 793 B

BIN
assets/icons/insta.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/icons/kid.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

BIN
assets/icons/kosher.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
assets/icons/location.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
assets/icons/magic.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
assets/icons/pass_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/icons/pesc.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/icons/privacy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/icons/process_qr.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
assets/icons/qty.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 896 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/icons/relaxed.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
assets/icons/search.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
assets/icons/send_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 874 B

BIN
assets/icons/skype.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

BIN
assets/icons/snapchat.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 940 B

BIN
assets/icons/star.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 703 B

BIN
assets/icons/tr_rate1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
assets/icons/tr_rate2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
assets/icons/tr_rate3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
assets/icons/tr_rate4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
assets/icons/truecaller.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/icons/veg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
assets/icons/vegan.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
assets/icons/whatsapp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/icons/wi_rate1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
assets/icons/wi_rate2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
assets/icons/wi_rate3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

BIN
assets/icons/wi_rate4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
assets/images/aa1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

BIN
assets/images/aa2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
assets/images/aa3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
assets/images/aa4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 KiB

BIN
assets/images/chicago.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
assets/images/clock.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 601 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Some files were not shown because too many files have changed in this diff Show More