Merge pull request 'main' (#9) from main into dev

Reviewed-on: #9

public/assets/css/demo-slick/demo-slick.css

@@ -2,6 +2,7 @@
   --font-global: "Plus Jakarta Sans", sans-serif;
   --font-alt: "Plus Jakarta Sans", sans-serif;
   --section-padding-y: 50px;
+  --color-teal-1: #64b3b4;
   --color-dark-1: #1e2432;
   --color-dark-2: #282e3c;
   --color-dark-3: #303747;
@@ -58,7 +59,8 @@
   --gradient-gray-light-1: linear-gradient(0deg, #f5f5f5 0%, #fff 100%);
   --gradient-gray-light-2: linear-gradient(0deg, #fff 0%, #f5f5f5 100%);
   --gradient-dark-alpha-1: linear-gradient(90deg, var(--color-dark-1) 40%, transparent 87%);
-  --gradient-dark-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-dark-1) 60%);
+  --gradient-dark-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-teal-1) 50%);
+  --gradient-teal-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-teal-1) 50%);
   --gradient-primary-alpha-1: linear-gradient(90deg, var(--color-primary-1) 40%, transparent 87%);
   --gradient-primary-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-primary-1) 60%);
   --gradient-gray-light-1: linear-gradient(0deg, #f7f9fc 0%, #fff 100%);
@@ -113,7 +115,8 @@
     var(--color-primary-1) 100%
   );
   --gradient-dark-alpha-1: linear-gradient(90deg, var(--color-dark-1) 40%, transparent 87%);
-  --gradient-dark-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-dark-1) 60%);
+  --gradient-dark-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-teal-1) 50%);
+  --gradient-teal-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-teal-1) 50%);
   --gradient-primary-alpha-1: linear-gradient(90deg, var(--color-primary-1) 40%, transparent 87%);
   --gradient-primary-alpha-2: linear-gradient(90deg, transparent 13%, var(--color-primary-1) 60%);
 }

public/assets/css/style.css

@@ -3908,6 +3908,10 @@ a.logo:hover {
   display: none;
 }
 
