Merge branch 'master' into feat(cms)/add-home-types

Author: alcercu

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

cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/controllers/r-and-d-page-fellowship-waitlist-section.ts

@@ -4,7 +4,7 @@
   "info": {
     "singularName": "research",
     "pluralName": "researches",
-    "displayName": "research",
+    "displayName": "Research",
     "description": ""
   },
   "options": {

cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/routes/r-and-d-page-fellowship-waitlist-section.ts

@@ -12,7 +12,7 @@
   },
   "pluginOptions": {},
   "attributes": {
-    "Topic": {
+    "topic": {
       "type": "text"
     },
     "paperLink": {

cms-backend/src/api/r-and-d-page-fellowship-waitlist-section/services/r-and-d-page-fellowship-waitlist-section.ts

@@ -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"

cms-backend/src/api/research/content-types/research/schema.json

@@ -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: {
@@ -213,6 +226,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;
       'home-page.card': HomePageCard;

cms-backend/src/api/third-party-publication/content-types/third-party-publication/schema.json

@@ -1662,37 +1662,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;
@@ -1703,7 +1676,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'
     >;
   };
 }
@@ -1783,7 +1756,7 @@ export interface ApiResearchResearch extends Struct.CollectionTypeSchema {
   info: {
     singularName: 'research';
     pluralName: 'researches';
-    displayName: 'research';
+    displayName: 'Research';
     description: '';
   };
   options: {
@@ -1987,7 +1960,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;
@@ -2549,7 +2522,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;