Merge version_4 into main

Update src/app/collections/prismastem/page.tsx
2026-05-31 22:42:56 +00:00 · 2026-05-31 22:42:53 +00:00 · 2026-05-31 22:42:53 +00:00 · 2026-05-31 22:42:52 +00:00 · 2026-05-31 22:42:52 +00:00 · 2026-05-31 22:42:51 +00:00
5 changed files with 203 additions and 195 deletions
--- a/src/app/collections/[collectionId]/page.tsx
+++ b/src/app/collections/[collectionId]/page.tsx
@@ -32,6 +32,47 @@ const collectionProducts: { [key: string]: any[] } = {
 const collectionTitles: { [key: string]: string } = {
  "p-aqua": "Aqua Collection",  "p-embercell": "EmberCell Collection",  "p-prismastem": "PrismaStem Collection"};

+const consistentNavItems = [
+  { name: "Home", id: "/"},
+  { name: "Best Sellers", id: "/#best-sellers"},
+  { name: "Aqua Collection", id: "/collections/p-aqua"},
+  { name: "EmberCell Collection", id: "/collections/p-embercell"},
+  { name: "PrismaStem Collection", id: "/collections/p-prismastem"},
+  { name: "About", id: "/#about"},
+  { name: "Contact", id: "/#contact"},
+];
+
+const consistentFooterColumns = [
+  {
+    title: "SHOP",    items: [
+      { label: "Best Sellers", href: "/#best-sellers"},
+      { label: "Aqua Collection", href: "/collections/p-aqua"},
+      { label: "EmberCell Collection", href: "/collections/p-embercell"},
+      { label: "PrismaStem Collection", href: "/collections/p-prismastem"},
+    ],
+  },
+  {
+    title: "CUSTOMER SERVICE",    items: [
+      { label: "Contact Us", href: "/#contact"},
+      { label: "FAQ", href: "/#faq"},
+      { label: "Shipping & Returns", href: "#"},
+    ],
+  },
+  {
+    title: "ABOUT US",    items: [
+      { label: "Our Story", href: "/#about"},
+      { label: "Our Philosophy", href: "/#about"},
+      { label: "Careers", href: "#"},
+    ],
+  },
+  {
+    title: "LEGAL",    items: [
+      { label: "Privacy Policy", href: "#"},
+      { label: "Terms of Service", href: "#"},
+    ],
+  },
+];
+
 export default function CollectionPage() {
  const params = useParams();
  const collectionId = params.collectionId as string;
@@ -54,16 +95,7 @@ export default function CollectionPage() {
      <ReactLenis root>
        <div id="nav" data-section="nav">
          <NavbarStyleCentered
-            navItems={[
-        { name: "Home", id: "/"},
-        { name: "Best Sellers", id: "/#best-sellers"},
-        { name: "Aqua Collection", id: "/collections/p-aqua"},
-        { name: "EmberCell Collection", id: "/collections/p-embercell"},
-        { name: "PrismaStem Collection", id: "/collections/p-prismastem"},
-        { name: "About", id: "/#about"},
-        { name: "Contact", id: "/#contact"},
-
-            ]}
+            navItems={consistentNavItems}
            brandName="Introstem"
          />
        </div>
@@ -83,36 +115,7 @@ export default function CollectionPage() {

        <div id="footer" data-section="footer">
          <FooterBase
-            columns={[
-              {
-                title: "SHOP",                items: [
-                  { label: "Best Sellers", href: "/#best-sellers"},
-                  { label: "Aqua Collection", href: "/collections/p-aqua"},
-                  { label: "EmberCell Collection", href: "/collections/p-embercell"},
-                  { label: "PrismaStem Collection", href: "/collections/p-prismastem"},
-                ],
-              },
-              {
-                title: "CUSTOMER SERVICE",                items: [
-                  { label: "Contact Us", href: "/#contact"},
-                  { label: "FAQ", href: "/#faq"},
-                  { label: "Shipping & Returns", href: "#"},
-                ],
-              },
-              {
-                title: "ABOUT US",                items: [
-                  { label: "Our Story", href: "/#about"},
-                  { label: "Our Philosophy", href: "/#about"},
-                  { label: "Careers", href: "#"},
-                ],
-              },
-              {
-                title: "LEGAL",                items: [
-                  { label: "Privacy Policy", href: "#"},
-                  { label: "Terms of Service", href: "#"},
-                ],
-              },
-            ]}
+            columns={consistentFooterColumns}
            logoText="Introstem"
            copyrightText="© 2024 Introstem. All Rights Reserved."
          />
--- a/src/app/collections/aqua/page.tsx
+++ b/src/app/collections/aqua/page.tsx
@@ -6,13 +6,44 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
 import FooterBase from '@/components/sections/footer/FooterBase';

 const consistentNavItems = [
-  { name: "Shop", id: "#shop" },
-  { name: "Best Sellers", id: "#best-sellers" },
-  { name: "Collections", id: "/collections" },
-  { name: "Products", id: "#products" },
-  { name: "Concerns", id: "#concerns" },
-  { name: "About", id: "#about" },
-  { name: "Contact", id: "#contact" },
+  { name: "Home", id: "/"},
+  { name: "Best Sellers", id: "/#best-sellers"},
+  { name: "Aqua Collection", id: "/collections/p-aqua"},
+  { name: "EmberCell Collection", id: "/collections/p-embercell"},
+  { name: "PrismaStem Collection", id: "/collections/p-prismastem"},
+  { name: "About", id: "/#about"},
+  { name: "Contact", id: "/#contact"},
+];
+
+const consistentFooterColumns = [
+  {
+    title: "SHOP",    items: [
+      { label: "Best Sellers", href: "/#best-sellers"},
+      { label: "Aqua Collection", href: "/collections/p-aqua"},
+      { label: "EmberCell Collection", href: "/collections/p-embercell"},
+      { label: "PrismaStem Collection", href: "/collections/p-prismastem"},
+    ],
+  },
+  {
+    title: "CUSTOMER SERVICE",    items: [
+      { label: "Contact Us", href: "/#contact"},
+      { label: "FAQ", href: "/#faq"},
+      { label: "Shipping & Returns", href: "#"},
+    ],
+  },
+  {
+    title: "ABOUT US",    items: [
+      { label: "Our Story", href: "/#about"},
+      { label: "Our Philosophy", href: "/#about"},
+      { label: "Careers", href: "#"},
+    ],
+  },
+  {
+    title: "LEGAL",    items: [
+      { label: "Privacy Policy", href: "#"},
+      { label: "Terms of Service", href: "#"},
+    ],
+  },
 ];

 export default function AquaCollectionPage() {
@@ -42,37 +73,7 @@ export default function AquaCollectionPage() {

        <div id="footer" data-section="footer">
          <FooterBase
-            columns={[
-              {
-                title: "SHOP",                items: [
-                  { label: "Best Sellers", href: "#best-sellers" },
-                  { label: "Collections", href: "/collections" },
-                  { label: "Body Care", href: "#products" },
-                  { label: "Serums", href: "#products" },
-                  { label: "Masks", href: "#products" },
-                ],
-              },
-              {
-                title: "CUSTOMER SERVICE",                items: [
-                  { label: "Contact Us", href: "#contact" },
-                  { label: "FAQ", href: "#faq" },
-                  { label: "Shipping & Returns", href: "#" },
-                ],
-              },
-              {
-                title: "ABOUT US",                items: [
-                  { label: "Our Story", href: "#about" },
-                  { label: "Our Philosophy", href: "#about" },
-                  { label: "Careers", href: "#" },
-                ],
-              },
-              {
-                title: "LEGAL",                items: [
-                  { label: "Privacy Policy", href: "#" },
-                  { label: "Terms of Service", href: "#" },
-                ],
-              },
-            ]}
+            columns={consistentFooterColumns}
            logoText="Introstem"
            copyrightText="© 2024 Introstem. All Rights Reserved."
          />
@@ -80,4 +81,4 @@ export default function AquaCollectionPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/collections/embercell/page.tsx
+++ b/src/app/collections/embercell/page.tsx
@@ -6,13 +6,44 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
 import FooterBase from '@/components/sections/footer/FooterBase';

 const consistentNavItems = [
-  { name: "Shop", id: "#shop" },
-  { name: "Best Sellers", id: "#best-sellers" },
-  { name: "Collections", id: "/collections" },
-  { name: "Products", id: "#products" },
-  { name: "Concerns", id: "#concerns" },
-  { name: "About", id: "#about" },
-  { name: "Contact", id: "#contact" },
+  { name: "Home", id: "/"},
+  { name: "Best Sellers", id: "/#best-sellers"},
+  { name: "Aqua Collection", id: "/collections/p-aqua"},
+  { name: "EmberCell Collection", id: "/collections/p-embercell"},
+  { name: "PrismaStem Collection", id: "/collections/p-prismastem"},
+  { name: "About", id: "/#about"},
+  { name: "Contact", id: "/#contact"},
+];
+
+const consistentFooterColumns = [
+  {
+    title: "SHOP",    items: [
+      { label: "Best Sellers", href: "/#best-sellers"},
+      { label: "Aqua Collection", href: "/collections/p-aqua"},
+      { label: "EmberCell Collection", href: "/collections/p-embercell"},
+      { label: "PrismaStem Collection", href: "/collections/p-prismastem"},
+    ],
+  },
+  {
+    title: "CUSTOMER SERVICE",    items: [
+      { label: "Contact Us", href: "/#contact"},
+      { label: "FAQ", href: "/#faq"},
+      { label: "Shipping & Returns", href: "#"},
+    ],
+  },
+  {
+    title: "ABOUT US",    items: [
+      { label: "Our Story", href: "/#about"},
+      { label: "Our Philosophy", href: "/#about"},
+      { label: "Careers", href: "#"},
+    ],
+  },
+  {
+    title: "LEGAL",    items: [
+      { label: "Privacy Policy", href: "#"},
+      { label: "Terms of Service", href: "#"},
+    ],
+  },
 ];

 export default function EmberCellCollectionPage() {
@@ -42,37 +73,7 @@ export default function EmberCellCollectionPage() {

        <div id="footer" data-section="footer">
          <FooterBase
-            columns={[
-              {
-                title: "SHOP",                items: [
-                  { label: "Best Sellers", href: "#best-sellers" },
-                  { label: "Collections", href: "/collections" },
-                  { label: "Body Care", href: "#products" },
-                  { label: "Serums", href: "#products" },
-                  { label: "Masks", href: "#products" },
-                ],
-              },
-              {
-                title: "CUSTOMER SERVICE",                items: [
-                  { label: "Contact Us", href: "#contact" },
-                  { label: "FAQ", href: "#faq" },
-                  { label: "Shipping & Returns", href: "#" },
-                ],
-              },
-              {
-                title: "ABOUT US",                items: [
-                  { label: "Our Story", href: "#about" },
-                  { label: "Our Philosophy", href: "#about" },
-                  { label: "Careers", href: "#" },
-                ],
-              },
-              {
-                title: "LEGAL",                items: [
-                  { label: "Privacy Policy", href: "#" },
-                  { label: "Terms of Service", href: "#" },
-                ],
-              },
-            ]}
+            columns={consistentFooterColumns}
            logoText="Introstem"
            copyrightText="© 2024 Introstem. All Rights Reserved."
          />
@@ -80,4 +81,4 @@ export default function EmberCellCollectionPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/collections/page.tsx
+++ b/src/app/collections/page.tsx
@@ -6,13 +6,44 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
 import FooterBase from '@/components/sections/footer/FooterBase';

 const consistentNavItems = [
-  { name: "Shop", id: "#shop" },
-  { name: "Best Sellers", id: "#best-sellers" },
-  { name: "Collections", id: "/collections" },
-  { name: "Products", id: "#products" },
-  { name: "Concerns", id: "#concerns" },
-  { name: "About", id: "#about" },
-  { name: "Contact", id: "#contact" },
+  { name: "Home", id: "/"},
+  { name: "Best Sellers", id: "/#best-sellers"},
+  { name: "Aqua Collection", id: "/collections/p-aqua"},
+  { name: "EmberCell Collection", id: "/collections/p-embercell"},
+  { name: "PrismaStem Collection", id: "/collections/p-prismastem"},
+  { name: "About", id: "/#about"},
+  { name: "Contact", id: "/#contact"},
+];
+
+const consistentFooterColumns = [
+  {
+    title: "SHOP",    items: [
+      { label: "Best Sellers", href: "/#best-sellers"},
+      { label: "Aqua Collection", href: "/collections/p-aqua"},
+      { label: "EmberCell Collection", href: "/collections/p-embercell"},
+      { label: "PrismaStem Collection", href: "/collections/p-prismastem"},
+    ],
+  },
+  {
+    title: "CUSTOMER SERVICE",    items: [
+      { label: "Contact Us", href: "/#contact"},
+      { label: "FAQ", href: "/#faq"},
+      { label: "Shipping & Returns", href: "#"},
+    ],
+  },
+  {
+    title: "ABOUT US",    items: [
+      { label: "Our Story", href: "/#about"},
+      { label: "Our Philosophy", href: "/#about"},
+      { label: "Careers", href: "#"},
+    ],
+  },
+  {
+    title: "LEGAL",    items: [
+      { label: "Privacy Policy", href: "#"},
+      { label: "Terms of Service", href: "#"},
+    ],
+  },
 ];

 export default function CollectionsIndexPage() {
@@ -57,37 +88,7 @@ export default function CollectionsIndexPage() {
        
        <div id="footer" data-section="footer">
          <FooterBase
-            columns={[
-              {
-                title: "SHOP",                items: [
-                  { label: "Best Sellers", href: "#best-sellers" },
-                  { label: "Collections", href: "/collections" },
-                  { label: "Body Care", href: "#products" },
-                  { label: "Serums", href: "#products" },
-                  { label: "Masks", href: "#products" },
-                ],
-              },
-              {
-                title: "CUSTOMER SERVICE",                items: [
-                  { label: "Contact Us", href: "#contact" },
-                  { label: "FAQ", href: "#faq" },
-                  { label: "Shipping & Returns", href: "#" },
-                ],
-              },
-              {
-                title: "ABOUT US",                items: [
-                  { label: "Our Story", href: "#about" },
-                  { label: "Our Philosophy", href: "#about" },
-                  { label: "Careers", href: "#" },
-                ],
-              },
-              {
-                title: "LEGAL",                items: [
-                  { label: "Privacy Policy", href: "#" },
-                  { label: "Terms of Service", href: "#" },
-                ],
-              },
-            ]}
+            columns={consistentFooterColumns}
            logoText="Introstem"
            copyrightText="© 2024 Introstem. All Rights Reserved."
          />
@@ -95,4 +96,4 @@ export default function CollectionsIndexPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/collections/prismastem/page.tsx
+++ b/src/app/collections/prismastem/page.tsx
@@ -6,12 +6,44 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
 import FooterBase from '@/components/sections/footer/FooterBase';

 const consistentNavItems = [
-  { name: "Shop", id: "#shop" },
-  { name: "Best Sellers", id: "#best-sellers" },  { name: "Collections", id: "/collections" },
-  { name: "Products", id: "#products" },
-  { name: "Concerns", id: "#concerns" },
-  { name: "About", id: "#about" },
-  { name: "Contact", id: "#contact" },
+  { name: "Home", id: "/"},
+  { name: "Best Sellers", id: "/#best-sellers"},
+  { name: "Aqua Collection", id: "/collections/p-aqua"},
+  { name: "EmberCell Collection", id: "/collections/p-embercell"},
+  { name: "PrismaStem Collection", id: "/collections/p-prismastem"},
+  { name: "About", id: "/#about"},
+  { name: "Contact", id: "/#contact"},
+];
+
+const consistentFooterColumns = [
+  {
+    title: "SHOP",    items: [
+      { label: "Best Sellers", href: "/#best-sellers"},
+      { label: "Aqua Collection", href: "/collections/p-aqua"},
+      { label: "EmberCell Collection", href: "/collections/p-embercell"},
+      { label: "PrismaStem Collection", href: "/collections/p-prismastem"},
+    ],
+  },
+  {
+    title: "CUSTOMER SERVICE",    items: [
+      { label: "Contact Us", href: "/#contact"},
+      { label: "FAQ", href: "/#faq"},
+      { label: "Shipping & Returns", href: "#"},
+    ],
+  },
+  {
+    title: "ABOUT US",    items: [
+      { label: "Our Story", href: "/#about"},
+      { label: "Our Philosophy", href: "/#about"},
+      { label: "Careers", href: "#"},
+    ],
+  },
+  {
+    title: "LEGAL",    items: [
+      { label: "Privacy Policy", href: "#"},
+      { label: "Terms of Service", href: "#"},
+    ],
+  },
 ];

 export default function PrismaStemCollectionPage() {
@@ -41,37 +73,7 @@ export default function PrismaStemCollectionPage() {

        <div id="footer" data-section="footer">
          <FooterBase
-            columns={[
-              {
-                title: "SHOP",                items: [
-                  { label: "Best Sellers", href: "#best-sellers" },
-                  { label: "Collections", href: "/collections" },
-                  { label: "Body Care", href: "#products" },
-                  { label: "Serums", href: "#products" },
-                  { label: "Masks", href: "#products" },
-                ],
-              },
-              {
-                title: "CUSTOMER SERVICE",                items: [
-                  { label: "Contact Us", href: "#contact" },
-                  { label: "FAQ", href: "#faq" },
-                  { label: "Shipping & Returns", href: "#" },
-                ],
-              },
-              {
-                title: "ABOUT US",                items: [
-                  { label: "Our Story", href: "#about" },
-                  { label: "Our Philosophy", href: "#about" },
-                  { label: "Careers", href: "#" },
-                ],
-              },
-              {
-                title: "LEGAL",                items: [
-                  { label: "Privacy Policy", href: "#" },
-                  { label: "Terms of Service", href: "#" },
-                ],
-              },
-            ]}
+            columns={consistentFooterColumns}
            logoText="Introstem"
            copyrightText="© 2024 Introstem. All Rights Reserved."
          />
@@ -79,4 +81,4 @@ export default function PrismaStemCollectionPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
Author	SHA1	Message	Date
bender	4c543f66a0	Merge version_4 into main Merge version_4 into main	2026-05-31 22:42:56 +00:00
bender	f8b887cd5a	Update src/app/collections/prismastem/page.tsx	2026-05-31 22:42:53 +00:00
bender	d4f1f24210	Update src/app/collections/page.tsx	2026-05-31 22:42:53 +00:00
bender	ae8a61fab9	Update src/app/collections/embercell/page.tsx	2026-05-31 22:42:52 +00:00
bender	0c31b2de7b	Update src/app/collections/aqua/page.tsx	2026-05-31 22:42:52 +00:00
bender	d3952bcf3e	Update src/app/collections/[collectionId]/page.tsx	2026-05-31 22:42:51 +00:00
bender	e3f1f794e0	Merge version_3 into main Merge version_3 into main	2026-05-31 22:41:14 +00:00
bender	f67d61ae42	Merge version_3 into main Merge version_3 into main	2026-05-31 22:40:50 +00:00
bender	e22caec5de	Merge version_3 into main Merge version_3 into main	2026-05-31 22:40:20 +00:00