[yoga-4] add new field: article

2025-05-20 07:46:17 +02:00
35 changed files with 41 additions and 423 deletions
--- a/api.http
+++ b/api.http
@@ -22,12 +22,3 @@ 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-page?fields[0]=*&populate[subscribeNow][fields][0]=*&populate[footer][fields][0]=*&populate[footer][populate][links][fields][0]=*&populate[footer][populate][contactUsEmail][fields][0]=*&populate[footer][populate][contactUsLocation][fields][0]=*&populate[footer][populate][contactUsPhoneNumber][fields][0]=*
-Accept: application/json
--- a/dev.sh
+++ b/dev.sh
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-cd environment/dev/docker-compose/yogastic
-docker compose up -d
-
--- a/environment/dev/docker/app/scripts/version.txt
+++ b/environment/dev/docker/app/scripts/version.txt
@@ -1 +1 @@
-202505291116.217a26c
+202505181151.77363d0
--- a/environment/dev/docker/cms/scripts/build.docker.build.step.build.sh
+++ b/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_INTERNAL -t $TAG_PUBLIC .
+docker build  --build-arg NODE_ENV=production -t $TAG .
--- a/environment/dev/docker/cms/scripts/build.docker.env.sh
+++ b/environment/dev/docker/cms/scripts/build.docker.env.sh
@@ -6,5 +6,4 @@ echo "Reading version file: ${VERSION_FILE}"

 export VERSION=$(cat "${VERSION_FILE}")

-export TAG_PUBLIC=docker.rschneider.hu/infra/yoga-cms:$VERSION
-export TAG_INTERNAL=internal-docker.rschneider.hu/infra/yoga-cms:$VERSION
+export TAG=docker.rschneider.hu/infra/yoga-cms:$VERSION
--- a/environment/dev/docker/cms/scripts/build.docker.push.sh
+++ b/environment/dev/docker/cms/scripts/build.docker.push.sh
@@ -3,7 +3,5 @@
 CURRENT_DIR=$(dirname "$0")
 # push docker image
 source "${CURRENT_DIR}/build.docker.env.sh"
-echo "push image ${TAG_INTERNAL}"
-docker push $TAG_INTERNAL
-echo "push image ${TAG_PUBLIC}"
-docker push $TAG_PUBLIC
+echo "push image ${TAG}"
+docker push $TAG
--- a/environment/dev/docker/cms/scripts/version.txt
+++ b/environment/dev/docker/cms/scripts/version.txt
@@ -1 +1 @@
-202507041949.cc6d814
+202505180959.57552b3
--- a/environment/prod/docker-compose/yogastic/docker-compose.yaml
+++ b/environment/prod/docker-compose/yogastic/docker-compose.yaml
@@ -21,7 +21,7 @@ services:
    networks:
      - yogastic
  app:
-    image: docker.rschneider.hu/infra/yoga-app:202505291116.217a26c
+    image: docker.rschneider.hu/infra/yoga-app:202505181151.77363d0
    platform: linux/amd64
    ports:
      - '4025:3000'
@@ -47,7 +47,7 @@ services:
      - proxy_shared
      - yogastic
  cms:
-    image: docker.rschneider.hu/infra/yoga-cms:202507041949.cc6d814
+    image: docker.rschneider.hu/infra/yoga-cms:202505180959.57552b3
    ports:
      - '4026:1337'
    environment:
@@ -71,6 +71,7 @@ services:
      - yogastic
    volumes:
      - strapi-uploads:/opt/app/public/uploads
+
 volumes:
  next-db: {}
  strapi-db: {}
--- a/yoga-app/eslint.config.mjs
+++ b/yoga-app/eslint.config.mjs
@@ -16,9 +16,9 @@ const eslintConfig = [
              "next/core-web-vitals",
              "next/typescript",
          ],
-          rules: {
-              "@typescript-eslint/no-explicit-any": "off"
-          },
+          // rules: {
+          //     "@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;
--- a/yoga-app/package-lock.json
+++ b/yoga-app/package-lock.json
@@ -9,7 +9,6 @@
      "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",
@@ -1394,16 +1393,6 @@
        "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",
--- a/yoga-app/package.json
+++ b/yoga-app/package.json
@@ -11,7 +11,6 @@
  },
  "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",
