{/* Enhanced Navigation Items with source tracking */}
{navigationItems.map((item) => {
@@ -623,12 +627,13 @@ export default function Navbar({
onClick={handleOpenCityDialogFromNavbar}
>
- {!activeCity || activeCity === 'shared'
+ {/* {!activeCity || activeCity === 'shared'
? 'City'
: ['landing', 'landingpage'].includes(activeCity.toLowerCase())
? 'City'
: activeCity.charAt(0).toUpperCase() + activeCity.slice(1)
- }
+ } */}
+ {citySelected ? cityName : "City"}
@@ -685,7 +690,7 @@ export default function Navbar({
label: 'My Profile',
icon:
,
action: () => {
- navigate('/profile');
+ navigate(citySelected?`/${slugify(cityName)}/profile`:'/profile');
setActiveUserDropdown(false);
}
},
@@ -784,10 +789,11 @@ export default function Navbar({
trigger={
- {activeCity && activeCity !== 'shared' ?
+ {/* {activeCity && activeCity !== 'shared' ?
activeCity.charAt(0).toUpperCase() + activeCity.slice(1) :
currentSource === 'melbourne' ? 'Melbourne' : 'Select City'
- }
+ } */}
+ {cityName ? cityName : "City"}
diff --git a/src/components/RegisterModal.tsx b/src/components/RegisterModal.tsx
new file mode 100644
index 0000000..e690a89
--- /dev/null
+++ b/src/components/RegisterModal.tsx
@@ -0,0 +1,391 @@
+import { useState, useEffect } from 'react';
+import { motion, AnimatePresence } from 'motion/react';
+import { X } from 'lucide-react';
+import { Button } from './ui/button';
+import { Input } from './ui/input';
+import { Label } from './ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
+import { useRegisterMutation } from '../Redux/services/auth.service';
+import { toast } from 'sonner';
+
+interface RegisterModalProps {
+ isOpen: boolean;
+ onClose: () => void;
+ onLoginClick: () => void;
+}
+
+export function RegisterModal({ isOpen, onClose, onLoginClick }: RegisterModalProps) {
+ const [formData, setFormData] = useState({
+ firstName: '',
+ lastName: '',
+ emailAddress: '',
+ isdCode: '+91',
+ mobileNumber: '',
+ address1: '',
+ address2: '',
+ city: '',
+ state: '',
+ country: 'Australia',
+ postalCode: ''
+ });
+ const [helperText, setHelperText] = useState('');
+ const [isLoading, setIsLoading] = useState(false);
+
+ const [register, { isLoading: isRegistering }] = useRegisterMutation();
+
+ useEffect(() => {
+ if (!isOpen) {
+ setFormData({
+ firstName: '',
+ lastName: '',
+ emailAddress: '',
+ isdCode: '+91',
+ mobileNumber: '',
+ address1: '',
+ address2: '',
+ city: '',
+ state: '',
+ country: 'Australia',
+ postalCode: ''
+ });
+ setHelperText('');
+ }
+ }, [isOpen]);
+
+ const handleInputChange = (field: string, value: string) => {
+ setFormData(prev => ({ ...prev, [field]: value }));
+ };
+
+ const validateForm = () => {
+ if (!formData.firstName.trim()) {
+ toast.error('First name is required');
+ return false;
+ }
+ if (!formData.lastName.trim()) {
+ toast.error('Last name is required');
+ return false;
+ }
+ if (!formData.emailAddress.trim() || !formData.emailAddress.includes('@')) {
+ toast.error('Please enter a valid email address');
+ return false;
+ }
+ if (!formData.mobileNumber.trim()) {
+ toast.error('Mobile number is required');
+ return false;
+ }
+ if (!/^\d+$/.test(formData.mobileNumber.trim())) {
+ toast.error('Mobile number must contain only digits');
+ return false;
+ }
+ if (!formData.address1.trim()) {
+ toast.error('Address is required');
+ return false;
+ }
+ if (!formData.city.trim()) {
+ toast.error('City is required');
+ return false;
+ }
+ if (!formData.state.trim()) {
+ toast.error('State is required');
+ return false;
+ }
+ if (!formData.postalCode.trim()) {
+ toast.error('Postal code is required');
+ return false;
+ }
+ if (!/^\d+$/.test(formData.postalCode.trim())) {
+ toast.error('Postal code must contain only digits');
+ return false;
+ }
+ return true;
+ };
+
+
+ const handleRegister = async () => {
+ if (!validateForm()) {
+ return;
+ }
+
+ setHelperText('');
+ setIsLoading(true);
+
+ try {
+ const response = await register(formData).unwrap();
+ console.log('Registration response:', response);
+
+ toast.success('Registration successful! Please login.');
+ setTimeout(() => {
+ onLoginClick();
+ onClose();
+ }, 2000);
+ } catch (error: any) {
+ console.error('Registration error:', error);
+ const errorMessage = error?.data?.message || 'Registration failed. Please try again.';
+ toast.error(errorMessage);
+ setHelperText(errorMessage);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ const handleKeyDown = (e: React.KeyboardEvent) => {
+ if (e.key === 'Enter') {
+ e.preventDefault();
+ handleRegister();
+ }
+ };
+
+ return (
+
+ {isOpen && (
+ <>
+
+
+
+
+
+
+
+ Create Account
+
+
+ Register to get started with City Cards
+
+
+
+
+
+ {/* Personal Information */}
+
+
Personal Information
+
+
+
+
+ Email Address *
+
+
+
+
+
+
+ ISD Code
+
+ handleInputChange('isdCode', value)}>
+
+
+
+ +1 (USA)
+ +44 (UK)
+ +61 (Australia)
+ +91 (India)
+ +86 (China)
+ +81 (Japan)
+ +49 (Germany)
+ +33 (France)
+
+
+
+
+
+
+ Mobile Number *
+
+
+
+
+
+ {/* Address Information */}
+
+
Address Information
+
+
+
+ Address Line 1 *
+
+
+
+
+
+ Address Line 2
+
+
+
+
+
+
+
+
+ Country *
+
+ handleInputChange('country', value)}>
+
+
+
+ Australia
+ United States
+ United Kingdom
+ Canada
+ India
+ Germany
+ France
+ Japan
+
+
+
+
+
+
+ Postal Code *
+
+
+
+
+
+ {helperText && (
+
+ {helperText}
+
+ )}
+
+
+ {isLoading || isRegistering ? (
+
+
+ Creating Account...
+
+
+
+ )}
+
+
+
+ {
+ onLoginClick();
+ onClose();
+ }}
+ className="font-poppins text-sm text-gray-600 hover:text-gray-800 transition-colors cursor-pointer"
+ >
+ Already have an account? Login
+
+
+
+
+
+
+ )}
+
+ );
+}
diff --git a/src/components/SuperSavingsPage.tsx b/src/components/SuperSavingsPage.tsx
deleted file mode 100644
index 6743d5d..0000000
--- a/src/components/SuperSavingsPage.tsx
+++ /dev/null
@@ -1,745 +0,0 @@
-import { useState } from 'react';
-import { motion } from 'motion/react';
-import { ArrowLeft, Search, Filter, Star, MapPin, Clock, Tag, Heart, Share2, ChevronDown, ChevronRight, Check, Hotel, Plane, Building2, MapPinned, Home, Gift, Percent } from 'lucide-react';
-import { Button } from './ui/button';
-import { Input } from './ui/input';
-import { Card, CardContent, CardHeader, CardTitle } from './ui/card';
-import { Badge } from './ui/badge';
-import { Separator } from './ui/separator';
-import { Checkbox } from './ui/checkbox';
-import Navbar from './Navbar';
-import { Footer } from './Footer';
-import { ImageWithFallback } from './figma/ImageWithFallback';
-import { TrustSection } from './TrustSection';
-import { MobileAppSection } from './MobileAppSection';
-import { ReviewsSection } from './ReviewsSection';
-import { TrustedCompanies } from './TrustedCompanies';
-import { Layout } from '../Layout';
-
-interface SuperSavingsPageProps {
- onBackClick: () => void;
- onHomeClick: () => void;
- onMelbourneClick: () => void;
- onPassesClick: () => void;
- onCheckoutClick: () => void;
- onSignInClick: () => void;
- onSignOutClick: () => void;
- onAttractionsClick: () => void;
- onBlogsClick: () => void;
- onHowItWorksClick: () => void;
- onFAQClick: () => void;
- onPrivacyPolicyClick: () => void;
- onAboutUsClick: () => void;
- onProfileClick: () => void;
- onCityCardsClick: () => void;
- onMagicItineraryClick: () => void;
- onPostCardsClick: () => void;
- onOffersClick: () => void;
- onSuperSavingsClick: () => void;
- onContactUsClick?: () => void;
- onEsimsClick?: () => void;
- onHotelDiscountsClick?: () => void;
- fromSource?: 'products' | 'passes';
- currentPage: string;
- user?: { email: string; name: string; } | null;
-}
-
-// Mock super savings data
-const savingsData = [
- {
- id: '1',
- business: 'Grand Hotels Melbourne',
- title: 'Up to 50% Off on luxury hotel stays across Melbourne',
- discount: '50% OFF',
- savedAmount: 'Save up to $300',
- image: 'https://images.unsplash.com/photo-1566073771259-6a8506099945?w=400',
- category: 'hotels'
- },
- {
- id: '2',
- business: 'Adventure Tours',
- title: '40% Off on guided adventure tours and experiences',
- discount: '40% OFF',
- savedAmount: 'Save up to $150',
- image: 'https://images.unsplash.com/photo-1571019613454-1cb2f99b2d8b?w=400',
- category: 'tours'
- },
- {
- id: '3',
- business: 'Premium Spa & Wellness',
- title: '45% Off on spa packages and wellness treatments',
- discount: '45% OFF',
- savedAmount: 'Save up to $200',
- image: 'https://images.unsplash.com/photo-1544161515-4ab6ce6db874?w=400',
- category: 'wellness'
- },
- {
- id: '4',
- business: 'Culinary Delights',
- title: '35% Off on fine dining at Michelin-starred restaurants',
- discount: '35% OFF',
- savedAmount: 'Save up to $120',
- image: 'https://images.unsplash.com/photo-1414235077428-338989a2e8c0?w=400',
- category: 'dining'
- },
- {
- id: '5',
- business: 'Entertainment Pass',
- title: '60% Off on theater shows and concert tickets',
- discount: '60% OFF',
- savedAmount: 'Save up to $250',
- image: 'https://images.unsplash.com/photo-1514306191717-452ec28c7814?w=400',
- category: 'entertainment'
- },
- {
- id: '6',
- business: 'Museum Pass',
- title: '55% Off on museum entries and special exhibitions',
- discount: '55% OFF',
- savedAmount: 'Save up to $180',
- image: 'https://images.unsplash.com/photo-1566127992631-137a642a90f4?w=400',
- category: 'museums'
- },
- {
- id: '7',
- business: 'Luxury Shopping',
- title: '30% Off on designer boutiques and luxury shopping',
- discount: '30% OFF',
- savedAmount: 'Save up to $500',
- image: 'https://images.unsplash.com/photo-1441986300917-64674bd600d8?w=400',
- category: 'shopping'
- },
- {
- id: '8',
- business: 'Water Sports',
- title: '45% Off on water sports and beach activities',
- discount: '45% OFF',
- savedAmount: 'Save up to $175',
- image: 'https://images.unsplash.com/photo-1476514525535-07fb3b4ae5f1?w=400',
- category: 'sports'
- },
- {
- id: '9',
- business: 'Wine Tasting Tours',
- title: '40% Off on wine country tours and tastings',
- discount: '40% OFF',
- savedAmount: 'Save up to $160',
- image: 'https://images.unsplash.com/photo-1506377247377-2a5b3b417ebb?w=400',
- category: 'tours'
- },
- {
- id: '10',
- business: 'Family Fun Parks',
- title: '50% Off on family entertainment and theme parks',
- discount: '50% OFF',
- savedAmount: 'Save up to $220',
- image: 'https://images.unsplash.com/photo-1524850011238-e3d235c7d4c9?w=400',
- category: 'entertainment'
- },
- {
- id: '11',
- business: 'Boutique Stays',
- title: '55% Off on boutique hotels and bed & breakfasts',
- discount: '55% OFF',
- savedAmount: 'Save up to $280',
- image: 'https://images.unsplash.com/photo-1551882547-ff40c63fe5fa?w=400',
- category: 'hotels'
- },
- {
- id: '12',
- business: 'Art Galleries',
- title: '35% Off on contemporary art galleries and workshops',
- discount: '35% OFF',
- savedAmount: 'Save up to $140',
- image: 'https://images.unsplash.com/photo-1561214115-f2f134cc4912?w=400',
- category: 'museums'
- },
- {
- id: '13',
- business: 'Luxury Cruises',
- title: '65% Off on harbor cruises and yacht experiences',
- discount: '65% OFF',
- savedAmount: 'Save up to $400',
- image: 'https://images.unsplash.com/photo-1544551763-46a013bb70d5?w=400',
- category: 'tours'
- }
-];
-
-const filterCategories = [
- { value: 'hotels', label: 'Hotels', count: 2 },
- { value: 'tours', label: 'Tours', count: 3 },
- { value: 'wellness', label: 'Wellness', count: 1 },
- { value: 'dining', label: 'Dining', count: 1 },
- { value: 'entertainment', label: 'Entertainment', count: 2 },
- { value: 'museums', label: 'Museums', count: 2 },
- { value: 'shopping', label: 'Shopping', count: 1 },
- { value: 'sports', label: 'Sports', count: 1 }
-];
-
-// Categories data for the Super Savings Categories section
-const categoriesData = [
- {
- icon: Hotel,
- title: 'Luxury Hotels',
- description: 'Premium stays at unbeatable prices',
- savings: 'Up to 50% off',
- color: 'from-primary to-primary/80'
- },
- {
- icon: Plane,
- title: 'Travel Tours',
- description: 'Guided experiences worth your time',
- savings: 'Up to 45% off',
- color: 'from-primary to-primary/80'
- },
- {
- icon: MapPinned,
- title: 'Attractions',
- description: 'Must-see landmarks and experiences',
- savings: 'Up to 60% off',
- color: 'from-primary to-primary/80'
- },
- {
- icon: Building2,
- title: 'Shopping',
- description: 'Designer brands and local boutiques',
- savings: 'Up to 35% off',
- color: 'from-primary to-primary/80'
- },
- {
- icon: Gift,
- title: 'Wellness',
- description: 'Spa treatments and relaxation',
- savings: 'Up to 45% off',
- color: 'from-primary to-primary/80'
- }
-];
-
-export function SuperSavingsPage({
- onBackClick,
- onHomeClick,
- onMelbourneClick,
- onPassesClick,
- onCheckoutClick,
- onSignInClick,
- onSignOutClick,
- onAttractionsClick,
- onBlogsClick,
- onHowItWorksClick,
- onFAQClick,
- onPrivacyPolicyClick,
- onAboutUsClick,
- onProfileClick,
- onCityCardsClick,
- onMagicItineraryClick,
- onPostCardsClick,
- onOffersClick,
- onSuperSavingsClick,
- onContactUsClick,
- onEsimsClick,
- onHotelDiscountsClick,
- fromSource = 'products',
- currentPage,
- user
-}: SuperSavingsPageProps) {
- const [searchQuery, setSearchQuery] = useState('');
- const [selectedCategories, setSelectedCategories] = useState
([]);
- const [currentPage_, setCurrentPage_] = useState(1);
- const [showLoadMore, setShowLoadMore] = useState(true);
-
- const toggleCategory = (category: string) => {
- setSelectedCategories(prev =>
- prev.includes(category)
- ? prev.filter(c => c !== category)
- : [...prev, category]
- );
- };
-
- const filteredSavings = savingsData.filter(saving => {
- const matchesSearch = saving.title.toLowerCase().includes(searchQuery.toLowerCase()) ||
- saving.business.toLowerCase().includes(searchQuery.toLowerCase());
- const matchesCategory = selectedCategories.length === 0 || selectedCategories.includes(saving.category);
-
- return matchesSearch && matchesCategory;
- });
-
- const itemsPerPage = 12;
- const displayedSavings = filteredSavings.slice(0, currentPage_ * itemsPerPage);
- const hasMoreItems = filteredSavings.length > displayedSavings.length;
-
- const handleLoadMore = () => {
- setCurrentPage_(prev => prev + 1);
- if (!hasMoreItems) setShowLoadMore(false);
- };
-
- // Show different layouts based on login state
- if (!user) {
- // Not logged in - show marketing/landing page
- return (
-
-
-
- {/* Hero Section */}
-
- {/* Background gradient */}
-
-
-
-
-
- Unlock {' '}
-
- Super Savings
-
-
-
- Experience incredible discounts up to 65% off on premium experiences, luxury stays, and unforgettable attractions.
-
-
- Start Saving Now
-
-
-
-
-
-
- {/* Trusted By Companies Section */}
-
-
-
-
-
- Trusted by the
- world's best
-
-
- Join thousands of savvy travelers enjoying massive savings on premium experiences
-
-
-
-
-
-
- {/* Featured Super Savings Section */}
-
-
-
-
- Featured {' '}
-
- Super Savings
-
-
-
- Check out our biggest discounts and start saving on premium experiences
-
-
-
-
-
- {/* Left Sidebar - Filters */}
-
-
-
- {/* Search by header */}
-
-
- {/* Filter categories */}
-
- {filterCategories.map(category => (
-
- toggleCategory(category.value)}
- className="border-gray-400"
- />
-
- {category.label} ({category.count})
-
-
- ))}
-
-
-
-
- {/* Main Content */}
-
- {/* Breadcrumb */}
-
-
- {fromSource === 'passes' ? (
- <>
- My Profile{'>'}My passes{'>'}
- Super Savings
-
- ) : (
- <>
- Our Products{'>'}
- Super Savings
-
- )}
-
-
-
- {/* Header Section */}
-
-
- Super Savings
-
-
- Exclusive discounts up to 65% off on premium experiences
-
-
-
- {/* Savings Grid */}
-
- {displayedSavings.map((saving, index) => (
-
-
- {/* Image */}
-
-
-
-
-
- {/* Discount Badge */}
-
- {saving.discount}
-
-
- {/* Business Name */}
-
-
- {/* Title */}
-
- {saving.title}
-
-
- {/* Saved Amount Display */}
-
-
-
-
- {saving.savedAmount}
-
-
-
-
-
- ))}
-
-
- {/* Minimal Pagination */}
-
-
-
-
-
-
- {[1, 2, 3].map((page) => (
- setCurrentPage_(page)}
- >
- {page}
-
- ))}
-
-
-
-
-
-
-
-
-
-
-
-
- View All Super Savings
-
-
-
-
- {/* How It Works Section */}
-
- {/* Background decorative elements */}
-
-
-
-
-
-
-
- Start Saving in Minutes
-
-
- Your journey to smarter travel and bigger savings begins with three simple steps.
-
-
-
-
- {/* Connecting line for desktop */}
-
-
-
- {[
- {
- step: '01',
- title: 'Unlock Access',
- description: 'Get your CityCards pass to instantly activate membership perks.',
- icon: MapPinned
- },
- {
- step: '02',
- title: 'Discover Deals',
- description: 'Browse exclusive offers on hotels, flights, and experiences.',
- icon: Search
- },
- {
- step: '03',
- title: 'Enjoy Savings',
- description: 'Redeem discounts instantly and watch your travel budget grow.',
- icon: Percent
- }
- ].map((item, index) => (
-
-
- {/* Icon Container */}
-
-
-
- {item.title}
-
-
- {item.description}
-
-
- ))}
-
-
-
-
-
-
- {/* Categories Section */}
-
- {/* Abstract Travel Patterns */}
-
-
-
- {/* Section Header */}
-
-
-
-
-
Explore Collections
-
- Curated for the Modern Traveler
-
-
- Discover exclusive savings across our most sought-after travel categories.
-
-
-
-
-
- View All Categories
-
-
-
-
-
-
- {/* Bento Grid Layout */}
-
- {categoriesData.map((category, index) => (
-
-
- {/* Background Gradient Hover */}
-
-
- {/* Large Watermark Icon for visual depth */}
-
-
-
-
-
-
-
- {category.savings}
-
-
-
-
- {category.title}
-
-
- {category.description}
-
-
-
-
-
- ))}
-
-
- {/* Mobile View All Button */}
-
-
- Browse All Categories
-
-
-
-
- {/* Access Your CityCards Section */}
-
-
-
- );
- }
-
-}
diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index 8cabeb8..50dba2a 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -3,7 +3,9 @@ import { useNavigate } from 'react-router-dom';
interface User {
email: string;
- name: string
+ name: string;
+ accessToken:string;
+ userId:string;
}
interface AuthContextType {
@@ -29,11 +31,15 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
const login = (userData: User) => {
setUser(userData)
localStorage.setItem("user", JSON.stringify(userData))
+ localStorage.setItem("accessToken", userData?.accessToken)
+ localStorage.setItem("userId", userData?.userId)
}
const logout = () => {
setUser(null)
localStorage.removeItem("user")
+ localStorage.removeItem("accessToken")
+ localStorage.removeItem("userId")
navigate("/")
}
diff --git a/src/global.d.ts b/src/global.d.ts
index 903f3f8..eb5a13c 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -32,3 +32,5 @@ declare module '*.mp4' {
const src: string;
export default src;
}
+
+declare module "*.css";
diff --git a/src/guidelines/Guidelines.md b/src/guidelines/Guidelines.md
deleted file mode 100644
index 4a00ca3..0000000
--- a/src/guidelines/Guidelines.md
+++ /dev/null
@@ -1,345 +0,0 @@
-# Image Reference Guidelines
-
-**IMPORTANT**: When I provide an image for reference, it is for design reference only. Do NOT use that image inside any image section in the code. The image is provided to help understand the layout, styling, and visual direction - not to be embedded as an actual image in the application.
-
-# CityCards Typography Guidelines
-
-**Project**: Typography Guidelines for CityCards Travel Website
-
-## Font System
-
-### Primary Font
-- **Poppins**: Used for all text including headings (H1–H6), body text, buttons, labels, and forms - Clean, readable, and consistent throughout
-
-### Font Weight Scale & Usage
-- **font-light (300)**: Hero headings only - For creating dynamic contrast in H1/H2
-- **font-normal (400)**: Standard body text - Default weight for paragraphs
-- **font-medium (500)**: Buttons, navigation links, subtle emphasis
-- **font-semibold (600)**: Section headings, primary buttons
-- **font-bold (700)**: Hero keywords, strong emphasis
-
-## Heading Typography Specifications
-
-### H1 - Hero/Main Page Headings
-- **Font**: Poppins
-- **Size**: `text-5xl md:text-6xl lg:text-7xl` (48px/60px/72px - targeting ~64px)
-- **Line Height**: `leading-tight`
-- **Pattern**: Dynamic multi-weight with gradient/italic accents (max 2 emphasis styles)
-
-```jsx
-
- Discover {' '}
-
- Melbourne's
- {' '}
- Best Experiences
-
-```
-
-### H2 - Section Headings
-- **Font**: Poppins
-- **Size**: `text-2xl md:text-3xl lg:text-4xl` (24px/36px/48px)
-- **Line Height**: `leading-tight`
-- **Pattern**: Mixed weights with gradient emphasis
-
-```jsx
-
- Explore {' '}
-
- Amazing
- {' '}
- Cities
-
-```
-
-### H3 - Subsection Headings
-- **Font**: Poppins
-- **Size**: `text-xl md:text-2xl` (24px/30px)
-- **Line Height**: `leading-snug`
-- **Weight**: `font-semibold`
-
-```jsx
-
- Feature Title
-
-```
-
-### H4 - Component Headings
-- **Font**: Poppins
-- **Size**: `text-lg md:text-xl` (20px/24px)
-- **Line Height**: `leading-snug`
-- **Weight**: `font-medium` or `font-semibold`
-
-```jsx
-
- Component Heading
-
-```
-
-### H5 - Card/Item Titles
-- **Font**: Poppins
-- **Size**: `text-lg` (18px)
-- **Line Height**: `leading-snug`
-- **Weight**: `font-medium`
-
-```jsx
-
- Card Title
-
-```
-
-### H6 - Small Headings
-- **Font**: Poppins
-- **Size**: `text-base` (16px)
-- **Line Height**: `leading-snug`
-- **Weight**: `font-medium`
-
-```jsx
-
- Small Heading
-
-```
-
-## Body Typography Specifications
-
-### Large Body Text
-- **Font**: Poppins
-- **Size**: `text-xl` (20px)
-- **Line Height**: `leading-relaxed`
-- **Weight**: `font-normal`
-
-```jsx
-
- Large descriptive text for important sections
-
-```
-
-### Regular Body Text
-- **Font**: Poppins
-- **Size**: `text-base` (16px)
-- **Line Height**: `leading-relaxed`
-- **Weight**: `font-normal`
-
-```jsx
-
- Regular body text content
-
-```
-
-### Small Body Text
-- **Font**: Poppins
-- **Size**: `text-sm` (14px)
-- **Line Height**: `leading-relaxed`
-- **Weight**: `font-normal` or `font-light`
-
-```jsx
-
- Caption or meta information
-
-```
-
-## Interactive Element Typography
-
-### Buttons
-- **Font**: Poppins
-- **Primary Weight**: `font-semibold`
-- **Secondary Weight**: `font-medium`
-- **Min Size**: 16px
-
-```jsx
-// Primary Button
-
- Primary Action
-
-
-// Secondary Button
-
- Secondary Action
-
-```
-
-### Navigation Links
-- **Font**: Poppins
-- **Weight**: `font-medium`
-- **Size**: `text-base` (16px)
-
-```jsx
-
- Navigation Link
-
-```
-
-### Form Labels
-- **Font**: Poppins
-- **Weight**: `font-light` or `font-normal`
-- **Size**: `text-sm` or `text-base` (14px/16px)
-
-```jsx
-
- Form Label
-
-```
-
-### Form Inputs
-- **Font**: Poppins
-- **Weight**: `font-normal`
-- **Size**: `text-base` (16px)
-
-```jsx
-
- Content with explicit styling
-
-```
-
-## Typography Rules
-
-### DO ✅
-- Use Poppins for all text (headings and body)
-- Apply max 2 emphasis styles per heading
-- Use gradient effects sparingly
-- Keep line-heights consistent
-- Always specify explicit font classes to override component defaults
-
-### DON'T ❌
-- Don't use font-light in small text
-- Don't mix more than 3 weights in one heading
-- Don't go below 14px for captions
-- Don't override font sizes without Tailwind classes
-- Don't break semantic heading hierarchy
-
-## Implementation Guidelines
-
-### Component Styling Override
-**IMPORTANT**: Always explicitly set typography classes to override component defaults:
-
-```jsx
-// ✅ CORRECT - Explicit typography classes
-
-
-
- Card Title
-
-
-
-
- Card content with explicit styling
-
-
-
-
-// ❌ INCORRECT - Relying on defaults
-
-
- Card Title
-
-
- Card content without explicit styling
-
-
-```
-
-### Dynamic Heading Patterns
-```jsx
-// Pattern 1: Light → Bold (H1/H2 only)
-
- Discover {' '}
-
- Amazing
- {' '}
- Destinations
-
-
-// Pattern 2: Normal → Semibold (H3/H4)
-
- Experience {' '}
- Melbourne's Culture
-
-```
-
-### Responsive Typography
-```jsx
-// Mobile-first responsive scaling
-
- Responsive Heading
-
-
-
- Responsive body text
-
-```
-
-**Add your own guidelines here**
-
diff --git a/src/main.tsx b/src/main.tsx
index 241b0b3..cfff6d7 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -4,10 +4,12 @@ import App from "./App";
import "./index.css";
import { Provider } from "react-redux";
import { store } from "./Redux/Store";
+import { Toaster } from "sonner";
createRoot(document.getElementById("root")!).render(
+
diff --git a/src/components/AboutUsPage.tsx b/src/pages/AboutUsPage.tsx
similarity index 98%
rename from src/components/AboutUsPage.tsx
rename to src/pages/AboutUsPage.tsx
index b68a755..29b87fd 100644
--- a/src/components/AboutUsPage.tsx
+++ b/src/pages/AboutUsPage.tsx
@@ -1,13 +1,13 @@
import React from 'react';
import { motion } from 'motion/react';
import { ArrowLeft, Heart, MapPin, Zap, Globe, Users, Camera, Coffee } from 'lucide-react';
-import { Button } from './ui/button';
-import { ImageWithFallback } from './figma/ImageWithFallback';
-import Navbar from './Navbar';
-import { Footer } from './Footer';
-import { MobileAppSection } from './MobileAppSection';
-import { EnhancedTestimonials } from './EnhancedTestimonials';
-import { ReviewsSection } from './ReviewsSection';
+// import { Button } from './ui/button';
+import { ImageWithFallback } from '../components/figma/ImageWithFallback';
+import Navbar from '../components/Navbar';
+import { Footer } from '../components/Footer';
+import { MobileAppSection } from '../components/MobileAppSection';
+import { EnhancedTestimonials } from '../components/EnhancedTestimonials';
+import { ReviewsSection } from '../components/ReviewsSection';
interface User {
email: string;
diff --git a/src/components/AttractionDetailsPage.tsx b/src/pages/AttractionDetailsPage.tsx
similarity index 65%
rename from src/components/AttractionDetailsPage.tsx
rename to src/pages/AttractionDetailsPage.tsx
index 4962d84..64223b9 100644
--- a/src/components/AttractionDetailsPage.tsx
+++ b/src/pages/AttractionDetailsPage.tsx
@@ -1,12 +1,25 @@
import { ArrowLeft, Calendar, Check, ChevronLeft, ChevronRight, Clock, MapPin, Users, X } from 'lucide-react';
import { motion } from 'motion/react';
+<<<<<<< HEAD:src/components/AttractionDetailsPage.tsx
+=======
+import { ArrowLeft, Clock, Users, Calendar, MapPin, Star, Check, X, ChevronLeft, ChevronRight } from 'lucide-react';
+import { Button } from '../components/ui/button';
+import { Badge } from '../components/ui/badge';
+import { Card, } from '../components/ui/card';
+import { ImageWithFallback } from '../components/figma/ImageWithFallback';
+import { Layout } from '../Layout';
+>>>>>>> cdadee5df40960af2263c2e5e6f4a8f234b7d5b0:src/pages/AttractionDetailsPage.tsx
import { useParams } from 'react-router-dom';
import { Layout } from '../Layout';
import { useGetAttractionDetailsByIdQuery } from '../Redux/services/attractions.service';
+<<<<<<< HEAD:src/components/AttractionDetailsPage.tsx
import { ImageWithFallback } from './figma/ImageWithFallback';
import { Badge } from './ui/badge';
import { Button } from './ui/button';
import { Card, } from './ui/card';
+=======
+import LoadingSpinner from '../components/LoadingSpinner';
+>>>>>>> cdadee5df40960af2263c2e5e6f4a8f234b7d5b0:src/pages/AttractionDetailsPage.tsx
interface AttractionDetailsPageProps {
onBackClick: () => void;
@@ -30,7 +43,9 @@ export function AttractionDetailsPage({
const { data: attraction, isLoading } = useGetAttractionDetailsByIdQuery(Number(attractionId));
if (isLoading) {
- return loading...
+ return (
+
{/* Back Button */}
@@ -81,7 +96,7 @@ export function AttractionDetailsPage({
{attraction.title}
{' '}
- Day Trip by {attraction.partner.businessName}
+ Day Trip by {attraction.partner.businessName}
@@ -98,10 +113,10 @@ export function AttractionDetailsPage({