Merge branch 'master' into feat(frontend)/add-footer

Author: alcercu

cms-backend/src/api/footer-subscribe-cta/content-types/footer-subscribe-cta/schema.json

@@ -0,0 +1,34 @@
+{
+  "kind": "singleType",
+  "collectionName": "footer_subscribe_ctas",
+  "info": {
+    "singularName": "footer-subscribe-cta",
+    "pluralName": "footer-subscribe-ctas",
+    "displayName": "FooterSubscribeCTA"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "logo": {
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ],
+      "type": "media",
+      "multiple": false
+    },
+    "notice": {
+      "type": "string"
+    },
+    "cta_text": {
+      "type": "string"
+    },
+    "cta_button": {
+      "type": "string"
+    }
+  }
+}

cms-backend/src/api/footer-subscribe-cta/controllers/footer-subscribe-cta.ts

@@ -0,0 +1,7 @@
+/**
+ * footer-subscribe-cta controller
+ */
+
+import { factories } from '@strapi/strapi'
+
+export default factories.createCoreController('api::footer-subscribe-cta.footer-subscribe-cta');

cms-backend/src/api/footer-subscribe-cta/routes/footer-subscribe-cta.ts

@@ -0,0 +1,7 @@
+/**
+ * footer-subscribe-cta router
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreRouter('api::footer-subscribe-cta.footer-subscribe-cta');

cms-backend/src/api/footer-subscribe-cta/services/footer-subscribe-cta.ts

@@ -0,0 +1,7 @@
+/**
+ * footer-subscribe-cta service
+ */
+
+import { factories } from '@strapi/strapi';
+
+export default factories.createCoreService('api::footer-subscribe-cta.footer-subscribe-cta');

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

@@ -541,6 +541,37 @@ export interface ApiFooterSocialsSectionFooterSocialsSection
   };
 }
 
+export interface ApiFooterSubscribeCtaFooterSubscribeCta
+  extends Struct.SingleTypeSchema {
+  collectionName: 'footer_subscribe_ctas';
+  info: {
+    singularName: 'footer-subscribe-cta';
+    pluralName: 'footer-subscribe-ctas';
+    displayName: 'FooterSubscribeCTA';
+  };
+  options: {
+    draftAndPublish: true;
+  };
+  attributes: {
+    logo: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>;
+    notice: Schema.Attribute.String;
+    cta_text: Schema.Attribute.String;
+    cta_button: 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::footer-subscribe-cta.footer-subscribe-cta'
+    >;
+  };
+}
+
 export interface ApiHeaderButtonHeaderButton extends Struct.SingleTypeSchema {
   collectionName: 'header_button';
   info: {
@@ -1227,6 +1258,7 @@ declare module '@strapi/strapi' {
       'plugin::users-permissions.user': PluginUsersPermissionsUser;
       'api::footer-links-section.footer-links-section': ApiFooterLinksSectionFooterLinksSection;
       'api::footer-socials-section.footer-socials-section': ApiFooterSocialsSectionFooterSocialsSection;
+      'api::footer-subscribe-cta.footer-subscribe-cta': ApiFooterSubscribeCtaFooterSubscribeCta;
       'api::header-button.header-button': ApiHeaderButtonHeaderButton;
       'api::kleros-logo.kleros-logo': ApiKlerosLogoKlerosLogo;
       'api::link.link': ApiLinkLink;

frontend/src/components/Footer.tsx

@@ -17,7 +17,7 @@ const Footer: React.FC<IFooter> = ({ footerData }) => {
   return (
     <div>
       <div className={
-        "bg-gradient-to-b from-light-blue to-[27.74%] to-kleros-purple py-16"
+        "bg-gradient-to-b from-secondary-blue to-[27.74%] to-primary-purple py-16"
       }>
         <div className="flex flex-col gap-12 px-6">
           {sections.map(({ title, links }) => (

frontend/tailwind.config.ts

@@ -11,13 +11,16 @@ const config: Config = {
       colors: {
         background: "var(--background)",
         foreground: "var(--foreground)",
-        "background-2": "#220050",
-        "stroke": "#42498F",
+        "primary-text": "#DAF0FF",
         "secondary-text": "#BECCE5",
-        "kleros-purple": "#9747FF",
-        "light-blue": "#7CE2FF",
-        "primary-blue": "#27CDFE",
+        "stroke": "#42498F",
+        "primary-purple": "#9747FF",
         "secondary-purple": "#BA75FE",
+        "dark-purple": "#230079",
+        "primary-blue": "#27CDFE",
+        "secondary-blue": "#7CE2FF",
+        "background-1": "#1B003F",
+        "background-2": "#220050",
       },
     },
   },