--- a/yoga-app/src/api/strapi/query/service.json
+++ b/yoga-app/src/api/strapi/query/service.json
@@ -1,25 +0,0 @@
-{
-  "fields": ["*"],
-  "populate": {
-    "subscribeNow": {
-      "fields": ["*"]
-    },
-    "footer": {
-      "fields": ["*"],
-      "populate": {
-        "links": {
-          "fields": ["*"]
-        },
-        "contactUsEmail": {
-          "fields": ["*"]
-        },
-        "contactUsLocation": {
-          "fields": ["*"]
-        },
-        "contactUsPhoneNumber": {
-          "fields": ["*"]
-        }
-      }
-    }
-  }
-}
--- a/yoga-app/src/api/strapi/strapi-api.ts
+++ b/yoga-app/src/api/strapi/strapi-api.ts
@@ -4,7 +4,6 @@ import qs from "qs";
 import aboutQuery from "@/api/strapi/query/about.json";
 import homeQuery from "@/api/strapi/query/home.json";
 import servicesQuery from "@/api/strapi/query/services.json";
-import serviceQuery from "@/api/strapi/query/service.json";
 import pricesQuery from "@/api/strapi/query/prices.json";
 import faqQuery from "@/api/strapi/query/faq.json";
 import contactQuery from "@/api/strapi/query/contact.json";
@@ -14,8 +13,6 @@ import {ServicesPage_Plain} from "@/types/generated-strapi-interfaces/api/servic
 import {PricesPage_Plain} from "@/types/generated-strapi-interfaces/api/prices-page";
 import {FaqPage_Plain} from "@/types/generated-strapi-interfaces/api/faq-page";
 import {ContactPage_Plain} from "@/types/generated-strapi-interfaces/api/contact-page";
-import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/yoga-single-service";
-import {ServicePage_Plain} from "@/types/generated-strapi-interfaces/api/service-page";


 class StrapiApi{
@@ -45,20 +42,6 @@ class StrapiApi{
        return this.getJson("/api/services-page?",servicesQuery);
    }

-    public getServicePage(): Promise<ServicePage_Plain>{
-        return this.getJson("/api/service-page?",serviceQuery);
-    }
-
-    public getService(name: string): Promise<YogaSingleService_Plain[]>{
-        return this.getJson("/api/yoga-single-services?", {
-            filters: {
-                name: {
-                    $eq: name,
-                },
-            },
-        });
-    }
-
    public getPricesPage(): Promise<PricesPage_Plain>{
        return this.getJson("/api/prices-page?",pricesQuery);
    }
--- a/yoga-app/src/api/strapi/strapi-client.ts
+++ b/yoga-app/src/api/strapi/strapi-client.ts
@@ -14,7 +14,6 @@ class StrapiClient{
        return  '/image/'+ imagePath;
    }
    public async  httpGet(path: string){
-        console.info("httpGet", path);
        return await httpClient.httpGet(this.strapiUrl + path);
    }
    public async httpGetJson<T>(url: string): Promise<Payload<T>>{
--- a/yoga-app/src/app/page.tsx
+++ b/yoga-app/src/app/page.tsx
@@ -16,6 +16,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 {
                header,
                ourServices,
--- a/yoga-app/src/app/services/[slug]/not-found.tsx
+++ b/yoga-app/src/app/services/[slug]/not-found.tsx
@@ -1,11 +0,0 @@
-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>
-    )
-}
--- a/yoga-app/src/app/services/[slug]/page.module.css
+++ b/yoga-app/src/app/services/[slug]/page.module.css
@@ -1,3 +0,0 @@
-.article h1{
-    color: black;
-}
--- a/yoga-app/src/app/services/[slug]/page.tsx
+++ b/yoga-app/src/app/services/[slug]/page.tsx
@@ -1,68 +1,6 @@
-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
-
-    const servicePage = await strapiApi.getServicePage();
-    if (!servicePage) {
-        return notFound()
-    }
-    const {subscribeNow, footer} = servicePage;
-    const servicesByName = await strapiApi.getService(slug);
-    if (!servicesByName || servicesByName.length === 0) {
-        return notFound();
-    }
-    const selectedService = servicesByName[0];
-    if ( !selectedService?.article?.length ) {
-        return notFound();
-    }
-    const article: BlocksContent = rewriteStrapiImageUrlToNextImageUrl( selectedService.article);

+export default async function ServiceDetails() {
    return (
-        <>
-            {selectedService && selectedService.header && selectedService.description &&
-                <SubHeaderComponent header1={selectedService.header} description={selectedService.description}/>}
-            <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/>
-        </>
-    );
+        <h1>hello    </h1>
+    )
 }
