Merge branch 'dev' of https://git.profit-planet.partners/Seazn/profit-planet-frontend into dev

src/app/about-us/page.tsx

@@ -208,7 +208,7 @@ const footerNavigation = {
 export default function AboutUsPage() {
   return (
     <PageLayout>
-      <div className="bg-gray-900">
+      <div className="bg-gray-900 pb-24 sm:pb-32">
         <main className="relative isolate">
         {/* Background */}
         <div

src/app/components/PageLayout.tsx

@@ -26,7 +26,7 @@ export default function PageLayout({
   const isMobile = isMobileDevice();
   
   return (
-    <div className="min-h-screen w-full flex flex-col relative bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100 transition-colors m-0 p-0">
+    <div className="h-screen w-full flex flex-col relative bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100 transition-colors overflow-hidden">
       
       {showHeader && (
         <div className="relative z-50 w-full flex-shrink-0">
@@ -34,10 +34,17 @@ export default function PageLayout({
         </div>
       )}
       
+<<<<<<< HEAD
       {/* Main content now participates in normal document flow */}
       <div className="flex-1 relative z-10 w-full flex flex-col">
         <PageTransitionEffect>{children}</PageTransitionEffect>
       </div>
+=======
+      {/* Main content grows to fill available space */}
+      <main className="flex-1 relative z-10 w-full overflow-y-auto">
+        {children}
+      </main>
+>>>>>>> 6ebe4eed3d7f8ef6bedea5dcf742bc73462a8af8
       
       {showFooter && (
         <div className="relative z-50 flex-shrink-0">

src/app/globals.css

@@ -11,12 +11,7 @@
   --color-brand-background: #FFFFFF;
 }
 
-@theme inline {
+/* Theme variables moved to :root for compatibility */
-  --color-background: var(--background);
-  --color-foreground: var(--foreground);
-  --font-sans: var(--font-geist-sans);
-  --font-mono: var(--font-geist-mono);
-}
 
 @media (prefers-color-scheme: dark) {
   :root {
@@ -25,8 +20,15 @@
   }
 }
 
-body {
+html, body {
+  margin: 0;
+  padding: 0;
+  height: 100%;
   background: var(--background);
   color: var(--foreground);
   font-family: Arial, Helvetica, sans-serif;
 }
+
+#__next {
+  height: 100%;
+}

src/app/page.tsx

@@ -6,7 +6,7 @@ export default function HomePage() {
       {/* Hero Section */}
       <section
         id="hero"
-        className="relative isolate flex flex-col h-screen"
+        className="relative isolate flex-1"
       >
         {/* ...existing code (pattern SVG + blurred polygon) ... */}
         <svg
@@ -46,44 +46,41 @@ export default function HomePage() {
           />
         </div>
 
-        {/* Background layering */}
+        {/* Background layers */}
-        <div className="relative flex-1 flex">
-          {/* ...existing code (absolute layers) ... */}
         <div className="absolute inset-0 -z-30 bg-white dark:bg-gray-950" />
         <div className="absolute inset-0 -z-20 bg-gradient-to-b from-gray-900/95 via-gray-900/80 to-gray-900 dark:from-gray-900/95 dark:via-gray-900/80 dark:to-gray-900" />
         <div className="pointer-events-none absolute inset-0 -z-10 bg-[radial-gradient(circle_at_30%_20%,rgba(255,255,255,0.18),transparent_65%)] dark:bg-[radial-gradient(circle_at_35%_25%,rgba(255,255,255,0.08),transparent_60%)]" />
         <div className="pointer-events-none absolute inset-0 -z-10 mix-blend-overlay [background-image:linear-gradient(rgba(255,255,255,0.04)_1px,transparent_1px),linear-gradient(90deg,rgba(255,255,255,0.04)_1px,transparent_1px)] bg-[size:40px_40px]" />
 
-          {/* Content wrapper now fills and centers vertically */}
+          {/* Content wrapper */}
-          <div className="mx-auto max-w-7xl px-6 py-20 lg:py-28 flex w-full items-center min-h-full">
+          <div className="mx-auto max-w-7xl px-4 py-8 sm:px-6 sm:py-16 lg:px-8 lg:py-28 flex w-full items-center h-full">
-            <div className="mx-auto max-w-2xl gap-x-14 lg:mx-0 lg:flex lg:max-w-none lg:items-center">
+            <div className="mx-auto max-w-2xl gap-x-8 lg:mx-0 lg:flex lg:max-w-none lg:items-center lg:gap-x-14">
               <div className="relative w-full lg:max-w-xl lg:shrink-0 xl:max-w-2xl">
-                <h1 className="text-5xl font-semibold tracking-tight text-pretty text-white sm:text-7xl">
+                <h1 className="text-3xl font-semibold tracking-tight text-pretty text-white sm:text-4xl md:text-5xl lg:text-6xl xl:text-7xl">
                   Profit Planet
                 </h1>
-                <p className="mt-4 text-xl italic text-gray-300 sm:text-2xl">
+                <p className="mt-3 text-lg italic text-gray-300 sm:mt-4 sm:text-xl md:text-2xl">
                   Building a Community that will bring change
                 </p>
-                <p className="mt-8 text-lg font-medium text-pretty text-gray-400 sm:max-w-md sm:text-xl/8 lg:max-w-none">
+                <p className="mt-6 text-base font-medium text-pretty text-gray-400 sm:mt-8 sm:text-lg md:text-xl lg:max-w-none">
                   Profit Planet is a platform building a vibrant community where members access diverse services and products from within. Users enjoy benefits like cashback and discounts, fostering a smart, rewarding ecosystem.
                 </p>
-                <div className="mt-10 flex items-center gap-x-6">
+                <div className="mt-8 flex flex-col gap-4 sm:mt-10 sm:flex-row sm:items-center sm:gap-x-6">
                   <a
                     href="/shop"
-                    className="rounded-md bg-indigo-500 px-3.5 py-2.5 text-sm font-semibold text-white shadow-xs hover:bg-indigo-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-500"
+                    className="rounded-md bg-indigo-500 px-4 py-3 text-base font-semibold text-white shadow-xs hover:bg-indigo-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-500 text-center sm:px-3.5 sm:py-2.5 sm:text-sm"
                   >
                     Shop
                   </a>
-                  <a href="/login" className="text-sm/6 font-semibold text-white">
+                  <a href="/login" className="text-base font-semibold text-white text-center sm:text-sm/6">
                     Login <span aria-hidden="true">→</span>
                   </a>
                 </div>
               </div>
-              {/* Removed sm:-mt-44 to prevent height reduction */}
+              {/* Mobile-hidden image gallery */}
-              <div className="mt-14 flex justify-end gap-8 sm:mt-14 sm:justify-start sm:pl-20 lg:mt-0 lg:pl-0">
+              <div className="hidden lg:flex mt-8 lg:mt-0 justify-end gap-4 xl:gap-8">
-                {/* ...existing code (image stacks) ... */}
+                <div className="flex flex-col space-y-4 xl:space-y-8">
-                <div className="ml-auto w-44 flex-none space-y-8 pt-32 sm:ml-0 sm:pt-80 lg:order-last lg:pt-36 xl:order-0 xl:pt-80">
+                  <div className="relative w-32 xl:w-44">
-                  <div className="relative">
                     <img
                       alt=""
                       src="https://images.unsplash.com/photo-1557804506-669a67965ba0?auto=format&fit=crop&h=528&q=80"
@@ -92,8 +89,8 @@ export default function HomePage() {
                     <div className="pointer-events-none absolute inset-0 rounded-xl ring-1 ring-white/10 ring-inset" />
                   </div>
                 </div>
-                <div className="mr-auto w-44 flex-none space-y-8 sm:mr-0 sm:pt-52 lg:pt-36">
+                <div className="flex flex-col space-y-4 xl:space-y-8 pt-8 xl:pt-16">
-                  <div className="relative">
+                  <div className="relative w-32 xl:w-44">
                     <img
                       alt=""
                       src="https://images.unsplash.com/photo-1485217988980-11786ced9454?auto=format&fit=crop&h=528&q=80"
@@ -101,7 +98,7 @@ export default function HomePage() {
                     />
                     <div className="pointer-events-none absolute inset-0 rounded-xl ring-1 ring-white/10 ring-inset" />
                   </div>
-                  <div className="relative">
+                  <div className="relative w-32 xl:w-44">
                     <img
                       alt=""
                       src="https://images.unsplash.com/photo-1559136555-9303baea8ebd?auto=format&fit=crop&crop=focalpoint&fp-x=.4&w=396&h=528&q=80"
@@ -110,8 +107,8 @@ export default function HomePage() {
                     <div className="pointer-events-none absolute inset-0 rounded-xl ring-1 ring-white/10 ring-inset" />
                   </div>
                 </div>
-                <div className="w-44 flex-none space-y-8 pt-32 sm:pt-0">
+                <div className="flex flex-col space-y-4 xl:space-y-8">
-                  <div className="relative">
+                  <div className="relative w-32 xl:w-44">
                     <img
                       alt=""
                       src="https://images.unsplash.com/photo-1670272504528-790c24957dda?auto=format&fit=crop&crop=left&w=400&h=528&q=80"
@@ -119,7 +116,7 @@ export default function HomePage() {
                     />
                     <div className="pointer-events-none absolute inset-0 rounded-xl ring-1 ring-white/10 ring-inset" />
                   </div>
-                  <div className="relative">
+                  <div className="relative w-32 xl:w-44">
                     <img
                       alt=""
                       src="https://images.unsplash.com/photo-1670272505284-8faba1c31f7d?auto=format&fit=crop&h=528&q=80"
@@ -131,10 +128,6 @@ export default function HomePage() {
               </div>
             </div>
           </div>
-
-          {/* Bottom fade (optional) */}
-          <div className="pointer-events-none absolute inset-x-0 bottom-0 h-24 bg-gradient-to-b from-transparent to-[#0F172A]" />
-        </div>
       </section>
     </PageLayout>
   );