diff --git a/api.http b/api.http index 4edd4b0..2871776 100644 --- a/api.http +++ b/api.http @@ -29,7 +29,7 @@ GET {{domain}}/api/yoga-single-services?filters[name][$eq]=service4 Accept: application/json ### GET service page -GET {{domain}}/api/home?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[header][fields][0]=*&populate[header][populate][button][fields][0]=*&populate[header][populate][button][image][fields][0]=name&populate[header][populate][button][image][fields][1]=mime&populate[header][populate][button][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[subscribeNow][fields][0]=*&populate[blogs][fields][0]=*&populate[blogs][populate][button][fields][0]=*&populate[blogs][populate][posts][fields][0]=name&populate[blogs][populate][posts][fields][1]=id&populate[blogs][populate][posts][fields][2]=header&populate[blogs][populate][posts][fields][3]=documentId&populate[blogs][populate][posts][populate][tags][fields][0]=*&populate[blogs][populate][posts][populate][teaserImage][fields][0]=name&populate[blogs][populate][posts][populate][teaserImage][fields][1]=mime&populate[blogs][populate][posts][populate][teaserImage][fields][2]=url&populate[feedbacks][fields][0]=*&populate[feedbacks][populate][feedbacks][fields][0]=*&populate[feedbacks][populate][feedbacks][populate][customerImage][fields][0]=name&populate[feedbacks][populate][feedbacks][populate][customerImage][fields][1]=mime&populate[feedbacks][populate][feedbacks][populate][customerImage][fields][2]=url&populate[ourServices][fields][0]=*&populate[ourServices][populate][services][fields][0]=*&populate[ourServices][populate][services][populate][image][fields][0]=name&populate[ourServices][populate][services][populate][image][fields][1]=mime&populate[ourServices][populate][services][populate][image][fields][2]=url&populate[aboutUs][fields][0]=*&populate[aboutUs][populate][image][fields][0]=name&populate[aboutUs][populate][image][fields][1]=mime&populate[aboutUs][populate][image][fields][2]=url&populate[contactUs][fields][0]=*&populate[prices][fields][0]=*&populate[prices][populate][prices][fields][0]=*&populate[prices][populate][prices][populate][icon][fields][0]=name&populate[prices][populate][prices][populate][icon][fields][1]=mime&populate[prices][populate][prices][populate][icon][fields][2]=url&populate[prices][populate][prices][populate][image][fields][0]=name&populate[prices][populate][prices][populate][image][fields][1]=mime&populate[prices][populate][prices][populate][image][fields][2]=url&populate[ourSpecialities][fields][0]=*&populate[ourSpecialities][populate][left1][fields][0]=*&populate[ourSpecialities][populate][left2][fields][0]=*&populate[ourSpecialities][populate][left3][fields][0]=*&populate[ourSpecialities][populate][left4][fields][0]=*&populate[ourSpecialities][populate][right1][fields][0]=*&populate[ourSpecialities][populate][right2][fields][0]=*&populate[ourSpecialities][populate][right3][fields][0]=*&populate[ourSpecialities][populate][right4][fields][0]=* +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[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 diff --git a/yoga-app/src/api/strapi/query/service-list.json b/yoga-app/src/api/strapi/query/service-list.json new file mode 100644 index 0000000..b60e7d8 --- /dev/null +++ b/yoga-app/src/api/strapi/query/service-list.json @@ -0,0 +1,41 @@ +{ + "fields": ["*"], + "populate": { + "services": { + "fields": ["*"], + "populate": { + "image": { + "fields": ["name","mime","url" ] + } + } + }, + "common": { + "fields": ["*"], + "populate": { + "logoImage": { + "fields": ["name","mime","url"] + } + } + }, + "subscribeNow": { + "fields": ["*"] + }, + "footer": { + "fields": ["*"], + "populate": { + "links": { + "fields": ["*"] + }, + "contactUsEmail": { + "fields": ["*"] + }, + "contactUsLocation": { + "fields": ["*"] + }, + "contactUsPhoneNumber": { + "fields": ["*"] + } + } + } + } +} diff --git a/yoga-app/src/api/strapi/strapi-api.ts b/yoga-app/src/api/strapi/strapi-api.ts index 49bd386..03d809b 100644 --- a/yoga-app/src/api/strapi/strapi-api.ts +++ b/yoga-app/src/api/strapi/strapi-api.ts @@ -4,6 +4,7 @@ import qs from "qs"; import aboutQuery from "@/api/strapi/query/about.json"; import homeQuery from "@/api/strapi/query/home.json"; import servicesQuery from "@/api/strapi/query/services.json"; +import 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"; @@ -11,6 +12,7 @@ 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"; @@ -49,6 +51,10 @@ class StrapiApi{ return this.getJson("/api/service-page?",serviceQuery); } + public getServiceListPage(): Promise{ + return this.getJson("/api/service-list-page?",serviceListPageQuery); + } + public getService(name: string): Promise{ return this.getJson("/api/yoga-single-services?", { filters: { diff --git a/yoga-app/src/app/serviceList/page.tsx b/yoga-app/src/app/serviceList/page.tsx new file mode 100644 index 0000000..f541895 --- /dev/null +++ b/yoga-app/src/app/serviceList/page.tsx @@ -0,0 +1,37 @@ +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"; + +export default async function Services() { + const { + header, + description, + footer, + subscribeNow, + common, + services + } = await strapiApi.getServiceListPage(); + console.info("ServiceListPage", services.length, services.map); + return ( + <> + + { + services && services.length > 0 && services.map( singleService => { + return ( + + ) + }) + } + { subscribeNow && } + { footer && } + + + + ); +} + +export const dynamic = 'force-dynamic' diff --git a/yoga-app/src/components/breadcrumbs.component.tsx b/yoga-app/src/components/breadcrumbs.component.tsx index b80c7a4..a7b5be1 100644 --- a/yoga-app/src/components/breadcrumbs.component.tsx +++ b/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 (
{pathToBreadCrumbs( "/" )} diff --git a/yoga-app/src/components/nav.component.tsx b/yoga-app/src/components/nav.component.tsx index 2642dbc..209ff69 100644 --- a/yoga-app/src/components/nav.component.tsx +++ b/yoga-app/src/components/nav.component.tsx @@ -1,22 +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 = ({menuItems, imageSrc}:Props) => { +const Nav = ({menuItems, imageSrc}: Props) => { return (
@@ -36,7 +36,8 @@ const Nav: FC = ({menuItems, imageSrc}:Props) => { @@ -46,32 +47,35 @@ const Nav: FC = ({menuItems, imageSrc}:Props) => { ); } -interface MenuItemProps{ +interface MenuItemProps { menuItem: MenuItem, dropdownItem?: boolean, } -const MenuItemComponent: FC = ({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 ( //
  • - {menuItem.label} + {menuItem.label}
    • ); } return ( -
  • +
    • { - menuItem.children.map((item,index) => ) + menuItem.children.map((item, index) => ) }
    diff --git a/yoga-app/src/components/our.services.item.component.tsx b/yoga-app/src/components/our.services.item.component.tsx index 763e704..d927ea4 100644 --- a/yoga-app/src/components/our.services.item.component.tsx +++ b/yoga-app/src/components/our.services.item.component.tsx @@ -14,7 +14,7 @@ const OurServiceItemComponent = ({config: {header,description,image,name}}: Prop if (!imageFile || !imageFile.url) { return null } - const path = '/services/' + name; + const path = '/serviceList#' + name; return (
    diff --git a/yoga-app/src/components/single.service.component.tsx b/yoga-app/src/components/single.service.component.tsx new file mode 100644 index 0000000..2d7f86c --- /dev/null +++ b/yoga-app/src/components/single.service.component.tsx @@ -0,0 +1,32 @@ +import {YogaSingleService_Plain} from "@/types/generated-strapi-interfaces/api/yoga-single-service"; +import clsx from "clsx"; +import NextBlocksRenderer from "@/components/next.blocks.renderer"; +import {BlocksContent} from "@strapi/blocks-react-renderer"; +import React from "react"; + + +export interface Props { + config: YogaSingleService_Plain +} + +const SingleService = ({config}: Props) => { + if (!config || !config.article) { + return null; // or some fallback UI + } + + return ( +
    +
    +
    +
    + +
    +
    +
    +
    + ); +} + +export default SingleService; diff --git a/yoga-app/src/types/generated-strapi-interfaces/api/service-list-page.ts b/yoga-app/src/types/generated-strapi-interfaces/api/service-list-page.ts new file mode 100644 index 0000000..76bbade --- /dev/null +++ b/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; + footer?: AdminPanelRelationPropertyModification; + common?: AdminPanelRelationPropertyModification; + services: AdminPanelRelationPropertyModification; +} diff --git a/yoga-app/src/util/const.ts b/yoga-app/src/util/const.ts index f08f3c3..f1e530c 100644 --- a/yoga-app/src/util/const.ts +++ b/yoga-app/src/util/const.ts @@ -11,7 +11,7 @@ export const MAIN_MENU:MenuItem[] = [ }, { label: 'Szolgáltatásaink', - href: '/services' + href: '/serviceList' }, // { // label: 'Oldalak', @@ -34,6 +34,10 @@ export const MAIN_MENU:MenuItem[] = [ label: 'GY.I.K', href: '/faq' }, + { + label: 'Szolgáltatásaink', + href: '/serviceList' + }, // { // label: 'Rólam', // href: '/team' diff --git a/yoga-cms/generated-strapi-interfaces/api/service-list-page.ts b/yoga-cms/generated-strapi-interfaces/api/service-list-page.ts new file mode 100644 index 0000000..76bbade --- /dev/null +++ b/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; + footer?: AdminPanelRelationPropertyModification; + common?: AdminPanelRelationPropertyModification; + services: AdminPanelRelationPropertyModification; +} diff --git a/yoga-cms/src/api/service-list-page/content-types/service-list-page/schema.json b/yoga-cms/src/api/service-list-page/content-types/service-list-page/schema.json new file mode 100644 index 0000000..c4d9847 --- /dev/null +++ b/yoga-cms/src/api/service-list-page/content-types/service-list-page/schema.json @@ -0,0 +1,40 @@ +{ + "kind": "singleType", + "collectionName": "service_list_pages", + "info": { + "singularName": "service-list-page", + "pluralName": "service-list-pages", + "displayName": "ServiceListPage" + }, + "options": { + "draftAndPublish": true + }, + "attributes": { + "header": { + "type": "string" + }, + "description": { + "type": "text" + }, + "subscribeNow": { + "type": "relation", + "relation": "oneToOne", + "target": "api::yoga-subscribe-now-component.yoga-subscribe-now-component" + }, + "footer": { + "type": "relation", + "relation": "oneToOne", + "target": "api::yoga-footer.yoga-footer" + }, + "common": { + "type": "relation", + "relation": "oneToOne", + "target": "api::yoga-common.yoga-common" + }, + "services": { + "type": "relation", + "relation": "oneToMany", + "target": "api::yoga-single-service.yoga-single-service" + } + } +} diff --git a/yoga-cms/src/api/service-list-page/controllers/service-list-page.ts b/yoga-cms/src/api/service-list-page/controllers/service-list-page.ts new file mode 100644 index 0000000..aef7640 --- /dev/null +++ b/yoga-cms/src/api/service-list-page/controllers/service-list-page.ts @@ -0,0 +1,7 @@ +/** + * service-list-page controller + */ + +import { factories } from '@strapi/strapi' + +export default factories.createCoreController('api::service-list-page.service-list-page'); diff --git a/yoga-cms/src/api/service-list-page/routes/service-list-page.ts b/yoga-cms/src/api/service-list-page/routes/service-list-page.ts new file mode 100644 index 0000000..650853d --- /dev/null +++ b/yoga-cms/src/api/service-list-page/routes/service-list-page.ts @@ -0,0 +1,7 @@ +/** + * service-list-page router + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreRouter('api::service-list-page.service-list-page'); diff --git a/yoga-cms/src/api/service-list-page/services/service-list-page.ts b/yoga-cms/src/api/service-list-page/services/service-list-page.ts new file mode 100644 index 0000000..600e403 --- /dev/null +++ b/yoga-cms/src/api/service-list-page/services/service-list-page.ts @@ -0,0 +1,7 @@ +/** + * service-list-page service + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreService('api::service-list-page.service-list-page'); diff --git a/yoga-cms/src/api/services-page/content-types/services-page/schema.json b/yoga-cms/src/api/services-page/content-types/services-page/schema.json index 33312e0..8a51f0d 100644 --- a/yoga-cms/src/api/services-page/content-types/services-page/schema.json +++ b/yoga-cms/src/api/services-page/content-types/services-page/schema.json @@ -4,7 +4,7 @@ "info": { "singularName": "services-page", "pluralName": "services-pages", - "displayName": "Services", + "displayName": "ServicesPage", "description": "" }, "options": { diff --git a/yoga-cms/types/generated/contentTypes.d.ts b/yoga-cms/types/generated/contentTypes.d.ts index 950d92b..808bf8d 100644 --- a/yoga-cms/types/generated/contentTypes.d.ts +++ b/yoga-cms/types/generated/contentTypes.d.ts @@ -871,6 +871,52 @@ export interface ApiPricesPagePricesPage extends Struct.SingleTypeSchema { }; } +export interface ApiServiceListPageServiceListPage + extends Struct.SingleTypeSchema { + collectionName: 'service_list_pages'; + info: { + displayName: 'ServiceListPage'; + pluralName: 'service-list-pages'; + singularName: 'service-list-page'; + }; + options: { + draftAndPublish: true; + }; + attributes: { + common: Schema.Attribute.Relation< + 'oneToOne', + 'api::yoga-common.yoga-common' + >; + createdAt: Schema.Attribute.DateTime; + createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> & + Schema.Attribute.Private; + description: Schema.Attribute.Text; + footer: Schema.Attribute.Relation< + 'oneToOne', + 'api::yoga-footer.yoga-footer' + >; + header: Schema.Attribute.String; + locale: Schema.Attribute.String & Schema.Attribute.Private; + localizations: Schema.Attribute.Relation< + 'oneToMany', + 'api::service-list-page.service-list-page' + > & + Schema.Attribute.Private; + publishedAt: Schema.Attribute.DateTime; + services: Schema.Attribute.Relation< + 'oneToMany', + 'api::yoga-single-service.yoga-single-service' + >; + 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 ApiServicePageServicePage extends Struct.SingleTypeSchema { collectionName: 'service_pages'; info: { @@ -917,7 +963,7 @@ export interface ApiServicesPageServicesPage extends Struct.SingleTypeSchema { collectionName: 'services_pages'; info: { description: ''; - displayName: 'Services'; + displayName: 'ServicesPage'; pluralName: 'services-pages'; singularName: 'services-page'; }; @@ -2604,6 +2650,7 @@ declare module '@strapi/strapi' { 'api::page.page': ApiPagePage; 'api::person.person': ApiPersonPerson; 'api::prices-page.prices-page': ApiPricesPagePricesPage; + 'api::service-list-page.service-list-page': ApiServiceListPageServiceListPage; 'api::service-page.service-page': ApiServicePageServicePage; 'api::services-page.services-page': ApiServicesPageServicesPage; 'api::yoga-about-us-component.yoga-about-us-component': ApiYogaAboutUsComponentYogaAboutUsComponent;