-
-export const dynamic = 'force-dynamic'
--- a/yoga-app/src/components/next.blocks.renderer.tsx
+++ b/yoga-app/src/components/next.blocks.renderer.tsx
@@ -1,28 +0,0 @@
-'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;
--- a/yoga-app/src/components/our.services.item.component.tsx
+++ b/yoga-app/src/components/our.services.item.component.tsx
@@ -3,18 +3,13 @@ import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/y
 import {StrapiFile} from "@/types/types";
 import strapiApi from "@/api/strapi/strapi-api";
 import styles from './our.services.item.component.module.css'
-import Link from "next/link";

 export interface Props {
    config: YogaSingleService_Plain
 }

-const OurServiceItemComponent = ({config: {header,description,image,name}}: Props) => {
+const OurServiceItemComponent = ({config: {header,description,image}}: Props) => {
    const imageFile: StrapiFile = image as StrapiFile;
-    if (!imageFile || !imageFile.url) {
-        return null
-    }
-    const path = '/services/' + name;
    return (

        <div className={styles.serviceSlide}>
@@ -22,15 +17,15 @@ const OurServiceItemComponent = ({config: {header,description,image,name}}: Prop
            <div className="services_box_content">
                <div className="services_box_upper_portion">
                    <figure className="mb-0">
-                        <YogaImageComponent src={strapiApi.getImageUrl(imageFile.url)} alt="" className="img-fluid"/>
+                        <YogaImageComponent src={strapiApi.getImageUrl(imageFile?.url)} alt="" className="img-fluid"/>
                    </figure>
                </div>
                <div className="services_box_lower_portion">
                    <h3>{header}</h3>
                    <p>{description}</p>
                    <div className="btn_wrapper">
-                        <Link href={path} className="text-decoration-none"><i
-                            className="fa-solid fa-arrow-right" aria-hidden="true"></i></Link>
+                        <a href="/services" className="text-decoration-none"><i
+                            className="fa-solid fa-arrow-right" aria-hidden="true"></i></a>
                    </div>
                </div>
            </div>
--- a/yoga-app/src/components/price.item.component.tsx
+++ b/yoga-app/src/components/price.item.component.tsx
@@ -7,7 +7,7 @@ export interface Props{
    config: YogaPrice_Plain
 }

-export function PriceItemComponent({config: {header, description, option1,option2,price,pricePostfix, icon, image,buttonText}} : Props){
+export function PriceItemComponent({config: {header,option1,option2,price,icon, image,buttonText}} : Props){
    // there are some issues with the strapi generated types
    const iconFile: StrapiFile = icon as StrapiFile;
    const imageFile: StrapiFile = image as StrapiFile;
@@ -28,7 +28,6 @@ export function PriceItemComponent({config: {header, description, option1,option
                </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}
@@ -39,7 +38,7 @@ export function PriceItemComponent({config: {header, description, option1,option
                    </ul>
                    <div className="pricing_plans_span_wrapper">
                        <span className="price">{price} FT</span>
-                        { pricePostfix && <span className="per_month">{pricePostfix}</span> }
+                        <span className="per_month">/per month</span>
                    </div>
                    <div className="btn_wrapper">
                        <a className="enroll_now_btn text-decoration-none" href="/pricing.html">{buttonText}</a>
--- a/yoga-app/src/types/generated-strapi-interfaces/api/article.ts
+++ b/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?: any;
+    blocks?: object;
  };
 }
 export interface Article_Plain {
@@ -28,7 +28,7 @@ export interface Article_Plain {
  cover?: Media_Plain;
  author?: Author_Plain;
  category?: Category_Plain;
-  blocks?: any;
+  blocks?: object;
 }

 export interface Article_NoRelations {
@@ -39,7 +39,7 @@ export interface Article_NoRelations {
  cover?: number;
  author?: number;
  category?: number;
-  blocks?: any;
+  blocks?: object;
 }

 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?: any;
+  blocks?: object;
 }
--- a/yoga-app/src/types/generated-strapi-interfaces/api/service-page.ts
+++ b/yoga-app/src/types/generated-strapi-interfaces/api/service-page.ts
@@ -1,40 +0,0 @@
-// Interface automatically generated by schemas-to-ts
-
-import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
-import { YogaFooter } from './yoga-footer';
-import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
-import { YogaFooter_Plain } from './yoga-footer';
-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 };
-  };
-}
-export interface ServicePage_Plain {
-  id: number;
-  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
-  description?: string;
-  subscribeNow?: YogaSubscribeNowComponent_Plain;
-  footer?: YogaFooter_Plain;
-}
-
-export interface ServicePage_NoRelations {
-  id: number;
-  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
-  description?: string;
-  subscribeNow?: number;
-  footer?: 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>;
-}
--- a/yoga-app/src/types/generated-strapi-interfaces/api/yoga-price.ts
+++ b/yoga-app/src/types/generated-strapi-interfaces/api/yoga-price.ts
@@ -14,8 +14,6 @@ export interface YogaPrice {
    price?: number;
    icon?: { data: Media };
    image?: { data: Media };
-    pricePostfix?: string;
-    description?: string;
  };
 }
 export interface YogaPrice_Plain {
@@ -27,8 +25,6 @@ export interface YogaPrice_Plain {
  price?: number;
  icon?: Media_Plain;
  image?: Media_Plain;
-  pricePostfix?: string;
-  description?: string;
 }

 export interface YogaPrice_NoRelations {
@@ -40,8 +36,6 @@ export interface YogaPrice_NoRelations {
  price?: number;
  icon?: number;
  image?: number;
-  pricePostfix?: string;
-  description?: string;
 }

 export interface YogaPrice_AdminPanelLifeCycle {
@@ -53,6 +47,4 @@ export interface YogaPrice_AdminPanelLifeCycle {
  price?: number;
  icon?: AdminPanelRelationPropertyModification<Media_Plain>;
  image?: AdminPanelRelationPropertyModification<Media_Plain>;
-  pricePostfix?: string;
-  description?: string;
 }
--- a/yoga-app/src/types/generated-strapi-interfaces/api/yoga-single-service.ts
+++ b/yoga-app/src/types/generated-strapi-interfaces/api/yoga-single-service.ts
@@ -13,7 +13,6 @@ export interface YogaSingleService {
    image?: { data: Media };
    imageAlt?: string;
    name?: string;
-    article?: any;
    locale: string;
    localizations?: { data: YogaSingleService[] };
  };
@@ -26,7 +25,6 @@ export interface YogaSingleService_Plain {
  image?: Media_Plain;
  imageAlt?: string;
  name?: string;
-  article?: any;
  locale: string;
  localizations?: YogaSingleService_Plain[];
 }
@@ -39,7 +37,6 @@ export interface YogaSingleService_NoRelations {
  image?: number;
  imageAlt?: string;
  name?: string;
-  article?: any;
  locale: string;
  localizations?: YogaSingleService[];
 }
@@ -52,7 +49,6 @@ export interface YogaSingleService_AdminPanelLifeCycle {
  image?: AdminPanelRelationPropertyModification<Media_Plain>;
  imageAlt?: string;
  name?: string;
-  article?: any;
  locale: string;
  localizations?: YogaSingleService[];
 }
--- a/yoga-cms/generated-strapi-interfaces/api/service-page.ts
+++ b/yoga-cms/generated-strapi-interfaces/api/service-page.ts
@@ -1,40 +0,0 @@
-// Interface automatically generated by schemas-to-ts
-
-import { YogaSubscribeNowComponent } from './yoga-subscribe-now-component';
-import { YogaFooter } from './yoga-footer';
-import { YogaSubscribeNowComponent_Plain } from './yoga-subscribe-now-component';
-import { YogaFooter_Plain } from './yoga-footer';
-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 };
-  };
-}
-export interface ServicePage_Plain {
-  id: number;
-  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
-  description?: string;
-  subscribeNow?: YogaSubscribeNowComponent_Plain;
-  footer?: YogaFooter_Plain;
-}
-
-export interface ServicePage_NoRelations {
-  id: number;
-  createdAt: Date;  updatedAt: Date;  publishedAt?: Date;  header?: string;
-  description?: string;
-  subscribeNow?: number;
-  footer?: 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>;
-}
--- a/yoga-cms/generated-strapi-interfaces/api/yoga-price.ts
+++ b/yoga-cms/generated-strapi-interfaces/api/yoga-price.ts
@@ -14,8 +14,6 @@ export interface YogaPrice {
    price?: number;
    icon?: { data: Media };
    image?: { data: Media };
-    pricePostfix?: string;
-    description?: string;
  };
 }
 export interface YogaPrice_Plain {
@@ -27,8 +25,6 @@ export interface YogaPrice_Plain {
  price?: number;
  icon?: Media_Plain;
  image?: Media_Plain;
-  pricePostfix?: string;
-  description?: string;
 }

 export interface YogaPrice_NoRelations {
@@ -40,8 +36,6 @@ export interface YogaPrice_NoRelations {
  price?: number;
  icon?: number;
  image?: number;
-  pricePostfix?: string;
-  description?: string;
 }

 export interface YogaPrice_AdminPanelLifeCycle {
@@ -53,6 +47,4 @@ export interface YogaPrice_AdminPanelLifeCycle {
  price?: number;
  icon?: AdminPanelRelationPropertyModification<Media_Plain>;
  image?: AdminPanelRelationPropertyModification<Media_Plain>;
-  pricePostfix?: string;
-  description?: string;
 }
--- a/yoga-cms/generated-strapi-interfaces/api/yoga-single-service.ts
+++ b/yoga-cms/generated-strapi-interfaces/api/yoga-single-service.ts
@@ -13,7 +13,7 @@ export interface YogaSingleService {
    image?: { data: Media };
    imageAlt?: string;
    name?: string;
-    article?: any;
+    article?: string;
    locale: string;
    localizations?: { data: YogaSingleService[] };
  };
@@ -26,7 +26,7 @@ export interface YogaSingleService_Plain {
  image?: Media_Plain;
  imageAlt?: string;
  name?: string;
-  article?: any;
+  article?: string;
  locale: string;
  localizations?: YogaSingleService_Plain[];
 }
@@ -39,7 +39,7 @@ export interface YogaSingleService_NoRelations {
  image?: number;
  imageAlt?: string;
  name?: string;
-  article?: any;
+  article?: string;
  locale: string;
  localizations?: YogaSingleService[];
 }
@@ -52,7 +52,7 @@ export interface YogaSingleService_AdminPanelLifeCycle {
  image?: AdminPanelRelationPropertyModification<Media_Plain>;
  imageAlt?: string;
  name?: string;
-  article?: any;
+  article?: string;
  locale: string;
  localizations?: YogaSingleService[];
 }
--- a/yoga-cms/src/api/service-page/content-types/service-page/schema.json
+++ b/yoga-cms/src/api/service-page/content-types/service-page/schema.json
@@ -1,31 +0,0 @@
-{
-  "kind": "singleType",
-  "collectionName": "service_pages",
-  "info": {
-    "singularName": "service-page",
-    "pluralName": "service-pages",
-    "displayName": "ServicePage",
-    "description": ""
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "attributes": {
-    "header": {
-      "type": "string"
-    },
-    "description": {
-      "type": "text"
-    },
-    "subscribeNow": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::yoga-subscribe-now-component.yoga-subscribe-now-component"
-    },
-    "footer": {
-      "type": "relation",
-      "relation": "oneToOne",
-      "target": "api::yoga-footer.yoga-footer"
-    }
-  }
-}
--- a/yoga-cms/src/api/service-page/controllers/service-page.ts
+++ b/yoga-cms/src/api/service-page/controllers/service-page.ts
@@ -1,7 +0,0 @@
-/**
- * service-page controller
- */
-
-import { factories } from '@strapi/strapi'
-
-export default factories.createCoreController('api::service-page.service-page');
--- a/yoga-cms/src/api/service-page/routes/service-page.ts
+++ b/yoga-cms/src/api/service-page/routes/service-page.ts
@@ -1,7 +0,0 @@
-/**
- * service-page router
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreRouter('api::service-page.service-page');
--- a/yoga-cms/src/api/service-page/services/service-page.ts
+++ b/yoga-cms/src/api/service-page/services/service-page.ts
@@ -1,7 +0,0 @@
-/**
- * service-page service
- */
-
-import { factories } from '@strapi/strapi';
-
-export default factories.createCoreService('api::service-page.service-page');
--- a/yoga-cms/src/api/yoga-price/content-types/yoga-price/schema.json
+++ b/yoga-cms/src/api/yoga-price/content-types/yoga-price/schema.json
@@ -4,8 +4,7 @@
  "info": {
    "singularName": "yoga-price",
    "pluralName": "yoga-prices",
-    "displayName": "YogaPrice",
-    "description": ""
+    "displayName": "YogaPrice"
  },
  "options": {
    "draftAndPublish": true
@@ -28,32 +27,24 @@
      "type": "integer"
    },
    "icon": {
-      "type": "media",
-      "multiple": false,
-      "required": false,
      "allowedTypes": [
        "images",
        "files",
        "videos",
        "audios"
-      ]
+      ],
+      "type": "media",
+      "multiple": false
    },
    "image": {
-      "type": "media",
-      "multiple": false,
-      "required": false,
      "allowedTypes": [
        "images",
        "files",
        "videos",
        "audios"
-      ]
-    },
-    "pricePostfix": {
-      "type": "string"
-    },
-    "description": {
-      "type": "text"
+      ],
+      "type": "media",
+      "multiple": false
    }
  }
 }
--- a/yoga-cms/src/api/yoga-single-service/content-types/yoga-single-service/schema.json
+++ b/yoga-cms/src/api/yoga-single-service/content-types/yoga-single-service/schema.json
@@ -73,7 +73,7 @@
      "type": "string"
    },
    "article": {
-      "type": "blocks"
+      "type": "richtext"
    }
  }
 }
--- a/yoga-cms/types/generated/contentTypes.d.ts
+++ b/yoga-cms/types/generated/contentTypes.d.ts
@@ -849,44 +849,6 @@ export interface ApiPricesPagePricesPage extends Struct.SingleTypeSchema {
  };
 }

