worked on onboarding screen

# Conflicts:
#	pubspec.yaml

android/app/src/main/AndroidManifest.xml

@@ -5,9 +5,9 @@
 
 
     <application
-        android:label="citycards_customer"
+        android:label="CityCard Customer"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"

flutter_launcher_icons.yaml

@@ -0,0 +1,19 @@
+# flutter pub run flutter_launcher_icons
+flutter_launcher_icons:
+  image_path: "assets/logo/logo_city_cards.png"
+
+  android: "launcher_icon"
+  # image_path_android: "assets/icon/icon.png"
+  min_sdk_android: 21 # android min sdk min:16, default 21
+  # adaptive_icon_background: "assets/icon/background.png"
+  # adaptive_icon_foreground: "assets/icon/foreground.png"
+  # adaptive_icon_foreground_inset: 16
+  # adaptive_icon_monochrome: "assets/icon/monochrome.png"
+
+  ios: true
+  # image_path_ios: "assets/icon/icon.png"
+  remove_alpha_ios: true
+  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
+  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
+  # desaturate_tinted_to_grayscale_ios: true
+  # background_color_ios: "#ffffff"

ios/Runner.xcodeproj/project.pbxproj

@@ -428,7 +428,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -485,7 +485,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

lib/add_details/add_details_view.dart

