From adef27b214941cd008280eae32f288c019f1b883 Mon Sep 17 00:00:00 2001
From: nguyenvanbao <nguyenhoanggiaphong12@gmail.com>
Date: Tue, 3 Feb 2026 16:24:55 +0700
Subject: [PATCH] feat: refactor service API schema and update layout structure

---
 api/servicesApi.ts                   |  62 ---------------------------
 app/layout.tsx                       |  44 ++++++++++++-------
 app/services/details/[slug]/page.tsx |   7 ++-
 app/services/page.tsx                |  51 ++++++++++++++++++++--
 app/utils/image.ts                   |  12 +++++-
 public/_images/default.jpg           | Bin 0 -> 2220 bytes
 6 files changed, 92 insertions(+), 84 deletions(-)
 create mode 100644 public/_images/default.jpg

diff --git a/api/servicesApi.ts b/api/servicesApi.ts
index a3f9117..1fcf7dc 100644
--- a/api/servicesApi.ts
+++ b/api/servicesApi.ts
@@ -8,7 +8,6 @@
 ======================= */
 
 export interface ServiceItem {
-  id: string;
   slug: string;
   name: string;
   description: string;
@@ -58,7 +57,6 @@ export interface DestinationSection {
     subTitle: string;
     mainTitle: string;
   };
-  items: CountryItem[];
 }
 
 export interface VisaItem {
@@ -90,11 +88,6 @@ export interface ReviewSection {
     subTitle: string;
     mainTitle: string;
   };
-  viewAllButton: {
-    text: string;
-    icon: string;
-    link: string;
-  };
   thumb: string;
   items: ClientReviewItem[];
 }