-export interface ApiServicePageServicePage extends Struct.SingleTypeSchema {
-  collectionName: 'service_pages';
-  info: {
-    description: '';
-    displayName: 'ServicePage';
-    pluralName: 'service-pages';
-    singularName: 'service-page';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  attributes: {
-    createdAt: Schema.Attribute.DateTime;
-    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-    description: Schema.Attribute.Text;
-    footer: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::yoga-footer.yoga-footer'
-    >;
-    header: Schema.Attribute.String;
-    locale: Schema.Attribute.String & Schema.Attribute.Private;
-    localizations: Schema.Attribute.Relation<
-      'oneToMany',
-      'api::service-page.service-page'
-    > &
-      Schema.Attribute.Private;
-    publishedAt: Schema.Attribute.DateTime;
-    subscribeNow: Schema.Attribute.Relation<
-      'oneToOne',
-      'api::yoga-subscribe-now-component.yoga-subscribe-now-component'
-    >;
-    updatedAt: Schema.Attribute.DateTime;
-    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
-      Schema.Attribute.Private;
-  };
-}
-
 export interface ApiServicesPageServicesPage extends Struct.SingleTypeSchema {
  collectionName: 'services_pages';
  info: {
@@ -1680,7 +1642,6 @@ export interface ApiYogaPriceComponentYogaPriceComponent
 export interface ApiYogaPriceYogaPrice extends Struct.CollectionTypeSchema {
  collectionName: 'yoga_prices';
  info: {
-    description: '';
    displayName: 'YogaPrice';
    pluralName: 'yoga-prices';
    singularName: 'yoga-price';
@@ -1693,7 +1654,6 @@ export interface ApiYogaPriceYogaPrice extends Struct.CollectionTypeSchema {
    createdAt: Schema.Attribute.DateTime;
    createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
      Schema.Attribute.Private;
-    description: Schema.Attribute.Text;
    header: Schema.Attribute.String;
    icon: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
    image: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
@@ -1706,7 +1666,6 @@ export interface ApiYogaPriceYogaPrice extends Struct.CollectionTypeSchema {
    option1: Schema.Attribute.String;
    option2: Schema.Attribute.String;
    price: Schema.Attribute.Integer;
-    pricePostfix: Schema.Attribute.String;
    publishedAt: Schema.Attribute.DateTime;
    updatedAt: Schema.Attribute.DateTime;
    updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
@@ -1732,7 +1691,7 @@ export interface ApiYogaSingleServiceYogaSingleService
    };
  };
  attributes: {
-    article: Schema.Attribute.Blocks;
+    article: Schema.Attribute.RichText;
    buttonLink: Schema.Attribute.String &
      Schema.Attribute.SetPluginOptions<{
        i18n: {
@@ -2544,7 +2503,6 @@ declare module '@strapi/strapi' {
      'api::page.page': ApiPagePage;
      'api::person.person': ApiPersonPerson;
      'api::prices-page.prices-page': ApiPricesPagePricesPage;
-      'api::service-page.service-page': ApiServicePageServicePage;
      'api::services-page.services-page': ApiServicesPageServicesPage;
      'api::yoga-about-us-component.yoga-about-us-component': ApiYogaAboutUsComponentYogaAboutUsComponent;
      'api::yoga-about-us-with-boxes-component.yoga-about-us-with-boxes-component': ApiYogaAboutUsWithBoxesComponentYogaAboutUsWithBoxesComponent;