Merge branch 'main' of https://giteadev3.link/rankrunners-dev/next-cochise into main

src/app/(main)/coba/page.tsx

@@ -1,9 +1,5 @@
 import { ImageSliderBlock } from "@/components/Blocks/ImageSlider";
 
 export default function CobaPage() {
-  return (
-    <>
-      <ImageSliderBlock />
-    </>
-  );
+  return <>{/* <ImageSliderBlock /> */}</>;
 }

src/app/(main)/home-bg-video/page.tsx

@@ -3,7 +3,7 @@ import Hero from "@/components/Hero";
 import dynamic from "next/dynamic";
 
 const ParallaxContainer = dynamic(() => import("@/components/ParallaxContainer"), {
-  ssr: true,
+  ssr: false,
 });
 
 export default function Home1BGVideoMultiPage() {

src/collections/Pages.ts

@@ -1,6 +1,7 @@
 import { BeforeFooterBlock } from "@/blocks/BeforeFooter";
 import { ContentBlock } from "@/blocks/Content";
 import { HorizontalImageContentBlock } from "@/blocks/HorizontalImageContent";
+import { ImageSliderBlock } from "@/blocks/ImageSlider";
 import { OurTeamBlock } from "@/blocks/OurTeam";
 import formatSlug from "@/utils/formatSlug";
 import { CollectionConfig } from "payload";
@@ -36,7 +37,7 @@ export const Pages: CollectionConfig = {
       label: "Page Layout",
       type: "blocks",
       minRows: 1,
-      blocks: [ContentBlock, BeforeFooterBlock, OurTeamBlock, HorizontalImageContentBlock],
+      blocks: [ContentBlock, BeforeFooterBlock, OurTeamBlock, HorizontalImageContentBlock, ImageSliderBlock],
     },
     {
       name: "meta",

src/components/Blocks/RenderBlocks.tsx

@@ -5,12 +5,14 @@ import { ContentBlock } from "./Content";
 import { BeforeFooterBlock } from "./BeforeFooter";
 import { OurTeamBlock } from "./OurTeam";
 import { HorizontalImageContentBlock } from "./HorizontalImageContent";
+import { ImageSliderBlock } from "./ImageSlider";
 
 const blockComponents = {
   contentBlock: ContentBlock,
   beforeFooterBlock: BeforeFooterBlock,
   ourTeamBlock: OurTeamBlock,
   horizontalImageContentBlock: HorizontalImageContentBlock,
+  imageSliderBlock: ImageSliderBlock,
 };
 
 export const RenderBlocks: React.FC<{

src/components/Hero.tsx

@@ -60,9 +60,9 @@ export default function Hero6() {
                 >
                   Learn More
                 </a>
-                <Link href="/radixact">
+                <Link href="/contact">
                   <button className="btn btn-mod btn-w btn-border-w btn-round btn-large btn-hover-anim ms-1 me-1 mt-2 align-middle w-full md:w-1/4">
-                    <span>Request Consultant</span>
+                    <span>Request Consultation</span>
                   </button>
                 </Link>
               </div>

src/components/Homepage.tsx

@@ -1,12 +1,10 @@
-import React from "react";
-
+import { features4 } from "@/data/features";
+import Image from "next/image";
+import Link from "next/link";
+import Blog from "./Blogs/Blog";
+import Cta3 from "./cta3";
 import Facts from "./Facts";
 import Service from "./Service";
-import Image from "next/image";
-import Blog from "./Blogs/Blog";
-import Link from "next/link";
-import { features4 } from "@/data/features";
-import Cta3 from "./cta3";
 
 export default function homepage({ onePage = false, dark = false }) {
   return (

src/payload-types.ts

@@ -197,6 +197,17 @@ export interface Page {
             blockName?: string | null;
             blockType: 'horizontalImageContentBlock';
           }
+        | {
+            images?:
+              | {
+                  image?: (number | null) | Media;
+                  id?: string | null;
+                }[]
+              | null;
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'imageSliderBlock';
+          }
       )[]
     | null;
   meta?: {
@@ -569,6 +580,18 @@ export interface PagesSelect<T extends boolean = true> {
               id?: T;
               blockName?: T;
             };
+        imageSliderBlock?:
+          | T
+          | {
+              images?:
+                | T
+                | {
+                    image?: T;
+                    id?: T;
+                  };
+              id?: T;
+              blockName?: T;
+            };
       };
   meta?:
     | T