diff --git a/frontEnd/app/services/[slug]/page.tsx b/frontEnd/app/services/[slug]/page.tsx index 5a4ca70c..9c096843 100644 --- a/frontEnd/app/services/[slug]/page.tsx +++ b/frontEnd/app/services/[slug]/page.tsx @@ -12,7 +12,11 @@ import ServicesInitAnimations from "@/components/pages/services/ServicesInitAnim import { Service } from "@/lib/api/serviceService"; import { generateServiceMetadata } from "@/lib/seo/metadata"; import { ServiceSchema, BreadcrumbSchema } from "@/components/shared/seo/StructuredData"; +<<<<<<< HEAD import { API_CONFIG, getApiHeaders } from "@/lib/config/api"; +======= +import { API_CONFIG } from "@/lib/config/api"; +>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5 interface ServicePageProps { params: Promise<{ @@ -24,6 +28,7 @@ interface ServicePageProps { // This pre-generates known pages, but new pages can still be generated on-demand export async function generateStaticParams() { try { +<<<<<<< HEAD // Use internal API URL for server-side requests const apiUrl = process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://127.0.0.1:1086'; const response = await fetch( @@ -31,6 +36,15 @@ export async function generateStaticParams() { { method: 'GET', headers: getApiHeaders(), +======= + const response = await fetch( + `${API_CONFIG.BASE_URL}/api/services/`, + { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, +>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5 next: { revalidate: 60 }, // Revalidate every minute for faster image updates } ); @@ -57,6 +71,7 @@ export async function generateMetadata({ params }: ServicePageProps) { const { slug } = await params; try { +<<<<<<< HEAD // Use internal API URL for server-side requests const apiUrl = process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://127.0.0.1:1086'; const response = await fetch( @@ -64,6 +79,15 @@ export async function generateMetadata({ params }: ServicePageProps) { { method: 'GET', headers: getApiHeaders(), +======= + const response = await fetch( + `${API_CONFIG.BASE_URL}/api/services/${slug}/`, + { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, +>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5 next: { revalidate: 60 }, // Revalidate every minute for faster image updates } ); @@ -87,6 +111,7 @@ const ServicePage = async ({ params }: ServicePageProps) => { const { slug } = await params; try { +<<<<<<< HEAD // Use internal API URL for server-side requests const apiUrl = process.env.INTERNAL_API_URL || process.env.NEXT_PUBLIC_API_URL || 'http://127.0.0.1:1086'; const response = await fetch( @@ -94,6 +119,15 @@ const ServicePage = async ({ params }: ServicePageProps) => { { method: 'GET', headers: getApiHeaders(), +======= + const response = await fetch( + `${API_CONFIG.BASE_URL}/api/services/${slug}/`, + { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, +>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5 next: { revalidate: 60 }, // Revalidate every minute for faster image updates } ); diff --git a/frontEnd/app/support-center/page.tsx b/frontEnd/app/support-center/page.tsx index 0d3ac26c..bf7922b4 100644 --- a/frontEnd/app/support-center/page.tsx +++ b/frontEnd/app/support-center/page.tsx @@ -12,8 +12,29 @@ type ModalType = 'create' | 'knowledge' | 'status' | null; const SupportCenterPage = () => { // Set metadata for client component useEffect(() => { +<<<<<<< HEAD // Only run on client side if (typeof window === 'undefined' || typeof document === 'undefined') return; +======= + const metadata = createMetadata({ + title: "Support Center - Enterprise Support & Help Desk", + description: "Get 24/7 enterprise support from GNX Soft. Access our knowledge base, create support tickets, check ticket status, and get help with our software solutions and services.", + keywords: [ + "Support Center", + "Customer Support", + "Help Desk", + "Technical Support", + "Knowledge Base", + "Support Tickets", + "Enterprise Support", + "IT Support", + ], + url: "/support-center", + }); + + const titleString = typeof metadata.title === 'string' ? metadata.title : "Support Center | GNX Soft"; + document.title = titleString; +>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5 try { const metadata = createMetadata({ diff --git a/frontEnd/components/pages/about/AboutBanner.tsx b/frontEnd/components/pages/about/AboutBanner.tsx index 8bb89e81..91fba988 100644 --- a/frontEnd/components/pages/about/AboutBanner.tsx +++ b/frontEnd/components/pages/about/AboutBanner.tsx @@ -227,7 +227,11 @@ const AboutBanner = () => { {/* Social Links */}
+<<<<<<< HEAD +======= + +>>>>>>> d7d7a2757a183aa1abd9dbabff804c45298df4e5 diff --git a/frontEnd/components/pages/career/CareerBanner.tsx b/frontEnd/components/pages/career/CareerBanner.tsx index feb99389..94a11165 100644 --- a/frontEnd/components/pages/career/CareerBanner.tsx +++ b/frontEnd/components/pages/career/CareerBanner.tsx @@ -117,7 +117,11 @@ const CareerBanner = () => {