CORE-4431 (#775)

* feat: CORE-4429 open pdf in new tab

* CORE-4429 babel config

* update dependencies

* [CORE-4431] docs-membership (#773)

* [CORE-4431] docs-membership (#774)

Co-authored-by: Eka <[email protected]>

Author: valeriibudko

babel.config.js

@@ -6,20 +6,29 @@ module.exports = (api) => {
       '@babel/preset-env',
       {
         useBuiltIns: 'usage',
-        corejs: 3,
+        corejs: '3',
       },
     ],
     '@babel/react',
   ]
   const plugins = [
+    '@babel/plugin-proposal-export-default-from',
     [
       '@babel/plugin-proposal-decorators',
       {
         legacy: true,
       },
     ],
     '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-syntax-dynamic-import',
+    '@babel/plugin-proposal-optional-chaining',
     '@babel/plugin-proposal-nullish-coalescing-operator',
+    [
+      '@babel/plugin-transform-runtime',
+      {
+        corejs: 3,
+      },
+    ],
   ]
 
   return {

components/markdown.jsx

@@ -9,7 +9,9 @@ import Link from './link'
 // pure text but renders own TextRenderer componet instead
 const MarkdownLink = ({ href, title, children }) => (
   <Link href={href} passHref>
-    <a title={title}>{children}</a>
+    <a target={href.includes('.pdf') ? '_blank' : '_self'} title={title}>
+      {children}
+    </a>
   </Link>
 )
 

components/outreach-materials/index.jsx

@@ -23,7 +23,7 @@ const format2name = (type) =>
   }[type])
 
 const format2action = (type) =>
-  ['gdoc', 'gslides'].includes(type) ? 'Open' : 'Download'
+  ['gdoc', 'gslides', 'pdf'].includes(type) ? 'Open' : 'Download'
 
 const ResourceLink = ({
   id,
@@ -51,6 +51,7 @@ const ResourceLink = ({
       data-format={format.toLowerCase()}
       data-action={action}
       data-label={label}
+      target="_blank"
       {...props}
       {...restProps}
     >

data/faq.yml

@@ -443,10 +443,10 @@ sections:
         question: |
           Can I use the CORE API for commercial purposes?
         answer: |
-          Yes, you can use the CORE API for commercial purposes, (Terms & Conditions) apply. 
-          We provide 30 Day Free Trial for Institution and Enterprise. 
-          We will ask you for your circumstances during the registration process and we might 
-          contact you afterwards to clarify any points and assess your eligibility for a free licence. 
+          Yes, you can use the CORE API for commercial purposes, (Terms & Conditions) apply.
+          We provide 30 Day Free Trial for Institution and Enterprise.
+          We will ask you for your circumstances during the registration process and we might
+          contact you afterwards to clarify any points and assess your eligibility for a free licence.
           If your circumstances change, please let us know.
       - slug: can-I-use-the-CORE-dataset-for-commercial-purposes
         question: |

data/membership.yml

@@ -10,7 +10,7 @@ header:
     - caption: download our flyer
       url: /resources/core-leaflet-Glasgow-A3.pdf
       variant: text
-      download: true
+      target: _blank
 
 content:
   - &dashboard

data/services/api.yml

@@ -17,7 +17,7 @@ header:
      - caption: Download our flyer
        variant: text
        url: /resources/core-api-flyer.pdf
-       download: true
+       target: _blank
 
 
 features:

data/services/dataset.yml

@@ -16,7 +16,7 @@ header:
     - caption: Download our flyer
       variant: text
       url: /resources/core-dataset-flyer.pdf
-      download: true
+      target: _blank
 
 features:
   - title: All the data in one single place

data/services/fastsync.yml

@@ -17,7 +17,7 @@ header:
     - caption: Download our flyer
       variant: text
       url: /resources/core-api-flyer.pdf
-      download: true
+      target: _blank
 
 
 features:

data/services/recommender.yml

@@ -21,7 +21,7 @@ header:
      - caption: Download our flyer
        variant: text
        url: /resources/core_flyer_recomender.pdf
-       download: true
+       target: _blank
 
 
 

data/sponsorship.yml

@@ -9,7 +9,7 @@ header:
     - caption: download our flyer
       url: /resources/flyer-CORE-Sponsorship.pdf
       variant: text
-      download: true
+      target: _blank
 
 content:
   - &website

design-v2/components/hero/index.jsx

@@ -33,6 +33,7 @@ const Hero = ({
           {actions.map((action) => (
             <Button
               href={action.url}
+              target={action.target}
               variant={action.variant}
               key={action.caption}
               download={action.download}

netlify-cms.config.yml

@@ -1132,3 +1132,45 @@ collections:
            widget: markdown
            required: false
            label: Fields description
+
+- name: docs-membership
+
+  media_folder: '/images/docs-membership'
+
+  create: false
+  delete: false
+
+  label: 📘 Documentation membership
+  label_singular: section
+  description: >
+    Documentation membership page for Dashboard and About
+  files:
+    - name: meta
+      label: ℹ️ Metadata (title, description, headline)
+      file:  docs-membership/meta.yml
+      fields:
+        - name: title
+          widget: string
+          label: Title
+          hint: >
+            Displayed in the browser as a tab name and in Google, when
+            the page appears in the search results.
+        - name: tagline
+          widget: text
+          label: Description
+          hint: >
+            Description of the page, not visible on the page but will be shown
+            in search engines when the page appers in results. Important
+            to have good performance in search engines.
+    - name: header
+      label: Header(title,description,image)
+      file: docs-membership/header.yml
+      fields:
+        - name: title
+          widget: string
+          hint: >
+            The title of the page. Displayed on the page below header.
+        - name: id
+          widget: string
+          label: id
+          hint: id of the block. Must match anchor link url

package-lock.json

@@ -13,7 +13,10 @@
     "@babel/core": "^7.12.3",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-decorators": "^7.12.1",
+    "@babel/plugin-proposal-export-default-from": "^7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.12.1",
     "@babel/preset-react": "^7.12.5",

package.json

@@ -100,6 +100,7 @@ const DatasetPageTemplate = ({
               key={action.caption}
               variant="contained"
               href={action.url}
+              target={action.target}
               className={styles.button}
             >
               {action.caption}

templates/documentation/dataset/index.jsx

@@ -92,6 +92,7 @@ const MembershipPageTemplate = ({ data }) => (
           {data.header.actions.map((action) => (
             <Button
               href={action.url}
+              target={action.target}
               variant={action.variant}
               key={action.caption}
               download={action.download}

templates/membership/index.jsx

@@ -25,6 +25,7 @@ const SponsorshipPageTemplate = ({ data }) => (
           {data.header.actions.map((action) => (
             <Button
               href={action.url}
+              target={action.target}
               variant={action.variant}
               key={action.caption}
               download={action.download}