@@ -28,6 +28,7 @@ class AddDetailsView extends StatelessWidget {
                 isWhiteLogo: false,
                 isProfilePage: false,
                 showCart: false,
+                showDivider: true,
               ),
               Row(
                 children: [

lib/attraction_details/attraction_details_view.dart

@@ -38,14 +38,9 @@ class AttractionDetailsView extends StatelessWidget {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
 
-                            CommonAppBar(isWhiteLogo: true, isProfilePage: false),
+                            CommonAppBar(isWhiteLogo: true, isProfilePage: false, showDivider: true,),
 
                             SizedBox(height: 10.h),
-                            Divider(
-                              color: Colors.white.withOpacity(0.6),
-                              height: 1.h,
-                            ),
-                            SizedBox(height: 8.h),
 
                             Row(
                               children: [

lib/attractions/views/attractions_page_view.dart

@@ -41,7 +41,7 @@ class AttractionsPage extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     // App bar
-                    CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                    CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true),
                     backWidget(context, "Your Attraction", Colors.black),
                     const SizedBox(height: 20),
 

lib/buy_a_pass/view/buy_pass_view.dart

@@ -41,7 +41,7 @@ class BuyPassView extends StatelessWidget {
             children: [
               Padding(
                 padding: EdgeInsets.symmetric(horizontal: 20.0.w),
-                child: CommonAppBar(isWhiteLogo: false, isProfilePage: true),
+                child: CommonAppBar(isWhiteLogo: false, isProfilePage: true,showDivider: true,),
               ),
 
               Padding(

lib/buy_a_pass/widget/payment_card_view.dart

@@ -126,7 +126,6 @@ class _PaymentCardState extends State<PaymentCard> {
             onTap: () {
               Navigator.of(
                 context,
-                rootNavigator: true,
               ).pushNamed(RouteConstants.checkout);
             },
             label: "Proceed to Pay",

lib/cart/views/my_cart_view_page.dart

@@ -38,6 +38,7 @@ class _MyCartPageState extends State<MyCartPage> {
                   isWhiteLogo: false,
                   isProfilePage: false,
                   showCart: false,
+                  showDivider: true,
                 ),
                 backWidget(context, "Your Cart", Colors.black),
                 SizedBox(height: 24.h),

lib/checkout/view/checkout_view.dart

@@ -24,6 +24,7 @@ class CheckoutView extends StatelessWidget {
                 isWhiteLogo: false,
                 isProfilePage: false,
                 showCart: false,
+                showDivider: true,
               ),
               Row(
                 children: [

lib/checkout/widget/all_coupons_bottomsheet.dart

@@ -1,4 +1,4 @@
-import 'package:citycards_customer/checkout/widget/purchase_details_bottomsheet.dart';
+import 'package:citycards_customer/postcard/widgets/purchase_details_bottom_sheet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
@@ -6,11 +6,23 @@ import 'package:citycards_customer/common_packages/custom_text.dart';
 class AllCouponsBottomsheet extends StatelessWidget {
   AllCouponsBottomsheet({super.key});
 
-  final List<String> coupons = [
-    "assets/images/red_coupon.png",
-    "assets/images/green_coupon.png",
-    "assets/images/orange_coupon.png",
-    "assets/images/orange_coupon.png",
+  final List<Map<String, String>> coupons = [
+    {
+      "text": "Flat 3% cashback using Amazon Pay Balance",
+      "coupon_code": "AMZNPAY3",
+    },
+    {
+      "text": "Flat 3% cashback using Amazon Pay Balance",
+      "coupon_code": "AMZNPAY3",
+    },
+    {
+      "text": "Flat 3% cashback using Amazon Pay Balance",
+      "coupon_code": "AMZNPAY3",
+    },
+    {
+      "text": "Flat 3% cashback using Amazon Pay Balance",
+      "coupon_code": "AMZNPAY3",
+    },
   ];
 
   @override
@@ -48,6 +60,7 @@ class AllCouponsBottomsheet extends StatelessWidget {
               itemCount: coupons.length,
               separatorBuilder: (_, __) => SizedBox(height: 12.h),
               itemBuilder: (context, index) {
+                final coupon = coupons[index];
                 return Container(
                   alignment: Alignment.center,
                   padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 8.h),
@@ -58,44 +71,62 @@ class AllCouponsBottomsheet extends StatelessWidget {
                       color: const Color(0xFFF95F62).withOpacity(0.12),
                     ),
                   ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Image.asset(
-                        width: 183.9.w,
-                        height: 72.82.h,
-                        coupons[index],
-                        fit: BoxFit.cover,
-                      ),
-                      GestureDetector(
-                        onTap: (){
-                          Navigator.pop(context);
-                          showModalBottomSheet(
-                            backgroundColor: Colors.white,
-                              context: context,
-                              isScrollControlled: true,
-                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.vertical(
-                                  top: Radius.circular(12.r),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          SizedBox(
+                            width: 220.w,
+                            child: CustomText(
+                              text: coupon['text'] ?? "",
+                              size: 12.sp,
+                              weight: FontWeight.w400,
+                            ),
+                          ),
+
+                          GestureDetector(
+                            onTap: () {
+                              Navigator.pop(context);
+                              PurchaseDetailsBottomSheet.show(context);
+                            },
+                            child: Container(
+                              width: 110.w,
+                              height: 44.h,
+                              decoration: BoxDecoration(
+                                color: Color(0xFFF95F62),
+                                borderRadius: BorderRadius.circular(12.r),
+                              ),
+                              child: Center(
+                                child: CustomText(
+                                  text: "Apply Coupon",
+                                  size: 12.sp,
+                                  color: Colors.white,
                                 ),
                               ),
-                              builder: (_) => const PurchaseDetailsBottomsheet());
-                        },
-                        child: Container(
-                          width: 110.w,
-                          height: 44.h,
-                          decoration: BoxDecoration(
-                            color: Color(0xFFF95F62),
-                            borderRadius: BorderRadius.circular(12.r),
-                          ),
-                          child: Center(
-                            child: CustomText(
-                              text: "Apply Coupon",
-                              size: 12.sp,
-                              color: Colors.white,
                             ),
                           ),
+                        ],
+                      ),
+                      SizedBox(height: 8.h),
+                      Container(
+                        height: 32.h,
+                        width: 83.w,
+                        decoration: BoxDecoration(
+                          color: Color(0xFFF95F62).withOpacity(0.12),
+                          border: Border.all(color: Color(0xFFF95F62)),
+
+                          borderRadius: BorderRadius.circular(6.r),
+                        ),
+                        child: Center(
+                          child: CustomText(
+                            text: coupon['coupon_code'] ?? "",
+                            size: 12.sp,
+                            weight: FontWeight.w400,
+                            color: Color(0xFFF95F62),
+                          ),
                         ),
                       ),
                     ],

lib/checkout/widget/login_email_bottomsheet.dart

@@ -1,6 +1,7 @@
 import 'package:citycards_customer/checkout/widget/verify_otp_bottomsheet.dart';
 import 'package:citycards_customer/common_packages/custom_filled_button.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
+import 'package:citycards_customer/core/route_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -10,7 +11,6 @@ class LoginEmailBottomsheet extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AnimatedPadding(
-
       duration: const Duration(milliseconds: 250),
       curve: Curves.easeOut,
       padding: EdgeInsets.only(
@@ -77,26 +77,31 @@ class LoginEmailBottomsheet extends StatelessWidget {
             ),
 
             SizedBox(height: 20.h),
-            Text.rich(
-              TextSpan(
-                children: [
-                  TextSpan(
-                    text: "Already have an account?",
-                    style: TextStyle(
-                      color: Colors.black.withOpacity(0.6),
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w400,
+            InkWell(
+              onTap: (){
+                Navigator.of(context).pushNamed(RouteConstants.createAcct);
+              },
+              child: Text.rich(
+                TextSpan(
+                  children: [
+                    TextSpan(
+                      text: "Already have an account?",
+                      style: TextStyle(
+                        color: Colors.black.withOpacity(0.6),
+                        fontSize: 12.sp,
+                        fontWeight: FontWeight.w400,
+                      ),
                     ),
-                  ),
-                  TextSpan(
-                    text: " Sign in",
-                    style: TextStyle(
-                      color: const Color(0xFFF95F62),
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w600,
+                    TextSpan(
+                      text: " Sign in",
+                      style: TextStyle(
+                        color: const Color(0xFFF95F62),
+                        fontSize: 12.sp,
+                        fontWeight: FontWeight.w600,
+                      ),
                     ),
-                  ),
-                ],
+                  ],
+                ),
               ),
             ),
             SizedBox(height: 15.h),

lib/checkout/widget/purchase_details_bottomsheet.dart

@@ -1,217 +0,0 @@
-import 'package:citycards_customer/checkout/bloc/purchase_details_bloc.dart';
-import 'package:citycards_customer/common_packages/custom_filled_button.dart';
-import 'package:citycards_customer/common_packages/custom_text.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class PurchaseDetailsBottomsheet extends StatelessWidget {
-  const PurchaseDetailsBottomsheet({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (_) => PurchaseDetailsBloc(),
-      child: AnimatedPadding(
-        duration: const Duration(milliseconds: 250),
-        curve: Curves.easeOut,
-        padding: EdgeInsets.only(
-          top: 24.h,
-          left: 20.w,
-          right: 20.w,
-          bottom: MediaQuery.of(context).viewInsets.bottom,
-        ),
-        child: BlocBuilder<PurchaseDetailsBloc, PurchaseDetailsState>(
-          builder: (context, state) {
-            final selected = state.buyPassState;
-
-            return Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                // --- Handle Bar ---
-                Container(
-                  height: 4.h,
-                  width: 40.w,
-                  decoration: BoxDecoration(
-                    color: const Color(0xFF2D3134),
-                    borderRadius: BorderRadius.circular(4.r),
-                  ),
-                ),
-                SizedBox(height: 12.h),
-
-                CustomText(
-                  text: "Purchase Details",
-                  size: 18.sp,
-                  weight: FontWeight.w600,
-                ),
-                SizedBox(height: 22.h),
-
-                // --- Option 1: Buy for Myself ---
-                GestureDetector(
-                  onTap: () {
-                    context.read<PurchaseDetailsBloc>().add(
-                      SetPurchaseDetailsEvent("myself"),
-                    );
-                  },
-                  child: Container(
-                    padding: EdgeInsets.all(6),
-                    decoration: BoxDecoration(
-                      border: Border.all(
-                        color: selected == "myself"
-                            ? const Color(0xFFF95F62)
-                            : Colors.transparent,
-                      ),
-                      borderRadius: BorderRadius.circular(10.r),
-                    ),
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.center,
-
-                      children: [
-                        Expanded(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Row(
-                                children: [
-                                  Icon(
-                                    selected == "myself"
-                                        ? Icons.radio_button_checked
-                                        : Icons.radio_button_off,
-                                    color: selected == "myself"
-                                        ? const Color(0xFFF95F62)
-                                        : Color(0xFF2B2929).withOpacity(.6),
-                                    size: 24.sp,
-                                  ),
-                                  SizedBox(width: 8.w),
-                                  CustomText(
-                                    text: "Buy Pass for Myself",
-                                    color: selected == "myself"
-                                        ? const Color(0xFFF95F62)
-                                        : Color(0xFF2B2929).withOpacity(.6),
-                                    size: 16.sp,
-                                    weight: FontWeight.w500,
-                                  ),
-                                ],
-                              ),
-                              if (selected == "myself") ...[
-                                SizedBox(height: 6.h),
-                                CustomText(
-                                  text: "Frank Adam",
-                                  size: 14.sp,
-                                  weight: FontWeight.w400,
-                                  color: Colors.black.withOpacity(0.6),
-                                ),
-                                SizedBox(height: 4.h),
-                                CustomText(
-                                  text: "132 My Street, Kingston, NY 12401",
-                                  size: 12.sp,
-                                  color: const Color(
-                                    0xFF000000,
-                                  ).withOpacity(0.4),
-                                ),
-                              ],
-                            ],
-                          ),
-                        ),
-                        if (selected == "myself")
-                          Container(
-                            padding: EdgeInsets.symmetric(
-                              horizontal: 6.w,
-                              vertical: 6.h,
-                            ),
-                            decoration: BoxDecoration(
-                              color: Color(0xFFF95F62).withOpacity(0.12),
-                              border: Border.all(
-                                color: const Color(0xFFF95F62),
-                                width: 1,
-                              ),
-                              borderRadius: BorderRadius.circular(12.r),
-                            ),
-                            child: CustomText(
-                              text: "Edit Details",
-                              size: 16.sp,
-                              weight: FontWeight.w500,
-                              color: const Color(0xFFF95F62),
-                            ),
-                          ),
-                      ],
-                    ),
-                  ),
-                ),
-                SizedBox(height: 16.h),
-
-                // --- Option 2: Gift the Pass ---
-                GestureDetector(
-                  onTap: () {
-                    context.read<PurchaseDetailsBloc>().add(
-                      SetPurchaseDetailsEvent("gift"),
-                    );
-                  },
-                  child: Container(
-                    padding: EdgeInsets.all(12.w),
-                    decoration: BoxDecoration(
-                      border: Border.all(
-                        color: selected == "gift"
-                            ? const Color(0xFFF95F62)
-                            : Colors.transparent,
-                      ),
-                      borderRadius: BorderRadius.circular(12.r),
-                    ),
-                    child: Expanded(
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Row(
-                            children: [
-                              Icon(
-                                selected == "gift"
-                                    ? Icons.radio_button_checked
-                                    : Icons.radio_button_off,
-                                color: selected == "gift"
-                                    ? const Color(0xFFF95F62)
-                                    : Color(0xFF2F2A2A).withOpacity(0.4),
-                                size: 24.sp,
-                              ),
-                              SizedBox(width: 8.w),
-                              CustomText(
-                                text: "Gift the pass",
-                                color: selected == "gift"
-                                    ? const Color(0xFFF95F62)
-                                    : Color(0xFF2F2A2A).withOpacity(0.4),
-                                size: 16.sp,
-                                weight: FontWeight.w500,
-                              ),
-                            ],
-                          ),
-                          SizedBox(height: 6.h),
-                          if (selected == "gift")
-                            CustomText(
-                              text: "Gift the pass for someone else",
-                              size: 12.sp,
-                              color: const Color(0xFF000000).withOpacity(0.6),
-                            ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ),
-
-                SizedBox(height: 24.h),
-
-                // --- Proceed Button ---
-                CustomFilledButton(
-                  onTap: () {
-                    Navigator.pop(context);
-                  },
-                  label: "Proceed",
-                  width: double.infinity,
-                ),
-                SizedBox(height: 20.h),
-              ],
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/checkout/widget/verify_otp_bottomsheet.dart

@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import '../../core/route_constants.dart';
+
 class VerifyOtpBottomsheet extends StatelessWidget {
   VerifyOtpBottomsheet({super.key});
 
@@ -84,26 +86,31 @@ class VerifyOtpBottomsheet extends StatelessWidget {
             ),
 
             SizedBox(height: 20.h),
-            Text.rich(
-              TextSpan(
-                children: [
-                  TextSpan(
-                    text: "Already have an account?",
-                    style: TextStyle(
-                      color: Colors.black.withOpacity(0.6),
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w400,
+            InkWell(
+              onTap: () {
+                Navigator.of(context).pushNamed(RouteConstants.createAcct);
+              },
+              child: Text.rich(
+                TextSpan(
+                  children: [
+                    TextSpan(
+                      text: "Already have an account?",
+                      style: TextStyle(
+                        color: Colors.black.withOpacity(0.6),
+                        fontSize: 12.sp,
+                        fontWeight: FontWeight.w400,
+                      ),
                     ),
-                  ),
-                  TextSpan(
-                    text: " Sign in",
-                    style: TextStyle(
-                      color: const Color(0xFFF95F62),
-                      fontSize: 12.sp,
-                      fontWeight: FontWeight.w600,
+                    TextSpan(
+                      text: " Sign in",
+                      style: TextStyle(
+                        color: const Color(0xFFF95F62),
+                        fontSize: 12.sp,
+                        fontWeight: FontWeight.w600,
+                      ),
                     ),
-                  ),
-                ],
+                  ],
+                ),
               ),
             ),
             SizedBox(height: 15.h),

lib/common_packages/app_bar.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 import '../core/route_constants.dart';
+import '../home/widgets/search_city_bottomsheet.dart';
 
 class CommonAppBar extends StatelessWidget {
   const CommonAppBar({
@@ -9,11 +10,13 @@ class CommonAppBar extends StatelessWidget {
     required this.isWhiteLogo,
     required this.isProfilePage,
     this.showCart = true,
+    required this.showDivider
   });
 
   final bool isWhiteLogo;
   final bool isProfilePage;
   final bool? showCart;
+  final bool showDivider;
 
   @override
   Widget build(BuildContext context) {
@@ -22,11 +25,25 @@ class CommonAppBar extends StatelessWidget {
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Image.asset(
-              isWhiteLogo
-                  ? "assets/logo/logo_city_cards_white.png"
-                  : "assets/logo/logo_city_cards.png",
-              scale: 4,
+            Row(
+              children: [
+                Image.asset(
+                  isWhiteLogo
+                      ? "assets/logo/melbourne_white.png"
+                      : "assets/logo/melbourne_logo.png",
+                  scale: 4,
+                ),
+                IconButton(onPressed: (){
+                  showModalBottomSheet(
+                    context: context,
+                    isScrollControlled: true,
+                    backgroundColor: Colors.transparent,
+                    builder: (_) => const CitySelectionBottomSheet(),
+
+                  );
+
+                }, icon: Icon(Icons.arrow_drop_down, color: isWhiteLogo ? Colors.white : Color(0xffF95F62), size: 30,))
+              ],
             ),
             Row(
               children: [
@@ -61,16 +78,14 @@ class CommonAppBar extends StatelessWidget {
                     },
                     child: CircleAvatar(
                       backgroundColor: Color(0xffFFDFDF),
-                      backgroundImage: AssetImage(
-                        "assets/images/profile_img.png",
-                      ),
+                      child: Image.asset( "assets/images/profile_default_img.png",),
                     ),
                   ),
               ],
             ),
           ],
         ),
-        if (!isWhiteLogo)
+        if (showDivider)
           Column(
             children: [
               SizedBox(height: 12.h),

lib/contact_us/contact_us_view.dart

@@ -25,7 +25,7 @@ class ContactUsPage extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               // Header bar
-              CommonAppBar(isWhiteLogo: false, isProfilePage: true),
+              CommonAppBar(isWhiteLogo: false, isProfilePage: true, showDivider: true,),
 
               backWidget(context,"Contact Us", Colors.black),
               SizedBox(height: 22.h),

lib/core/app_router.dart

@@ -10,6 +10,7 @@ import 'package:citycards_customer/edit_profile/edit_profile_view.dart';
 import 'package:citycards_customer/esim_offer/esim_offer_view.dart';
 import 'package:citycards_customer/faq/faq_view.dart';
 import 'package:citycards_customer/hotel_offer/hotel_offer_view.dart';
+import 'package:citycards_customer/intro_screens/views/intro_screen_view.dart';
 import 'package:citycards_customer/itinerary_creation/bloc/itinerary_detail_bloc.dart';
 import 'package:citycards_customer/itinerary_creation/bloc/itinerary_steps_selection_bloc.dart';
 import 'package:citycards_customer/itinerary_creation/views/itinerary_creation_start_view.dart';
@@ -28,6 +29,7 @@ import '../attractions/views/attractions_page_view.dart';
 import '../cart/views/my_cart_view_page.dart';
 import '../common_bloc/bottom_navigation_bloc.dart';
 import '../home/views/home_page_view.dart';
+import '../home/views/registered_user_home_page.dart';
 import 'route_constants.dart';
 
 class AppRouter {
@@ -43,6 +45,11 @@ class AppRouter {
             );
           },
         );
+
+      case RouteConstants.intro:
+        return MaterialPageRoute(builder: (_){
+          return IntroScreensView();
+        });
       case RouteConstants.attractionsPage:
         final args = settings.arguments as String;
         return MaterialPageRoute(builder: (_) => AttractionsPage(source: args));
@@ -198,6 +205,13 @@ class AppRouter {
         return MaterialPageRoute(builder: (_){
           return OfferPassDetailView();
         });
+
+      case RouteConstants.registeredUserHome:
+        return MaterialPageRoute(
+          builder: (_) {
+            return RegisteredUserHomePage();
+          },
+        );
       default:
         return MaterialPageRoute(
           builder: (_) =>

lib/core/inside_bottom_navigator.dart

@@ -1,4 +1,5 @@
 import 'package:citycards_customer/core/route_constants.dart';
+import 'package:citycards_customer/home/views/registered_user_home_page.dart';
 import 'package:citycards_customer/my_pass/blocs/my_pass_bloc.dart';
 import 'package:citycards_customer/postcard/views/add_filter_step_page_view.dart';
 import 'package:flutter/material.dart';
@@ -6,19 +7,29 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../attraction_details/attraction_details_view.dart';
 import '../attractions/views/attractions_page_view.dart';
+import '../buy_a_pass/view/buy_pass_view.dart';
+import '../checkout/view/checkout_view.dart';
+import '../create_account/create_account_view.dart';
+import '../itinerary_creation/bloc/itinerary_detail_bloc.dart';
+import '../itinerary_creation/bloc/itinerary_steps_selection_bloc.dart';
+import '../itinerary_creation/views/itinerary_creation_view.dart';
+import '../itinerary_creation/views/magic_itinerary_filled_view.dart';
 import '../my_pass/views/booking_page_view.dart';
+import '../my_pass/views/booking_successful_page_view.dart';
 import '../my_pass/views/qr_pass_page_view.dart';
+import '../offer_pass_detail/offer_pass_detail_view.dart';
 import '../postcard/blocs/postcard_creation_bloc.dart';
 import '../postcard/views/postcard_creation_page_view.dart';
 import '../search_offers/bloc/search_offers_listing_bloc.dart';
 import '../search_offers/view/search_offers_with_listing.dart';
+import '../your_itinerary/view/your_itinerary_view.dart';
 
 Widget buildOffstageNavigator(
-    int index,
-    int currentIndex,
-    Widget child,
-    Key key,
-    ) {
+  int index,
+  int currentIndex,
+  Widget child,
+  Key key,
+) {
   return Offstage(
     offstage: currentIndex != index,
     child: Navigator(
@@ -28,21 +39,41 @@ Widget buildOffstageNavigator(
           case '/':
             return MaterialPageRoute(builder: (_) => child);
 
-        // 🔹 Attractions Page
+          // 🔹 Attractions Page
           case RouteConstants.attractionsPage:
             final args = settings.arguments as String;
             return MaterialPageRoute(
-              builder: (_) => AttractionsPage(source: args,),
+              builder: (_) => AttractionsPage(source: args),
             );
 
           case RouteConstants.attractionDetails:
-            return MaterialPageRoute(builder: (_) {
-              return AttractionDetailsView();
-            });
+            return MaterialPageRoute(
+              builder: (_) {
+                return AttractionDetailsView();
+              },
+            );
 
-            case RouteConstants.makeBooking:
-            return MaterialPageRoute(builder: (_) {
-              return MakeBookingView(title: 'asffdsf', description: 'afdsfadsfasdfads',);
+          case RouteConstants.makeBooking:
+            return MaterialPageRoute(
+              builder: (_) {
+                return MakeBookingView(
+                  title: 'Koh Rong Samloem',
+                  description:
+                      'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Convallis condimentum morbi non egestas enim amet sagittis.ß',
+                );
+              },
+            );
+
+          case RouteConstants.bookingSuccessful:
+            return MaterialPageRoute(
+              builder: (_) {
+                return BookingSuccessfulPageView();
+              },
+            );
+
+          case RouteConstants.offerPassDetail:
+            return MaterialPageRoute(builder: (_){
+              return OfferPassDetailView();
             });
 
           case RouteConstants.searchOffer:
@@ -55,7 +86,7 @@ Widget buildOffstageNavigator(
               },
             );
 
-        // 🔹 Upload Photo Page (start of postcard creation flow)
+          // 🔹 Upload Photo Page (start of postcard creation flow)
           case RouteConstants.uploadPhotoPage:
             return MaterialPageRoute(
               builder: (_) => BlocProvider(
@@ -64,11 +95,13 @@ Widget buildOffstageNavigator(
               ),
             );
 
-        // 🔹 Add Filter Page (uses same bloc instance)
+          // 🔹 Add Filter Page (uses same bloc instance)
           case RouteConstants.addFilterPage:
             return MaterialPageRoute(
               builder: (context) {
-                final previousBloc = BlocProvider.of<PostcardCreationBloc>(context);
+                final previousBloc = BlocProvider.of<PostcardCreationBloc>(
+                  context,
+                );
                 return BlocProvider.value(
                   value: previousBloc,
                   child: const AddFilterStepPageView(),
@@ -76,7 +109,6 @@ Widget buildOffstageNavigator(
               },
             );
 
-
           case RouteConstants.qrPage:
             return MaterialPageRoute(
               builder: (context) {
@@ -88,11 +120,68 @@ Widget buildOffstageNavigator(
               },
             );
 
+          case RouteConstants.itineraryCreation:
+            return MaterialPageRoute(
+              builder: (_) {
+                return MultiBlocProvider(
+                  providers: [
+                    BlocProvider<ItineraryStepNavigationBloc>(
+                      create: (_) => ItineraryStepNavigationBloc(),
+                    ),
+
+                    BlocProvider<AddItineraryDetailBloc>(
+                      create: (_) => AddItineraryDetailBloc(),
+                    ),
+                  ],
+                  child: const ItineraryCreationPage(),
+                );
+              },
+            );
+
+          case RouteConstants.yourItinerary:
+            return MaterialPageRoute(
+              builder: (_) {
+                return YourItineraryView();
+              },
+            );
+
+          case RouteConstants.magicItineraryFilledScreen:
+            return MaterialPageRoute(builder: (_){
+              return MagicItineraryFilledView();
+            });
+
+          case RouteConstants.checkout:
+            return MaterialPageRoute(
+              builder: (_) {
+                return CheckoutView();
+              },
+            );
+
+          case RouteConstants.buyPass:
+            return MaterialPageRoute(
+              builder: (_) {
+                return BuyPassView();
+              },
+            );
+
+          case RouteConstants.createAcct:
+            return MaterialPageRoute(
+              builder: (_) {
+                return CreateAccountView();
+              },
+            );
+
+            case RouteConstants.registeredUserHome:
+            return MaterialPageRoute(
+              builder: (_) {
+                return RegisteredUserHomePage();
+              },
+            );
+
           default:
             return MaterialPageRoute(
-              builder: (_) => const Scaffold(
-                body: Center(child: Text('Page not found')),
-              ),
+              builder: (_) =>
+                  const Scaffold(body: Center(child: Text('Page not found'))),
             );
         }
       },

lib/core/route_constants.dart

@@ -1,7 +1,12 @@
 class RouteConstants {
 
+
+  static const String intro = 'intro';
+
   /****************************** HOME SECTION ************************************/
+
   static const String home = '/home';
+  static const String registeredUserHome = '/registeredUserHome';
   static const String attractionsPage = "/attractions";
   static const String postCardPage = "/postcards";
   static const String uploadPhotoPage = "/uploadPhoto";
@@ -49,4 +54,5 @@ class RouteConstants {
 
   static const String qrPage = '/qrPage';
   static const String makeBooking = '/makeBooking';
+  static const String bookingSuccessful = '/bookingSuccessful';
 }

lib/create_account/create_account_view.dart

@@ -29,6 +29,7 @@ class CreateAccountView extends StatelessWidget {
                 isWhiteLogo: false,
                 isProfilePage: false,
                 showCart: false,
+                showDivider: true,
               ),
               Row(
                 children: [

lib/edit_profile/edit_profile_view.dart

@@ -25,7 +25,7 @@ class EditProfilePage extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               // Header
-              CommonAppBar(isWhiteLogo: false, isProfilePage: true),
+              CommonAppBar(isWhiteLogo: false, isProfilePage: true,showDivider: true,),
 
               // Back + title
               backWidget(context,"Edit Profile", Colors.black),

lib/esim_offer/esim_offer_view.dart

@@ -18,7 +18,7 @@ class EsimOfferPage extends StatelessWidget {
               Container(
                 color: Colors.white,
                 padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-                child: CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                child: CommonAppBar(isWhiteLogo: false, isProfilePage: false,showDivider: true,),
               ),
 
               /************************* Top Banner  ***********************/

lib/faq/faq_view.dart

@@ -19,7 +19,7 @@ class FaqPage extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                CommonAppBar(isWhiteLogo: false, isProfilePage: true),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: true, showDivider: true,),
                 backWidget(context,"FAQ", Colors.black),
                 SizedBox(height: 34.h),
 

lib/home/bloc/app_start_bloc.dart

@@ -0,0 +1,42 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+/// --- Events ---
+abstract class AppStartEvent {}
+
+class CheckFirstTimeUser extends AppStartEvent {}
+class MarkUserAsRegistered extends AppStartEvent {}
+
+/// --- States ---
+abstract class AppStartState {}
+
+class AppStartLoading extends AppStartState {}
+class AppStartFirstTime extends AppStartState {}
+class AppStartRegistered extends AppStartState {}
+
+/// --- Bloc ---
+class AppStartBloc extends Bloc<AppStartEvent, AppStartState> {
+  AppStartBloc() : super(AppStartLoading()) {
+    on<CheckFirstTimeUser>(_onCheckFirstTimeUser);
+    on<MarkUserAsRegistered>(_onMarkUserAsRegistered);
+  }
+
+  Future<void> _onCheckFirstTimeUser(
+      CheckFirstTimeUser event, Emitter<AppStartState> emit) async {
+    emit(AppStartLoading());
+    final prefs = await SharedPreferences.getInstance();
+    final isFirstTime = prefs.getBool('isFirstTimeUser') ?? true;
+    if (isFirstTime) {
+      emit(AppStartFirstTime());
+    } else {
+      emit(AppStartRegistered());
+    }
+  }
+
+  Future<void> _onMarkUserAsRegistered(
+      MarkUserAsRegistered event, Emitter<AppStartState> emit) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('isFirstTimeUser', false);
+    emit(AppStartRegistered());
+  }
+}

lib/home/views/first_time_user_home_page.dart

@@ -5,7 +5,8 @@ import '../../common_packages/app_bar.dart';
 import '../widgets/explore_cities_card.dart';
 
 class FirstTimeUserHomePage extends StatefulWidget {
-  const FirstTimeUserHomePage({super.key});
+  final VoidCallback onContinue;
+  const FirstTimeUserHomePage({super.key, required this.onContinue});
 
   @override
   State<FirstTimeUserHomePage> createState() => _FirstTimeUserHomePageState();
@@ -92,7 +93,7 @@ class _FirstTimeUserHomePageState extends State<FirstTimeUserHomePage> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    CommonAppBar(isWhiteLogo: true, isProfilePage: false),
+                    CommonAppBar(isWhiteLogo: true, isProfilePage: false, showDivider: false),
                     SizedBox(height: 140.h),
                     Text(
                       "CityCards.\nSee More,\nSpend Less.",
@@ -120,9 +121,7 @@ class _FirstTimeUserHomePageState extends State<FirstTimeUserHomePage> {
                           borderRadius: BorderRadius.circular(25.r),
                         ),
                       ),
-                      onPressed: () {
-
-                      },
+                      onPressed: widget.onContinue,
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [

lib/home/views/home_page_view.dart

@@ -1,13 +1,14 @@
-import 'package:citycards_customer/home/views/registered_user_home_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:citycards_customer/common_packages/custom_bottom_navbar.dart';
+import 'package:citycards_customer/core/inside_bottom_navigator.dart';
+import 'package:citycards_customer/itinerary_creation/views/itinerary_creation_start_view.dart';
+import 'package:citycards_customer/my_pass/views/my_pass_page_view.dart';
+import 'package:citycards_customer/postcard/views/postcard_initial_page_view.dart';
 import '../../common_bloc/bottom_navigation_bloc.dart';
-import '../../common_packages/custom_bottom_navbar.dart';
-import '../../core/inside_bottom_navigator.dart';
-import '../../itinerary_creation/views/itinerary_creation_start_view.dart';
-import '../../my_pass/views/my_pass_page_view.dart';
-import '../../postcard/views/postcard_initial_page_view.dart';
+import '../bloc/app_start_bloc.dart';
 import 'first_time_user_home_page.dart';
+import 'registered_user_home_page.dart';
 
 class HomePage extends StatefulWidget {
   const HomePage({super.key});
@@ -18,33 +19,59 @@ class HomePage extends StatefulWidget {
 
 class _HomePageState extends State<HomePage> {
   final _navigatorKeys = [
-    GlobalKey<NavigatorState>(), // tab 0
-    GlobalKey<NavigatorState>(), // tab 1
-    GlobalKey<NavigatorState>(), // tab 2
-    GlobalKey<NavigatorState>(), // tab 2
+    GlobalKey<NavigatorState>(),
+    GlobalKey<NavigatorState>(),
+    GlobalKey<NavigatorState>(),
+    GlobalKey<NavigatorState>(),
   ];
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<NavigationBloc, NavigationState>(
-      builder: (context, state) {
-        final currentIndex = state.selectedIndex;
+    return BlocProvider(
+      create: (_) => AppStartBloc()..add(CheckFirstTimeUser()),
+      child: BlocBuilder<AppStartBloc, AppStartState>(
+        builder: (context, state) {
+          if (state is AppStartLoading) {
+            return const Scaffold(
+              body: Center(child: CircularProgressIndicator()),
+            );
+          }
 
-        return SafeArea(
-          top: false,
-          child: Scaffold(
-            body: Stack(
-              children: [
-                buildOffstageNavigator(0, currentIndex, const FirstTimeUserHomePage(), _navigatorKeys[0]),
-                buildOffstageNavigator(1, currentIndex, const ItineraryCreationStartPage(), _navigatorKeys[1]),
-                buildOffstageNavigator(2, currentIndex, const MyPassesView(), _navigatorKeys[2]),
-                buildOffstageNavigator(3, currentIndex, const PostcardPage(), _navigatorKeys[3]),
-              ],
-            ),
-            bottomNavigationBar: CustomBottomNavBar(),
-          ),
-        );
-      },
+          if (state is AppStartFirstTime) {
+            return FirstTimeUserHomePage(
+              onContinue: () {
+                context.read<AppStartBloc>().add(MarkUserAsRegistered());
+              },
+            );
+          }
+
+          // Once registered → show normal main home tabs
+          return BlocBuilder<NavigationBloc, NavigationState>(
+            builder: (context, navState) {
+              final currentIndex = navState.selectedIndex;
+
+              return SafeArea(
+                top: false,
+                child: Scaffold(
+                  body: Stack(
+                    children: [
+                      buildOffstageNavigator(0, currentIndex,
+                          const RegisteredUserHomePage(), _navigatorKeys[0]),
+                      buildOffstageNavigator(1, currentIndex,
+                          const ItineraryCreationStartPage(), _navigatorKeys[1]),
+                      buildOffstageNavigator(2, currentIndex,
+                          const MyPassesView(), _navigatorKeys[2]),
+                      buildOffstageNavigator(3, currentIndex,
+                          const PostcardPage(), _navigatorKeys[3]),
+                    ],
+                  ),
+                  bottomNavigationBar: const CustomBottomNavBar(),
+                ),
+              );
+            },
+          );
+        },
+      ),
     );
   }
 }

lib/home/views/registered_user_home_page.dart

@@ -13,40 +13,36 @@ import '../widgets/journey_cards_listview.dart';
 import '../widgets/pass_card_list.dart';
 
 class RegisteredUserHomePage extends StatefulWidget {
-   const RegisteredUserHomePage({super.key});
+  const RegisteredUserHomePage({super.key});
 
   @override
   State<RegisteredUserHomePage> createState() => _RegisteredUserHomePageState();
 }
 
 class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
-
-   final List<Map<String, String>> attractions = [
+  final List<Map<String, String>> attractions = [
     {
       'title': 'Long-Tail Boat Charter',
       'subtitle': 'Lorem ipsum dolor sit amet...',
-      'image':
-      'assets/images/clock.png',
+      'image': 'assets/images/clock.png',
+    },
+    {
+      'title': 'Koh Rong Samloemr',
+      'subtitle': 'Lorem ipsum dolor sit amet...',
+      'image': 'assets/images/koh_rong.png',
+    },
+    {
+      'title': 'Long-Tail Boat Charter',
+      'subtitle': 'Lorem ipsum dolor sit amet...',
+      'image': 'assets/images/clock.png',
     },
     {
       'title': 'Koh Rong Samloemr',
       'subtitle': 'Lorem ipsum dolor sit amet...',
       'image': 'assets/images/koh_rong.png',
     },
-     {
-       'title': 'Long-Tail Boat Charter',
-       'subtitle': 'Lorem ipsum dolor sit amet...',
-       'image':
-       'assets/images/clock.png',
-     },
-     {
-       'title': 'Koh Rong Samloemr',
-       'subtitle': 'Lorem ipsum dolor sit amet...',
-       'image': 'assets/images/koh_rong.png',
-     },
   ];
 
-
   @override
   Widget build(BuildContext context) {
     return SafeArea(
@@ -68,10 +64,14 @@ class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      CommonAppBar(isWhiteLogo: true , isProfilePage: false),
-                      SizedBox(height: 50.h),
+                      CommonAppBar(
+                        isWhiteLogo: false,
+                        isProfilePage: false,
+                        showDivider: false,
+                      ),
+                      SizedBox(height: 70.h),
                       Text(
-                        "Chicago",
+                        "Melbourne",
                         style: TextStyle(
                           color: Colors.white,
                           fontWeight: FontWeight.w500,
@@ -81,11 +81,11 @@ class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
                       const SizedBox(height: 4),
                       Text(
                         "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
-                            "Cras posuere, nisl id dictum consequat, elit enim tincidunt magna...",
+                        "Cras posuere, nisl id dictum consequat, elit enim tincidunt magna...",
                         style: TextStyle(
                           color: Colors.white.withOpacity(0.9),
                           fontSize: 12,
-                          fontWeight: FontWeight.w400
+                          fontWeight: FontWeight.w400,
                         ),
                       ),
                       const SizedBox(height: 12),
@@ -119,24 +119,31 @@ class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
                                 ),
                                 TextSpan(
                                   text: "Attractions",
-                                  style:
-                                  TextStyle(fontSize: 18, color: Colors.black, fontWeight: FontWeight.w500,),
+                                  style: TextStyle(
+                                    fontSize: 18,
+                                    color: Colors.black,
+                                    fontWeight: FontWeight.w500,
+                                  ),
                                 ),
                               ],
                             ),
                           ),
                           InkWell(
-                            onTap: (){
-                              Navigator.of(context).pushNamed(RouteConstants.attractionsPage, arguments: "home");
+                            onTap: () {
+                              Navigator.of(context).pushNamed(
+                                RouteConstants.attractionsPage,
+                                arguments: "home",
+                              );
                             },
-                            child: Text("View all",
+                            child: Text(
+                              "View all",
                               style: TextStyle(
                                 fontSize: 12,
                                 fontWeight: FontWeight.w500,
                                 color: Color(0xffF95F62),
                               ),
                             ),
-                          )
+                          ),
                         ],
                       ),
                       const SizedBox(height: 12),
@@ -145,11 +152,7 @@ class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
                   ),
                 ),
                 InwardCurvedContainer(
-                  child: Stack(
-                    children: [
-                      DreamJourneySection()
-                    ]
-                  )
+                  child: Stack(children: [DreamJourneySection()]),
                 ),
                 const SizedBox(height: 10),
                 ESimOfferSection(),
@@ -162,10 +165,15 @@ class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
                     children: [
                       Column(
                         children: [
-                          _buildFeatureCard(
-                            image: "assets/images/claim_offers_bg.jpg",
-                            title: "Claim offers with your City Cards",
-                            subtitle: "Lorem ipsum dolor sit amet...",
+                          InkWell(
+                            onTap: () {
+                              Navigator.of(context).pushNamed(RouteConstants.searchOffer);
+                            },
+                            child: _buildFeatureCard(
+                              image: "assets/images/claim_offers_bg.jpg",
+                              title: "Claim offers with your City Cards",
+                              subtitle: "Lorem ipsum dolor sit amet...",
+                            ),
                           ),
                         ],
                       ),
@@ -190,90 +198,95 @@ class _RegisteredUserHomePageState extends State<RegisteredUserHomePage> {
   Widget _buildTag(String label) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-      decoration:
-      BoxDecoration(color: Color(0xffF95F62), borderRadius: BorderRadius.circular(20)),
-      child: Text(label,
-          style:TextStyle(
-              color: Colors.white, fontWeight: FontWeight.w500, fontSize: 12)),
+      decoration: BoxDecoration(
+        color: Color(0xffF95F62),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: Colors.white,
+          fontWeight: FontWeight.w500,
+          fontSize: 12,
+        ),
+      ),
     );
   }
 
-   Widget _buildFeatureCard({
-     required String image,
-     required String title,
-     required String subtitle,
-   }) {
-     return Stack(
-       children: [
-         ClipRRect(
-           borderRadius: BorderRadius.circular(16),
-           child: Image.asset(
-             image,
-             height: 200,
-             width: double.infinity,
-             fit: BoxFit.cover,
-           ),
-         ),
-         Positioned(
-           left: 16,
-           right: 16,
-           bottom: 16,
-           child: Container(
-             padding: const EdgeInsets.all(12),
-             decoration: BoxDecoration(
-               color: Colors.white.withOpacity(0.9),
-               borderRadius: BorderRadius.circular(16),
-             ),
-             child: Row(
-               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-               children: [
+  Widget _buildFeatureCard({
+    required String image,
+    required String title,
+    required String subtitle,
+  }) {
+    return Stack(
+      children: [
+        ClipRRect(
+          borderRadius: BorderRadius.circular(16),
+          child: Image.asset(
+            image,
+            height: 200,
+            width: double.infinity,
+            fit: BoxFit.cover,
+          ),
+        ),
+        Positioned(
+          left: 16,
+          right: 16,
+          bottom: 16,
+          child: Container(
+            padding: const EdgeInsets.all(12),
+            decoration: BoxDecoration(
+              color: Colors.white.withOpacity(0.9),
+              borderRadius: BorderRadius.circular(16),
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        title,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: const TextStyle(
+                          fontWeight: FontWeight.w600,
+                          fontSize: 18,
+                        ),
+                      ),
+                      Text(
+                        subtitle,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: GoogleFonts.poppins(
+                          fontSize: 14,
+                          color: Colors.black.withOpacity(0.6),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
 
-                 Expanded(
-                   child: Column(
-                     crossAxisAlignment: CrossAxisAlignment.start,
-                     children: [
-                       Text(
-                         title,
-                         maxLines: 1,
-                         overflow: TextOverflow.ellipsis,
-                         style: const TextStyle(
-                           fontWeight: FontWeight.w600,
-                           fontSize: 18,
-                         ),
-                       ),
-                       Text(
-                         subtitle,
-                         maxLines: 1,
-                         overflow: TextOverflow.ellipsis,
-                         style: GoogleFonts.poppins(
-                           fontSize: 14,
-                           color: Colors.black.withOpacity(0.6),
-                         ),
-                       ),
-                     ],
-                   ),
-                 ),
-
-                 const SizedBox(width: 8),
-
-                 // Right side arrow button
-                 Container(
-                   decoration: const BoxDecoration(
-                     color: Color(0xffFDCDCE),
-                     shape: BoxShape.circle,
-                   ),
-                   padding: const EdgeInsets.all(12),
-                   child: Image.asset(
-                     "assets/icons/arrow_angle_up.png",
-                     scale: 4,
-                   ),
-                 ),
-               ],
-             ),
-           ),
-         ),
-       ],
-     );
-   }
+                const SizedBox(width: 8),
 
+                // Right side arrow button
+                Container(
+                  decoration: const BoxDecoration(
+                    color: Color(0xffFDCDCE),
+                    shape: BoxShape.circle,
+                  ),
+                  padding: const EdgeInsets.all(12),
+                  child: Image.asset(
+                    "assets/icons/arrow_angle_up.png",
+                    scale: 4,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
 }

lib/home/widgets/get_your_pass_card.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+import '../../core/route_constants.dart';
+
 class GetYourPassCard extends StatelessWidget {
   const GetYourPassCard({super.key});
 
@@ -30,16 +32,21 @@ class GetYourPassCard extends StatelessWidget {
                   color: Colors.black,
                 ),
               ),
-              Container(
-                padding: const EdgeInsets.all(8),
-                decoration: const BoxDecoration(
-                  color: Color(0xffF95F62),
-                  shape: BoxShape.circle,
-                ),
-                child: const Icon(
-                  Icons.arrow_forward,
-                  color: Colors.black,
-                  size: 18,
+              InkWell(
+                onTap: (){
+                  Navigator.of(context).pushNamed(RouteConstants.buyPass);
+                },
+                child: Container(
+                  padding: const EdgeInsets.all(8),
+                  decoration: const BoxDecoration(
+                    color: Color(0xffF95F62),
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(
+                    Icons.arrow_forward,
+                    color: Colors.black,
+                    size: 18,
+                  ),
                 ),
               ),
             ],

lib/home/widgets/pass_card_list.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+import '../../core/route_constants.dart';
+
 class ChooseYourPassSection extends StatefulWidget {
   const ChooseYourPassSection({super.key});
 
@@ -179,7 +181,9 @@ class _ChooseYourPassSectionState extends State<ChooseYourPassSection> {
           SizedBox(
             width: double.infinity,
             child: ElevatedButton(
-              onPressed: () {},
+              onPressed: () {
+                Navigator.of(context).pushNamed(RouteConstants.buyPass);
+              },
               style: ElevatedButton.styleFrom(
                 backgroundColor: item['color'],
                 padding: const EdgeInsets.symmetric(vertical: 14),

lib/hotel_offer/hotel_offer_view.dart

@@ -18,7 +18,7 @@ class HotelOfferView extends StatelessWidget {
               Container(
                 color: Colors.white,
                 padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-                child: CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                child: CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: false),
               ),
               // Banner Section
               Stack(

lib/intro_screens/blocs/intro_screens_bloc.dart

@@ -0,0 +1,12 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class IntroScreensState {
+  final int currentPage;
+  IntroScreensState({required this.currentPage});
+}
+
+class IntroScreensCubit extends Cubit<IntroScreensState> {
+  IntroScreensCubit() : super(IntroScreensState(currentPage: 0));
+
+  void updatePage(int index) => emit(IntroScreensState(currentPage: index));
+}

lib/intro_screens/models/intro_screens_model.dart

@@ -0,0 +1,11 @@
+class IntroScreensModel {
+  final String image;
+  final String title;
+  final String description;
+
+  IntroScreensModel({
+    required this.image,
+    required this.title,
+    required this.description,
+  });
+}

lib/intro_screens/repositories/intro_screens_repository.dart

@@ -0,0 +1,26 @@
+import '../models/intro_screens_model.dart';
+
+class IntroScreensRepository {
+  List<IntroScreensModel> getIntroScreensData() {
+    return [
+      IntroScreensModel(
+        image: 'assets/images/splash1.png',
+        title: 'What we provide',
+        description:
+        'Discover cities like never before with CityCards! Buy passes for top attractions and enjoy exclusive discounts on hotels, eSIMs, and more.',
+      ),
+      IntroScreensModel(
+        image: 'assets/images/splash2.png',
+        title: 'Manage Booking Seamlessly',
+        description:
+        'Easily manage and promote your attractions while connecting with travelers and handling bookings in one place.',
+      ),
+      IntroScreensModel(
+        image: 'assets/images/splash3.jpg',
+        title: 'Postcard and Magic itinerary for your friends',
+        description:
+        'Craft your magic itinerary to explore the world effortlessly with CityCards, and send postcards to friends.',
+      ),
+    ];
+  }
+}

lib/intro_screens/view_models/intro_screens_viewmodel.dart

@@ -0,0 +1,8 @@
+import '../repositories/intro_screens_repository.dart';
+import '../models/intro_screens_model.dart';
+
+class IntroScreensViewModel {
+  final IntroScreensRepository _repository = IntroScreensRepository();
+
+  List<IntroScreensModel> get pages => _repository.getIntroScreensData();
+}

lib/intro_screens/views/intro_screen_view.dart

@@ -0,0 +1,176 @@
+import 'package:citycards_customer/core/route_constants.dart';
+import 'package:citycards_customer/intro_screens/view_models/intro_screens_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_glass_morphism/flutter_glass_morphism.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import '../blocs/intro_screens_bloc.dart';
+
+class IntroScreensView extends StatelessWidget {
+  final PageController _pageController = PageController();
+  final IntroScreensViewModel _viewModel = IntroScreensViewModel();
+
+  IntroScreensView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final pages = _viewModel.pages;
+
+    return BlocProvider(
+      create: (_) => IntroScreensCubit(),
+      child: Scaffold(
+        body: BlocBuilder<IntroScreensCubit, IntroScreensState>(
+          builder: (context, state) {
+            return Stack(
+              children: [
+                // Background PageView
+                PageView.builder(
+                  controller: _pageController,
+                  itemCount: pages.length,
+                  onPageChanged: (index) =>
+                      context.read<IntroScreensCubit>().updatePage(index),
+                  itemBuilder: (context, index) {
+                    final page = pages[index];
+                    return Stack(
+                      fit: StackFit.expand,
+                      children: [
+                        Image.asset(page.image, fit: BoxFit.cover),
+                        Container(
+                          decoration: BoxDecoration(
+                            gradient: LinearGradient(
+                              begin: Alignment.topCenter,
+                              end: Alignment.bottomCenter,
+                              colors: [Color(0xFF00000000), Color(0xFF000000)],
+                            ),
+                          ),
+                        ),
+                      ],
+                    );
+                  },
+                ),
+
+                // Skip Button (Only first 2 pages)
+                if (state.currentPage < pages.length - 1)
+                  Positioned(
+                    top: 50,
+                    right: 20,
+                    child: GestureDetector(
+                      onTap: (){
+                        Navigator.pushReplacementNamed(context,RouteConstants.home);
+                      },
+                      child: Container(
+                        height: 48.h,
+                        width: 92.w,
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(16.r),
+                          border: Border.all(color: Colors.white),
+                        ),
+                        child: Center(
+                          child: Text(
+                            'Skip',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 16.sp,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+
+                // Bottom Content
+                Align(
+                  alignment: Alignment.bottomCenter,
+                  child: GlassMorphismContainer(
+                    blurIntensity: 0.5,
+                    padding: EdgeInsets.symmetric(
+                      horizontal: 24.w,
+                      vertical: 17.h,
+                    ),
+                    margin: const EdgeInsets.all(20),
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Text(
+                          pages[state.currentPage].title,
+                          style: TextStyle(
+                            color: Colors.white,
+                            fontSize: 24.sp,
+                            fontWeight: FontWeight.w500,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                        SizedBox(height: 8.h),
+                        Text(
+                          pages[state.currentPage].description,
+                          style: TextStyle(
+                            color: Colors.white,
+                            fontSize: 14.sp,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                        SizedBox(height: 24.h),
+
+                        // Dots Indicator
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: List.generate(
+                            pages.length,
+                            (index) => Container(
+                              margin: const EdgeInsets.symmetric(
+                                horizontal: 4.0,
+                              ),
+                              width: 36.w,
+                              height: 12.h,
+                              decoration: BoxDecoration(
+                                color: state.currentPage == index
+                                    ? Color(0xFFF95F62)
+                                    : Color(0xFFF95F62).withOpacity(0.42),
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                            ),
+                          ),
+                        ),
+                        SizedBox(height: 24.h),
+                        ElevatedButton(
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Color(0xFFF95F62),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(16.r),
+                            ),
+                            minimumSize: const Size(double.infinity, 52),
+                          ),
+                          onPressed: () {
+                            if (state.currentPage == pages.length - 1) {
+                              Navigator.pushReplacementNamed(context, '/home');
+                            } else {
+                              _pageController.nextPage(
+                                duration: const Duration(milliseconds: 400),
+                                curve: Curves.easeInOut,
+                              );
+                            }
+                          },
+                          child: Text(
+                            state.currentPage == pages.length - 1
+                                ? "Let's Get Started"
+                                : 'Continue',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 20.sp,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

lib/itinerary_creation/views/itinerary_creation_start_view.dart

@@ -57,9 +57,7 @@ class ItineraryCreationStartPage extends StatelessWidget {
                 onTap: () {
                   Navigator.of(
                     context,
-                    rootNavigator: true,
-                  ).pushNamed(RouteConstants.itineraryCreation);
-                  // Navigator.pushNamed(context, RouteConstants.itineraryCreation);
+                  ).pushReplacementNamed(RouteConstants.itineraryCreation);
                 },
                 showArrow: true,
                 label: "Let’s Get Started",

lib/itinerary_creation/views/itinerary_creation_steps/itinerary_completion_view.dart

@@ -6,6 +6,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:citycards_customer/common_packages/custom_text.dart';
 import 'package:citycards_customer/common_packages/custom_filled_button.dart';
 
+import '../../../core/route_constants.dart';
+
 class ItineraryCompletionView extends StatelessWidget {
   const ItineraryCompletionView({super.key});
 
@@ -135,7 +137,9 @@ class ItineraryCompletionView extends StatelessWidget {
                   label: "Get My Trip Plan",
                   showArrow: true,
                   onTap: () {
-                    // Navigate to next step
+                    Navigator.of(
+                      context,
+                    ).pushReplacementNamed((RouteConstants.yourItinerary));
                   },
                 ),
               ],

lib/itinerary_creation/views/magic_itinerary_empty_view.dart

@@ -17,7 +17,7 @@ class MagicItineraryEmptyView extends StatelessWidget {
           padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 10.h),
           child: Column(
             children: [
-              CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+              CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: false,),
               SizedBox(height: 90.h),
               Image.asset("assets/images/itinerary_banner.png", width: 260.w),
               SizedBox(height: 27.h),

lib/itinerary_creation/views/magic_itinerary_filled_view.dart

@@ -19,7 +19,7 @@ class MagicItineraryFilledView extends StatelessWidget {
           child: SingleChildScrollView(
             child: Column(
               children: [
-                CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: false,),
 
                 SizedBox(height: 24.h),
                 ItineraryFilledCard(),
@@ -147,18 +147,23 @@ class ItineraryFilledCard extends StatelessWidget {
 
           SizedBox(height: 12.h),
 
-          Container(
-            height: 43.h,
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(8.r),
-              border: Border.all(color: Color(0xFFF95F62)),
-            ),
-            child: Center(
-              child: CustomText(
-                text: "View Itinerary",
-                size: 16.sp,
-                color: Color(0xFFF95F62),
-                weight: FontWeight.w500,
+          InkWell(
+            onTap: (){
+              Navigator.of(context).pushReplacementNamed(RouteConstants.yourItinerary);
+            },
+            child: Container(
+              height: 43.h,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(8.r),
+                border: Border.all(color: Color(0xFFF95F62)),
+              ),
+              child: Center(
+                child: CustomText(
+                  text: "View Itinerary",
+                  size: 16.sp,
+                  color: Color(0xFFF95F62),
+                  weight: FontWeight.w500,
+                ),
               ),
             ),
           ),

lib/main.dart

@@ -1,5 +1,6 @@
 import 'package:citycards_customer/cart/blocs/postcard_bloc.dart';
 import 'package:citycards_customer/core/route_constants.dart';
+import 'package:citycards_customer/trail.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -40,7 +41,8 @@ class MyApp extends StatelessWidget {
           ],
           child: MaterialApp(
             onGenerateRoute: _appRouter.onGenerateRoute,
-            initialRoute: RouteConstants.buyPass,
+            // initialRoute: RouteConstants.intro,
+            home: LottieAnimationScreen(),
             debugShowCheckedModeBanner: false,
             title: 'City Cards',
             theme: ThemeData(

lib/my_pass/views/booking_page_view.dart

@@ -1,8 +1,11 @@
+import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:citycards_customer/common_packages/back_widget.dart';
+import 'package:citycards_customer/core/route_constants.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:table_calendar/table_calendar.dart';
+import 'package:syncfusion_flutter_datepicker/datepicker.dart';
 
 import '../blocs/make_booking_bloc.dart';
 import '../blocs/make_booking_events.dart';
@@ -32,209 +35,180 @@ class MakeBookingView extends StatelessWidget {
           final now = DateTime.now();
 
           return SafeArea(
-            child: SingleChildScrollView(
-              padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 20.h),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  // 🔙 Back + Title
-                  GestureDetector(
-                    onTap: () => Navigator.pop(context),
-                    child: Row(
-                      children: [
-                        const Icon(Icons.arrow_back, size: 20),
-                        SizedBox(width: 6.w),
-                        Text(
-                          "Make Booking",
-                          style: GoogleFonts.poppins(
-                            fontSize: 14.sp,
-                            fontWeight: FontWeight.w500,
+            child: Scaffold(
+              backgroundColor: Colors.white,
+              body: SingleChildScrollView(
+                padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 20.h),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+
+                    CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
+                    backWidget(context, "Make Booking", Colors.black),
+                    SizedBox(
+                      height: 20.h,
+                    ),
+
+                    // 🏝 Title
+                    Text(
+                      title,
+                      style: GoogleFonts.poppins(
+                        fontSize: 18.sp,
+                        fontWeight: FontWeight.w600,
+                        color: Colors.black,
+                      ),
+                    ),
+                    SizedBox(height: 4.h),
+
+                    // 📄 Description
+                    Text(
+                      description,
+                      style: GoogleFonts.poppins(
+                        fontSize: 12.sp,
+                        color: Colors.black54,
+                      ),
+                    ),
+                    SizedBox(height: 24.h),
+
+                    // 📅 Calendar Container
+                    Container(
+                      width: double.infinity,
+                      padding: EdgeInsets.symmetric(vertical: 12.h, horizontal: 10.w),
+                      decoration: BoxDecoration(
+                        color: Colors.white,
+                        borderRadius: BorderRadius.circular(16.r),
+                        boxShadow: [
+                          BoxShadow(
+                            color: Colors.black12.withOpacity(0.06),
+                            blurRadius: 12,
+                            offset: const Offset(0, 4),
+                          ),
+                        ],
+                      ),
+                      child: Column(
+                        children: [
+                          Text(
+                            "When are you visiting?",
+                            style: GoogleFonts.poppins(
+                              fontSize: 14.sp,
+                              fontWeight: FontWeight.w500,
+                              color: Colors.black,
+                            ),
+                          ),
+                          SizedBox(height: 8.h),
+
+                          // 🗓 SfDateRangePicker
+                      SfDateRangePicker(
+                        view: DateRangePickerView.month,
+                        selectionMode: DateRangePickerSelectionMode.range,
+                        minDate: now,
+                        maxDate: now.add(const Duration(days: 365)),
+                        enablePastDates: false,
+                        backgroundColor: Colors.white,
+                        showNavigationArrow: true,
+
+                        // ✅ Put the background color here
+                        headerStyle: DateRangePickerHeaderStyle(
+                          backgroundColor: Colors.white,           // <-- removes the purple strip
+                          textAlign: TextAlign.center,
+                          textStyle: GoogleFonts.poppins(
+                            fontSize: 13.sp,
+                            fontWeight: FontWeight.w600,
                             color: Colors.black,
                           ),
                         ),
-                      ],
-                    ),
-                  ),
-                  SizedBox(height: 20.h),
 
-                  // 🏝 Attraction title
-                  Text(
-                    title,
-                    style: GoogleFonts.poppins(
-                      fontSize: 18.sp,
-                      fontWeight: FontWeight.w600,
-                      color: Colors.black,
-                    ),
-                  ),
-                  SizedBox(height: 4.h),
-
-                  // Description
-                  Text(
-                    description,
-                    style: GoogleFonts.poppins(
-                      fontSize: 12.sp,
-                      color: Colors.black54,
-                    ),
-                  ),
-                  SizedBox(height: 24.h),
-
-                  // 📅 Calendar
-                  Container(
-                    padding: EdgeInsets.all(12.w),
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(20.r),
-                      boxShadow: [
-                        BoxShadow(
-                          color: Colors.black12.withOpacity(0.05),
-                          blurRadius: 6,
-                          offset: const Offset(0, 3),
-                        ),
-                      ],
-                    ),
-                    child: Column(
-                      children: [
-                        Text(
-                          "When are you visiting?",
-                          style: GoogleFonts.poppins(
-                            fontSize: 14.sp,
-                            fontWeight: FontWeight.w500,
+                        monthViewSettings: DateRangePickerMonthViewSettings(
+                          firstDayOfWeek: 7,
+                          viewHeaderStyle: DateRangePickerViewHeaderStyle(
+                            textStyle: GoogleFonts.poppins(
+                              color: Colors.grey.shade600,
+                              fontSize: 11.sp,
+                              fontWeight: FontWeight.w500,
+                            ),
                           ),
+                          blackoutDates: _getUnavailableDates(state.availableDates, now),
                         ),
-                        SizedBox(height: 10.h),
 
-                        TableCalendar(
-                          focusedDay: now,
-                          firstDay: now,
-                          lastDay: now.add(const Duration(days: 365)),
-                          calendarFormat: CalendarFormat.month,
-                          availableCalendarFormats: const {
-                            CalendarFormat.month: 'Month'
-                          },
-                          rangeStartDay: state.startDate,
-                          rangeEndDay: state.endDate,
-                          rangeSelectionMode: RangeSelectionMode.toggledOn,
-                          onRangeSelected: (start, end, focusedDay) {
+                        monthCellStyle: DateRangePickerMonthCellStyle(
+                          textStyle: GoogleFonts.poppins(fontSize: 12.sp, color: Colors.black87),
+                          todayTextStyle: GoogleFonts.poppins(
+                              fontSize: 12.sp, color: Colors.black, fontWeight: FontWeight.w500),
+                          blackoutDateTextStyle: GoogleFonts.poppins(
+                              fontSize: 12.sp, color: Colors.grey.shade400,
+                              decoration: TextDecoration.lineThrough),
+                        ),
+
+                        rangeTextStyle: GoogleFonts.poppins(
+                            fontSize: 12.sp, color: Colors.white, fontWeight: FontWeight.w500),
+                        startRangeSelectionColor: const Color(0xffFF5A5F),
+                        endRangeSelectionColor: const Color(0xffFF5A5F),
+                        rangeSelectionColor: const Color(0xffFF5A5F).withOpacity(0.15),
+                        selectionTextStyle: GoogleFonts.poppins(
+                            fontSize: 12.sp, color: Colors.white, fontWeight: FontWeight.w500),
+
+                        initialSelectedRange: state.startDate != null && state.endDate != null
+                            ? PickerDateRange(state.startDate, state.endDate)
+                            : null,
+                        onSelectionChanged: (DateRangePickerSelectionChangedArgs args) {
+                          if (args.value is PickerDateRange) {
+                            final start = args.value.startDate;
+                            final end = args.value.endDate;
                             if (start != null && end != null) {
                               bloc.add(SelectDate(start, end));
                             }
-                          },
-                          headerStyle: HeaderStyle(
-                            titleCentered: true,
-                            formatButtonVisible: false,
-                            titleTextStyle: GoogleFonts.poppins(
+                          }
+                        },
+                      ),
+                        ],
+                      ),
+                    ),
+
+                    SizedBox(height: 40.h),
+
+                    // ✅ Confirm button
+                    GestureDetector(
+                      onTap: () {
+                        if (state.startDate != null && state.endDate != null) {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              content: Text(
+                                "Booking confirmed from "
+                                    "${state.startDate!.toLocal().toString().split(' ')[0]} "
+                                    "to ${state.endDate!.toLocal().toString().split(' ')[0]}",
+                              ),
+                            ),
+                          );
+                          Navigator.of(context).pushNamed(RouteConstants.bookingSuccessful);
+                        } else {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            const SnackBar(
+                              content: Text("Please select a valid date range"),
+                            ),
+                          );
+                        }
+                      },
+                      child: Container(
+                        width: double.infinity,
+                        padding: EdgeInsets.symmetric(vertical: 14.h),
+                        decoration: BoxDecoration(
+                          color: const Color(0xffFF5A5F),
+                          borderRadius: BorderRadius.circular(30.r),
+                        ),
+                        child: Center(
+                          child: Text(
+                            "Confirm Booking",
+                            style: GoogleFonts.poppins(
+                              color: Colors.white,
                               fontSize: 14.sp,
                               fontWeight: FontWeight.w600,
                             ),
                           ),
-                          calendarStyle: CalendarStyle(
-                            rangeHighlightColor:
-                            const Color(0xffFF5A5F).withOpacity(0.2),
-                            rangeStartDecoration: const BoxDecoration(
-                              color: Color(0xffFF5A5F),
-                              shape: BoxShape.circle,
-                            ),
-                            rangeEndDecoration: const BoxDecoration(
-                              color: Color(0xffFF5A5F),
-                              shape: BoxShape.circle,
-                            ),
-                            todayDecoration: const BoxDecoration(
-                              color: Color(0xffFFEAEA),
-                              shape: BoxShape.circle,
-                            ),
-                            outsideDaysVisible: false,
-                          ),
-
-                          // Custom day builder for unavailable days
-                          calendarBuilders: CalendarBuilders(
-                            defaultBuilder: (context, day, focusedDay) {
-                              final isAvailable = state.availableDates
-                                  .any((d) => isSameDay(d, day));
-
-                              if (!isAvailable) {
-                                // ❌ Strike-through unavailable date
-                                return Stack(
-                                  alignment: Alignment.center,
-                                  children: [
-                                    Text(
-                                      '${day.day}',
-                                      style: GoogleFonts.poppins(
-                                        fontSize: 12.sp,
-                                        color: Colors.grey.shade400,
-                                      ),
-                                    ),
-                                    Positioned(
-                                      top: 12.h,
-                                      child: Container(
-                                        width: 14.w,
-                                        height: 1.2.h,
-                                        color: Colors.grey.shade400,
-                                      ),
-                                    ),
-                                  ],
-                                );
-                              }
-
-                              // ✅ Normal available day
-                              return Center(
-                                child: Text(
-                                  '${day.day}',
-                                  style: GoogleFonts.poppins(
-                                    fontSize: 12.sp,
-                                    color: Colors.black87,
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-
-                  SizedBox(height: 40.h),
-
-                  // ✅ Confirm Booking button
-                  GestureDetector(
-                    onTap: () {
-                      if (state.startDate != null && state.endDate != null) {
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            content: Text(
-                              "Booking confirmed from "
-                                  "${state.startDate!.toLocal().toString().split(' ')[0]} "
-                                  "to ${state.endDate!.toLocal().toString().split(' ')[0]}",
-                            ),
-                          ),
-                        );
-                      } else {
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          const SnackBar(
-                            content: Text("Please select a valid date range"),
-                          ),
-                        );
-                      }
-                    },
-                    child: Container(
-                      width: double.infinity,
-                      padding: EdgeInsets.symmetric(vertical: 14.h),
-                      decoration: BoxDecoration(
-                        color: const Color(0xffFF5A5F),
-                        borderRadius: BorderRadius.circular(30.r),
-                      ),
-                      child: Center(
-                        child: Text(
-                          "Confirm Booking",
-                          style: GoogleFonts.poppins(
-                            color: Colors.white,
-                            fontSize: 14.sp,
-                            fontWeight: FontWeight.w600,
-                          ),
                         ),
                       ),
                     ),
-                  ),
-                ],
+                  ],
+                ),
               ),
             ),
           );
@@ -242,4 +216,18 @@ class MakeBookingView extends StatelessWidget {
       ),
     );
   }
+
+  /// Marks unavailable days (those not in availableDates) as blackout
+  List<DateTime> _getUnavailableDates(List<DateTime> available, DateTime start) {
+    final end = start.add(const Duration(days: 365));
+    final allDays = List.generate(
+      end.difference(start).inDays,
+          (i) => DateTime(start.year, start.month, start.day + i),
+    );
+
+    return allDays
+        .where((day) => !available.any((a) =>
+    a.year == day.year && a.month == day.month && a.day == day.day))
+        .toList();
+  }
 }

lib/my_pass/views/booking_successful_page_view.dart

@@ -0,0 +1,82 @@
+import 'package:citycards_customer/common_packages/app_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+import '../../common_packages/back_widget.dart';
+
+class BookingSuccessfulPageView extends StatelessWidget {
+  const BookingSuccessfulPageView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      child: Scaffold(
+        backgroundColor: Colors.white,
+        body: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
+              backWidget(context, "Make Booking", Colors.black),
+              SizedBox(height: 40.h),
+
+              Image.asset("assets/images/booking_successful.png", scale: 4,),
+
+              SizedBox(height: 20.h),
+
+              Text(
+                "Booking Completed\nSuccessfully!",
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 20.sp,
+                  fontWeight: FontWeight.w600,
+                  color: Color(0xff0A0D13),
+                ),
+              ),
+
+              SizedBox(height: 20.h),
+
+              Text(
+                "Your booking has been Confirmed on 08/01/2025",
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                  fontSize: 16.sp,
+                  fontWeight: FontWeight.w400,
+                  color: Color(0xff2D3134),
+                ),
+              ),
+
+              SizedBox(height: 100.h),
+
+              GestureDetector(
+                onTap: () {
+                  Navigator.pop(context);
+                },
+                child: Container(
+                  width: double.infinity,
+                  padding: EdgeInsets.symmetric(vertical: 14.h),
+                  decoration: BoxDecoration(
+                    color: const Color(0xffFF5A5F),
+                    borderRadius: BorderRadius.circular(30.r),
+                  ),
+                  child: Center(
+                    child: Text(
+                      "Go Back",
+                      style: GoogleFonts.poppins(
+                        color: Colors.white,
+                        fontSize: 14.sp,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/my_pass/views/my_pass_page_view.dart

@@ -91,7 +91,7 @@ class MyPassesView extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+              CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
               SizedBox(height: 10.h),
               Row(
                 children: [

lib/my_pass/views/qr_pass_page_view.dart

@@ -27,7 +27,7 @@ class QrPassView extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                    CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
                     SizedBox(height: 10.h),
                     backWidget(context, "Back", Colors.black),
                     SizedBox(height: 20.h),

lib/offer_pass_detail/offer_pass_detail_view.dart

@@ -40,6 +40,7 @@ class OfferPassDetailView extends StatelessWidget {
                             CommonAppBar(
                               isWhiteLogo: false,
                               isProfilePage: false,
+                              showDivider: true,
                             ),
 
                             SizedBox(height: 8.h),

lib/postcard/views/add_filter_step_page_view.dart

@@ -29,7 +29,7 @@ class AddFilterStepPageView extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                    CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true),
                     StepProgressBar(totalSteps: 4, currentStep: 2),
                     const SizedBox(height: 24),
                     Text(

lib/postcard/views/my_orders_page_view.dart

@@ -32,7 +32,7 @@ class _MyOrdersPageViewState extends State<MyOrdersPageView> {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 // 🏙️ Header
-                CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
 
                 Row(
                   children: [

lib/postcard/views/order_postcard_preview_page_view.dart

@@ -31,7 +31,7 @@ class _OrderPostcardPreviewPageViewState extends State<OrderPostcardPreviewPageV
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: false,showDivider: true,),
 
                 Row(
                   children: [

lib/postcard/views/order_success_page_view.dart

@@ -24,7 +24,7 @@ class OrderSuccessPageView extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
 
                 Text(
                   "🎉🥳",

lib/postcard/views/postcard_checkout_page_view.dart

@@ -23,7 +23,7 @@ class PostcardCheckoutPageView extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
                 // Header
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,

lib/postcard/views/postcard_initial_page_view.dart

@@ -21,7 +21,7 @@ class PostcardPage extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
 
-              CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+              CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
               SizedBox(height: 50.h),
 
               ClipRRect(

lib/postcard/views/postcard_purchase_form_page_view.dart

@@ -23,7 +23,7 @@ class PostcardPurchaseFormPageView extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                CommonAppBar(isWhiteLogo: false, isProfilePage: false),
+                CommonAppBar(isWhiteLogo: false, isProfilePage: false, showDivider: true,),
 
                 // Order ID
                 Text(