[ci-skip] New Prod yoga-app deployment version: 202509161943.65409a9

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/service-list-page?fields[0]=*&populate[services][fields][0]=*&populate[services][populate][image][fields][0]=name&populate[services][populate][image][fields][1]=mime&populate[services][populate][image][fields][2]=url&populate[common][fields][0]=*&populate[common][populate][logoImage][fields][0]=name&populate[common][populate][logoImage][fields][1]=mime&populate[common][populate][logoImage][fields][2]=url&populate[subscribeNow][fields][0]=*&populate[subscribeNow][populate][image][fields][0]=name&populate[subscribeNow][populate][image][fields][1]=mime&populate[subscribeNow][populate][image][fields][2]=url&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]=*&populate[footer][populate][logo][fields][0]=name&populate[footer][populate][logo][fields][1]=mime&populate[footer][populate][logo][fields][2]=url
+Accept: application/json
+
+
+
+

dev.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+PROJECT_ROOT=$(readlink -f $(dirname $0))
+
+ENV_DIR=${PROJECT_ROOT}"/environment/dev/docker-compose/yogastic"
+CMS_DIR=${PROJECT_ROOT}"/yoga-cms"
+APP_DIR=${PROJECT_ROOT}"/yoga-app"
+
+echo "PROJECT_ROOT $PROJECT_ROOT"
+
+cd $ENV_DIR
+docker compose up -d
+
+cd $CMS_DIR
+fuser -k 1337/tcp
+npm run develop &
+
+cd $APP_DIR
+fuser -k 4081/tcp
+npm run dev &

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

@@ -1 +1 @@
-202505181151.77363d0
+202509160924.c47ec66

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
+202509161943.65409a9

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:202509160924.c47ec66
     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:202509161943.65409a9
     ports:
       - '4026:1337'
     environment:
@@ -71,7 +71,6 @@ services:
       - yogastic
     volumes:
       - strapi-uploads:/opt/app/public/uploads
-
 volumes:
   next-db: {}
   strapi-db: {}

package.json

@@ -8,7 +8,8 @@
     "build.docker.image.app": "cd environment/dev/docker/app/scripts && bash build.docker.build.sh ",
     "build.docker.image.cms": "cd environment/dev/docker/cms/scripts && bash build.docker.build.sh ",
     "push.docker.image.app": "cd environment/dev/docker/app/scripts && bash build.docker.push.sh ",
-    "push.docker.image.cms": "cd environment/dev/docker/cms/scripts && bash build.docker.push.sh "
+    "push.docker.image.cms": "cd environment/dev/docker/cms/scripts && bash build.docker.push.sh ",
+    "dev": "bash ./dev.sh"
   },
   "author": "",
   "license": "ISC",

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": {
@@ -63,7 +72,16 @@
       }
     },
     "subscribeNow": {
-      "fields": ["*"]
+      "fields": ["*"],
+      "populate": {
+        "image": {
+          "fields": [
+            "name",
+            "mime",
+            "url"
+          ]
+        }
+      }
     },
     "footer": {
       "fields": ["*"],
@@ -79,6 +97,9 @@
         },
         "contactUsPhoneNumber": {
           "fields": ["*"]
+        },
+        "logo": {
+          "fields": ["name","mime","url"]
         }
       }
     }

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

@@ -1,6 +1,14 @@
 {
   "fields": ["*"],
   "populate": {
+    "common": {
+      "fields": ["*"],
+      "populate": {
+        "logoImage": {
+          "fields": ["name","mime","url"]
+        }
+      }
+    },
     "contactUs": {
       "fields": ["*"]
     },
@@ -8,7 +16,16 @@
       "fields": ["*"]
     },
     "subscribe": {
-      "fields": ["*"]
+      "fields": ["*"],
+      "populate": {
+        "image": {
+          "fields": [
+            "name",
+            "mime",
+            "url"
+          ]
+        }
+      }
   },
     "footer": {
       "fields": ["*"],
@@ -24,6 +41,9 @@
         },
         "contactUsPhoneNumber": {
           "fields": ["*"]
+        },
+        "logo": {
+          "fields": ["name","mime","url"]
         }
       }
     }

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": {
@@ -43,7 +51,16 @@
       }
     },
     "subscribe": {
-      "fields": ["*"]
+      "fields": ["*"],
+      "populate": {
+        "image": {
+          "fields": [
+            "name",
+            "mime",
+            "url"
+          ]
+        }
+      }
   },
     "footer": {
       "fields": ["*"],
@@ -59,6 +76,9 @@
         },
         "contactUsPhoneNumber": {
           "fields": ["*"]
+        },
+        "logo": {
+          "fields": ["name","mime","url"]
         }
       }
     }

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

@@ -1,5 +1,13 @@
 {
   "populate": {
+    "common": {
+      "fields": ["*"],
+      "populate": {
+        "logoImage": {
+          "fields": ["name","mime","url"]
+        }
+      }
+    },
     "header": {
       "fields": ["*"],
       "populate": {
@@ -7,8 +15,12 @@
           "fields": [
             "*"
           ]
+        },
+        "image": {
+            "fields": ["name","mime","url"]
           }          
       }
+      
     },
     "footer": {
       "fields": ["*"],
@@ -24,11 +36,23 @@
         },
         "contactUsPhoneNumber": {
           "fields": ["*"]
+        },
+        "logo": {
+          "fields": ["name","mime","url"]
         }
       }
     },
     "subscribeNow": {
-      "fields": ["*"]
+      "fields": ["*"],
+      "populate": {
+        "image": {
+          "fields": [
+            "name",
+            "mime",
+            "url"
+          ]
+        }
+      }
   },
     "blogs": {
       "fields": ["*"],
@@ -128,6 +152,9 @@
         },
         "right4": {
           "fields": ["*"]
+        },
+        "image": {
+          "fields": ["name","mime","url"]
         }
       }
     }

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": {
@@ -40,7 +48,16 @@
       }
     },
     "subscribe": {
-      "fields": ["*"]
+      "fields": ["*"],
+      "populate": {
+        "image": {
+          "fields": [
+            "name",
+            "mime",
+            "url"
+          ]
+        }
+      }
     },
     "footer": {
       "fields": ["*"],
@@ -56,6 +73,9 @@
         },
         "contactUsPhoneNumber": {
           "fields": ["*"]
+        },
+        "logo": {
+          "fields": ["name","mime","url"]
         }
       }
     }

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

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

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

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

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": {
@@ -43,6 +51,9 @@
         },
         "right4": {
           "fields": ["*"]
+        },
+        "image": {
+          "fields": ["name","mime","url"]
         }
       }
     },
@@ -79,7 +90,16 @@
       }
     },
     "subscribe": {
-      "fields": ["*"]
+      "fields": ["*"],
+      "populate": {
+        "image": {
+          "fields": [
+            "name",
+            "mime",
+            "url"
+          ]
+        }
+    }
   },
     "footer": {
       "fields": ["*"],
@@ -95,6 +115,9 @@
         },
         "contactUsPhoneNumber": {
           "fields": ["*"]
+        },
+        "logo": {
+          "fields": ["name","mime","url"]
         }
       }
     }

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

@@ -4,15 +4,20 @@ 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 serviceListPageQuery from "@/api/strapi/query/service-list.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";
 import {YogaBlogPost_Plain} from "@/types/generated-strapi-interfaces/api/yoga-blog-post";
 import {Home_Plain} from "@/types/generated-strapi-interfaces/api/home";
 import {ServicesPage_Plain} from "@/types/generated-strapi-interfaces/api/services-page";
+import {ServiceListPage_Plain} from "@/types/generated-strapi-interfaces/api/service-list-page";
 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 +47,24 @@ class StrapiApi{
         return this.getJson("/api/services-page?",servicesQuery);
     }
 
+    public getServicePage(): Promise<ServicePage_Plain>{
+        return this.getJson("/api/service-page?",serviceQuery);
+    }
+
+    public getServiceListPage(): Promise<ServiceListPage_Plain>{
+        return this.getJson("/api/service-list-page?",serviceListPageQuery);
+    }
+
+    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

@@ -3,41 +3,56 @@ import {Payload} from "@/types/generated-strapi-interfaces/common/Payload";
 
 const STRAPI_URL = process.env.STRAPI_URL;
 