+.body-scrolled .social-nav {
+  color: var(--color-dark-3);
+}
+
 /* Menu sub */
 
 .inner-nav .mi-chevron-down {

src/app/(main)/[slug]/page.tsx

@@ -59,7 +59,6 @@ function Loading() {
   return (
     <>
       <HeroOther />
-
       {/* Section */}
       <BlogDetailContentSkeleton />
       {/* End Section */}

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

@@ -31,8 +31,8 @@ export default async function BlogPage({ searchParams }: { searchParams?: Promis
                 placeholder="Search blog..."
                 className="input-lg input-circle form-control h-12"
               />
-              <div className="input-group-append">
+              <div className="input-group-append px-2">
-                <button className="btn btn-info text-white h-12" type="submit">
+                <button className="btn btn-info text-white h-12 px-5" type="submit">
                   Search
                 </button>
               </div>

src/app/globals.css

@@ -10,6 +10,7 @@
   --ext-color-primary-5: #e7ccc0;
   --ext-color-primary-6: #64b3b4;
   --ext-color-primary-7: #a8dcca;
+  --ext-color-primary-8: #e3b19b;
   --background: #ffffff;
   --foreground: #171717;
 }
@@ -23,6 +24,7 @@
     --ext-color-primary-5: #e7ccc0;
     --ext-color-primary-6: #64b3b4;
     --ext-color-primary-7: #a8dcca;
+    --ext-color-primary-8: #e3b19b;
     --background: #0a0a0a;
     --foreground: #ededed;
   }

src/components/Blocks/BeforeFooter/index.tsx

@@ -52,7 +52,7 @@ export function BeforeFooterBlock({ title, description, buttonText, showLinier =
         <div className="pt-5">
           <Link
             href="/contact"
-            className="inline-block bg-[#2E2D51] hover:bg-[#232244] text-white py-3 px-6 rounded-full text-lg shadow-lg transition-all"
+            className="inline-block bg-extColorPrimary6 hover:bg-extColorPrimary8 text-white py-3 px-6 rounded-full text-lg shadow-lg transition-all duration-500"
           >
             {buttonText ?? placeholderButtonText} →
           </Link>

src/components/Blogs/BlogCardItem.tsx

@@ -20,7 +20,7 @@ export interface BlogCardItemProps {
 export function BlogCardItem({ data }: BlogCardItemProps) {
   return (
     <div className="post-prev-3 col-12 col-md-6 col-lg-4 col-xl-4 mt-50">
-      <div className="post-prev-3-container flex flex-col">
+      <div className="post-prev-3-container flex flex-col shadow-md hover:scale-[1.02]">
         <div className="relative w-full h-[200px]">
           <a href={`/${data.slug}/`}>
             <Image src={data?.img?.url ?? ""} alt={data?.img?.alt ?? ""} fill className="object-cover" />

src/components/Header.tsx

@@ -5,6 +5,12 @@ import { navMenuData } from "@/data/menu";
 import { toggleMobileMenu } from "@/utils/toggleMobileMenu";
 import Image from "next/image";
 import Link from "next/link";
+import { FaFacebook, FaLinkedin, FaTwitter } from "react-icons/fa";
+const shareIcons: Record<string, any> = {
+  facebook: <FaFacebook className="social-nav text-2xl lg:text-gray-300" />,
+  linkedin: <FaLinkedin className="social-nav text-2xl lg:text-gray-300" />,
+  twitter: <FaTwitter className="social-nav text-2xl lg:text-gray-300" />,
+};
 
 export default function Header({ links }: { links: typeof navMenuData }) {
   return (
@@ -49,6 +55,15 @@ export default function Header({ links }: { links: typeof navMenuData }) {
           <li></li>
         </ul>
       </div>
+      <div className="flex mt-4 gap-3">
+        {Object.keys(shareIcons).map((k, idx) => {
+          return (
+            <a key={idx} className="cursor-pointer" href={"/"} target="_blank">
+              {shareIcons[k]}
+            </a>
+          );
+        })}
+      </div>
       {/* End Main Menu */}
     </div>
   );

src/components/Hero.tsx

@@ -7,7 +7,7 @@ export default function Hero() {
 
   return (
     <section className="home-section bg-dark-1 bg-dark-alpha-30 light-content scrollSpysection" id="home">
-      <div className="container min-h-[90vh] d-flex align-items-center pt-100 pb-100 pt-sm-120 pb-sm-120">
+      <div className="container min-h-[80vh] d-flex align-items-center pt-100 pb-100 pt-sm-120 pb-sm-120">
         {/* Background Video */}
         {/* Please replace the video file in folder "video" with your own file */}
         <div className="bg-video-wrapper">

src/components/HeroOther.tsx

@@ -16,17 +16,17 @@ const shareIcons: Record<string, any> = {
 
 export default function HeroOther({ title, img, createdAt, shareUrl }: HeroOtherProps) {
   return (
-    <section className="page-section bg-dark-1 bg-gradient-gray-dark-1 light-content bg-scroll overflow-hidden !py-20 md:!py-48 relative">
+    <section className="page-section bg-dark-1 bg-gradient-gray-dark-1 light-content bg-scroll overflow-hidden !py-20 md:!pt-32 md:!pb-24 relative min-h-[48vh]">
       {/* <!-- Background Shape --> */}
-      <div className="bg-shape-1 w-full h-full opacity-50">
+      <div className="bg-shape-1 w-full h-full opacity-50 bg-contain">
-        <Image src={!!img ? img : "/assets/images/hero-default.webp"} fill alt="" />
+        <Image src={img || "/assets/images/hero-default.webp"} alt="" fill className="object-cover" />
       </div>
       {/* <!-- End Background Shape --> */}
 
       <div className="container position-relative pt-sm-40 text-center">
         <div className="row">
           <div className="col-md-10 offset-md-1 col-lg-8 offset-lg-2">
-            <h1 className="hs-title-10 mb-10">{title ?? ""}</h1>
+            <h1 className="text-5xl !font-medium mb-10 leading-[1.5]">{title ?? ""}</h1>
             {!!createdAt && (
               <div className="blog-item-data mb-0 wow fadeIn" data-wow-delay="0.2s">
                 <div className="flex justify-center items-center">

src/components/Homepage.tsx

@@ -16,29 +16,21 @@ export default function homepage({ dark = false }) {
             <Image src="/assets/images/demo-slick/decoration-2.svg" alt="Image Description" width={128} height={228} />
           </div>
         </div>
-        <div className="w-full absolute -top-20 md:-top-40 lg:-top-20 z-[99] flex">
+        <div className="relative">
-          <div className="bg-white w-11/12 lg:w-9/12 xl:w-8/12 mx-auto flex flex-col md:flex-row p-3 space-x-3 space-y-3 rounded-xl shadow-xl">
+          <div className="w-full mt-[-100px] md:mt-[-150px] lg:mt-[-100px] 2xl:mt-[-200px] mb-[50px] z-[99] flex justify-center">
-            <div className="flex-1 relative">
+            <div className="bg-white h-full flex flex-col lg:flex-row flex-wrap justify-center p-4 lg:p-8 gap-3 rounded-xl shadow-xl">
               <Image
+                className="rounded-xl"
                 src="/assets/images/Cochise_New-service_Radixact-Announcement-900x900-1-1-768x768.webp"
-                alt=""
+                width={450}
-                width={500}
                 height={0}
-                className="w-full h-auto rounded-xl"
-              />
-            </div>
-            <div className="flex-1 relative">
-              <Image
-                src="/assets/images/cochise-welcome.png"
                 alt=""
-                width={500}
-                height={0}
-                className="w-full h-auto rounded-xl"
               />
+              <Image className="rounded-xl" src="/assets/images/cochise-welcome.png" width={500} height={0} alt="" />
             </div>
           </div>
         </div>
-        <div className="w-full flex flex-wrap justify-center space-x-5 space-y-4 mt-[550px] md:mt-[24vh] lg:mt-[62vh] wow fadeInUp">
+        <div className="w-full flex flex-wrap justify-center space-x-5 wow fadeInUp">
           <Link href="/radiation-oncology">
             <div className="w-[320px] h-[320px] hover:scale-105 transition-transform duration-500 bg-[url('/assets/images/cochise-radiation-oncology-768x512.webp')] bg-cover rounded-full flex items-center justify-center overflow-auto relative">
               <div className="h-full w-full rounded-full bg-gradient-to-b from-[#E3B19B82] to-[#798D90] text-center align-middle flex items-center justify-center"></div>

tailwind.config.ts

@@ -18,6 +18,7 @@ export default {
         extColorPrimary5: "var(--ext-color-primary-5)",
         extColorPrimary6: "var(--ext-color-primary-6)",
         extColorPrimary7: "var(--ext-color-primary-7)",
+        extColorPrimary8: "var(--ext-color-primary-8)",
       },
     },
   },