From b3475573fccc3ff9c2a00b50c7df5c997ef7340f Mon Sep 17 00:00:00 2001 From: Harman-singh-waraich Date: Mon, 13 Jan 2025 17:11:40 +0530 Subject: [PATCH] refactor(cms):r-and-d-types --- .../schema.json | 5 +++ ...-and-d-page-fellowship-waitlist-section.ts | 7 ---- ...-and-d-page-fellowship-waitlist-section.ts | 7 ---- ...-and-d-page-fellowship-waitlist-section.ts | 7 ---- .../content-types/research/schema.json | 2 +- .../third-party-publication/schema.json | 2 +- .../r-and-d-page/waitlist-section.json} | 12 ++---- cms-backend/types/generated/components.d.ts | 14 +++++++ cms-backend/types/generated/contentTypes.d.ts | 40 +++---------------- 9 files changed, 30 insertions(+), 66 deletions(-) delete mode 100644 cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/controllers/r-and-d-page-fellowship-waitlist-section.ts delete mode 100644 cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/routes/r-and-d-page-fellowship-waitlist-section.ts delete mode 100644 cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/services/r-and-d-page-fellowship-waitlist-section.ts rename cms-backend/src/{api/r-and-d-page-fellowship-waitlist-section/content-types/r-and-d-page-fellowship-waitlist-section/schema.json => components/r-and-d-page/waitlist-section.json} (59%) diff --git a/cms-backend/src/api/r-and-d-page-fellowship-tab-section/content-types/r-and-d-page-fellowship-tab-section/schema.json b/cms-backend/src/api/r-and-d-page-fellowship-tab-section/content-types/r-and-d-page-fellowship-tab-section/schema.json index 7a6b1b6..4fa5192 100644 --- a/cms-backend/src/api/r-and-d-page-fellowship-tab-section/content-types/r-and-d-page-fellowship-tab-section/schema.json +++ b/cms-backend/src/api/r-and-d-page-fellowship-tab-section/content-types/r-and-d-page-fellowship-tab-section/schema.json @@ -26,6 +26,11 @@ }, "tabName": { "type": "string" + }, + "waitlistSection": { + "type": "component", + "repeatable": false, + "component": "r-and-d-page.waitlist-section" } } } diff --git a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/controllers/r-and-d-page-fellowship-waitlist-section.ts b/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/controllers/r-and-d-page-fellowship-waitlist-section.ts deleted file mode 100644 index 83e80a1..0000000 --- a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/controllers/r-and-d-page-fellowship-waitlist-section.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * r-and-d-page-fellowship-waitlist-section controller - */ - -import { factories } from '@strapi/strapi' - -export default factories.createCoreController('api::r-and-d-page-fellowship-waitlist-section.r-and-d-page-fellowship-waitlist-section'); diff --git a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/routes/r-and-d-page-fellowship-waitlist-section.ts b/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/routes/r-and-d-page-fellowship-waitlist-section.ts deleted file mode 100644 index e843848..0000000 --- a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/routes/r-and-d-page-fellowship-waitlist-section.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * r-and-d-page-fellowship-waitlist-section router - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreRouter('api::r-and-d-page-fellowship-waitlist-section.r-and-d-page-fellowship-waitlist-section'); diff --git a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/services/r-and-d-page-fellowship-waitlist-section.ts b/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/services/r-and-d-page-fellowship-waitlist-section.ts deleted file mode 100644 index e3e7ec5..0000000 --- a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/services/r-and-d-page-fellowship-waitlist-section.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * r-and-d-page-fellowship-waitlist-section service - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreService('api::r-and-d-page-fellowship-waitlist-section.r-and-d-page-fellowship-waitlist-section'); diff --git a/cms-backend/src/api/research/content-types/research/schema.json b/cms-backend/src/api/research/content-types/research/schema.json index dcc512b..00019b6 100644 --- a/cms-backend/src/api/research/content-types/research/schema.json +++ b/cms-backend/src/api/research/content-types/research/schema.json @@ -4,7 +4,7 @@ "info": { "singularName": "research", "pluralName": "researches", - "displayName": "research", + "displayName": "Research", "description": "" }, "options": { diff --git a/cms-backend/src/api/third-party-publication/content-types/third-party-publication/schema.json b/cms-backend/src/api/third-party-publication/content-types/third-party-publication/schema.json index 4a37205..176970d 100644 --- a/cms-backend/src/api/third-party-publication/content-types/third-party-publication/schema.json +++ b/cms-backend/src/api/third-party-publication/content-types/third-party-publication/schema.json @@ -12,7 +12,7 @@ }, "pluginOptions": {}, "attributes": { - "Topic": { + "topic": { "type": "text" }, "paperLink": { diff --git a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/content-types/r-and-d-page-fellowship-waitlist-section/schema.json b/cms-backend/src/components/r-and-d-page/waitlist-section.json similarity index 59% rename from cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/content-types/r-and-d-page-fellowship-waitlist-section/schema.json rename to cms-backend/src/components/r-and-d-page/waitlist-section.json index 334787a..a36a6b1 100644 --- a/cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/content-types/r-and-d-page-fellowship-waitlist-section/schema.json +++ b/cms-backend/src/components/r-and-d-page/waitlist-section.json @@ -1,15 +1,9 @@ { - "kind": "singleType", - "collectionName": "r_and_d_page_fellowship_waitlist_sections", + "collectionName": "components_r_and_d_page_waitlist_sections", "info": { - "singularName": "r-and-d-page-fellowship-waitlist-section", - "pluralName": "r-and-d-page-fellowship-waitlist-sections", - "displayName": "R&DPageFellowshipWaitlistSection" + "displayName": "WaitlistSection" }, - "options": { - "draftAndPublish": true - }, - "pluginOptions": {}, + "options": {}, "attributes": { "header": { "type": "string" diff --git a/cms-backend/types/generated/components.d.ts b/cms-backend/types/generated/components.d.ts index 1c8e381..3383429 100644 --- a/cms-backend/types/generated/components.d.ts +++ b/cms-backend/types/generated/components.d.ts @@ -1,5 +1,18 @@ import type { Struct, Schema } from '@strapi/strapi'; +export interface RAndDPageWaitlistSection extends Struct.ComponentSchema { + collectionName: 'components_r_and_d_page_waitlist_sections'; + info: { + displayName: 'WaitlistSection'; + }; + attributes: { + header: Schema.Attribute.String; + applyButton: Schema.Attribute.Component<'content.button-link', false>; + arrowLink: Schema.Attribute.Component<'content.button-link', false>; + icon: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>; + }; +} + export interface RAndDPageKlerosBook extends Struct.ComponentSchema { collectionName: 'components_r_and_d_page_kleros_books'; info: { @@ -199,6 +212,7 @@ export interface ContentButtonLink extends Struct.ComponentSchema { declare module '@strapi/strapi' { export module Public { export interface ComponentSchemas { + 'r-and-d-page.waitlist-section': RAndDPageWaitlistSection; 'r-and-d-page.kleros-book': RAndDPageKlerosBook; 'pnk-token-page.token-stat-display': PnkTokenPageTokenStatDisplay; 'for-builders-page.solution-section': ForBuildersPageSolutionSection; diff --git a/cms-backend/types/generated/contentTypes.d.ts b/cms-backend/types/generated/contentTypes.d.ts index 5d5ce4d..1271fcd 100644 --- a/cms-backend/types/generated/contentTypes.d.ts +++ b/cms-backend/types/generated/contentTypes.d.ts @@ -1467,37 +1467,10 @@ export interface ApiRAndDPageFellowshipTabSectionRAndDPageFellowshipTabSection testimonialsHeader: Schema.Attribute.String; fellowsHeader: Schema.Attribute.String; tabName: Schema.Attribute.String; - createdAt: Schema.Attribute.DateTime; - updatedAt: Schema.Attribute.DateTime; - publishedAt: Schema.Attribute.DateTime; - createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> & - Schema.Attribute.Private; - updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> & - Schema.Attribute.Private; - locale: Schema.Attribute.String; - localizations: Schema.Attribute.Relation< - 'oneToMany', - 'api::r-and-d-page-fellowship-tab-section.r-and-d-page-fellowship-tab-section' + waitlistSection: Schema.Attribute.Component< + 'r-and-d-page.waitlist-section', + false >; - }; -} - -export interface ApiRAndDPageFellowshipWaitlistSectionRAndDPageFellowshipWaitlistSection - extends Struct.SingleTypeSchema { - collectionName: 'r_and_d_page_fellowship_waitlist_sections'; - info: { - singularName: 'r-and-d-page-fellowship-waitlist-section'; - pluralName: 'r-and-d-page-fellowship-waitlist-sections'; - displayName: 'R&DPageFellowshipWaitlistSection'; - }; - options: { - draftAndPublish: true; - }; - attributes: { - header: Schema.Attribute.String; - applyButton: Schema.Attribute.Component<'content.button-link', false>; - arrowLink: Schema.Attribute.Component<'content.button-link', false>; - icon: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>; createdAt: Schema.Attribute.DateTime; updatedAt: Schema.Attribute.DateTime; publishedAt: Schema.Attribute.DateTime; @@ -1508,7 +1481,7 @@ export interface ApiRAndDPageFellowshipWaitlistSectionRAndDPageFellowshipWaitlis locale: Schema.Attribute.String; localizations: Schema.Attribute.Relation< 'oneToMany', - 'api::r-and-d-page-fellowship-waitlist-section.r-and-d-page-fellowship-waitlist-section' + 'api::r-and-d-page-fellowship-tab-section.r-and-d-page-fellowship-tab-section' >; }; } @@ -1588,7 +1561,7 @@ export interface ApiResearchResearch extends Struct.CollectionTypeSchema { info: { singularName: 'research'; pluralName: 'researches'; - displayName: 'research'; + displayName: 'Research'; description: ''; }; options: { @@ -1792,7 +1765,7 @@ export interface ApiThirdPartyPublicationThirdPartyPublication draftAndPublish: true; }; attributes: { - Topic: Schema.Attribute.Text; + topic: Schema.Attribute.Text; paperLink: Schema.Attribute.Component<'content.button-link', false>; createdAt: Schema.Attribute.DateTime; updatedAt: Schema.Attribute.DateTime; @@ -2348,7 +2321,6 @@ declare module '@strapi/strapi' { 'api::pnk-token-page-need-section.pnk-token-page-need-section': ApiPnkTokenPageNeedSectionPnkTokenPageNeedSection; 'api::pnk-token-page-tokenomics-section.pnk-token-page-tokenomics-section': ApiPnkTokenPageTokenomicsSectionPnkTokenPageTokenomicsSection; 'api::r-and-d-page-fellowship-tab-section.r-and-d-page-fellowship-tab-section': ApiRAndDPageFellowshipTabSectionRAndDPageFellowshipTabSection; - 'api::r-and-d-page-fellowship-waitlist-section.r-and-d-page-fellowship-waitlist-section': ApiRAndDPageFellowshipWaitlistSectionRAndDPageFellowshipWaitlistSection; 'api::r-and-d-page-hero.r-and-d-page-hero': ApiRAndDPageHeroRAndDPageHero; 'api::r-and-d-page-research-tab-section.r-and-d-page-research-tab-section': ApiRAndDPageResearchTabSectionRAndDPageResearchTabSection; 'api::research.research': ApiResearchResearch;