@@ -251,7 +244,6 @@ export const getFallbackServicePageData = (): ServicePageData => ({
     },
     items: [
       {
-        id: "immigration-appeal",
         slug: "immigration-appeal",
         name: "Immigration Appeal & Legal Support",
         description:
@@ -311,7 +303,6 @@ export const getFallbackServicePageData = (): ServicePageData => ({
         },
       },
       {
-        id: "scholarship-guidance",
         slug: "scholarship-guidance",
         name: "Scholarship & Study Grant Guidance",
         description:
@@ -373,7 +364,6 @@ export const getFallbackServicePageData = (): ServicePageData => ({
         },
       },
       {
-        id: "permanent-residency",
         slug: "permanent-residency",
         name: "Permanent Residency (PR) Services",
         description:
@@ -435,7 +425,6 @@ export const getFallbackServicePageData = (): ServicePageData => ({
         },
       },
       {
-        id: "citizenship-naturalization",
         slug: "citizenship-naturalization",
         name: "Citizenship & Naturalization Guidance",
         description:
@@ -505,52 +494,6 @@ export const getFallbackServicePageData = (): ServicePageData => ({
       subTitle: "Countries we offer",
       mainTitle: "Choose Your Immigration Destination",
     },
-    items: [
-      {
-        id: "canada",
-        name: "Canada",
-        description:
-          "Canada provides quality education, rich and global opportunities",
-        image: "/assets/img/home-3/choose-us/01.jpg",
-        icon: "/assets/img/home-3/choose-us/icon-1.png",
-        link: "/countries/canada",
-      },
-      {
-        id: "south-korea",
-        name: "South Korea",
-        description:
-          "South Korea offers advanced technology and cultural experiences",
-        image: "/assets/img/home-3/choose-us/02.jpg",
-        icon: "/assets/img/home-3/choose-us/icon-2.png",
-        link: "/countries/south-korea",
-      },
-      {
-        id: "france",
-        name: "France",
-        description: "France offers unique cultural experiences and education",
-        image: "/assets/img/home-3/choose-us/03.jpg",
-        icon: "/assets/img/home-3/choose-us/icon-3.png",
-        link: "/countries/france",
-      },
-      {
-        id: "uk",
-        name: "UK",
-        description:
-          "UK provides world-class education and career opportunities",
-        image: "/assets/img/home-3/choose-us/04.jpg",
-        icon: "/assets/img/home-3/choose-us/icon-2.png",
-        link: "/countries/uk",
-      },
-      {
-        id: "germany",
-        name: "Germany",
-        description:
-          "Germany offers excellent education and work opportunities",
-        image: "/assets/img/home-3/choose-us/05.jpg",
-        icon: "/assets/img/home-3/choose-us/icon-3.png",
-        link: "/countries/germany",
-      },
-    ],
   },
 
   visas: {
@@ -590,11 +533,6 @@ export const getFallbackServicePageData = (): ServicePageData => ({
       subTitle: "What Our Clients Say",
       mainTitle: "Immigration Success Stories",
     },
-    viewAllButton: {
-      text: "View All Review",
-      icon: "fa-solid fa-arrow-right",
-      link: "/contact",
-    },
     thumb: "/assets/img/home-3/test-thumb.jpg",
     items: [
       {
diff --git a/app/layout.tsx b/app/layout.tsx
index d330d31..0b131a9 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,9 +1,8 @@
 import type { Metadata } from "next";
 import "./globals.css";
 
-
-import Header from "./components/Header";
-import Footer from "./components/Footer";
+// import Header from "./components/Header";
+// import Footer from "./components/Footer";
 import Loader from "./components/Loader";
 import BackToTop from "./components/BackToTop";
 import MouseCursor from "./components/MouseCursor";
@@ -24,7 +23,7 @@ export default function RootLayout({
       <head>
         {/* Favicon */}
         <link rel="shortcut icon" href="/assets/img/favicon.png" />
-        
+
         {/* Bootstrap min.css */}
         <link rel="stylesheet" href="/assets/css/bootstrap.min.css" />
         {/* All Min Css */}
@@ -35,7 +34,7 @@ export default function RootLayout({
         <link rel="stylesheet" href="/assets/css/magnific-popup.css" />
         {/* MeanMenu.css */}
         <link rel="stylesheet" href="/assets/css/meanmenu.css" />
-         {/* Odometer.css */}
+        {/* Odometer.css */}
         <link rel="stylesheet" href="/assets/css/odometer.css" />
         {/* Swiper Bundle.css */}
         <link rel="stylesheet" href="/assets/css/swiper-bundle.min.css" />
@@ -44,22 +43,37 @@ export default function RootLayout({
         {/* Main.css */}
         <link rel="stylesheet" href="/assets/css/main.css" />
       </head>
-     <body className="smooth-scroll-yes">
+      <body className="smooth-scroll-yes">
         <Loader />
         <BackToTop />
         <MouseCursor />
-        <Header />
-        
+        {/* <Header /> */}
+
         {children}
-        
-        <Footer />
+
+        {/* <Footer /> */}
 
         {/* Scripts */}
-        <Script src="/assets/js/jquery-3.7.1.min.js" strategy="beforeInteractive" />
-        <Script src="/assets/js/viewport.jquery.js" strategy="afterInteractive" />
-        <Script src="/assets/js/bootstrap.bundle.min.js" strategy="afterInteractive" />
-        <Script src="/assets/js/jquery.nice-select.min.js" strategy="afterInteractive" />
-        <Script src="/assets/js/jquery.waypoints.js" strategy="afterInteractive" />
+        <Script
+          src="/assets/js/jquery-3.7.1.min.js"
+          strategy="beforeInteractive"
+        />
+        <Script
+          src="/assets/js/viewport.jquery.js"
+          strategy="afterInteractive"
+        />
+        <Script
+          src="/assets/js/bootstrap.bundle.min.js"
+          strategy="afterInteractive"
+        />
+        <Script
+          src="/assets/js/jquery.nice-select.min.js"
+          strategy="afterInteractive"
+        />
+        <Script
+          src="/assets/js/jquery.waypoints.js"
+          strategy="afterInteractive"
+        />
         <Script src="/assets/js/odometer.min.js" strategy="afterInteractive" />
         <Script
           src="/assets/js/swiper-bundle.min.js"
diff --git a/app/services/details/[slug]/page.tsx b/app/services/details/[slug]/page.tsx
index 27f76fa..afd8a6a 100644
--- a/app/services/details/[slug]/page.tsx
+++ b/app/services/details/[slug]/page.tsx
@@ -16,7 +16,6 @@ export async function generateMetadata({
   try {
     const { slug } = await params;
     const data = await fetchServiceBySlug(slug);
-
     if (!data || !data.serviceDetails) {
       return {
         title: "Service Not Found",
@@ -112,6 +111,10 @@ export default async function ServiceDetailsPage({
                           <div className="accordion" id="accordionExample">
                             {faq.items.map((faqItem: any, index: number) => {
                               const isExpanded = faqItem.isExpanded;
+                              const questionNumber = String(index + 1).padStart(
+                                2,
+                                "0",
+                              );
                               return (
                                 <div
                                   key={`faq-${index}`}
@@ -132,7 +135,7 @@ export default async function ServiceDetailsPage({
                                       }
                                       aria-controls={`collapse${index}`}
                                     >
-                                      {faqItem.question}
+                                      {questionNumber}. {faqItem.question}
                                     </button>
                                   </h5>
                                   <div
diff --git a/app/services/page.tsx b/app/services/page.tsx
index 0817cfb..1d1a476 100644
--- a/app/services/page.tsx
+++ b/app/services/page.tsx
@@ -11,6 +11,51 @@ export const metadata: Metadata = {
 export default async function ServicesPage() {
   const data = await fetchServicePageData();
   const { services, destinations, visas, reviews } = data;
+  const country = [
+    {
+      id: "canada",
+      name: "Canada",
+      description:
+        "Canada provides quality education, rich culture and global opportunities",
+      image: "img/home-3/choose-us/01.jpg",
+      icon: "img/home-3/choose-us/icon-1.png",
+      link: "country-details.html",
+    },
+    {
+      id: "south-korea",
+      name: "South Korea",
+      description:
+        "South Korea offers advanced technology and cultural experiences",
+      image: "img/home-3/choose-us/02.jpg",
+      icon: "img/home-3/choose-us/icon-2.png",
+      link: "country-details.html",
+    },
+    {
+      id: "france",
+      name: "France",
+      description:
+        "France offers rich cultural heritage and educational excellence",
+      image: "img/home-3/choose-us/03.jpg",
+      icon: "img/home-3/choose-us/icon-3.png",
+      link: "country-details.html",
+    },
+    {
+      id: "uk",
+      name: "UK",
+      description: "UK provides world-class education and career opportunities",
+      image: "img/home-3/choose-us/04.jpg",
+      icon: "img/home-3/choose-us/icon-2.png",
+      link: "country-details.html",
+    },
+    {
+      id: "germany",
+      name: "Germany",
+      description: "Germany offers excellent education and strong economy",
+      image: "img/home-3/choose-us/05.jpg",
+      icon: "img/home-3/choose-us/icon-3.png",
+      link: "country-details.html",
+    },
+  ];
 
   return (
     <>
@@ -99,7 +144,7 @@ export default async function ServicesPage() {
             </h2>
           </div>
           <div className="destination-offer-wrapper-3 fade-up-anim row g-4 g-xl-4 row-cols-xl-5 row-cols-lg-4 row-cols-md-2 row-cols-1">
-            {destinations.items.map((country: any) => (
+            {country.map((country: any) => (
               <div key={country.id} className="col destination-offer-item">
                 <div className="choose-us-image">
                   <img src={imageUrl(country.image)} alt="img" />
@@ -122,7 +167,7 @@ export default async function ServicesPage() {
       </section>
 
       {/* Service-Visa Section Start */}
-      <section className="service-visa-section fix">
+      {/* <section className="service-visa-section fix">
         <div className="container">
           <div className="service-visa-wrapper">
             {visas.items.map((visa: any, index: number) => (
@@ -144,7 +189,7 @@ export default async function ServicesPage() {
             ))}
           </div>
         </div>
-      </section>
+      </section> */}
 
       {/* Testimonial Section3 Start */}
       <section className="testimonial-section section-padding fix">
diff --git a/app/utils/image.ts b/app/utils/image.ts
index f019bb1..9bae754 100644
--- a/app/utils/image.ts
+++ b/app/utils/image.ts
@@ -1,5 +1,13 @@
 export const imageUrl = (path?: string) => {
-  if (!path) return "";
+  // Không có ảnh → ảnh mặc định
+  if (!path) return "/_images/default.jpg";
+
+  // Đã là full URL
   if (path.startsWith("http")) return path;
-  return `${process.env.NEXT_PUBLIC_API_URL}/${path}`;
+
+  const base = (
+    process.env.NEXT_PUBLIC_API_URL || "http://localhost:3001"
+  ).replace(/\/$/, "");
+
+  return `${base}/${path.replace(/^\//, "")}`;
 };
diff --git a/public/_images/default.jpg b/public/_images/default.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b0e2512518fd43726d8c8f0a871331049aefd729
GIT binary patch
literal 2220
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
PUjZ;Tu`+&Z==tm)ci<Mb

literal 0
HcmV?d00001