[yoga-4] add new field: article

api.http

@@ -22,8 +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

dev.sh

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

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

@@ -13,7 +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";
 
 
 class StrapiApi{
@@ -43,16 +42,6 @@ class StrapiApi{
         return this.getJson("/api/services-page?",servicesQuery);
     }
 
-    public getServicePage(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/app/services/[slug]/page.tsx

@@ -1,27 +1,6 @@
-import React from "react";
-import strapiApi from "@/api/strapi/strapi-api";
-export default async function ServiceArticlePage({params}: {
-    params: { slug: string}
-} ) {
-    const servicesByName = await strapiApi.getServicePage(params.slug);
-    // return (
-    //     <>
-    //         {header && description && <SubHeaderComponent header1={header} description={description} />}
-    //         { ourServices && <OurServicesComponent  config={ourServices}  /> }
-    //         { contactUs && <ContactUsComponent contactUs={contactUs} />}
-    //         { ourSpecialities && <OurSpecialitiesComponent config={ourSpecialities} /> }
-    //         { feedbacks && <FeedbackComponent config={feedbacks} /> }
-    //         { blogs && <BlogPostsComponent config={blogs} /> }
-    //         { subscribe && <SubscribeComponent config={subscribe} /> }
-    //         { footer &&  <FooterComponent config={footer} /> }
-    //         <AosComponent />
-    //     </>
-    // );
-    console.info("slug", params.slug);
-    console.info("servicesByName", servicesByName);
-            return (
-                <div>hello world {params.slug}</div>
-            );
-}
 
-export const dynamic = 'force-dynamic'
+export default async function ServiceDetails() {
+    return (
+        <h1>hello    </h1>
+    )
+}

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>

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

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

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

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",
+    "displayName": "YogaPrice"
-    "description": ""
   },
   "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"
-      ]
+      ],
-    },
+      "type": "media",
-    "pricePostfix": {
+      "multiple": false
-      "type": "string"
-    },
-    "description": {
-      "type": "text"
     }
   }
 }

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

@@ -73,11 +73,6 @@
       "type": "string"
     },
     "article": {
-      "pluginOptions": {
-        "i18n": {
-          "localized": true
-        }
-      },
       "type": "richtext"
     }
   }

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

@@ -1642,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';
@@ -1655,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'>;
@@ -1668,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'> &
@@ -1694,12 +1691,7 @@ export interface ApiYogaSingleServiceYogaSingleService
     };
   };
   attributes: {
-    article: Schema.Attribute.RichText &
+    article: Schema.Attribute.RichText;
-      Schema.Attribute.SetPluginOptions<{
-        i18n: {
-          localized: true;
-        };
-      }>;
     buttonLink: Schema.Attribute.String &
       Schema.Attribute.SetPluginOptions<{
         i18n: {