-class StrapiClient{
+class StrapiClient {
 
     constructor(private strapiUrl: string = "http://localhost:1337") {
     }
-    public getImageUrl(imagePath: string){
+
-        if ( !imagePath ){
+    public getImageUrl(imagePath: string) {
+        if (!imagePath) {
             return "dummy.png"
         }
-        return  '/image/'+ imagePath;
+        return '/image/' + imagePath;
     }
-    public async  httpGet(path: string){
+
-        return await httpClient.httpGet(this.strapiUrl + path);
+    public async httpGet(path: string) {
+        let result = undefined;
+        try {
+            const absoluteUrl = this.strapiUrl + path;
+            console.info("httpGet", {path,absoluteUrl});
+            result = await httpClient.httpGet(this.strapiUrl + path);
+        } catch (e) {
+            console.log("httpGet error", e);
+            throw e;
         }
-    public async httpGetJson<T>(url: string): Promise<Payload<T>>{
+        if (!result.ok) {
+            console.info("httpGet not ok", result);
+            throw new Error(result.statusText);
+        }
+        return result;
+    }
+
+    public async httpGetJson<T>(url: string): Promise<Payload<T>> {
         const response = await this.httpGet(url);
         return await response.json();
     }
 
-    public async findContentType<T>(contentType: string,options?: FindContentOptions): Promise<Payload<T>>{
+    public async findContentType<T>(contentType: string, options?: FindContentOptions): Promise<Payload<T>> {
         const searchParams = new URLSearchParams();
-        if ( options?.populateAll ){
+        if (options?.populateAll) {
-            searchParams.append("populate","*");
+            searchParams.append("populate", "*");
         }
-        if (options?.localeAll){
+        if (options?.localeAll) {
-            searchParams.append("_locale","all");
+            searchParams.append("_locale", "all");
         }
 
 
-
+        const response = await this.httpGet("/api/" + contentType + "?" + searchParams.toString());
-        const response =  await this.httpGet("/api/"+contentType+"?"+searchParams.toString());
         return await response.json();
     }
 }
 
-export interface FindContentOptions{
+export interface FindContentOptions {
     populateAll?: boolean;
     localeAll?: boolean;
 }

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

@@ -1,6 +1,5 @@
 import React from "react";
 import AosComponent from "@/components/aos.component";
-import BlogPostsComponent from "@/components/blog.posts.component";
 import FooterComponent from "@/components/footer.component";
 import SubscribeComponent from "@/components/subscribe.component";
 import strapiApi from "@/api/strapi/strapi-api";
@@ -13,15 +12,14 @@ export default async function About() {
         header,
         description,
         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} /> }
             { footer && <FooterComponent config={footer} /> }
             <AosComponent />

yoga-app/src/app/globals.scss

@@ -12,6 +12,9 @@
 @import '../styles/custom-style';
 @import '../styles/special-classes';
 @import 'node_modules/aos/src/sass/aos.scss';
+@import '../styles/block-with-image';
+@import '../styles/block-with-left-image';
+@import '../styles/block-with-right-image';
 
 //<!-- Latest compiled and minified CSS -->
 //<link

yoga-app/src/app/layout.tsx

@@ -73,8 +73,8 @@ const generateIcons = ( ): IconDescriptor[] => {
 
 
 export const metadata: Metadata = {
-    title: "Yoga App",
+    title: "Reverseyoga",
-    description: "Yoga App",
+    description: "Reverseyoga - Yoga mindenkinek",
     icons: generateIcons(),
     manifest: "./assets/images/favicon/manifest.json",
     other: {

yoga-app/src/app/page.tsx

@@ -5,7 +5,6 @@ import AboutUsComponent from "@/components/about.us.component";
 import OurSpecialitiesComponent from "@/components/our.specialities.component";
 import ContactUsComponent from "@/components/contact.us.component";
 import PricingComponent from "@/components/pricing.component";
-import FeedbackComponent from "@/components/feedbackComponent";
 import BlogPostsComponent from "@/components/blog.posts.component";
 import FooterComponent from "@/components/footer.component";
 import SubscribeComponent from "@/components/subscribe.component";
@@ -16,9 +15,8 @@ import webApi from "@/api/web-client/web-api";
 export default async function Home() {
         const pageData = await webApi.getHomePage();
 
-        console.info(JSON.stringify(pageData))
-
         const {
+                common,
                 header,
                 ourServices,
                 aboutUs,
@@ -28,18 +26,18 @@ export default async function Home() {
                 blogs,
                 subscribeNow,
                 footer,
-                feedbacks
         } = pageData;
+
   return (
       <>
-              { header && <MainHeaderComponent config={header}/> }
+              { header && <MainHeaderComponent config={header} common={common} /> }
               { aboutUs && <AboutUsComponent data={aboutUs} /> }
               { ourServices && <OurServicesComponent config={ourServices}/> }
               { ourSpecialities && <OurSpecialitiesComponent config={ourSpecialities} /> }
               { contactUs && <ContactUsComponent contactUs={contactUs} /> }
               { prices && <PricingComponent config={prices}/> }
-              { feedbacks && <FeedbackComponent config={feedbacks} /> }
+              {/*{ feedbacks && <FeedbackComponent config={feedbacks} /> }*/}
-              { blogs && <BlogPostsComponent config={blogs} /> }
+              { blogs && blogs.posts?.length && <BlogPostsComponent config={blogs} /> }
               { subscribeNow && <SubscribeComponent config={subscribeNow} /> }
               { footer && <FooterComponent config={footer} /> }
           <AosComponent />

yoga-app/src/app/prices/page.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import AosComponent from "@/components/aos.component";
 import PricingComponent from "@/components/pricing.component";
-import BlogPostsComponent from "@/components/blog.posts.component";
 import SubscribeComponent from "@/components/subscribe.component";
 import SubHeaderComponent from "@/components/subHeader.component";
 import YogaDiscountComponent from "@/components/yogaDiscountComponent";
@@ -19,16 +18,15 @@ export default async function PricesPage( ) {
         description,
         price,
         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} /> }
             { subscribe && <SubscribeComponent config={subscribe} /> }
             { footer && <FooterComponent config={footer} /> }
             <AosComponent />

yoga-app/src/app/seed/route.ts

@@ -110,10 +110,8 @@ export async function GET() {
   //     'Uncomment this file and remove this line. You can delete this file when you are finished.',
   // });
   try {
-    console.info("get request")
     strapiApi.getHomePage();
 
-    console.info("begin")
     await connectionPool.query(`BEGIN`);
     await seedUsers();
     await seedCustomers();

yoga-app/src/app/serviceList/page.tsx

@@ -0,0 +1,39 @@
+import React from "react";
+import AosComponent from "@/components/aos.component";
+import FooterComponent from "@/components/footer.component";
+import SubscribeComponent from "@/components/subscribe.component";
+import strapiApi from "@/api/strapi/strapi-api";
+import SubHeaderComponent from "@/components/subHeader.component";
+import SingleServiceComponent from "@/components/single.service.component";
+import {sortServicesByPriority} from "@/util/sorting";
+
+export default async function Services() {
+    const {
+        header,
+        description,
+        footer,
+        subscribeNow,
+        common,
+        services
+    } = await strapiApi.getServiceListPage();
+    const sortedServices = services ? [...services] : [];
+    sortedServices.sort( sortServicesByPriority )
+    return (
+        <>
+            <SubHeaderComponent  header={{header1:header,description}} common={common}/>
+            {
+                  sortedServices.map( (singleService,index) => {
+                    return (
+                        <SingleServiceComponent key={singleService.id} config={singleService} index={index}/>
+                    )
+                })
+            }
+            { subscribeNow && <SubscribeComponent config={subscribeNow} /> }
+            { footer &&  <FooterComponent config={footer} /> }
+            <AosComponent />
+        </>
+
+    );
+}
+
+export const dynamic = 'force-dynamic'

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

@@ -0,0 +1,74 @@
+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";
+
+const rewriteStrapiImageUrlToNextImageUrl = (content: BlocksContent) =>{
+    console.info("content", content);
+    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
+
+    console.info("service slug",slug);
+    const servicePage = await strapiApi.getServicePage();
+    if (!servicePage) {
+        return notFound()
+    }
+    console.info("Servicepage found");
+    const {subscribeNow, footer, common} = servicePage;
+    const servicesByName = await strapiApi.getService(slug);
+    console.info("servicesByName",servicesByName);
+
+    if (!servicesByName || servicesByName.length === 0) {
+        return notFound();
+    }
+    const selectedService = servicesByName[0];
+    console.info("selected service",selectedService)
+    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

@@ -12,7 +12,7 @@ import SubHeaderComponent from "@/components/subHeader.component";
 
 export default async function Services() {
     const {
-        header,
+        header = undefined,
         description,
         ourServices,
         contactUs,
@@ -20,11 +20,12 @@ export default async function Services() {
         feedbacks,
         blogs,
         footer,
-        subscribe
+        subscribe,
-    } = await strapiApi.getServicesPage();
+        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/about.us.with.boxes.component.tsx

@@ -2,13 +2,17 @@ import YogaImageComponent from "@/components/yoga.image.component";
 import {
     YogaAboutUsWithBoxesComponent_Plain
 } from "@/types/generated-strapi-interfaces/api/yoga-about-us-with-boxes-component";
+import {StrapiFile} from "@/types/types";
+import strapiApi from "@/api/strapi/strapi-api";
 
 export interface Props{
     config: YogaAboutUsWithBoxesComponent_Plain
 }
 
-export default function AboutUsWithBoxesComponent({ config: {title,header,description, box1,box2,box3,box4}}: Props){
+export default function AboutUsWithBoxesComponent({ config: {title,header,description, image, box1,box2,box3,box4}}: Props){
 
+    const imageFile: StrapiFile = image as StrapiFile;
+    const imageUrl = strapiApi.getImageUrl(imageFile?.url)
     
     return (
         <section className="aboutpage_aboutus_section">
@@ -16,7 +20,7 @@ export default function AboutUsWithBoxesComponent({ config: {title,header,descri
                 <div className="row">
                     <div className="col-lg-7 col-md-6 col-sm-12 col-xs-12">
                         <div className="aboutpage_aboutus_image">
-                            <figure className="mb-0"><YogaImageComponent src="./assets/images/about_page_aboutus_image.png" alt="" className="img-fluid" /></figure>
+                            <figure className="mb-0"><YogaImageComponent src={imageUrl} alt="" className="img-fluid" /></figure>
                         </div>
                         <figure className="aboutus_top_shape left_shape mb-0">
                             <YogaImageComponent src="./assets/images/aboutus_top_shape.png" alt="" className="img-fluid" />

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

@@ -10,7 +10,6 @@ export default function AchievementsComponent({
         title,header,description
     }
                                               }: Props){
-    console.info("achievements",achievements)
     return (
         <section className="achievement_section">
             <div className="container">

yoga-app/src/components/achievements.item.component.module.css

@@ -0,0 +1,4 @@
+
+.textCenter{
+    text-align: center;
+}

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

@@ -3,6 +3,10 @@ import {YogaAchivement_Plain} from "@/types/generated-strapi-interfaces/api/yoga
 import {StrapiFile} from "@/types/types";
 import strapiApi from "@/api/strapi/strapi-api";
 
+import styles from './achievements.item.component.module.css';
+import clsx from "clsx";
+
+
 export interface Props{
     achievement: YogaAchivement_Plain
 
@@ -15,7 +19,7 @@ const imageFile: StrapiFile = image as StrapiFile;
     return (
                     <div className="col-lg-2 col-md-4 col-sm-6 col-xs-12">
                         <div className="logo_wrapper">
-                            <figure className="mb-0"><YogaImageComponent src={strapiApi.getImageUrl(imageFile?.url)} alt="" className="img-fluid"/></figure>
+                            <figure className="mb-0"><YogaImageComponent src={strapiApi.getImageUrl(imageFile?.url)} alt="" className={clsx(styles.textCenter, "img-fluid")}/></figure>
                             <div className="logo_content">
                                 {description}
                             </div>

yoga-app/src/components/block.with.image.component.tsx

@@ -0,0 +1,35 @@
+import {ButtonConfig, ImageConfig} from "@/types/types";
+import {BlocksContent} from "@strapi/blocks-react-renderer";
+import BlockWithRightImage from "@/components/block.with.right.image.component";
+import BlockWithLeftImage from "@/components/block.with.left.image.component";
+
+
+export interface BlockWithImageComponentProps {
+    id?: string;
+    title?: string;
+    header?: string;
+    block: BlocksContent;
+    image: ImageConfig;
+    button?: ButtonConfig;
+}
+
+export default function BlockWithImageComponent({
+                                                    block,
+                                                    image,
+                                                    id,
+                                                    title,
+                                                    header,
+                                                    button
+                                                }: BlockWithImageComponentProps) {
+    return (
+        <>
+            {image?.position == 'Right' && <BlockWithRightImage
+                block={block} image={image} id={id} title={title}
+                header={header}
+                button={button}/>}
+            {image?.position == 'Left' && <BlockWithLeftImage block={block} image={image} id={id} title={title}
+                                                              header={header}
+                                                              button={button}/>}
+        </>
+    );
+}

yoga-app/src/components/block.with.left.image.component.module.css

@@ -0,0 +1,6 @@
+.leftImage {
+    /*border-top-left-radius: 200px;*/
+    /*border-bottom-right-radius: 200px;*/
+    /*margin: -150px 12px 12px 0;*/
+}
+

yoga-app/src/components/block.with.left.image.component.tsx

@@ -0,0 +1,50 @@
+import YogaImageComponent from "@/components/yoga.image.component";
+import NextBlocksRenderer from "@/components/next.blocks.renderer";
+import {BlockWithImageComponentProps} from "@/components/block.with.image.component";
+import styles from './block.with.left.image.component.module.css';
+import clsx from "clsx";
+
+
+export default function BlockWithLeftImage (  {
+    id,title,header,  image: {
+        url,
+    },block,button
+} : BlockWithImageComponentProps){
+
+
+    return (
+        <section className={clsx("block_with_left_image_section","block_with_image","block_with_left_image",styles.blockWithLeftImage)} id={id}>
+            <div className="container">
+                <div className="block_with_left_image_box">
+                    <div className="row">
+                        { url && <div className="block_with_left_image_image d-lg-none d-md-none col-sm-12 col-xs-12">
+                            <figure className="mb-0">
+                                <YogaImageComponent src={url} alt=""
+                                                    className={clsx("img-fluid",  styles.leftImage)}/>
+                            </figure>
+                        </div>
+                        }
+                        <div className="col-lg-12 col-md-12 col-sm-12 col-xs-12" data-aos="fade-up">
+                            <div className={ clsx("block_with_image_content","block_with_image_content","block_with_left_image_content",styles.blockLeftblock_with_imageContent)}>
+                                {url && <div className="block_with_left_image_image d-lg-block d-md-block d-sm-none d-xs-none d-none">
+                                    <figure className="mb-0"><YogaImageComponent src={url} alt="" className={clsx("img-fluid", "float-left", styles.leftImage)}/></figure>
+                                </div>
+                                }
+                                {title && <h5>{title}</h5> }
+                                {header && <h2>{header}</h2> }
+                                <NextBlocksRenderer content={  block } />
+                                <div className="btn_wrapper">
+                                    {button && <a href={button.link} className="text-decoration-none read_more_btn">{button.label}</a>}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <figure className="block_with_image_left_shape left_shape mb-0">
+                    <YogaImageComponent src="./assets/images/our_block_with_image_shape.png" alt="" className="img-fluid" />
+                </figure>
+            </div>
+        </section>
+        
+    )
+}

yoga-app/src/components/block.with.right.image.component.module.css

@@ -0,0 +1,4 @@
+.rightImage {
+
+}
+

yoga-app/src/components/block.with.right.image.component.tsx

@@ -0,0 +1,53 @@
+import YogaImageComponent from "@/components/yoga.image.component";
+import {BlockWithImageComponentProps} from "@/components/block.with.image.component";
+import NextBlocksRenderer from "@/components/next.blocks.renderer";
+import styles from './block.with.right.image.component.module.css';
+import clsx from "clsx";
+
+export default function BlockWithRightImage({
+                                              id,  title, header, block, button, image: {
+        url,
+    },
+                                            }: BlockWithImageComponentProps) {
+
+
+    return (
+        <section className={clsx("block_with_right_image_section","block_with_image","block_with_right_image")} id={id}>
+            <div className="container">
+                <div className="block_with_image_box">
+                    <div className="row">
+                        <div className="col-lg-12 col-md-12 col-sm-12 col-xs-12" data-aos="fade-up">
+                            <div className={ clsx("block_with_right_image_content","block-with-image-content","block-with-right-image-content")}>
+                                {
+                                    url && <div className="block_with_right_image_image d-lg-block d-md-block d-sm-none d-xs-none d-none">
+                                        <figure className="mb-0">
+                                            <YogaImageComponent src={url} alt=""
+                                                                                     className={clsx("img-fluid", "float-right", styles.rightImage)}/>
+                                        </figure>
+                                    </div>
+                                }
+                                {title && <h5>{title}</h5>}
+                                {header && <h2>{header}</h2>}
+                                <NextBlocksRenderer content={block}/>
+                                <div className="btn_wrapper">
+                                    {button && <a href={button.link}
+                                                  className="text-decoration-none read_more_btn">{button.label}</a>}
+                                </div>
+                            </div>
+                        </div>
+                        { url && <div className="block_with_right_image_image d-lg-none d-md-none col-sm-12 col-xs-12">
+                                <figure className="mb-0">
+                                    <YogaImageComponent src={url} alt=""
+                                                        className={clsx("img-fluid", "float-right", styles.rightImage)}/>
+                                </figure>
+                        </div>
+                        }
+                    </div>
+                </div>
+                <figure className="block_with_right_image_right_shape right_shape mb-0">
+                    <YogaImageComponent src="./assets/images/our_block_with_image_shape.png" alt="" className="img-fluid"/>
+                </figure>
+            </div>
+        </section>
+    )
+}

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

@@ -12,6 +12,7 @@ const pathToBreadCrumbs = (path: string) => {
         'services' : 'Szolgáltatásaim',
         'prices' : 'Áraim',
         'faq' : 'GYIK',
+        'serviceList' : 'Szolgáltatások',
     }
     if ( mapping.hasOwnProperty(path)){
         return mapping[path];
@@ -24,9 +25,6 @@ const NextBreadcrumb = () => {
     const paths = usePathname()
     const pathNames = paths.split('/').filter( path => path )
 
-
-
-
     return (
         <div className="btn_wrapper">
             <span className="sub_home_span">{pathToBreadCrumbs( "/" )} </span>

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

@@ -1,6 +1,8 @@
 import Link from "next/link";
 import YogaImageComponent from "@/components/yoga.image.component";
 import {YogaFooter_Plain} from "@/types/generated-strapi-interfaces/api/yoga-footer";
+import {StrapiFile} from "@/types/types";
+import strapiApi from "@/api/strapi/strapi-api";
 
 export interface Props{
     config: YogaFooter_Plain
@@ -14,10 +16,13 @@ const FooterComponent = ({ config: {
     contactUsEmail,
     contactUsLocation,
     contactUsPhoneNumber,
-    copyRight
+    copyRight,
+    logo = undefined
 } }: Props) => {
 
-
+    const imageFile: StrapiFile =  logo as StrapiFile;
+    const imageUrl = strapiApi.getImageUrl(imageFile?.url)
+    console.info("imageUrl", imageUrl);
 
     return (<section className="footer-section" id="footer_section">
             <div className="container">
@@ -26,7 +31,7 @@ const FooterComponent = ({ config: {
                         <div className="col-lg-3 col-md-4 col-sm-6 col-xs-12 d-lg-block d-none">
                             <div className="footer_logo">
                                 <Link href="/index.html" className="text-decoration-none">
-                                    <figure className="mb-0"><YogaImageComponent src="/assets/images/footer_logo.png" alt=""
+                                    <figure className="mb-0"><YogaImageComponent src={imageUrl} alt=""
                                                                   className="img-fluid"/></figure>
                                 </Link>
                             </div>

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

@@ -0,0 +1,69 @@
+import React from 'react';
+
+interface ListingComponentProps {
+  text?: string;
+}
+
+const ListingComponent: React.FC<ListingComponentProps> = ({ text }) => {
+  if (!text) {
+    return null;
+  }
+
+  const lines = text.split('\n');
+  const elements: React.ReactNode[] = [];
+  let currentParagraph: string[] = [];
+  let currentList: React.ReactNode[] = [];
+
+  const flushParagraph = () => {
+    if (currentParagraph.length > 0) {
+      elements.push(<p key={elements.length}>{currentParagraph.join('\n')}</p>);
+      currentParagraph = [];
+    }
+  };
+
+  const flushList = () => {
+    if (currentList.length > 0) {
+      elements.push(<ul key={elements.length}>{currentList}</ul>);
+      currentList = [];
+    }
+  };
+
+  let currentListItemContent: string[] = [];
+
+  const flushListItem = () => {
+      if(currentListItemContent.length > 0) {
+          currentList.push(<li key={currentList.length}>{currentListItemContent.join('\n')}</li>);
+          currentListItemContent = [];
+      }
+  }
+
+  for (const line of lines) {
+    const trimmedLine = line.trim();
+
+    if (trimmedLine.startsWith('- ') || trimmedLine.startsWith('* ')) {
+      flushParagraph(); // End any ongoing paragraph
+      flushListItem(); // End previous list item
+      currentListItemContent.push(trimmedLine.substring(2));
+    } else if (trimmedLine === '') {
+      flushListItem();
+      flushList(); // An empty line ends the list
+    } else {
+      if (currentList.length > 0 || currentListItemContent.length > 0) {
+        // This line belongs to the current list item
+        currentListItemContent.push(line);
+      } else {
+        // This is a paragraph line
+        flushList();
+        currentParagraph.push(line);
+      }
+    }
+  }
+
+  flushListItem();
+  flushList();
+  flushParagraph();
+
+  return <>{elements}</>;
+};
+
+export default ListingComponent;

yoga-app/src/components/mainHeaderComponent.tsx

@@ -2,22 +2,32 @@ 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";
+import { YogaCommon_Plain } from "@/types/generated-strapi-interfaces/api/yoga-common";
 export interface Props{
-    config: YogaMainHeaderComponent_Plain
+    config: YogaMainHeaderComponent_Plain,
+    common?: YogaCommon_Plain
 }
 const MainHeaderComponent = ({ config: {
     title,
     header,
     description,
     button,
-    headerIType
+    headerIType,
+    image
 
-}}: Props) => {
+},common}: Props) => {
+
+    const imageFile: StrapiFile = image as StrapiFile;
+    const imageSrc  = imageFile ?  strapiApi.getImageUrl(imageFile?.url): undefined;
+    const logoImageFile: StrapiFile = (common?.logoImage)  as StrapiFile;
+    const logoImageSrc = logoImageFile ? strapiApi.getImageUrl(logoImageFile.url) : undefined;
 
     return (
         <div className="banner-section-outer">
             <header>
-                <Nav menuItems={MAIN_MENU} />
+                <Nav menuItems={MAIN_MENU} imageSrc={logoImageSrc} />
             </header>
             {/*<!-- SOCIAL ICONS -->*/}
             <div className="social-icons left_icons float-left d-table" data-aos="fade-down">
@@ -54,7 +64,7 @@ const MainHeaderComponent = ({ config: {
                         <div className="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                             <div className="banner-section-image">
                                 <figure className="mb-0">
-                                    <YogaImageComponent src="/assets/images/banner_right_image.png" alt="" />
+                                    <YogaImageComponent src={imageSrc!} alt="" />
                                 </figure>
                             </div>
                         </div>

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

@@ -1,23 +1,22 @@
 "use client"
-import {FC} from "react";
 import YogaImageComponent from "@/components/yoga.image.component";
 import clsx from "clsx";
 import Link from "next/link";
 
-export interface MenuItem{
+export interface MenuItem {
     href?: string;
     label: string;
     children?: MenuItem[];
     active?: boolean,
     styleClass?: string;
 }
-export interface Props{
+
+export interface Props {
     menuItems: MenuItem[];
+    imageSrc?: string;
 }
 
-const Nav: FC<Props> = ({menuItems}:Props) => {
+const Nav = ({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"
@@ -37,7 +36,8 @@ const Nav: FC<Props> = ({menuItems}:Props) => {
                         </button>
                         <div className="collapse navbar-collapse" id="navbarSupportedContent">
                             <ul className="navbar-nav">
-                                {menuItems.map( (menuItem,index) => <MenuItemComponent key={"nav"+menuItem.href+"_"+index} menuItem={menuItem} />)}
+                                {menuItems.map((menuItem, index) => <MenuItemComponent
+                                    key={"nav" + menuItem.href + "_" + index} menuItem={menuItem}/>)}
                             </ul>
                         </div>
                     </nav>
@@ -47,32 +47,35 @@ const Nav: FC<Props> = ({menuItems}:Props) => {
     );
 }
 
-interface MenuItemProps{
+interface MenuItemProps {
     menuItem: MenuItem,
     dropdownItem?: boolean,
 }
-const MenuItemComponent: FC<MenuItemProps>  = ({menuItem, dropdownItem}: MenuItemProps) => {
+
-    if ( !menuItem ){
+const MenuItemComponent = ({menuItem, dropdownItem}: MenuItemProps) => {
+    if (!menuItem) {
         return (<></>);
     }
-    if ( !menuItem.children || menuItem.children.length == 0 ){
+    if (!menuItem.children || menuItem.children.length == 0) {
         return (
             // <li className="nav-item active">
             <li className={clsx("nav-item", {"active": menuItem.active})}>
-                <a className={clsx("nav-link", {"dropdown-item":dropdownItem},menuItem.styleClass)} href={menuItem.href}>{menuItem.label}</a>
+                <a className={clsx("nav-link", {"dropdown-item": dropdownItem}, menuItem.styleClass)}
+                   href={menuItem.href!}>{menuItem.label}</a>
             </li>
         );
     }
 
     return (
-        <li className={clsx("nav-item", "dropdown",{"active": menuItem.active})}>
+        <li className={clsx("nav-item", "dropdown", {"active": menuItem.active})}>
             <a className="nav-link dropdown-toggle dropdown-color navbar-text-color" href="#"
                role="button" data-toggle="dropdown" aria-haspopup="true"
                aria-expanded="false">{menuItem.label}</a>
             <div className="dropdown-menu drop-down-content">
                 <ul className="list-unstyled drop-down-pages">
                     {
-                        menuItem.children.map((item,index) => <MenuItemComponent key={"child_"+item.href+"_"+index} menuItem={item}  dropdownItem={true}/>)
+                        menuItem.children.map((item, index) => <MenuItemComponent
+                            key={"child_" + item.href + "_" + index} menuItem={item} dropdownItem={true}/>)
                     }
                 </ul>
             </div>

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.component.tsx

@@ -6,6 +6,7 @@ import "slick-carousel/slick/slick.css";
 import "slick-carousel/slick/slick-theme.css";
 import Slider ,{Settings} from "react-slick";
 import OurServiceItemComponent from "@/components/our.services.item.component";
+import {sortServicesByPriority} from "@/util/sorting";
 
 
 export interface Props{
@@ -67,7 +68,8 @@ const OurServiceComponent = ({config: {title,header,description,services}}: Prop
             }
         ]
     };
-    console.info(settings)
+    const sortedServices = services ? [...services] : [];
+    sortedServices.sort( sortServicesByPriority )
     return (
         <section className="services_section">
             <div className="container">
@@ -89,7 +91,7 @@ const OurServiceComponent = ({config: {title,header,description,services}}: Prop
                 {/*</div>*/}
 
                 <Slider {...settings}>
-                    {services.map(
+                    {sortedServices.map(
                         itemConfig =>
                             <OurServiceItemComponent config={itemConfig} key={itemConfig.id} />
                     )}

yoga-app/src/components/our.services.item.component.module.css

@@ -31,6 +31,11 @@
     padding-right: 0;
 }
 
+.roundedImage{
+    border-top-left-radius: 60px;
+    border-bottom-right-radius: 60px;
+}
+
 /*:global(div.slick-active):nth-last-child(n!*){*/
 /*    padding-left: 6px;*/
 /*    padding-right: 0;*!*/

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

@@ -3,13 +3,19 @@ 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";
+import classNames from "classnames";
 
 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 = '/serviceList#' + name;
     return (
 
         <div className={styles.serviceSlide}>
@@ -17,15 +23,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={classNames(styles.roundedImage,"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/our.specialities.component.tsx

@@ -1,6 +1,8 @@
 import YogaImageComponent from "@/components/yoga.image.component";
 import OurSpecialitiesItemComponent from "@/components/our.specialities.item.component";
 import {YogaSpecialitiesComponent_Plain} from "@/types/generated-strapi-interfaces/api/yoga-specialities-component";
+import {StrapiFile} from "@/types/types";
+import strapiApi from "@/api/strapi/strapi-api";
 
 export interface Props{
     config: YogaSpecialitiesComponent_Plain
@@ -14,8 +16,14 @@ const OurSpecialitiesComponent = ({ config: { title,header,description,
     right1,
     right2,
     right3,
-    right4
+    right4,
+    image
 } }: Props) => {
+
+
+    const imageFile: StrapiFile = image as StrapiFile;
+    const imageUrl = strapiApi.getImageUrl(imageFile?.url)
+
     return (
 
         <section className="our_specialties_section">
@@ -43,7 +51,7 @@ const OurSpecialitiesComponent = ({ config: { title,header,description,
                     </div>
                     <div className="col-lg-6 col-md-4 col-sm-6 col-xs-12 d-md-block d-none">
                         <figure className="specialties_image mb-0">
-                            <YogaImageComponent src="/assets/images/specialties_image.png" alt="" className="img-fluid" />
+                            <YogaImageComponent src={imageUrl} alt="" className="img-fluid" />
                         </figure>
                     </div>
                     <div className="col-lg-3 col-md-4 col-sm-6 col-xs-12" data-aos="fade-right">

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

@@ -7,11 +7,10 @@ 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;
-    console.info("image:",strapiApi.getImageUrl(imageFile?.url));
     return (
         <div className="col-lg-4 col-md-4 col-sm-6 col-xs-12">
             <div className="pricing_plans_box_content">
@@ -28,6 +27,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 +38,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/single.service.component.tsx

@@ -0,0 +1,30 @@
+import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/yoga-single-service";
+import React from "react";
+import BlockWithImageComponent from "@/components/block.with.image.component";
+import {ImagePosition, StrapiFile} from "@/types/types";
+import strapiApi from "@/api/strapi/strapi-api";
+
+
+export interface Props {
+    config: YogaSingleService_Plain,
+    index: number
+}
+
+const SingleService = ({config, index}: Props) => {
+    if (!config || !config.article) {
+        return null; // or some fallback UI
+    }
+
+    const {article, articleImage, name, header} = config;
+    let imageUrl: string | undefined = undefined;
+    const strapiFile = articleImage as StrapiFile;
+    imageUrl = strapiApi.getImageUrl(strapiFile?.url);
+
+    return (
+        <BlockWithImageComponent id={name} block={article}
+                                 image={{position: index % 2 ? ImagePosition.Left : ImagePosition.Right, url: imageUrl}}
+                                 header={header}/>
+    );
+}
+
+export default SingleService;

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

@@ -3,14 +3,31 @@ 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) ;
+    }
 
-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 +59,6 @@ const SubHeaderComponent = ({header1,description}: Props) =>{
 }
 
 export default SubHeaderComponent;
+
+
+export const dynamic = 'force-dynamic'

yoga-app/src/components/subscribe.component.module.css

@@ -0,0 +1,4 @@
+
+.roundedImage img{
+    border-bottom-right-radius: 60px;
+}

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

@@ -3,14 +3,22 @@ import {
     YogaSubscribeNowComponent_Plain
 } from "@/types/generated-strapi-interfaces/api/yoga-subscribe-now-component";
 import clsx from "clsx";
+import {StrapiFile} from "@/types/types";
+import strapiApi from "@/api/strapi/strapi-api";
+import styles from './subscribe.component.module.css'
+
 export interface Props{
     config: YogaSubscribeNowComponent_Plain,
-    styleClass?: string
+    styleClass?: string,
 }
 const SubscribeComponent = ({
-                                config: {title,header,placeHolderEmail,buttonSubscribeLabel},
+                                config: {title,header,placeHolderEmail,buttonSubscribeLabel, image = undefined},
     styleClass
 }: Props) => {
+    const imageFile: StrapiFile = image as StrapiFile;
+    if (!imageFile || !imageFile.url) {
+        return null
+    }
     return (
         <section className={clsx("subscribe_section",styleClass)}>
             <div className="container">
@@ -32,8 +40,8 @@ const SubscribeComponent = ({
                             </div>
                         </div>
                         <div className="col-lg-5 col-md-5 col-sm-6 col-xs-12">
-                            <figure className="subscribe_image mb-0">
+                            <figure  className={clsx(styles.roundedImage,"subscribe_image","mb-0",)}>
-                                <YogaImageComponent src="/assets/images/subscribe_image.png" alt=""/>
+                                <YogaImageComponent   src={strapiApi.getImageUrl(imageFile.url)} alt=""/>
                             </figure>
                         </div>
                     </div>

yoga-app/src/components/text.with.image.component.tsx

@@ -1,5 +1,5 @@
 import TextWithRightImage from "@/components/text.with.right.image.component";
-import TextWithLeftImage from "@/components/text.with.right.left.component";
+import TextWithLeftImage from "@/components/text.with.left.image.component";
 import {YogaTextWithImageComponent_Plain} from "@/types/generated-strapi-interfaces/api/yoga-text-with-image-component";
 
 export interface Props{

yoga-app/src/components/text.with.left.image.component.tsx

@@ -2,6 +2,7 @@ import YogaImageComponent from "@/components/yoga.image.component";
 import {YogaTextWithImageComponent_Plain} from "@/types/generated-strapi-interfaces/api/yoga-text-with-image-component";
 import {StrapiFile} from "@/types/types";
 import strapiApi from "@/api/strapi/strapi-api";
+import ListingComponent from "@/components/listing.component";
 
 export interface Props{
     config: YogaTextWithImageComponent_Plain
@@ -29,7 +30,7 @@ export default function TextWithLeftImage ({config: {
                             <div className="vision_content">
                                 <h5>{title}</h5>
                                 <h2>{header}</h2>
-                                <p>{description}</p>
+                                <ListingComponent text={description} />
                                 <div className="btn_wrapper">
                                     {button && <a href={button.link} className="text-decoration-none read_more_btn">{button.label}</a>}
                                 </div>

yoga-app/src/components/text.with.right.image.component.tsx

@@ -2,6 +2,7 @@ import YogaImageComponent from "@/components/yoga.image.component";
 import {YogaTextWithImageComponent_Plain} from "@/types/generated-strapi-interfaces/api/yoga-text-with-image-component";
 import {StrapiFile} from "@/types/types";
 import strapiApi from "@/api/strapi/strapi-api";
+import ListingComponent from "./listing.component";
 
 export interface Props{
     config: YogaTextWithImageComponent_Plain
@@ -22,7 +23,7 @@ export default function TextWithRightImage ({config: {
                             <div className="mission_content">
                                 <h5>{title}</h5>
                                 <h2>{header}</h2>
-                                <p>{description}</p>
+                                <ListingComponent text={description} />
                                 <div className="btn_wrapper">
                                     {button && <a href={button.link} className="text-decoration-none read_more_btn">{button.label}</a>}
                                 </div>

yoga-app/src/styles/block-with-image.scss

@@ -0,0 +1 @@
+

yoga-app/src/styles/block-with-left-image.scss

@@ -0,0 +1,209 @@
+.block_with_left_image {
+  --y-padding: 45px 0 130px;
+  --y-box-border-radius: 200px;
+  --y-content-padding-top: 150px;
+  --y-btn-font-size: 22px;
+  --y-btn-padding: 24px 44px;
+  --y-image-margin-top: -150px;
+  --y-block-with-right-image-spacing-image: 96px;
+  --y-block-with-image-spacing-main: 66px;
+
+  padding: var(--y-padding);
+  position: relative;
+
+  &_box {
+    width: 100%;
+    background-color: var(--e-global-color-white);
+    border-radius: var(--y-box-border-radius) 0 var(--y-box-border-radius) 0;
+    box-shadow: 1px 1px 50px rgb(0 0 0 / 7%);
+  }
+
+  &_content {
+    padding-top: var(--y-content-padding-top);
+    padding-left: 40px;
+
+    h5 {
+      text-transform: uppercase;
+      color: var(--e-global-color-secondary);
+      letter-spacing: 3.1px;
+      margin-bottom: 12px;
+    }
+
+    h2 {
+      margin-bottom: 16px;
+      color: var(--e-global-color-primary);
+    }
+
+    p {
+      margin-bottom: 32px;
+      color: var(--e-global-color-text);
+      padding-right: 60px;
+    }
+
+    .btn_wrapper .read_more_btn {
+      font-size: var(--y-btn-font-size);
+      line-height: var(--y-btn-font-size);
+      font-weight: 500;
+      padding: var(--y-btn-padding);
+      text-align: center;
+      color: var(--e-global-color-white);
+      display: inline-block;
+      background-color: var(--e-global-color-secondary);
+      border-radius: 35px 0px 35px 0px;
+      transition: all 0.3s ease-in-out;
+      position: relative;
+      overflow: hidden;
+
+      &:hover {
+        color: var(--e-global-color-accent);
+        background-color: var(--e-global-color-soft-orange);
+        transform: translateY(-10px);
+
+        &::before {
+          left: 0%;
+          right: auto;
+          width: 100%;
+        }
+      }
+
+      &::before {
+        display: block;
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        height: 100%;
+        width: 0px;
+        z-index: -1;
+        content: '';
+        color: var(--e-global-color-accent);
+        background-color: var(--e-global-color-soft-orange);
+        transition: all 0.4s cubic-bezier(0.12, 0, 0.38, 1) 0s;
+      }
+    }
+
+    p, h1, h2, h3, h4, h5 {
+      padding-right: var(--y-block-with-right-image-spacing-image);
+      padding-left: var(--y-block-with-image-spacing-main);
+    }
+  }
+
+  &_image img {
+    border-top-left-radius: var(--y-box-border-radius);
+    border-bottom-right-radius: var(--y-box-border-radius);
+    margin: var(--y-image-margin-top) 12px 12px -40px;
+    max-width: 50%;
+  }
+
+  &_left_shape {
+    position: absolute;
+    top: 140px;
+    left: 0;
+  }
+
+  @media screen and (max-width: 1440px) {
+    &_left_shape {
+      top: unset;
+      bottom: 15px;
+      img {
+        width: 95px;
+      }
+    }
+  }
+
+  @media screen and (max-width: 1199px) {
+    --y-padding: 50px 0 100px;
+    --y-content-padding-top: 80px;
+    --y-btn-font-size: 20px;
+    --y-btn-padding: 22px 40px;
+    --y-image-margin-top: -80px;
+
+    &_content {
+      padding-left: 15px;
+
+      p, h2, h3, h4, h5, h6{
+        padding-left: 55px;
+        padding-right: 70px;
+      }
+
+      h5 { margin-bottom: 8px; }
+      h2 { margin-bottom: 12px; }
+      p {
+        margin-bottom: 28px;
+      }
+    }
+    &_left_shape {
+      display: none;
+    }
+
+    .block_with_left_image_image img{
+      margin-left: -15px;
+    }
+  }
+
+  @media screen and (max-width: 991px) {
+    --y-padding: 35px 0 70px;
+    --y-box-border-radius: 120px;
+    --y-content-padding-top: 40px;
+    --y-btn-font-size: 18px;
+    --y-btn-padding: 20px 35px;
+    --y-image-margin-top: -40px;
+
+    &_content {
+      padding-left: 0;
+
+      p, h2, h3, h4, h5, h6{
+        padding-right: 45px;
+        padding-left: 45px;
+      }
+      h5 { margin-bottom: 5px; }
+      h2 { margin-bottom: 10px; }
+      p {
+        margin-bottom: 22px;
+      }
+    }
+    .block_with_left_image_image img{
+      margin-left: 0;
+    }
+  }
+
+  @media screen and (max-width: 767px) {
+    --y-padding: 30px 0 60px;
+    --y-box-border-radius: 185px;
+    --y-btn-font-size: 16px;
+    --y-btn-padding: 18px 32px;
+    --y-image-margin-top: 0;
+
+    &_image {
+      margin-bottom: 30px;
+      img {
+        max-width: 100%;
+      }
+    }
+
+    &_content {
+      padding-top: 0;
+      text-align: center;
+      padding-left: 0px;
+      margin-bottom: 30px;
+      h2 { margin-bottom: 8px; }
+      p {
+        margin-bottom: 18px;
+        padding: 0 50px;
+      }
+    }
+  }
+
+  @media screen and (max-width: 575px) {
+    --y-box-border-radius: 118px;
+    --y-btn-font-size: 14px;
+    --y-btn-padding: 16px 30px;
+
+    &_content p {
+      margin-bottom: 15px;
+      padding: 0 10px;
+    }
+    &_image img {
+        max-width: 100%;
+    }
+  }
+}

yoga-app/src/styles/block-with-right-image.scss

@@ -0,0 +1,221 @@
+/* About Page Our block_with_image Section Style */
+
+.block_with_right_image {
+  --y-block-with-right-image-spacing-image: 96px;
+  --y-block-with-image-spacing-main: 66px;
+  --y-block-with-right-image-top-spacing: 150px;
+  --y-box-border-radius: 200px;
+  --y-btn-font-size: 22px;
+  --y-btn-padding: 24px 44px;
+
+  padding: 130px 0 45px;
+  position: relative;
+
+  &_image img {
+    max-width: 50%;
+    border-top-left-radius: var(--y-box-border-radius);
+    border-bottom-right-radius: var(--y-box-border-radius);
+    margin: calc(-1 * var(--y-block-with-right-image-top-spacing)) 0 12px 12px;
+  }
+
+  .block_with_image_box {
+    width: 100%;
+    background-color: var(--e-global-color-white);
+    border-radius: var(--y-box-border-radius) 0 var(--y-box-border-radius) 0;
+    box-shadow: 1px 1px 50px rgb(0 0 0 / 7%);
+  }
+
+  &_content {
+    padding-top: var(--y-block-with-right-image-top-spacing);
+    padding-left: 96px;
+
+    h5 {
+      text-transform: uppercase;
+      color: var(--e-global-color-secondary);
+      letter-spacing: 3.1px;
+      margin-bottom: 12px;
+    }
+
+    h2 {
+      margin-bottom: 16px;
+      color: var(--e-global-color-primary);
+    }
+
+    p {
+      margin-bottom: 32px;
+      color: var(--e-global-color-text);
+      padding-right: 25px;
+    }
+
+    .btn_wrapper .read_more_btn {
+      font-size: var(--y-btn-font-size);
+      line-height: var(--y-btn-font-size);
+      font-weight: 500;
+      padding: var(--y-btn-padding);
+      text-align: center;
+      color: var(--e-global-color-white);
+      display: inline-block;
+      background-color: var(--e-global-color-secondary);
+      border-radius: 35px 0px 35px 0px;
+      transition: all 0.3s ease-in-out;
+      position: relative;
+      overflow: hidden;
+
+      &:hover {
+        color: var(--e-global-color-accent);
+        background-color: var(--e-global-color-soft-orange);
+        transform: translateY(-10px);
+
+        &::before {
+          left: 0%;
+          right: auto;
+          width: 100%;
+        }
+      }
+
+      &::before {
+        display: block;
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        height: 100%;
+        width: 0px;
+        z-index: -1;
+        content: '';
+        color: var(--e-global-color-accent);
+        background-color: var(--e-global-color-soft-orange);
+        transition: all 0.4s cubic-bezier(0.12, 0, 0.38, 1) 0s;
+      }
+    }
+
+    p, h1, h2, h3, h4, h5 {
+      padding-right: var(--y-block-with-right-image-spacing-image);
+      padding-left: 0;
+    }
+  }
+
+  &_right_shape {
+    position: absolute;
+    top: 210px;
+    right: 0;
+  }
+
+  @media screen and (max-width: 1440px) {
+    &_right_shape {
+      top: 15px;
+      img {
+        width: 90px;
+      }
+    }
+    &_image img {
+      margin-top: calc(-1 * var(--y-block-with-right-image-top-spacing));
+    }
+  }
+
+  @media screen and (max-width: 1199px) {
+    --y-block-with-right-image-top-spacing: 135px;
+    --y-btn-font-size: 20px;
+    --y-btn-padding: 22px 40px;
+    padding: 100px 0 50px;
+
+    &_content {
+      padding-left: 70px;
+      p, h2, h3, h4, h5, h6{
+        padding-right: 70px;
+      }
+      h5 {
+        margin-bottom: 8px;
+      }
+      h2 {
+        margin-bottom: 12px;
+      }
+      p {
+        margin-bottom: 28px;
+      }
+    }
+    &_right_shape {
+      display: none;
+    }
+    &_image img {
+      margin-top: calc(-1 * var(--y-block-with-right-image-top-spacing));
+    }
+  }
+
+  @media screen and (max-width: 991px) {
+    --y-block-with-right-image-top-spacing: 70px;
+    --y-box-border-radius: 140px;
+    --y-btn-font-size: 18px;
+    --y-btn-padding: 20px 35px;
+    padding: 70px 0 35px;
+
+    &_content {
+
+      p, h2, h3, h4, h5, h6{
+        padding-right: 45px;
+      }
+
+      padding-left: 45px;
+      h5 {
+        margin-bottom: 5px;
+      }
+      h2 {
+        margin-bottom: 10px;
+      }
+      p {
+        margin-bottom: 22px;
+      }
+    }
+    &_image img {
+      margin-top: calc(-1 * var(--y-block-with-right-image-top-spacing));
+    }
+  }
+
+  @media screen and (max-width: 767px) {
+    --y-block-with-right-image-top-spacing: 60px;
+    --y-box-border-radius: 185px;
+    --y-btn-font-size: 16px;
+    --y-btn-padding: 18px 32px;
+    padding: 60px 0 30px;
+
+    &_content {
+      padding-left: 0;
+      text-align: center;
+      margin-bottom: 30px;
+      h2,h3,h4,h5,h6 {
+        padding-right: 0;
+        margin-bottom: 8px;
+      }
+      p {
+        margin-bottom: 18px;
+        padding: 0 50px;
+      }
+    }
+    &_image img {
+      margin-top: 0;
+      margin-bottom: 0;
+      max-width: 100%;
+    }
+  }
+
+  @media screen and (max-width: 575px) {
+    --y-block-with-right-image-top-spacing: 50px;
+    --y-box-border-radius: 118px;
+    --y-btn-font-size: 14px;
+    --y-btn-padding: 16px 30px;
+
+    &_content {
+      h2,h3,h4,h5,h6{
+        padding-right: 0;
+      }
+      p {
+        margin-bottom: 15px;
+        padding: 0 10px;
+      }
+    }
+    &_image img {
+      margin-top: 0;
+      margin-bottom: 0;
+      max-width: 100%;
+    }
+  }
+}

yoga-app/src/styles/mediaqueries.scss

@@ -299,7 +299,7 @@
         width: 115px;
     }
     .aboutus_content {
-        padding-top: 130px;
+        padding-top: 0;
         padding-left: 10px;
     }
     .aboutus_content h5 {
@@ -1263,7 +1263,7 @@
         width: 110px;
     }
     .aboutus_content {
-        padding-top: 60px;
+        padding-top: 0;
         padding-left: 0;
     }
     .aboutus_content h2 {

yoga-app/src/styles/readme.md

@@ -0,0 +1,21 @@
+## MediaQueries brakepoints
+
+```css
+
+
+/* Media Queries  */
+
+@media screen and (max-width: 1440px){
+
+}
+@media screen and (max-width: 1199px){
+    
+}
+@media screen and (max-width: 991px){}
+
+@media screen and (max-width: 767px){}
+
+@media screen and (max-width: 575px) {
+}
+
+```

yoga-app/src/styles/style.scss

@@ -501,7 +501,7 @@ p{
     left: -65px;
 }
 .aboutus_content{
-    padding-top: 145px;
+    padding-top: 0;
     padding-left: 16px;
 }
 .aboutus_content h5{

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/home.ts

@@ -10,6 +10,7 @@ import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
 import { YogaMainHeaderComponent } from './yoga-main-header-component';
+import { YogaCommon } from './yoga-common';
 import { YogaOurServicesComponent_Plain } from './yoga-our-services-component';
 import { YogaAboutUsComponent_Plain } from './yoga-about-us-component';
 import { YogaSpecialitiesComponent_Plain } from './yoga-specialities-component';
@@ -20,6 +21,7 @@ import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
 import { YogaMainHeaderComponent_Plain } from './yoga-main-header-component';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface Home {
@@ -35,6 +37,7 @@ export interface Home {
     subscribeNow?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
     header?: { data: YogaMainHeaderComponent };
+    common?: { data: YogaCommon };
     locale: string;
     localizations?: { data: Home[] };
   };
@@ -51,6 +54,7 @@ export interface Home_Plain {
   subscribeNow?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
   header?: YogaMainHeaderComponent_Plain;
+  common?: YogaCommon_Plain;
   locale: string;
   localizations?: Home_Plain[];
 }
@@ -67,6 +71,7 @@ export interface Home_NoRelations {
   subscribeNow?: number;
   footer?: number;
   header?: number;
+  common?: number;
   locale: string;
   localizations?: Home[];
 }
@@ -83,6 +88,7 @@ export interface Home_AdminPanelLifeCycle {
   subscribeNow?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
   header?: AdminPanelRelationPropertyModification<YogaMainHeaderComponent_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
   locale: string;
   localizations?: Home[];
 }

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-list-page.ts

@@ -0,0 +1,52 @@
+// 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 { YogaSingleService } from './yoga-single-service';
+import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
+import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
+import { YogaSingleService_Plain } from './yoga-single-service';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
+
+export interface ServiceListPage {
+  id: number;
+  attributes: {
+    createdAt: Date;    updatedAt: Date;    publishedAt?: Date;    header?: string;
+    description?: string;
+    subscribeNow?: { data: YogaSubscribeNowComponent };
+    footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
+    services: { data: YogaSingleService[] };
+  };
+}
+export interface ServiceListPage_Plain {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: YogaSubscribeNowComponent_Plain;
+  footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
+  services: YogaSingleService_Plain[];
+}
+
+export interface ServiceListPage_NoRelations {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: number;
+  footer?: number;
+  common?: number;
+  services: number[];
+}
+
+export interface ServiceListPage_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>;
+  services: AdminPanelRelationPropertyModification<YogaSingleService_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,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-app/src/types/generated-strapi-interfaces/api/yoga-footer.ts

@@ -1,8 +1,11 @@
 // Interface automatically generated by schemas-to-ts
 
 import { Link } from '../components/yoga-site/Link';
+import { Media } from '../components/shared/Media';
 import { Link_Plain } from '../components/yoga-site/Link';
+import { Media_Plain } from '../components/shared/Media';
 import { Link_NoRelations } from '../components/yoga-site/Link';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface YogaFooter {
   id: number;
@@ -17,6 +20,7 @@ export interface YogaFooter {
     contactUsLocation?: Link;
     copyRight?: string;
     name?: string;
+    logo?: { data: Media };
   };
 }
 export interface YogaFooter_Plain {
@@ -31,6 +35,7 @@ export interface YogaFooter_Plain {
   contactUsLocation?: Link_Plain;
   copyRight?: string;
   name?: string;
+  logo?: Media_Plain;
 }
 
 export interface YogaFooter_NoRelations {
@@ -45,6 +50,7 @@ export interface YogaFooter_NoRelations {
   contactUsLocation?: Link_NoRelations;
   copyRight?: string;
   name?: string;
+  logo?: number;
 }
 
 export interface YogaFooter_AdminPanelLifeCycle {
@@ -59,4 +65,5 @@ export interface YogaFooter_AdminPanelLifeCycle {
   contactUsLocation?: Link_Plain;
   copyRight?: string;
   name?: string;
+  logo?: 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,9 @@ export interface YogaSingleService {
     image?: { data: Media };
     imageAlt?: string;
     name?: string;
+    article?: any;
+    articleImage?: { data: Media };
+    priority?: number;
     locale: string;
     localizations?: { data: YogaSingleService[] };
   };
@@ -25,6 +28,9 @@ export interface YogaSingleService_Plain {
   image?: Media_Plain;
   imageAlt?: string;
   name?: string;
+  article?: any;
+  articleImage?: Media_Plain;
+  priority?: number;
   locale: string;
   localizations?: YogaSingleService_Plain[];
 }
@@ -37,6 +43,9 @@ export interface YogaSingleService_NoRelations {
   image?: number;
   imageAlt?: string;
   name?: string;
+  article?: any;
+  articleImage?: number;
+  priority?: number;
   locale: string;
   localizations?: YogaSingleService[];
 }
@@ -49,6 +58,9 @@ export interface YogaSingleService_AdminPanelLifeCycle {
   image?: AdminPanelRelationPropertyModification<Media_Plain>;
   imageAlt?: string;
   name?: string;
+  article?: any;
+  articleImage?: AdminPanelRelationPropertyModification<Media_Plain>;
+  priority?: number;
   locale: string;
   localizations?: YogaSingleService[];
 }

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

@@ -1,7 +1,9 @@
 // Interface automatically generated by schemas-to-ts
 
 import { YogaSingleSpeciality } from './yoga-single-speciality';
+import { Media } from '../components/shared/Media';
 import { YogaSingleSpeciality_Plain } from './yoga-single-speciality';
+import { Media_Plain } from '../components/shared/Media';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface YogaSpecialitiesComponent {
@@ -19,6 +21,7 @@ export interface YogaSpecialitiesComponent {
     right2?: { data: YogaSingleSpeciality };
     right3?: { data: YogaSingleSpeciality };
     right4?: { data: YogaSingleSpeciality };
+    image?: { data: Media };
     locale: string;
     localizations?: { data: YogaSpecialitiesComponent[] };
   };
@@ -37,6 +40,7 @@ export interface YogaSpecialitiesComponent_Plain {
   right2?: YogaSingleSpeciality_Plain;
   right3?: YogaSingleSpeciality_Plain;
   right4?: YogaSingleSpeciality_Plain;
+  image?: Media_Plain;
   locale: string;
   localizations?: YogaSpecialitiesComponent_Plain[];
 }
@@ -55,6 +59,7 @@ export interface YogaSpecialitiesComponent_NoRelations {
   right2?: number;
   right3?: number;
   right4?: number;
+  image?: number;
   locale: string;
   localizations?: YogaSpecialitiesComponent[];
 }
@@ -73,6 +78,7 @@ export interface YogaSpecialitiesComponent_AdminPanelLifeCycle {
   right2?: AdminPanelRelationPropertyModification<YogaSingleSpeciality_Plain>;
   right3?: AdminPanelRelationPropertyModification<YogaSingleSpeciality_Plain>;
   right4?: AdminPanelRelationPropertyModification<YogaSingleSpeciality_Plain>;
+  image?: AdminPanelRelationPropertyModification<Media_Plain>;
   locale: string;
   localizations?: YogaSpecialitiesComponent[];
 }

yoga-app/src/types/generated-strapi-interfaces/api/yoga-subscribe-now-component.ts

@@ -1,5 +1,9 @@
 // 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 YogaSubscribeNowComponent {
   id: number;
   attributes: {
@@ -7,6 +11,7 @@ export interface YogaSubscribeNowComponent {
     header?: string;
     placeHolderEmail?: string;
     buttonSubscribeLabel?: string;
+    image?: { data: Media };
   };
 }
 export interface YogaSubscribeNowComponent_Plain {
@@ -15,6 +20,7 @@ export interface YogaSubscribeNowComponent_Plain {
   header?: string;
   placeHolderEmail?: string;
   buttonSubscribeLabel?: string;
+  image?: Media_Plain;
 }
 
 export interface YogaSubscribeNowComponent_NoRelations {
@@ -23,6 +29,7 @@ export interface YogaSubscribeNowComponent_NoRelations {
   header?: string;
   placeHolderEmail?: string;
   buttonSubscribeLabel?: string;
+  image?: number;
 }
 
 export interface YogaSubscribeNowComponent_AdminPanelLifeCycle {
@@ -31,4 +38,5 @@ export interface YogaSubscribeNowComponent_AdminPanelLifeCycle {
   header?: string;
   placeHolderEmail?: string;
   buttonSubscribeLabel?: string;
+  image?: AdminPanelRelationPropertyModification<Media_Plain>;
 }

yoga-app/src/types/types.ts

@@ -1,3 +1,4 @@
+
 export interface StrapiFile{
     "id": string,
     "documentId": string,
@@ -5,3 +6,23 @@ export interface StrapiFile{
     "mime": string,
     "url": string
 }
+
+export enum ImagePosition {
+    Left = 'Left',
+    Right = 'Right',}
+
+export interface ButtonConfig{
+    label?: string,
+    link?: string,
+    style?: 'Primary' | 'Secondary' | 'Outline' | 'Text',
+    size?: 'Small' | 'Medium' | 'Large',
+    openInNewTab?: boolean,
+}
+
+export interface ImageConfig{
+    position: ImagePosition,
+    url?: string,
+    alt?: string,
+    width?: number,
+    height?: number,
+}

yoga-app/src/util/const.ts

@@ -11,29 +11,42 @@ export const MAIN_MENU:MenuItem[] = [
     },
     {
         label: 'Szolgáltatásaink',
-        href: '/services'
+        href: '/serviceList'
     },
-    {
+    // {
-        label: 'Oldalak',
+    //     label: 'Oldalak',
-        children: [
+    //     children: [
+    //         {
+    //             label: 'Áraink',
+    //             href: '/prices'
+    //         },
+    //         {
+    //             label: 'FAQ',
+    //             href: '/faq'
+    //         },
+    //     ]
+    // },
     {
         label: 'Áraink',
         href: '/prices'
     },
     {
-                label: 'FAQ',
+        label: 'GY.I.K',
         href: '/faq'
     },
-        ]
-    },
     {
-        label: 'Rólam',
+        label: 'Szolgáltatásaink',
-        href: '/team'
+        href: '/serviceList'
     },
+    // {
+    //     label: 'Rólam',
+    //     href: '/team'
+    // },
+    // {
+    //     label: 'Blog',
+    //     href: '/blog'
+    // },
     {
-        label: 'Blog',
-        href: '/blog'
-    }, {
         label: 'Kapcsolat',
         href: '/contact',
         styleClass: "contact_us"

yoga-app/src/util/sorting.ts

@@ -0,0 +1,7 @@
+import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/yoga-single-service";
+
+export function sortServicesByPriority(a: YogaSingleService_Plain, b: YogaSingleService_Plain) {
+  const priorityA = a.priority ?? 0;
+  const priorityB = b.priority ?? 0;
+  return priorityB - priorityA;
+}

yoga-cms/auto-gen-queries/about.json

@@ -39,6 +39,9 @@
         specialityRight4: {
           fields: ['*'] ,
         },
+        "image": {
+          "fields": ["name","mime","url"]
+        }
       }
     }
   },

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/home.ts

@@ -10,6 +10,7 @@ import { YogaBlogPostsComponent } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
 import { YogaFooter } from './yoga-footer';
 import { YogaMainHeaderComponent } from './yoga-main-header-component';
+import { YogaCommon } from './yoga-common';
 import { YogaOurServicesComponent_Plain } from './yoga-our-services-component';
 import { YogaAboutUsComponent_Plain } from './yoga-about-us-component';
 import { YogaSpecialitiesComponent_Plain } from './yoga-specialities-component';
@@ -20,6 +21,7 @@ import { YogaBlogPostsComponent_Plain } from './yoga-blog-posts-component';
 import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
 import { YogaFooter_Plain } from './yoga-footer';
 import { YogaMainHeaderComponent_Plain } from './yoga-main-header-component';
+import { YogaCommon_Plain } from './yoga-common';
 import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface Home {
@@ -35,6 +37,7 @@ export interface Home {
     subscribeNow?: { data: YogaSubscribeNowComponent };
     footer?: { data: YogaFooter };
     header?: { data: YogaMainHeaderComponent };
+    common?: { data: YogaCommon };
     locale: string;
     localizations?: { data: Home[] };
   };
@@ -51,6 +54,7 @@ export interface Home_Plain {
   subscribeNow?: YogaSubscribeNowComponent_Plain;
   footer?: YogaFooter_Plain;
   header?: YogaMainHeaderComponent_Plain;
+  common?: YogaCommon_Plain;
   locale: string;
   localizations?: Home_Plain[];
 }
@@ -67,6 +71,7 @@ export interface Home_NoRelations {
   subscribeNow?: number;
   footer?: number;
   header?: number;
+  common?: number;
   locale: string;
   localizations?: Home[];
 }
@@ -83,6 +88,7 @@ export interface Home_AdminPanelLifeCycle {
   subscribeNow?: AdminPanelRelationPropertyModification<YogaSubscribeNowComponent_Plain>;
   footer?: AdminPanelRelationPropertyModification<YogaFooter_Plain>;
   header?: AdminPanelRelationPropertyModification<YogaMainHeaderComponent_Plain>;
+  common?: AdminPanelRelationPropertyModification<YogaCommon_Plain>;
   locale: string;
   localizations?: Home[];
 }

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-list-page.ts

@@ -0,0 +1,52 @@
+// 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 { YogaSingleService } from './yoga-single-service';
+import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
+import { YogaFooter_Plain } from './yoga-footer';
+import { YogaCommon_Plain } from './yoga-common';
+import { YogaSingleService_Plain } from './yoga-single-service';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
+
+export interface ServiceListPage {
+  id: number;
+  attributes: {
+    createdAt: Date;    updatedAt: Date;    publishedAt?: Date;    header?: string;
+    description?: string;
+    subscribeNow?: { data: YogaSubscribeNowComponent };
+    footer?: { data: YogaFooter };
+    common?: { data: YogaCommon };
+    services: { data: YogaSingleService[] };
+  };
+}
+export interface ServiceListPage_Plain {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: YogaSubscribeNowComponent_Plain;
+  footer?: YogaFooter_Plain;
+  common?: YogaCommon_Plain;
+  services: YogaSingleService_Plain[];
+}
+
+export interface ServiceListPage_NoRelations {
+  id: number;
+  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
+  description?: string;
+  subscribeNow?: number;
+  footer?: number;
+  common?: number;
+  services: number[];
+}
+
+export interface ServiceListPage_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>;
+  services: AdminPanelRelationPropertyModification<YogaSingleService_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-footer.ts

@@ -1,8 +1,11 @@
 // Interface automatically generated by schemas-to-ts
 
 import { Link } from '../components/yoga-site/Link';
+import { Media } from '../components/shared/Media';
 import { Link_Plain } from '../components/yoga-site/Link';
+import { Media_Plain } from '../components/shared/Media';
 import { Link_NoRelations } from '../components/yoga-site/Link';
+import { AdminPanelRelationPropertyModification } from '../common/AdminPanelRelationPropertyModification';
 
 export interface YogaFooter {
   id: number;
@@ -17,6 +20,7 @@ export interface YogaFooter {
     contactUsLocation?: Link;
     copyRight?: string;
     name?: string;
+    logo?: { data: Media };
   };
 }
 export interface YogaFooter_Plain {
@@ -31,6 +35,7 @@ export interface YogaFooter_Plain {
   contactUsLocation?: Link_Plain;
   copyRight?: string;
   name?: string;
+  logo?: Media_Plain;
 }
 
 export interface YogaFooter_NoRelations {
@@ -45,6 +50,7 @@ export interface YogaFooter_NoRelations {
   contactUsLocation?: Link_NoRelations;
   copyRight?: string;
   name?: string;
+  logo?: number;
 }
 
 export interface YogaFooter_AdminPanelLifeCycle {
@@ -59,4 +65,5 @@ export interface YogaFooter_AdminPanelLifeCycle {
   contactUsLocation?: Link_Plain;
   copyRight?: string;
   name?: string;
+  logo?: AdminPanelRelationPropertyModification<Media_Plain>;
 }

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;
 }