[yoga-11] add common type and add logo

Reviewed-on: https://gitea.rschneider.hu/rschneider/yogastic/pulls/10

api.http

@@ -22,3 +22,16 @@ x
 GET {{domain}}/api/yoga-blog-posts/wmhqy1n8japcfpy0of4hauwm
 Accept: application/json
 #Authorization: Bearer {{token}}
+
+
+### GET request with a header
+GET {{domain}}/api/yoga-single-services?filters[name][$eq]=service4
+Accept: application/json
+
+### GET service page
+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
+
+
+
+

dev.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+cd environment/dev/docker-compose/yogastic
+docker compose up -d
+

environment/dev/docker/app/scripts/version.txt

@@ -1 +1 @@
-202505181151.77363d0
+202505262234.f0f0a97

environment/dev/docker/cms/scripts/build.docker.build.step.build.sh

@@ -9,4 +9,4 @@ echo "build image ${TAG} from folder ${PROJECT_ROOT}"
 
 cd $PROJECT_ROOT
 
-docker build  --build-arg NODE_ENV=production -t $TAG .
+docker build  --build-arg NODE_ENV=production -t $TAG_INTERNAL -t $TAG_PUBLIC .

environment/dev/docker/cms/scripts/build.docker.env.sh

@@ -6,4 +6,5 @@ echo "Reading version file: ${VERSION_FILE}"
 
 export VERSION=$(cat "${VERSION_FILE}")
 
-export TAG=docker.rschneider.hu/infra/yoga-cms:$VERSION
+export TAG_PUBLIC=docker.rschneider.hu/infra/yoga-cms:$VERSION
+export TAG_INTERNAL=internal-docker.rschneider.hu/infra/yoga-cms:$VERSION

environment/dev/docker/cms/scripts/build.docker.push.sh

@@ -3,5 +3,7 @@
 CURRENT_DIR=$(dirname "$0")
 # push docker image
 source "${CURRENT_DIR}/build.docker.env.sh"
-echo "push image ${TAG}"
+echo "push image ${TAG_INTERNAL}"
-docker push $TAG
+docker push $TAG_INTERNAL
+echo "push image ${TAG_PUBLIC}"
+docker push $TAG_PUBLIC

environment/dev/docker/cms/scripts/version.txt

@@ -1 +1 @@
-202505180959.57552b3
+202505232026.6bb9365

environment/prod/docker-compose/yogastic/docker-compose.yaml

@@ -21,7 +21,7 @@ services:
     networks:
       - yogastic
   app:
-    image: docker.rschneider.hu/infra/yoga-app:202505181151.77363d0
+    image: docker.rschneider.hu/infra/yoga-app:202505262234.f0f0a97
     platform: linux/amd64
     ports:
       - '4025:3000'
@@ -47,7 +47,7 @@ services:
       - proxy_shared
       - yogastic
   cms:
-    image: docker.rschneider.hu/infra/yoga-cms:202505180959.57552b3
+    image: docker.rschneider.hu/infra/yoga-cms:202505232026.6bb9365
     ports:
       - '4026:1337'
     environment:
@@ -71,7 +71,6 @@ services:
       - yogastic
     volumes:
       - strapi-uploads:/opt/app/public/uploads
-
 volumes:
   next-db: {}
   strapi-db: {}

yoga-app/eslint.config.mjs

@@ -16,9 +16,9 @@ const eslintConfig = [
               "next/core-web-vitals",
               "next/typescript",
           ],
-          // rules: {
+          rules: {
-          //     "@typescript-eslint/no-explicit-any": "off"
+              "@typescript-eslint/no-explicit-any": "off"
-          // },
+          },
       }
 
   ),
@@ -32,6 +32,6 @@ const eslintConfig = [
   // }
 ];
 
-console.info("eslint config",eslintConfig)
+// console.info("eslint config",eslintConfig)
 
 export default eslintConfig;

yoga-app/package-lock.json

@@ -9,6 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@fortawesome/fontawesome-free": "^6.7.2",
+        "@strapi/blocks-react-renderer": "^1.0.2",
         "@strapi/database": "^5.10.3",
         "@types/aos": "^3.0.7",
         "@types/bcrypt": "^5.0.2",
@@ -1393,6 +1394,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/@strapi/blocks-react-renderer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@strapi/blocks-react-renderer/-/blocks-react-renderer-1.0.2.tgz",
+      "integrity": "sha512-pRV/WMreo5wyrLg7J0pw1DM9lg8U8m+QA7Bd8CPN3beUBTdDhYrFTTNZh3XveEdnURZNJu1X0aWXAg4SzVg7QA==",
+      "hasInstallScript": true,
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/@strapi/database": {
       "version": "5.10.3",
       "resolved": "https://registry.npmjs.org/@strapi/database/-/database-5.10.3.tgz",

yoga-app/package.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.7.2",
+    "@strapi/blocks-react-renderer": "^1.0.2",
     "@strapi/database": "^5.10.3",
     "@types/aos": "^3.0.7",
     "@types/bcrypt": "^5.0.2",

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": {

yoga-app/src/api/strapi/query/contact.json

