diff --git a/api.http b/api.http index 141dff6..99d28f6 100644 --- a/api.http +++ b/api.http @@ -29,5 +29,9 @@ GET {{domain}}/api/yoga-single-services?filters[name][$eq]=service4 Accept: application/json ### GET service page -GET {{domain}}/api/service-page?fields[0]=*&populate[subscribeNow][fields][0]=*&populate[footer][fields][0]=*&populate[footer][populate][links][fields][0]=*&populate[footer][populate][contactUsEmail][fields][0]=*&populate[footer][populate][contactUsLocation][fields][0]=*&populate[footer][populate][contactUsPhoneNumber][fields][0]=* +GET {{domain}}/api/contact-page?fields[0]=*&populate[contactUs][fields][0]=*&populate[google_maps][fields][0]=*&populate[subscribe][fields][0]=*&populate[footer][fields][0]=*&populate[footer][populate][links][fields][0]=*&populate[footer][populate][contactUsEmail][fields][0]=*&populate[footer][populate][contactUsLocation][fields][0]=*&populate[footer][populate][contactUsPhoneNumber][fields][0]=* Accept: application/json + + + + diff --git a/yoga-app/src/api/strapi/query/about.json b/yoga-app/src/api/strapi/query/about.json index d561965..1b7e32f 100644 --- a/yoga-app/src/api/strapi/query/about.json +++ b/yoga-app/src/api/strapi/query/about.json @@ -1,8 +1,17 @@ { + "populate": { "header": { "fields": ["header1","description"] }, + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, "aboutUs": { "fields": ["*"], "populate": { diff --git a/yoga-app/src/api/strapi/query/contact.json b/yoga-app/src/api/strapi/query/contact.json index 56996a5..1398177 100644 --- a/yoga-app/src/api/strapi/query/contact.json +++ b/yoga-app/src/api/strapi/query/contact.json @@ -1,6 +1,14 @@ { "fields": ["*"], "populate": { + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, "contactUs": { "fields": ["*"] }, diff --git a/yoga-app/src/api/strapi/query/faq.json b/yoga-app/src/api/strapi/query/faq.json index 2d17349..d06d1ff 100644 --- a/yoga-app/src/api/strapi/query/faq.json +++ b/yoga-app/src/api/strapi/query/faq.json @@ -1,6 +1,14 @@ { "fields": ["*"], "populate": { + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, "questionsAndAnswers": { "fields": ["*"], "populate": { diff --git a/yoga-app/src/api/strapi/query/prices.json b/yoga-app/src/api/strapi/query/prices.json index 1832b93..cd9e9cf 100644 --- a/yoga-app/src/api/strapi/query/prices.json +++ b/yoga-app/src/api/strapi/query/prices.json @@ -1,6 +1,14 @@ { "fields": ["*"], "populate": { + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, "price": { "fields": ["*"], "populate": { diff --git a/yoga-app/src/api/strapi/query/service.json b/yoga-app/src/api/strapi/query/service.json index ea569ba..a23ed74 100644 --- a/yoga-app/src/api/strapi/query/service.json +++ b/yoga-app/src/api/strapi/query/service.json @@ -1,6 +1,14 @@ { "fields": ["*"], "populate": { + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, "subscribeNow": { "fields": ["*"] }, diff --git a/yoga-app/src/api/strapi/query/services.json b/yoga-app/src/api/strapi/query/services.json index 13cba5f..6f4a711 100644 --- a/yoga-app/src/api/strapi/query/services.json +++ b/yoga-app/src/api/strapi/query/services.json @@ -1,6 +1,14 @@ { "fields": ["*"], "populate": { + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, "ourServices": { "fields": ["*"], "populate": { diff --git a/yoga-app/src/app/about/page.tsx b/yoga-app/src/app/about/page.tsx index 26f3643..84f1e7d 100644 --- a/yoga-app/src/app/about/page.tsx +++ b/yoga-app/src/app/about/page.tsx @@ -24,13 +24,16 @@ export default async function About() { blogs, subscribeNow, footer, + common } = pageData; - console.info("about us", JSON.stringify(aboutUs)) + + + return ( <> - { header && } + { header && } { aboutUs && } { discount && } diff --git a/yoga-app/src/app/contact/page.tsx b/yoga-app/src/app/contact/page.tsx index 0afabd7..a105590 100644 --- a/yoga-app/src/app/contact/page.tsx +++ b/yoga-app/src/app/contact/page.tsx @@ -16,11 +16,12 @@ export default async function ContactPage(){ contactUs, google_maps, subscribe, - footer + footer, + common } = await strapiApi.getContactPage(); return ( <> - { } + { } { contactUs && } { google_maps && } { subscribe && } diff --git a/yoga-app/src/app/faq/page.tsx b/yoga-app/src/app/faq/page.tsx index 346ba32..8ab2fbe 100644 --- a/yoga-app/src/app/faq/page.tsx +++ b/yoga-app/src/app/faq/page.tsx @@ -15,11 +15,12 @@ export default async function About() { questionsAndAnswers, blogs, subscribe, - footer + footer, + common } = await strapiApi.getFaqPage(); return ( - <>xxxxx - { } + <> + { } { questionsAndAnswers && } { blogs && } { subscribe && } diff --git a/yoga-app/src/app/prices/page.tsx b/yoga-app/src/app/prices/page.tsx index f88cca3..c136a2d 100644 --- a/yoga-app/src/app/prices/page.tsx +++ b/yoga-app/src/app/prices/page.tsx @@ -21,11 +21,12 @@ export default async function PricesPage( ) { discount, blogs, subscribe, - footer + footer, + common } = await strapiApi.getPricesPage(); return ( <> - + { price && } { discount && } { blogs && } diff --git a/yoga-app/src/app/services/[slug]/page.tsx b/yoga-app/src/app/services/[slug]/page.tsx index 331ef45..04b4c6c 100644 --- a/yoga-app/src/app/services/[slug]/page.tsx +++ b/yoga-app/src/app/services/[slug]/page.tsx @@ -45,7 +45,8 @@ export default async function ServiceArticlePage({params}: { return ( <> {selectedService && selectedService.header && selectedService.description && - } + } +
diff --git a/yoga-app/src/app/services/page.tsx b/yoga-app/src/app/services/page.tsx index bdf4b30..5529a02 100644 --- a/yoga-app/src/app/services/page.tsx +++ b/yoga-app/src/app/services/page.tsx @@ -20,11 +20,12 @@ export default async function Services() { feedbacks, blogs, footer, - subscribe + subscribe, + common } = await strapiApi.getServicesPage(); return ( <> - {header && description && } + { ourServices && } { contactUs && } { ourSpecialities && } diff --git a/yoga-app/src/components/mainHeaderComponent.tsx b/yoga-app/src/components/mainHeaderComponent.tsx index 2306999..4d1194f 100644 --- a/yoga-app/src/components/mainHeaderComponent.tsx +++ b/yoga-app/src/components/mainHeaderComponent.tsx @@ -2,6 +2,8 @@ import YogaImageComponent from "@/components/yoga.image.component"; import {YogaMainHeaderComponent_Plain} from "@/types/generated-strapi-interfaces/api/yoga-main-header-component"; import {MAIN_MENU} from "@/util/const"; import Nav from "@/components/nav.component"; +import {StrapiFile} from "@/types/types"; +import strapiApi from "@/api/strapi/strapi-api"; export interface Props{ config: YogaMainHeaderComponent_Plain } @@ -10,14 +12,18 @@ const MainHeaderComponent = ({ config: { header, description, button, - headerIType + headerIType, + image }}: Props) => { + const imageFile: StrapiFile = image as StrapiFile; + const imageSrc = imageFile ? strapiApi.getImageUrl(imageFile?.url): undefined; + return (
-
{/**/}
diff --git a/yoga-app/src/components/nav.component.tsx b/yoga-app/src/components/nav.component.tsx index 0ec5fd0..2642dbc 100644 --- a/yoga-app/src/components/nav.component.tsx +++ b/yoga-app/src/components/nav.component.tsx @@ -13,11 +13,10 @@ export interface MenuItem{ } export interface Props{ menuItems: MenuItem[]; + imageSrc?: string; } -const Nav: FC = ({menuItems}:Props) => { - - +const Nav: FC = ({menuItems, imageSrc}:Props) => { return (
@@ -25,7 +24,7 @@ const Nav: FC = ({menuItems}:Props) => {