diff --git a/yoga-app/src/api/strapi/query/service.json b/yoga-app/src/api/strapi/query/service.json index ab1330e..ea569ba 100644 --- a/yoga-app/src/api/strapi/query/service.json +++ b/yoga-app/src/api/strapi/query/service.json @@ -1,7 +1,7 @@ { "fields": ["*"], "populate": { - "subscribe": { + "subscribeNow": { "fields": ["*"] }, "footer": { diff --git a/yoga-app/src/api/strapi/strapi-client.ts b/yoga-app/src/api/strapi/strapi-client.ts index 9cf838a..48fab18 100644 --- a/yoga-app/src/api/strapi/strapi-client.ts +++ b/yoga-app/src/api/strapi/strapi-client.ts @@ -14,6 +14,7 @@ class StrapiClient{ return '/image/'+ imagePath; } public async httpGet(path: string){ + console.info("httpGet", path); return await httpClient.httpGet(this.strapiUrl + path); } public async httpGetJson(url: string): Promise>{ diff --git a/yoga-app/src/app/services/[slug]/page.module.css b/yoga-app/src/app/services/[slug]/page.module.css new file mode 100644 index 0000000..3bc39f0 --- /dev/null +++ b/yoga-app/src/app/services/[slug]/page.module.css @@ -0,0 +1,3 @@ +.article h1{ + color: black; +} diff --git a/yoga-app/src/app/services/[slug]/page.tsx b/yoga-app/src/app/services/[slug]/page.tsx index c867876..8687169 100644 --- a/yoga-app/src/app/services/[slug]/page.tsx +++ b/yoga-app/src/app/services/[slug]/page.tsx @@ -1,39 +1,45 @@ import React from "react"; import strapiApi from "@/api/strapi/strapi-api"; import {BlocksContent, BlocksRenderer} from "@strapi/blocks-react-renderer"; +import SubscribeComponent from "@/components/subscribe.component"; +import FooterComponent from "@/components/footer.component"; +import SubHeaderComponent from "@/components/subHeader.component"; +import AosComponent from "@/components/aos.component"; +import styles from './page.module.css' +import NextBlocksRenderer from "@/components/next.blocks.renderer"; + export default async function ServiceArticlePage({params}: { - params: Promise<{ slug: string}> -} ) { + params: Promise<{ slug: string }> +}) { const {slug} = await params - const {footer= undefined, subscribeNow = undefined} = await strapiApi.getServicePage(); + const {header, description, footer, subscribeNow} = await strapiApi.getServicePage(); const servicesByName = await strapiApi.getService(slug); - // return ( - // <> - // {header && description && } - // { ourServices && } - // { contactUs && } - // { ourSpecialities && } - // { feedbacks && } - // { blogs && } - // { subscribe && } - // { footer && } - // - // - // ); - console.info("slug", slug); - console.info("servicesByName", servicesByName); const selectedService = servicesByName[0]; const article = selectedService.article; - console.info("article", article); + console.info(article); selectedService.article - return ( - <> - - { subscribeNow && } - { footer && } - - ); + return ( + <> + {selectedService && selectedService.header && selectedService.description && + } +
+
+
+
+ +
+
+
+ +
+ {subscribeNow && } + {footer && } + + + ); } export const dynamic = 'force-dynamic' diff --git a/yoga-app/src/components/next.blocks.renderer.tsx b/yoga-app/src/components/next.blocks.renderer.tsx new file mode 100644 index 0000000..e997689 --- /dev/null +++ b/yoga-app/src/components/next.blocks.renderer.tsx @@ -0,0 +1,31 @@ +'use client'; +import {BlocksContent, BlocksRenderer} from "@strapi/blocks-react-renderer"; +import strapiApi from "@/api/strapi/strapi-api"; +import React from "react"; +import YogaImageComponent from "@/components/yoga.image.component"; + +export interface Props{ + content: BlocksContent; +} +const NextBlocksRenderer = ({ content }: Props) => { + return ( + { + console.log(image); + const url = new URL(image.url); + return ( + + ); + } + }} + />); +} + +export default NextBlocksRenderer;