Merge pull request 'main' (#42) from main into testing

Reviewed-on: #42

.gitea/workflows/deploy.yml

@@ -0,0 +1,67 @@
+name: CityCards-Website
+
+on:
+    push:
+        branches:
+            - main
+            - beta
+            - testing
+            - uat-beta
+            - staging
+            - production
+
+jobs:
+    Build-CityCards-Website:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Code in Runner
+              uses: actions/checkout@v3
+            - name: Branch and Folder Selection for Deployment
+              run: |
+                    BRANCH_NAME=${{ gitea.ref_name }}
+                    case $BRANCH_NAME in
+                        #beta)
+                        #echo "PROJECT_FOLDER=/home/citycards/citycards-superadmin" >> $GITHUB_ENV
+                        #PROJECT_FOLDER="/home/citycards/citycards-superadmin"
+                        #;;
+                        testing)
+                        echo "PROJECT_FOLDER=/home/citycards/Test-Release/citycards-frontend/CityCards-Website" >> $GITHUB_ENV
+                        PROJECT_FOLDER="/home/citycards/Test-Release/citycards-frontend/CityCards-Website"
+                        ;;
+                        #client)
+                        #echo "PROJECT_FOLDER=/home/citycards/Client-Release/citycards-frontend/CityCards-AdminPanel" >> $GITHUB_ENV
+                        #PROJECT_FOLDER="/home/citycards/Client-Release/citycards-frontend/CityCards-AdminPanel"
+                        #;;
+                        #uat-beta)
+                        #echo "PROJECT_FOLDER=/home/citycards/UAT-Release/citycards-frontend/CityCards-AdminPanel" >> $GITHUB_ENV
+                        #PROJECT_FOLDER="/home/citycards/UAT-Release/citycards-frontend/CityCards-AdminPanel"
+                        #;;                        
+                        *)
+                        echo "Unknown Branch"
+                        exit 1 
+                        ;;
+                    esac
+                    echo "BRANCH_NAME=${{ gitea.ref_name }}" >> $GITHUB_ENV
+                    echo "SELECTED BRANCH : $BRANCH_NAME"
+                    echo "SELECTED FOLDER : $PROJECT_FOLDER"
+
+            - name: Deployment to Server SSH
+              uses: appleboy/ssh-action@v1
+              with:
+                host: ${{ secrets.BETA_SERVER_HOST }}
+                username: ${{ secrets.BETA_SERVER_USERNAME }}
+                password: ${{ secrets.BETA_SERVER_PASSWORD }}
+                port: ${{ secrets.BETA_SERVER_PORT }}
+                envs: BRANCH_NAME,PROJECT_FOLDER
+                script: |
+                        set -xe
+                        echo $BRANCH_NAME
+                        echo $PROJECT_FOLDER
+                        cd $PROJECT_FOLDER
+                        git fetch
+                        git reset --hard origin/$BRANCH_NAME
+                        git pull origin $BRANCH_NAME
+                        echo "BUILDING..... "
+                        npm i
+                        npm run build
+            

src/components/LandingMagicItinerary.tsx

@@ -6,6 +6,7 @@ import { Button } from './ui/button';
 
 // Import your video from assets
 import cityTourVideo from '../assets/itinenary-animation-vid.mp4';
+import { useNavigate } from 'react-router-dom';
 
 interface ItineraryCard {
   id: number;
@@ -22,6 +23,8 @@ export function LandingMagicItinerary() {
   const [isPlaying, setIsPlaying] = useState(true);
   const [videoLoaded, setVideoLoaded] = useState(false);
 
+  const navigate = useNavigate()
+
   const handleVideoLoad = () => {
     setVideoLoaded(true);
   };
@@ -31,7 +34,7 @@ export function LandingMagicItinerary() {
   };
 
   return (
-    <section className="relative py-20 lg:py-32 overflow-hidden -mt-20 pt-32 z-[49]">
+    <section className="relative py-20 lg:py-15 overflow-hidden -mt-20 z-[49]">
       {/* Dynamic Background */}
       <div className="absolute inset-0 overflow-hidden pointer-events-none z-[5]">
         {/* Background Image as fallback */}
@@ -97,7 +100,7 @@ export function LandingMagicItinerary() {
         {/* Header */}
         <div className="text-center mb-16 max-w-5xl w-full">
           <motion.div
-            className="inline-flex items-center gap-3 bg-gradient-to-r from-warm-coral/10 to-orange-100/50 backdrop-blur-sm px-6 py-3 rounded-full border-2 border-warm-coral/30 shadow-xl mb-8"
+            className="inline-flex items-center gap-3 bg-gradient-to-r from-warm-coral/10 to-orange-100/50 backdrop-blur-sm pl-6 py-3 rounded-full border-2 border-warm-coral/30 shadow-xl mb-8"
             initial={{ opacity: 0, scale: 0.8, y: 20 }}
             whileInView={{ opacity: 1, scale: 1, y: 0 }}
             transition={{ duration: 0.7, ease: [0.34, 1.56, 0.64, 1] }}
@@ -131,7 +134,7 @@ export function LandingMagicItinerary() {
             viewport={{ once: true }}
           >
             <span className="font-light">Plan Your</span>{' '}
-            <span className="font-bold italic bg-gradient-to-r via-orange-500 to-rose-500 bg-clip-text pr-2 text-transparent drop-shadow-lg">
+            <span className="font-bold italic bg-gradient-to-r from-red-500  via-orange-500 to-rose-500 bg-clip-text pr-2 text-transparent drop-shadow-lg">
               Dream Journey
             </span>
             <br />
@@ -250,6 +253,7 @@ export function LandingMagicItinerary() {
           >
             <Button
               withShine={true}
+              onClick={() => navigate('/landing-magic-itinerary')}
               className="py-6 px-14 rounded-full text-lg font-bold bg-gradient-to-r via-orange-500 to-rose-500 hover:from-warm-coral/90 hover:via-orange-500/90 hover:to-rose-500/90 shadow-2xl hover:shadow-warm-coral/50 transition-all hover:scale-105 hover:-translate-y-1"
             >
               <span className="flex items-center gap-3">

src/components/LandingTrustSection.tsx

@@ -204,7 +204,7 @@ export function LandingTrustSection() {
                       style={{
                         transform: `rotate(${cardRotation}deg) translateY(${cardOffset}px)`,
                         transformOrigin: 'center center',
-                        minHeight: '480px',
+                        minHeight: '360px',
                         background: `
                           radial-gradient(circle at 20% 80%, rgba(255, 248, 235, 0.8) 0%, transparent 50%),
                           radial-gradient(circle at 80% 20%, rgba(250, 245, 230, 0.6) 0%, transparent 50%),

src/pages/MelbournePage.tsx

@@ -222,7 +222,7 @@ export function MelbournePage({
           </div> */}
 
 
-          <div className="container mx-auto px-4 py-12 space-y-24">
+          <div className="container mx-auto px-4 py-12">
             {/* Features Grid */}
             <motion.section
               id="overview"
@@ -802,7 +802,7 @@ export function MelbournePage({
             </section>
           </div>
 
-          <div className="container mx-auto px-4 py-12 space-y-24">
+          <div className="container mx-auto px-4 py-12">
             {/* Testimonials */}
             <EnhancedTestimonials />