@@ -1,6 +1,14 @@
 {
   "fields": ["*"],
   "populate": {
+    "common": {
+      "fields": ["*"],
+      "populate": {
+        "logoImage": {
+          "fields": ["name","mime","url"]
+        }
+      }
+    },
     "contactUs": {
       "fields": ["*"]
     },

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": {

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": {

yoga-app/src/api/strapi/query/service.json

@@ -0,0 +1,33 @@
+{
+  "fields": ["*"],
+  "populate": {
+    "common": {
+      "fields": ["*"],
+      "populate": {
+        "logoImage": {
+          "fields": ["name","mime","url"]
+        }
+      }
+    },
+    "subscribeNow": {
+      "fields": ["*"]
+    },
+    "footer": {
+      "fields": ["*"],
+      "populate": {
+        "links": {
+          "fields": ["*"]
+        },
+        "contactUsEmail": {
+          "fields": ["*"]
+        },
+        "contactUsLocation": {
+          "fields": ["*"]
+        },
+        "contactUsPhoneNumber": {
+          "fields": ["*"]
+        }
+      }
+    }
+  }
+}

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": {

yoga-app/src/api/strapi/strapi-api.ts

@@ -4,6 +4,7 @@ import qs from "qs";
 import aboutQuery from "@/api/strapi/query/about.json";
 import homeQuery from "@/api/strapi/query/home.json";
 import servicesQuery from "@/api/strapi/query/services.json";
+import serviceQuery from "@/api/strapi/query/service.json";
 import pricesQuery from "@/api/strapi/query/prices.json";
 import faqQuery from "@/api/strapi/query/faq.json";
 import contactQuery from "@/api/strapi/query/contact.json";
@@ -13,6 +14,8 @@ import {ServicesPage_Plain} from "@/types/generated-strapi-interfaces/api/servic
 import {PricesPage_Plain} from "@/types/generated-strapi-interfaces/api/prices-page";
 import {FaqPage_Plain} from "@/types/generated-strapi-interfaces/api/faq-page";
 import {ContactPage_Plain} from "@/types/generated-strapi-interfaces/api/contact-page";
+import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/yoga-single-service";
+import {ServicePage_Plain} from "@/types/generated-strapi-interfaces/api/service-page";
 
 
 class StrapiApi{
@@ -42,6 +45,20 @@ class StrapiApi{
         return this.getJson("/api/services-page?",servicesQuery);
     }
 
+    public getServicePage(): Promise<ServicePage_Plain>{
+        return this.getJson("/api/service-page?",serviceQuery);
+    }
+
+    public getService(name: string): Promise<YogaSingleService_Plain[]>{
+        return this.getJson("/api/yoga-single-services?", {
+            filters: {
+                name: {
+                    $eq: name,
+                },
+            },
+        });
+    }
+
     public getPricesPage(): Promise<PricesPage_Plain>{
         return this.getJson("/api/prices-page?",pricesQuery);
     }

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<T>(url: string): Promise<Payload<T>>{

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 && <SubHeaderComponent header1={header?.header1} header2={header?.header2} description={header?.description}/> }
+            { header && <SubHeaderComponent   header={header}  common={common}/> }
 
             { aboutUs && <AboutUsWithBoxesComponent config={aboutUs}/>}
             { discount && <YogaDiscountComponent config={discount}/>}

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 (
         <>
-            { <SubHeaderComponent header1={header} description={description} /> }
+            { <SubHeaderComponent header={{header1:header,description}}  common={common}/> }
             { contactUs &&  <ContactUsComponent contactUs={contactUs} /> }
             { google_maps &&  <GoogleMapsComponent config={google_maps} /> }
             { subscribe && <SubscribeComponent config={subscribe} styleClass={"contact_subscribe_section"}  /> }

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
+        <>
-            { <SubHeaderComponent header1={header} description={description} /> }
+            { <SubHeaderComponent header={{header1:header,description}}  common={common}/> }
             { questionsAndAnswers &&  <FaqComponent config={questionsAndAnswers} /> }
             { blogs && <BlogPostsComponent config={blogs} /> }
             { subscribe && <SubscribeComponent config={subscribe} /> }

yoga-app/src/app/page.tsx

@@ -16,8 +16,6 @@ import webApi from "@/api/web-client/web-api";
 export default async function Home() {
         const pageData = await webApi.getHomePage();
 
-        console.info(JSON.stringify(pageData))
-
         const {
                 header,
                 ourServices,

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 (
         <>
-          <SubHeaderComponent  header1={header} description={description}/>
+          <SubHeaderComponent  header={{header1:header,description}} common={common}/>
             { price && <PricingComponent  config={price}/> }
             { discount && <YogaDiscountComponent config={discount} /> }
             { blogs && <BlogPostsComponent config={blogs} /> }

yoga-app/src/app/services/[slug]/not-found.tsx

@@ -0,0 +1,11 @@
+import Link from 'next/link'
+
+export default function NotFound() {
+    return (
+        <div>
+            <h2>Nem található</h2>
+            <p>Could not find requested resource</p>
+            <Link href="/">Vissza a kezdőoldalra</Link>
+        </div>
+    )
+}

yoga-app/src/app/services/[slug]/page.module.css

@@ -0,0 +1,3 @@
+.article h1{
+    color: black;
+}

yoga-app/src/app/services/[slug]/page.tsx

@@ -1,6 +1,69 @@
+import React from "react";
+import strapiApi from "@/api/strapi/strapi-api";
+import {BlocksContent} 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";
+import clsx from "clsx";
+import {notFound} from "next/navigation";
 
-export default async function ServiceDetails() {
+const rewriteStrapiImageUrlToNextImageUrl = (content: BlocksContent) =>{
-    return (
+    console.info("content", content);
-        <h1>hello    </h1>
+    for(const item of content){
-    )
+        if ( item.type == 'image'){
+            const imageData = item.image;
+            const url = new URL(imageData.url);
+            imageData.url = strapiApi.getImageUrl(url.pathname);
+        }
+    }
+    return content;
 }
+
+export default async function ServiceArticlePage({params}: {
+    params: Promise<{ slug: string }>
+}) {
+    const {slug} = await params
+
+    const servicePage = await strapiApi.getServicePage();
+    if (!servicePage) {
+        return notFound()
+    }
+    const {subscribeNow, footer, common} = servicePage;
+    const servicesByName = await strapiApi.getService(slug);
+    if (!servicesByName || servicesByName.length === 0) {
+        return notFound();
+    }
+    const selectedService = servicesByName[0];
+    if ( !selectedService?.article?.length ) {
+        return notFound();
+    }
+    const article: BlocksContent = rewriteStrapiImageUrlToNextImageUrl( selectedService.article);
+
+    return (
+        <>
+            {selectedService && selectedService.header && selectedService.description &&
+            <SubHeaderComponent  header={{header1:selectedService.header, description: selectedService.description}} common={common}/>}
+
+            <section className={clsx( styles.article, 'mb-3')}>
+                <div className="container">
+                    <div className={"row"}>
+                        <div className={"col-lg-12 col-md-12 col-sm-12 col-xs-12"}>
+                            <NextBlocksRenderer
+                                content={article as BlocksContent}
+                            />
+                        </div>
+                    </div>
+                </div>
+
+            </section>
+            {subscribeNow && <SubscribeComponent config={subscribeNow}/>}
+            {footer && <FooterComponent config={footer}/>}
+            <AosComponent/>
+        </>
+    );
+}
+
+export const dynamic = 'force-dynamic'

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 && <SubHeaderComponent header1={header} description={description} />}
+            <SubHeaderComponent  header={{header1:header,description}} common={common}/>
             { ourServices && <OurServicesComponent  config={ourServices}  /> }
             { contactUs && <ContactUsComponent contactUs={contactUs} />}
             { ourSpecialities && <OurSpecialitiesComponent config={ourSpecialities} /> }

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 (
         <div className="banner-section-outer">
             <header>
-                <Nav menuItems={MAIN_MENU} />
+                <Nav menuItems={MAIN_MENU} imageSrc={imageSrc} />
             </header>
             {/*<!-- SOCIAL ICONS -->*/}
             <div className="social-icons left_icons float-left d-table" data-aos="fade-down">

yoga-app/src/components/nav.component.tsx

@@ -13,11 +13,10 @@ export interface MenuItem{
 }
 export interface Props{
     menuItems: MenuItem[];
+    imageSrc?: string;
 }
 
-const Nav: FC<Props> = ({menuItems}:Props) => {
+const Nav: FC<Props> = ({menuItems, imageSrc}:Props) => {
-
-
 
     return (
         <header>
@@ -25,7 +24,7 @@ const Nav: FC<Props> = ({menuItems}:Props) => {
                 <div className="container-fluid">
                     <nav className="navbar navbar-expand-lg navbar-light p-0">
                         <Link className="navbar-brand" href="/">
-                            <figure className="mb-0"><YogaImageComponent src="/assets/images/yogastic_logo.png" alt=""/>
+                            <figure className="mb-0"> {imageSrc && <YogaImageComponent src={imageSrc} alt=""/>}
                             </figure>
                         </Link>
                         <button className="navbar-toggler collapsed" type="button" data-toggle="collapse"

yoga-app/src/components/next.blocks.renderer.tsx

@@ -0,0 +1,28 @@
+'use client';
+import {BlocksContent, BlocksRenderer} from "@strapi/blocks-react-renderer";
+import React from "react";
+import YogaImageComponent from "@/components/yoga.image.component";
+
+export interface Props{
+    content: BlocksContent;
+}
+const NextBlocksRenderer = ({ content }: Props) => {
+    return  (
+    <BlocksRenderer
+        content={content}
+        blocks={{
+            image: ({image}) => {
+                return (
+                    <YogaImageComponent
+                        src={image.url}
+                        // width={image.width}
+                        // height={image.height}
+                        alt={image.alternativeText || ""}
+                    />
+                );
+            }
+        }}
+        />);
+}
+
+export default NextBlocksRenderer;

yoga-app/src/components/our.services.item.component.tsx

@@ -3,13 +3,18 @@ import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/y
 import {StrapiFile} from "@/types/types";
 import strapiApi from "@/api/strapi/strapi-api";
 import styles from './our.services.item.component.module.css'
+import Link from "next/link";
 
 export interface Props {
     config: YogaSingleService_Plain
 }
 
-const OurServiceItemComponent = ({config: {header,description,image}}: Props) => {
+const OurServiceItemComponent = ({config: {header,description,image,name}}: Props) => {
     const imageFile: StrapiFile = image as StrapiFile;
+    if (!imageFile || !imageFile.url) {
+        return null
+    }
+    const path = '/services/' + name;
     return (
 
         <div className={styles.serviceSlide}>
@@ -17,15 +22,15 @@ const OurServiceItemComponent = ({config: {header,description,image}}: Props) =>
             <div className="services_box_content">
                 <div className="services_box_upper_portion">
                     <figure className="mb-0">
-                        <YogaImageComponent src={strapiApi.getImageUrl(imageFile?.url)} alt="" className="img-fluid"/>
+                        <YogaImageComponent src={strapiApi.getImageUrl(imageFile.url)} alt="" className="img-fluid"/>
                     </figure>
                 </div>
                 <div className="services_box_lower_portion">
                     <h3>{header}</h3>
                     <p>{description}</p>
                     <div className="btn_wrapper">
-                        <a href="/services" className="text-decoration-none"><i
+                        <Link href={path} className="text-decoration-none"><i
-                            className="fa-solid fa-arrow-right" aria-hidden="true"></i></a>
+                            className="fa-solid fa-arrow-right" aria-hidden="true"></i></Link>
                     </div>
                 </div>
             </div>

yoga-app/src/components/price.item.component.tsx

@@ -7,7 +7,7 @@ export interface Props{
     config: YogaPrice_Plain
 }
 
-export function PriceItemComponent({config: {header,option1,option2,price,icon, image,buttonText}} : Props){
+export function PriceItemComponent({config: {header, description, option1,option2,price,pricePostfix, icon, image,buttonText}} : Props){
     // there are some issues with the strapi generated types
     const iconFile: StrapiFile = icon as StrapiFile;
     const imageFile: StrapiFile = image as StrapiFile;
@@ -28,6 +28,7 @@ export function PriceItemComponent({config: {header,option1,option2,price,icon,
                 </div>
                 <div className="pricing_plans_box_lower_portion">
                     <h3>{header}</h3>
+                    <p className={'text-center'}>{description}</p>
                     <ul className="list-unstyled">
                         <li>
                             <i className="fa-solid fa-check" aria-hidden="true"></i>{option1}
@@ -38,7 +39,7 @@ export function PriceItemComponent({config: {header,option1,option2,price,icon,
                     </ul>
                     <div className="pricing_plans_span_wrapper">
                         <span className="price">{price} FT</span>
-                        <span className="per_month">/per month</span>
+                        { pricePostfix && <span className="per_month">{pricePostfix}</span> }
                     </div>
                     <div className="btn_wrapper">
                         <a className="enroll_now_btn text-decoration-none" href="/pricing.html">{buttonText}</a>

yoga-app/src/components/subHeader.component.tsx

@@ -3,14 +3,33 @@ import Nav from "@/components/nav.component";
 import {MAIN_MENU} from "@/util/const";
 import {HeaderB} from "@/types/generated-strapi-interfaces/components/yoga-site/HeaderB";
 import NextBreadcrumb from "@/components/breadcrumbs.component";
+import {YogaCommon_Plain} from "@/types/generated-strapi-interfaces/api/yoga-common";
+import strapiApi from "@/api/strapi/strapi-api";
+import {StrapiFile} from "@/types/types";
 
 
-export type  Props = HeaderB ;
+export type  Props = {
+    header: HeaderB,
+    common?: YogaCommon_Plain
+} ;
+
+const SubHeaderComponent = ( {
+    header:{  header1,description},common  }: Props) =>{
+
+
+    let logoImageSrc: string|undefined = undefined;
+
+    const logoImage = common && common.logoImage;
+    if ( logoImage ){
+        const logoImageFile: StrapiFile = logoImage as StrapiFile;
+        logoImageSrc  =   strapiApi.getImageUrl(logoImageFile?.url) ;
+    }
+
+    console.info("image", logoImageSrc);
 
-const SubHeaderComponent = ({header1,description}: Props) =>{
     return (
         <div className="sub-banner-section">
-             <Nav menuItems={MAIN_MENU} />
+             <Nav menuItems={MAIN_MENU} imageSrc={logoImageSrc} />
             <section className="banner-section">
                 <div className="container">
                     <div className="row">
@@ -42,3 +61,6 @@ const SubHeaderComponent = ({header1,description}: Props) =>{
 }
 
 export default SubHeaderComponent;
+
+
+export const dynamic = 'force-dynamic'

yoga-app/src/types/generated-strapi-interfaces/api/about.ts

@@ -8,6 +8,7 @@ import { YogaAboutUsWithBoxesComponent } from './yoga-about-us-with-boxes-compon
 import { YogaDiscountComponent } from './yoga-discount-component';
 import { YogaTextWithImageComponent } from './yoga-text-with-image-component';
 import { YogaAchivementsComponent } from './yoga-achivements-component';
+import { YogaCommon } from './yoga-common';
 import { HeaderB_Plain } from '../components/yoga-site/HeaderB';
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
@@ -16,6 +17,7 @@ import { YogaAboutUsWithBoxesComponent_Plain } from './yoga-about-us-with-boxes-
 import { YogaDiscountComponent_Plain } from './yoga-discount-component';
 import { YogaTextWithImageComponent_Plain } from './yoga-text-with-image-component';
 import { YogaAchivementsComponent_Plain } from './yoga-achivements-component';
+import { YogaCommon_Plain } from './yoga-common';
 import { HeaderB_NoRelations } from '../components/yoga-site/HeaderB';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
@@ -31,6 +33,7 @@ export interface About {
     ourMission?: { data: YogaTextWithImageComponent };
     ourVision?: { data: YogaTextWithImageComponent };
     achievements?: { data: YogaAchivementsComponent };
+    common?: { data: YogaCommon };
     locale: string;
     localizations?: { data: About[] };
   };
@@ -46,6 +49,7 @@ export interface About_Plain {
   ourMission?: YogaTextWithImageComponent_Plain;
   ourVision?: YogaTextWithImageComponent_Plain;
   achievements?: YogaAchivementsComponent_Plain;
+  common?: YogaCommon_Plain;
   locale: string;
   localizations?: About_Plain[];
 }
@@ -61,6 +65,7 @@ export interface About_NoRelations {
   ourMission?: number;
   ourVision?: number;
   achievements?: number;
+  common?: number;
   locale: string;
   localizations?: About[];
 }
@@ -76,6 +81,7 @@ export interface About_AdminPanelLifeCycle {
   ourMission?: AdminPanelRelationPropertyModification<YogaTextWithImageComponent_Plain>;
   ourVision?: AdminPanelRelationPropertyModification<YogaTextWithImageComponent_Plain>;
   achievements?: AdminPanelRelationPropertyModification<YogaAchivementsComponent_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
   locale: string;
   localizations?: About[];
 }

yoga-app/src/types/generated-strapi-interfaces/api/article.ts

@@ -17,7 +17,7 @@ export interface Article {
     cover?: { data: Media };
     author?: { data: Author };
     category?: { data: Category };
-    blocks?: object;
+    blocks?: any;
   };
 }
 export interface Article_Plain {
@@ -28,7 +28,7 @@ export interface Article_Plain {
   cover?: Media_Plain;
   author?: Author_Plain;
   category?: Category_Plain;
-  blocks?: object;
+  blocks?: any;
 }
 
 export interface Article_NoRelations {
@@ -39,7 +39,7 @@ export interface Article_NoRelations {
   cover?: number;
   author?: number;
   category?: number;
-  blocks?: object;
+  blocks?: any;
 }
 
 export interface Article_AdminPanelLifeCycle {
@@ -50,5 +50,5 @@ export interface Article_AdminPanelLifeCycle {
   cover?: AdminPanelRelationPropertyModification<Media_Plain>;
   author?: AdminPanelRelationPropertyModification<Author_Plain>;
   category?: AdminPanelRelationPropertyModification<Category_Plain>;
-  blocks?: object;
+  blocks?: any;
 }

yoga-app/src/types/generated-strapi-interfaces/api/contact-page.ts

@@ -4,10 +4,12 @@ import { YogaContactUs } from './yoga-contact-us';
 import { YogaGoogleMapsComponent } from './yoga-google-maps-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaContactUs_Plain } from './yoga-contact-us';
 import { YogaGoogleMapsComponent_Plain } from './yoga-google-maps-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface ContactPage {
@@ -19,6 +21,7 @@ export interface ContactPage {
     google_maps?: { data: YogaGoogleMapsComponent };
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
   };
 }
 export interface ContactPage_Plain {
@@ -29,6 +32,7 @@ export interface ContactPage_Plain {
   google_maps?: YogaGoogleMapsComponent_Plain;
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
 }
 
 export interface ContactPage_NoRelations {
@@ -39,6 +43,7 @@ export interface ContactPage_NoRelations {
   google_maps?: number;
   subscribe?: number;
   footer?: number;
+  common?: number;
 }
 
 export interface ContactPage_AdminPanelLifeCycle {
@@ -49,4 +54,5 @@ export interface ContactPage_AdminPanelLifeCycle {
   google_maps?: AdminPanelRelationPropertyModification<YogaGoogleMapsComponent_Plain>;
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-app/src/types/generated-strapi-interfaces/api/faq-page.ts

@@ -5,11 +5,13 @@ import { YogaAchivementsComponent } from './yoga-achivements-component';
 import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaFaqComponent_Plain } from './yoga-faq-component';
 import { YogaAchivementsComponent_Plain } from './yoga-achivements-component';
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface FaqPage {
@@ -22,6 +24,7 @@ export interface FaqPage {
     blogs?: { data: YogaBlogPostsComponent };
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
   };
 }
 export interface FaqPage_Plain {
@@ -33,6 +36,7 @@ export interface FaqPage_Plain {
   blogs?: YogaBlogPostsComponent_Plain;
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
 }
 
 export interface FaqPage_NoRelations {
@@ -44,6 +48,7 @@ export interface FaqPage_NoRelations {
   blogs?: number;
   subscribe?: number;
   footer?: number;
+  common?: number;
 }
 
 export interface FaqPage_AdminPanelLifeCycle {
@@ -55,4 +60,5 @@ export interface FaqPage_AdminPanelLifeCycle {
   blogs?: AdminPanelRelationPropertyModification<YogaBlogPostsComponent_Plain>;
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-app/src/types/generated-strapi-interfaces/api/global.ts

@@ -14,6 +14,7 @@ export interface Global {
     favicon?: { data: Media };
     siteDescription: string;
     defaultSeo?: Seo;
+    logoImage?: { data: Media };
   };
 }
 export interface Global_Plain {
@@ -22,6 +23,7 @@ export interface Global_Plain {
   favicon?: Media_Plain;
   siteDescription: string;
   defaultSeo?: Seo_Plain;
+  logoImage?: Media_Plain;
 }
 
 export interface Global_NoRelations {
@@ -30,6 +32,7 @@ export interface Global_NoRelations {
   favicon?: number;
   siteDescription: string;
   defaultSeo?: Seo_NoRelations;
+  logoImage?: number;
 }
 
 export interface Global_AdminPanelLifeCycle {
@@ -38,4 +41,5 @@ export interface Global_AdminPanelLifeCycle {
   favicon?: AdminPanelRelationPropertyModification<Media_Plain>;
   siteDescription: string;
   defaultSeo?: Seo_Plain;
+  logoImage?: AdminPanelRelationPropertyModification<Media_Plain>;
 }

yoga-app/src/types/generated-strapi-interfaces/api/prices-page.ts

@@ -5,11 +5,13 @@ import { YogaDiscountComponent } from './yoga-discount-component';
 import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaPriceComponent_Plain } from './yoga-price-component';
 import { YogaDiscountComponent_Plain } from './yoga-discount-component';
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface PricesPage {
@@ -22,6 +24,7 @@ export interface PricesPage {
     blogs?: { data: YogaBlogPostsComponent };
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
   };
 }
 export interface PricesPage_Plain {
@@ -33,6 +36,7 @@ export interface PricesPage_Plain {
   blogs?: YogaBlogPostsComponent_Plain;
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
 }
 
 export interface PricesPage_NoRelations {
@@ -44,6 +48,7 @@ export interface PricesPage_NoRelations {
   blogs?: number;
   subscribe?: number;
   footer?: number;
+  common?: number;
 }
 
 export interface PricesPage_AdminPanelLifeCycle {
@@ -55,4 +60,5 @@ export interface PricesPage_AdminPanelLifeCycle {
   blogs?: AdminPanelRelationPropertyModification<YogaBlogPostsComponent_Plain>;
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-app/src/types/generated-strapi-interfaces/api/service-page.ts

@@ -0,0 +1,46 @@
+// Interface automatically generated by schemas-to-ts
+
+import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
+import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
+import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
+import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
+
+export interface ServicePage {
+  id: number;
+  attributes: {
+    createdAt: Date;    updatedAt: Date;    publishedAt?: Date;    header?: string;
+    description?: string;
+    subscribeNow?: { data: YogaSubscribeNowComponent };
+    footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
+  };
+}
+export interface ServicePage_Plain {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: YogaSubscribeNowComponent_Plain;
+  footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
+}
+
+export interface ServicePage_NoRelations {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: number;
+  footer?: number;
+  common?: number;
+}
+
+export interface ServicePage_AdminPanelLifeCycle {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
+  footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
+}

yoga-app/src/types/generated-strapi-interfaces/api/services-page.ts

@@ -7,6 +7,7 @@ import { YogaCustomerFeedbackComponent } from './yoga-customer-feedback-componen
 import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaOurServicesComponent_Plain } from './yoga-our-services-component';
 import { YogaContactUs_Plain } from './yoga-contact-us';
 import { YogaSpecialitiesComponent_Plain } from './yoga-specialities-component';
@@ -14,6 +15,7 @@ import { YogaCustomerFeedbackComponent_Plain } from './yoga-customer-feedback-co
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface ServicesPage {
@@ -29,6 +31,7 @@ export interface ServicesPage {
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
     title?: string;
+    common?: { data: YogaCommon };
   };
 }
 export interface ServicesPage_Plain {
@@ -43,6 +46,7 @@ export interface ServicesPage_Plain {
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
   title?: string;
+  common?: YogaCommon_Plain;
 }
 
 export interface ServicesPage_NoRelations {
@@ -57,6 +61,7 @@ export interface ServicesPage_NoRelations {
   subscribe?: number;
   footer?: number;
   title?: string;
+  common?: number;
 }
 
 export interface ServicesPage_AdminPanelLifeCycle {
@@ -71,4 +76,5 @@ export interface ServicesPage_AdminPanelLifeCycle {
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
   title?: string;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-app/src/types/generated-strapi-interfaces/api/yoga-common.ts

@@ -0,0 +1,26 @@
+// Interface automatically generated by schemas-to-ts
+
+import { Media } from '../components/shared/Media';
+import { Media_Plain } from '../components/shared/Media';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
+
+export interface YogaCommon {
+  id: number;
+  attributes: {
+    createdAt: Date;    updatedAt: Date;    publishedAt?: Date;    logoImage?: { data: Media };
+  };
+}
+export interface YogaCommon_Plain {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  logoImage?: Media_Plain;
+}
+
+export interface YogaCommon_NoRelations {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  logoImage?: number;
+}
+
+export interface YogaCommon_AdminPanelLifeCycle {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  logoImage?: AdminPanelRelationPropertyModification<Media_Plain>;
+}

yoga-app/src/types/generated-strapi-interfaces/api/yoga-price.ts

@@ -14,6 +14,8 @@ export interface YogaPrice {
     price?: number;
     icon?: { data: Media };
     image?: { data: Media };
+    pricePostfix?: string;
+    description?: string;
   };
 }
 export interface YogaPrice_Plain {
@@ -25,6 +27,8 @@ export interface YogaPrice_Plain {
   price?: number;
   icon?: Media_Plain;
   image?: Media_Plain;
+  pricePostfix?: string;
+  description?: string;
 }
 
 export interface YogaPrice_NoRelations {
@@ -36,6 +40,8 @@ export interface YogaPrice_NoRelations {
   price?: number;
   icon?: number;
   image?: number;
+  pricePostfix?: string;
+  description?: string;
 }
 
 export interface YogaPrice_AdminPanelLifeCycle {
@@ -47,4 +53,6 @@ export interface YogaPrice_AdminPanelLifeCycle {
   price?: number;
   icon?: AdminPanelRelationPropertyModification<Media_Plain>;
   image?: AdminPanelRelationPropertyModification<Media_Plain>;
+  pricePostfix?: string;
+  description?: string;
 }

yoga-app/src/types/generated-strapi-interfaces/api/yoga-single-service.ts

@@ -13,6 +13,7 @@ export interface YogaSingleService {
     image?: { data: Media };
     imageAlt?: string;
     name?: string;
+    article?: any;
     locale: string;
     localizations?: { data: YogaSingleService[] };
   };
@@ -25,6 +26,7 @@ export interface YogaSingleService_Plain {
   image?: Media_Plain;
   imageAlt?: string;
   name?: string;
+  article?: any;
   locale: string;
   localizations?: YogaSingleService_Plain[];
 }
@@ -37,6 +39,7 @@ export interface YogaSingleService_NoRelations {
   image?: number;
   imageAlt?: string;
   name?: string;
+  article?: any;
   locale: string;
   localizations?: YogaSingleService[];
 }
@@ -49,6 +52,7 @@ export interface YogaSingleService_AdminPanelLifeCycle {
   image?: AdminPanelRelationPropertyModification<Media_Plain>;
   imageAlt?: string;
   name?: string;
+  article?: any;
   locale: string;
   localizations?: YogaSingleService[];
 }

yoga-cms/generated-strapi-interfaces/api/about.ts

@@ -8,6 +8,7 @@ import { YogaAboutUsWithBoxesComponent } from './yoga-about-us-with-boxes-compon
 import { YogaDiscountComponent } from './yoga-discount-component';
 import { YogaTextWithImageComponent } from './yoga-text-with-image-component';
 import { YogaAchivementsComponent } from './yoga-achivements-component';
+import { YogaCommon } from './yoga-common';
 import { HeaderB_Plain } from '../components/yoga-site/HeaderB';
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
@@ -16,6 +17,7 @@ import { YogaAboutUsWithBoxesComponent_Plain } from './yoga-about-us-with-boxes-
 import { YogaDiscountComponent_Plain } from './yoga-discount-component';
 import { YogaTextWithImageComponent_Plain } from './yoga-text-with-image-component';
 import { YogaAchivementsComponent_Plain } from './yoga-achivements-component';
+import { YogaCommon_Plain } from './yoga-common';
 import { HeaderB_NoRelations } from '../components/yoga-site/HeaderB';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
@@ -31,6 +33,7 @@ export interface About {
     ourMission?: { data: YogaTextWithImageComponent };
     ourVision?: { data: YogaTextWithImageComponent };
     achievements?: { data: YogaAchivementsComponent };
+    common?: { data: YogaCommon };
     locale: string;
     localizations?: { data: About[] };
   };
@@ -46,6 +49,7 @@ export interface About_Plain {
   ourMission?: YogaTextWithImageComponent_Plain;
   ourVision?: YogaTextWithImageComponent_Plain;
   achievements?: YogaAchivementsComponent_Plain;
+  common?: YogaCommon_Plain;
   locale: string;
   localizations?: About_Plain[];
 }
@@ -61,6 +65,7 @@ export interface About_NoRelations {
   ourMission?: number;
   ourVision?: number;
   achievements?: number;
+  common?: number;
   locale: string;
   localizations?: About[];
 }
@@ -76,6 +81,7 @@ export interface About_AdminPanelLifeCycle {
   ourMission?: AdminPanelRelationPropertyModification<YogaTextWithImageComponent_Plain>;
   ourVision?: AdminPanelRelationPropertyModification<YogaTextWithImageComponent_Plain>;
   achievements?: AdminPanelRelationPropertyModification<YogaAchivementsComponent_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
   locale: string;
   localizations?: About[];
 }

yoga-cms/generated-strapi-interfaces/api/contact-page.ts

@@ -4,10 +4,12 @@ import { YogaContactUs } from './yoga-contact-us';
 import { YogaGoogleMapsComponent } from './yoga-google-maps-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaContactUs_Plain } from './yoga-contact-us';
 import { YogaGoogleMapsComponent_Plain } from './yoga-google-maps-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface ContactPage {
@@ -19,6 +21,7 @@ export interface ContactPage {
     google_maps?: { data: YogaGoogleMapsComponent };
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
   };
 }
 export interface ContactPage_Plain {
@@ -29,6 +32,7 @@ export interface ContactPage_Plain {
   google_maps?: YogaGoogleMapsComponent_Plain;
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
 }
 
 export interface ContactPage_NoRelations {
@@ -39,6 +43,7 @@ export interface ContactPage_NoRelations {
   google_maps?: number;
   subscribe?: number;
   footer?: number;
+  common?: number;
 }
 
 export interface ContactPage_AdminPanelLifeCycle {
@@ -49,4 +54,5 @@ export interface ContactPage_AdminPanelLifeCycle {
   google_maps?: AdminPanelRelationPropertyModification<YogaGoogleMapsComponent_Plain>;
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-cms/generated-strapi-interfaces/api/faq-page.ts

@@ -5,11 +5,13 @@ import { YogaAchivementsComponent } from './yoga-achivements-component';
 import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaFaqComponent_Plain } from './yoga-faq-component';
 import { YogaAchivementsComponent_Plain } from './yoga-achivements-component';
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface FaqPage {
@@ -22,6 +24,7 @@ export interface FaqPage {
     blogs?: { data: YogaBlogPostsComponent };
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
   };
 }
 export interface FaqPage_Plain {
@@ -33,6 +36,7 @@ export interface FaqPage_Plain {
   blogs?: YogaBlogPostsComponent_Plain;
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
 }
 
 export interface FaqPage_NoRelations {
@@ -44,6 +48,7 @@ export interface FaqPage_NoRelations {
   blogs?: number;
   subscribe?: number;
   footer?: number;
+  common?: number;
 }
 
 export interface FaqPage_AdminPanelLifeCycle {
@@ -55,4 +60,5 @@ export interface FaqPage_AdminPanelLifeCycle {
   blogs?: AdminPanelRelationPropertyModification<YogaBlogPostsComponent_Plain>;
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-cms/generated-strapi-interfaces/api/global.ts

@@ -14,6 +14,7 @@ export interface Global {
     favicon?: { data: Media };
     siteDescription: string;
     defaultSeo?: Seo;
+    logoImage?: { data: Media };
   };
 }
 export interface Global_Plain {
@@ -22,6 +23,7 @@ export interface Global_Plain {
   favicon?: Media_Plain;
   siteDescription: string;
   defaultSeo?: Seo_Plain;
+  logoImage?: Media_Plain;
 }
 
 export interface Global_NoRelations {
@@ -30,6 +32,7 @@ export interface Global_NoRelations {
   favicon?: number;
   siteDescription: string;
   defaultSeo?: Seo_NoRelations;
+  logoImage?: number;
 }
 
 export interface Global_AdminPanelLifeCycle {
@@ -38,4 +41,5 @@ export interface Global_AdminPanelLifeCycle {
   favicon?: AdminPanelRelationPropertyModification<Media_Plain>;
   siteDescription: string;
   defaultSeo?: Seo_Plain;
+  logoImage?: AdminPanelRelationPropertyModification<Media_Plain>;
 }

yoga-cms/generated-strapi-interfaces/api/prices-page.ts

@@ -5,11 +5,13 @@ import { YogaDiscountComponent } from './yoga-discount-component';
 import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaPriceComponent_Plain } from './yoga-price-component';
 import { YogaDiscountComponent_Plain } from './yoga-discount-component';
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface PricesPage {
@@ -22,6 +24,7 @@ export interface PricesPage {
     blogs?: { data: YogaBlogPostsComponent };
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
   };
 }
 export interface PricesPage_Plain {
@@ -33,6 +36,7 @@ export interface PricesPage_Plain {
   blogs?: YogaBlogPostsComponent_Plain;
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
 }
 
 export interface PricesPage_NoRelations {
@@ -44,6 +48,7 @@ export interface PricesPage_NoRelations {
   blogs?: number;
   subscribe?: number;
   footer?: number;
+  common?: number;
 }
 
 export interface PricesPage_AdminPanelLifeCycle {
@@ -55,4 +60,5 @@ export interface PricesPage_AdminPanelLifeCycle {
   blogs?: AdminPanelRelationPropertyModification<YogaBlogPostsComponent_Plain>;
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-cms/generated-strapi-interfaces/api/service-page.ts

@@ -0,0 +1,46 @@
+// Interface automatically generated by schemas-to-ts
+
+import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
+import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
+import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
+import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
+
+export interface ServicePage {
+  id: number;
+  attributes: {
+    createdAt: Date;    updatedAt: Date;    publishedAt?: Date;    header?: string;
+    description?: string;
+    subscribeNow?: { data: YogaSubscribeNowComponent };
+    footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
+  };
+}
+export interface ServicePage_Plain {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: YogaSubscribeNowComponent_Plain;
+  footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
+}
+
+export interface ServicePage_NoRelations {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: number;
+  footer?: number;
+  common?: number;
+}
+
+export interface ServicePage_AdminPanelLifeCycle {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
+  footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
+}

yoga-cms/generated-strapi-interfaces/api/services-page.ts

@@ -7,6 +7,7 @@ import { YogaCustomerFeedbackComponent } from './yoga-customer-feedback-componen
 import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
+import { YogaCommon } from './yoga-common';
 import { YogaOurServicesComponent_Plain } from './yoga-our-services-component';
 import { YogaContactUs_Plain } from './yoga-contact-us';
 import { YogaSpecialitiesComponent_Plain } from './yoga-specialities-component';
@@ -14,6 +15,7 @@ import { YogaCustomerFeedbackComponent_Plain } from './yoga-customer-feedback-co
 import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface ServicesPage {
@@ -29,6 +31,7 @@ export interface ServicesPage {
     subscribe?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
     title?: string;
+    common?: { data: YogaCommon };
   };
 }
 export interface ServicesPage_Plain {
@@ -43,6 +46,7 @@ export interface ServicesPage_Plain {
   subscribe?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
   title?: string;
+  common?: YogaCommon_Plain;
 }
 
 export interface ServicesPage_NoRelations {
@@ -57,6 +61,7 @@ export interface ServicesPage_NoRelations {
   subscribe?: number;
   footer?: number;
   title?: string;
+  common?: number;
 }
 
 export interface ServicesPage_AdminPanelLifeCycle {
@@ -71,4 +76,5 @@ export interface ServicesPage_AdminPanelLifeCycle {
   subscribe?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
   title?: string;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
 }

yoga-cms/generated-strapi-interfaces/api/yoga-common.ts

@@ -0,0 +1,30 @@
+// Interface automatically generated by schemas-to-ts
+
+import { Media } from '../components/shared/Media';
+import { Media_Plain } from '../components/shared/Media';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
+
+export interface YogaCommon {
+  id: number;
+  attributes: {
+    createdAt: Date;    updatedAt: Date;    publishedAt?: Date;    logoImage?: { data: Media };
+    name: string;
+  };
+}
+export interface YogaCommon_Plain {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  logoImage?: Media_Plain;
+  name: string;
+}
+
+export interface YogaCommon_NoRelations {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  logoImage?: number;
+  name: string;
+}
+
+export interface YogaCommon_AdminPanelLifeCycle {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  logoImage?: AdminPanelRelationPropertyModification<Media_Plain>;
+  name: string;
+}

yoga-cms/generated-strapi-interfaces/api/yoga-price.ts

@@ -14,6 +14,8 @@ export interface YogaPrice {
     price?: number;
     icon?: { data: Media };
     image?: { data: Media };
+    pricePostfix?: string;
+    description?: string;
   };
 }
 export interface YogaPrice_Plain {
@@ -25,6 +27,8 @@ export interface YogaPrice_Plain {
   price?: number;
   icon?: Media_Plain;
   image?: Media_Plain;
+  pricePostfix?: string;
+  description?: string;
 }
 
 export interface YogaPrice_NoRelations {
@@ -36,6 +40,8 @@ export interface YogaPrice_NoRelations {
   price?: number;
   icon?: number;
   image?: number;
+  pricePostfix?: string;
+  description?: string;
 }
 
 export interface YogaPrice_AdminPanelLifeCycle {
@@ -47,4 +53,6 @@ export interface YogaPrice_AdminPanelLifeCycle {
   price?: number;
   icon?: AdminPanelRelationPropertyModification<Media_Plain>;
   image?: AdminPanelRelationPropertyModification<Media_Plain>;
+  pricePostfix?: string;
+  description?: string;
 }

yoga-cms/generated-strapi-interfaces/api/yoga-single-service.ts

@@ -13,7 +13,7 @@ export interface YogaSingleService {
     image?: { data: Media };
     imageAlt?: string;
     name?: string;
-    article?: string;
+    article?: any;
     locale: string;
     localizations?: { data: YogaSingleService[] };
   };
@@ -26,7 +26,7 @@ export interface YogaSingleService_Plain {
   image?: Media_Plain;
   imageAlt?: string;
   name?: string;
-  article?: string;
+  article?: any;
   locale: string;
   localizations?: YogaSingleService_Plain[];
 }
@@ -39,7 +39,7 @@ export interface YogaSingleService_NoRelations {
   image?: number;
   imageAlt?: string;
   name?: string;
-  article?: string;
+  article?: any;
   locale: string;
   localizations?: YogaSingleService[];
 }
@@ -52,7 +52,7 @@ export interface YogaSingleService_AdminPanelLifeCycle {
   image?: AdminPanelRelationPropertyModification<Media_Plain>;
   imageAlt?: string;
   name?: string;
-  article?: string;
+  article?: any;
   locale: string;
   localizations?: YogaSingleService[];
 }

yoga-cms/src/api/about/content-types/about/schema.json

@@ -65,6 +65,11 @@
       "type": "relation",
       "relation": "oneToOne",
       "target": "api::yoga-achivements-component.yoga-achivements-component"
+    },
+    "common": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-common.yoga-common"
     }
   }
 }

yoga-cms/src/api/contact-page/content-types/contact-page/schema.json

@@ -37,6 +37,11 @@
       "type": "relation",
       "relation": "oneToOne",
       "target": "api::yoga-footer.yoga-footer"
+    },
+    "common": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-common.yoga-common"
     }
   }
 }

yoga-cms/src/api/faq-page/content-types/faq-page/schema.json

@@ -42,6 +42,11 @@
       "type": "relation",
       "relation": "oneToOne",
       "target": "api::yoga-footer.yoga-footer"
+    },
+    "common": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-common.yoga-common"
     }
   }
 }

yoga-cms/src/api/global/content-types/global/schema.json

@@ -20,7 +20,11 @@
       "type": "media",
       "multiple": false,
       "required": false,
-      "allowedTypes": ["images", "files", "videos"]
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos"
+      ]
     },
     "siteDescription": {
       "type": "text",
@@ -30,6 +34,17 @@
       "type": "component",
       "repeatable": false,
       "component": "shared.seo"
+    },
+    "logoImage": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ]
     }
   }
 }

yoga-cms/src/api/prices-page/content-types/prices-page/schema.json

@@ -4,7 +4,8 @@
   "info": {
     "singularName": "prices-page",
     "pluralName": "prices-pages",
-    "displayName": "PricesPage"
+    "displayName": "PricesPage",
+    "description": ""
   },
   "options": {
     "draftAndPublish": true
@@ -41,6 +42,11 @@
       "type": "relation",
       "relation": "oneToOne",
       "target": "api::yoga-footer.yoga-footer"
+    },
+    "common": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-common.yoga-common"
     }
   }
 }

yoga-cms/src/api/service-page/content-types/service-page/schema.json

@@ -0,0 +1,36 @@
+{
+  "kind": "singleType",
+  "collectionName": "service_pages",
+  "info": {
+    "singularName": "service-page",
+    "pluralName": "service-pages",
+    "displayName": "ServicePage",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "attributes": {
+    "header": {
+      "type": "string"
+    },
+    "description": {
+      "type": "text"
+    },
+    "subscribeNow": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-subscribe-now-component.yoga-subscribe-now-component"
+    },
+    "footer": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-footer.yoga-footer"
+    },
+    "common": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-common.yoga-common"
+    }
+  }
+}

yoga-cms/src/api/service-page/controllers/service-page.ts

@@ -0,0 +1,7 @@
+/**
+ * service-page controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::service-page.service-page');

yoga-cms/src/api/service-page/routes/service-page.ts

@@ -0,0 +1,7 @@
+/**
+ * service-page router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::service-page.service-page');

yoga-cms/src/api/service-page/services/service-page.ts

@@ -0,0 +1,7 @@
+/**
+ * service-page service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::service-page.service-page');

yoga-cms/src/api/services-page/content-types/services-page/schema.json

@@ -55,6 +55,11 @@
     },
     "title": {
       "type": "string"
+    },
+    "common": {
+      "type": "relation",
+      "relation": "oneToOne",
+      "target": "api::yoga-common.yoga-common"
     }
   }
 }

yoga-cms/src/api/yoga-common/content-types/yoga-common/schema.json

@@ -0,0 +1,30 @@
+{
+  "kind": "collectionType",
+  "collectionName": "yoga_commons",
+  "info": {
+    "singularName": "yoga-common",
+    "pluralName": "yoga-commons",
+    "displayName": "YogaCommon",
+    "description": ""
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "attributes": {
+    "logoImage": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ]
+    },
+    "name": {
+      "type": "string",
+      "required": true
+    }
+  }
+}

yoga-cms/src/api/yoga-common/controllers/yoga-common.ts

@@ -0,0 +1,7 @@
+/**
+ * yoga-common controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::yoga-common.yoga-common');

yoga-cms/src/api/yoga-common/routes/yoga-common.ts

@@ -0,0 +1,7 @@
+/**
+ * yoga-common router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::yoga-common.yoga-common');

yoga-cms/src/api/yoga-common/services/yoga-common.ts

@@ -0,0 +1,7 @@
+/**
+ * yoga-common service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::yoga-common.yoga-common');

yoga-cms/src/api/yoga-price/content-types/yoga-price/schema.json

@@ -4,7 +4,8 @@
   "info": {
     "singularName": "yoga-price",
     "pluralName": "yoga-prices",
-    "displayName": "YogaPrice"
+    "displayName": "YogaPrice",
+    "description": ""
   },
   "options": {
     "draftAndPublish": true
@@ -27,24 +28,32 @@
       "type": "integer"
     },
     "icon": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
       "allowedTypes": [
         "images",
         "files",
         "videos",
         "audios"
-      ],
+      ]
-      "type": "media",
-      "multiple": false
     },
     "image": {
+      "type": "media",
+      "multiple": false,
+      "required": false,
       "allowedTypes": [
         "images",
         "files",
         "videos",
         "audios"
-      ],
+      ]
-      "type": "media",
+    },
-      "multiple": false
+    "pricePostfix": {
+      "type": "string"
+    },
+    "description": {
+      "type": "text"
     }
   }
 }

yoga-cms/src/api/yoga-single-service/content-types/yoga-single-service/schema.json

@@ -73,7 +73,7 @@
       "type": "string"
     },
     "article": {
-      "type": "richtext"
+      "type": "blocks"
     }
   }
 }

yoga-cms/types/generated/contentTypes.d.ts

@@ -402,6 +402,10 @@ export interface ApiAboutAbout extends Struct.SingleTypeSchema {
       'oneToOne',
       'api::yoga-blog-posts-component.yoga-blog-posts-component'
     >;
+    common: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-common.yoga-common'
+    >;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
@@ -556,6 +560,10 @@ export interface ApiContactPageContactPage extends Struct.SingleTypeSchema {
     draftAndPublish: true;
   };
   attributes: {
+    common: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-common.yoga-common'
+    >;
     contactUs: Schema.Attribute.Relation<
       'oneToOne',
       'api::yoga-contact-us.yoga-contact-us'
@@ -610,6 +618,10 @@ export interface ApiFaqPageFaqPage extends Struct.SingleTypeSchema {
       'oneToOne',
       'api::yoga-blog-posts-component.yoga-blog-posts-component'
     >;
+    common: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-common.yoga-common'
+    >;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
@@ -663,6 +675,7 @@ export interface ApiGlobalGlobal extends Struct.SingleTypeSchema {
       'api::global.global'
     > &
       Schema.Attribute.Private;
+    logoImage: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
     publishedAt: Schema.Attribute.DateTime;
     siteDescription: Schema.Attribute.Text & Schema.Attribute.Required;
     siteName: Schema.Attribute.String & Schema.Attribute.Required;
@@ -803,6 +816,7 @@ export interface ApiPersonPerson extends Struct.SingleTypeSchema {
 export interface ApiPricesPagePricesPage extends Struct.SingleTypeSchema {
   collectionName: 'prices_pages';
   info: {
+    description: '';
     displayName: 'PricesPage';
     pluralName: 'prices-pages';
     singularName: 'prices-page';
@@ -815,6 +829,10 @@ export interface ApiPricesPagePricesPage extends Struct.SingleTypeSchema {
       'oneToOne',
       'api::yoga-blog-posts-component.yoga-blog-posts-component'
     >;
+    common: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-common.yoga-common'
+    >;
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
@@ -849,6 +867,48 @@ export interface ApiPricesPagePricesPage extends Struct.SingleTypeSchema {
   };
 }
 
+export interface ApiServicePageServicePage extends Struct.SingleTypeSchema {
+  collectionName: 'service_pages';
+  info: {
+    description: '';
+    displayName: 'ServicePage';
+    pluralName: 'service-pages';
+    singularName: 'service-page';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    common: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-common.yoga-common'
+    >;
+    createdAt: Schema.Attribute.DateTime;
+    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+    description: Schema.Attribute.Text;
+    footer: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-footer.yoga-footer'
+    >;
+    header: Schema.Attribute.String;
+    locale: Schema.Attribute.String & Schema.Attribute.Private;
+    localizations: Schema.Attribute.Relation<
+      'oneToMany',
+      'api::service-page.service-page'
+    > &
+      Schema.Attribute.Private;
+    publishedAt: Schema.Attribute.DateTime;
+    subscribeNow: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-subscribe-now-component.yoga-subscribe-now-component'
+    >;
+    updatedAt: Schema.Attribute.DateTime;
+    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+  };
+}
+
 export interface ApiServicesPageServicesPage extends Struct.SingleTypeSchema {
   collectionName: 'services_pages';
   info: {
@@ -865,6 +925,10 @@ export interface ApiServicesPageServicesPage extends Struct.SingleTypeSchema {
       'oneToOne',
       'api::yoga-blog-posts-component.yoga-blog-posts-component'
     >;
+    common: Schema.Attribute.Relation<
+      'oneToOne',
+      'api::yoga-common.yoga-common'
+    >;
     contactUs: Schema.Attribute.Relation<
       'oneToOne',
       'api::yoga-contact-us.yoga-contact-us'
@@ -1170,6 +1234,36 @@ export interface ApiYogaBlogPostsComponentYogaBlogPostsComponent
   };
 }
 
+export interface ApiYogaCommonYogaCommon extends Struct.CollectionTypeSchema {
+  collectionName: 'yoga_commons';
+  info: {
+    description: '';
+    displayName: 'YogaCommon';
+    pluralName: 'yoga-commons';
+    singularName: 'yoga-common';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    createdAt: Schema.Attribute.DateTime;
+    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+    locale: Schema.Attribute.String & Schema.Attribute.Private;
+    localizations: Schema.Attribute.Relation<
+      'oneToMany',
+      'api::yoga-common.yoga-common'
+    > &
+      Schema.Attribute.Private;
+    logoImage: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
+    name: Schema.Attribute.String & Schema.Attribute.Required;
+    publishedAt: Schema.Attribute.DateTime;
+    updatedAt: Schema.Attribute.DateTime;
+    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
+      Schema.Attribute.Private;
+  };
+}
+
 export interface ApiYogaContactUsYogaContactUs
   extends Struct.CollectionTypeSchema {
   collectionName: 'yoga_contact_uses';
@@ -1642,6 +1736,7 @@ export interface ApiYogaPriceComponentYogaPriceComponent
 export interface ApiYogaPriceYogaPrice extends Struct.CollectionTypeSchema {
   collectionName: 'yoga_prices';
   info: {
+    description: '';
     displayName: 'YogaPrice';
     pluralName: 'yoga-prices';
     singularName: 'yoga-price';
@@ -1654,6 +1749,7 @@ export interface ApiYogaPriceYogaPrice extends Struct.CollectionTypeSchema {
     createdAt: Schema.Attribute.DateTime;
     createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
       Schema.Attribute.Private;
+    description: Schema.Attribute.Text;
     header: Schema.Attribute.String;
     icon: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
     image: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
@@ -1666,6 +1762,7 @@ export interface ApiYogaPriceYogaPrice extends Struct.CollectionTypeSchema {
     option1: Schema.Attribute.String;
     option2: Schema.Attribute.String;
     price: Schema.Attribute.Integer;
+    pricePostfix: Schema.Attribute.String;
     publishedAt: Schema.Attribute.DateTime;
     updatedAt: Schema.Attribute.DateTime;
     updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@@ -1691,7 +1788,7 @@ export interface ApiYogaSingleServiceYogaSingleService
     };
   };
   attributes: {
-    article: Schema.Attribute.RichText;
+    article: Schema.Attribute.Blocks;
     buttonLink: Schema.Attribute.String &
       Schema.Attribute.SetPluginOptions<{
         i18n: {
@@ -2503,6 +2600,7 @@ declare module '@strapi/strapi' {
       'api::page.page': ApiPagePage;
       'api::person.person': ApiPersonPerson;
       'api::prices-page.prices-page': ApiPricesPagePricesPage;
+      'api::service-page.service-page': ApiServicePageServicePage;
       'api::services-page.services-page': ApiServicesPageServicesPage;
       'api::yoga-about-us-component.yoga-about-us-component': ApiYogaAboutUsComponentYogaAboutUsComponent;
       'api::yoga-about-us-with-boxes-component.yoga-about-us-with-boxes-component': ApiYogaAboutUsWithBoxesComponentYogaAboutUsWithBoxesComponent;
@@ -2510,6 +2608,7 @@ declare module '@strapi/strapi' {
       'api::yoga-achivements-component.yoga-achivements-component': ApiYogaAchivementsComponentYogaAchivementsComponent;
       'api::yoga-blog-post.yoga-blog-post': ApiYogaBlogPostYogaBlogPost;
       'api::yoga-blog-posts-component.yoga-blog-posts-component': ApiYogaBlogPostsComponentYogaBlogPostsComponent;
+      'api::yoga-common.yoga-common': ApiYogaCommonYogaCommon;
       'api::yoga-contact-us.yoga-contact-us': ApiYogaContactUsYogaContactUs;
       'api::yoga-customer-feedback-component.yoga-customer-feedback-component': ApiYogaCustomerFeedbackComponentYogaCustomerFeedbackComponent;
       'api::yoga-customer-feedback.yoga-customer-feedback': ApiYogaCustomerFeedbackYogaCustomerFeedback;