pull and update footer

src/components/Blogs/Blog.tsx

@@ -17,8 +17,23 @@ export default async function Blog() {
           <div className="col-lg-8 offset-lg-2 text-center mb-md-30">
             <h2 className="section-caption-slick mb-30 mb-sm-20">Our Blog</h2>
             <h3 className="section-title mb-30">Check the latest news about our company in our blog.</h3>
+            <p className="section-descr mb-0">
+              There are three kinds of web developer specialization front-end developer, back-end developer, and
+              full-stack developer.
+            </p>
+          </div>
+          <div className="col-lg-2 d-flex align-items-end">
+            <div className="local-scroll text-center text-lg-end w-100">
+              <Link href={`/slick-blog-dark`} className="link-hover-anim" data-link-animate="y">
+                <span className="link-strong link-strong-unhovered">
+                  Our blog <i className="mi-arrow-right size-24" aria-hidden="true"></i>
+                </span>
+                <span className="link-strong link-strong-hovered" aria-hidden="true">
+                  Our blog <i className="mi-arrow-right size-24" aria-hidden="true"></i>
+                </span>
+              </Link>
+            </div>
           </div>
-          <div className="col-lg-2 d-flex align-items-end"></div>
         </div>
         {/* Blog Posts Grid */}
         <div className="row mt-n30">
@@ -27,7 +42,7 @@ export default async function Blog() {
             <div key={i} className="post-prev-3 col-12 col-lg-10 offset-lg-1 col-xl-6 offset-xl-0 mt-30">
               <div className="post-prev-3-container d-block d-sm-flex">
                 <div className="post-prev-3-img">
-                  <Link href={`/blog/${elm.slug}`}>
+                  <Link href={elm.slug}>
                     <Image
                       src={elm.imgFormatted.url}
                       width={400}
@@ -39,7 +54,7 @@ export default async function Blog() {
                 </div>
                 <div className="post-prev-3-intro">
                   <h4 className="post-prev-3-title">
-                    <Link href={`/blog/${elm.slug}`}>{elm.title}</Link>
+                    <Link href={elm.slug}>{elm.title}</Link>
                   </h4>
                   <div className="post-prev-3-text">{sanitizeBlogContentIntoStringPreview(elm.content)}</div>
                   <div className="post-prev-3-info clearfix">
@@ -53,12 +68,6 @@ export default async function Blog() {
           ))}
           {/* End Post Item */}
         </div>
-        <Link href={`/blog`} className="link-hover-anim mt-5 hover:opacity-[.8] float-end">
-          <span>
-            Our blog <i className="mi-arrow-right" aria-hidden="true"></i>
-          </span>
-        </Link>
-
         {/* End Blog Posts Grid */}
       </div>
     </>

src/components/Footer.tsx

@@ -15,7 +15,6 @@ export default function Footer() {
         <div className="w-full md:w-1/4 mb-6 md:mb-0 flex flex-col items-start">
           <Image src="/assets/images/demo-slick/logo-dark.webp" alt="Cochise Oncology Logo" width={363} height={138} />
           <p className="text-sm mt-3">© {new Date().getFullYear()} All Rights Reserved</p>
-          <p className="text-sm text-orange-300 font-semibold">Website by Megaphone Designs</p>
           <a href="/privacy-policy" className="text-sm text-orange-300 font-semibold">
             Privacy Policy
           </a>
@@ -23,7 +22,7 @@ export default function Footer() {
 
         <div className="w-full md:w-1/3 mb-6 md:mb-0">
           <h3 className="text-lg font-semibold mb-4">Contact Us</h3>
-          <ul className="space-y-4 border-gray-400 pl-4">
+          <ul className="space-y-4 border-gray-400 pl-0">
             <li className="flex items-center space-x-4 border-b border-gray-500 pb-2">
               <FaMapMarkerAlt className="text-2xl text-gray-300" />
               <div className="leading-tight">

src/components/Homepage.tsx

@@ -5,6 +5,20 @@ import Blog from "./Blogs/Blog";
 import Cta3 from "./cta3";
 import Facts from "./Facts";
 import Service from "./Service";
+<<<<<<< HEAD
+import Image from "next/image";
+import Testimonials from "./Testimonials";
+import Blog from "./Blogs/Blog";
+import Newsletter from "./Newsletter";
+import Contact from "./Contacts/Contact";
+import Link from "next/link";
+import TestimonialsDark from "./TestimonialsDark";
+import ContactDark from "./ContactDark";
+import { features4 } from "@/data/features";
+import Cta3 from "./cta3";
+import { fetchBlog } from "@/services/payload/blog";
+=======
+>>>>>>> a16f9d0ca8184e03b85217be1656938178f0ce00
 
 export default function homepage({ onePage = false, dark = false }) {
   return (