Merge branch 'main' into key-features-carousel

tinacms · Sep 24, 2024 · ddb326b · ddb326b
2 parents 7ff5fa5 + 97c2257
commit ddb326b
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 1,270 deletions.
diff --git a/components/blocks/LogoGrid.template.ts b/components/blocks/LogoGrid.template.ts
@@ -34,14 +34,7 @@ export const logoGridTemplate: TinaTemplate = {
           name: 'link',
           label: 'Link',
           type: 'string',
-          ui: {
-            validate: (val) => {
-              // make sure value is https url
-              if (!val?.startsWith('https://')) {
-                return 'Must be a valid https url'
-              }
-            },
-          },
+          description: 'The URL to link to when the logo is clicked. Should be either (1) an internal link (e.g. /showcase#unity) or (2) an external link (e.g. https://ndcconferences.com/).',
         },
         { name: 'logo', label: 'Logo Image', type: 'image' },
         { name: 'size', label: 'Size', type: 'number' },

diff --git a/content/blocksPages/home.json b/content/blocksPages/home.json
@@ -39,49 +39,49 @@
       "items": [
         {
           "name": "Bunny Net",
-          "link": "https://tina.io/showcase#bunny-net",
+          "link": "/showcase#bunny-net",
           "logo": "/svg/logos/bunnynet.svg",
           "size": 220
         },
         {
           "name": "Unity",
-          "link": "https://tina.io/showcase#unity",
+          "link": "/showcase#unity",
           "logo": "/svg/logos/unity.svg",
           "size": 220
         },
         {
           "name": "Protocol Labs",
-          "link": "https://tina.io/showcase#protocol-labs",
+          "link": "/showcase#protocol-labs",
           "logo": "/svg/logos/protocollabs.svg",
           "size": 90
         },
         {
           "name": "City of London",
-          "link": "https://tina.io/showcase#city-of-london",
+          "link": "/showcase#city-of-london",
           "logo": "/svg/logos/cityoflondon.svg",
           "size": 120
         },
         {
           "name": "Devolver Digital",
-          "link": "https://tina.io/showcase#devolver-digital",
+          "link": "/showcase#devolver-digital",
           "logo": "/svg/logos/devolverdigital.svg",
           "size": 150
         },
         {
           "name": "Smashing Magazine",
-          "link": "https://tina.io/showcase#smashing-magazine",
+          "link": "/showcase#smashing-magazine",
           "logo": "/svg/logos/smashing.svg",
           "size": 90
         },
         {
           "name": "Supernova",
-          "link": "https://tina.io/showcase#supernova",
+          "link": "/showcase#supernova",
           "logo": "/svg/logos/supernova.svg",
           "size": 240
         },
         {
           "name": "Paradise Helicopters",
-          "link": "https://tina.io/showcase#paradise-helicopters",
+          "link": "/showcase#paradise-helicopters",
           "logo": "/svg/logos/paradisehelicopters.svg",
           "size": 150
         },
@@ -93,37 +93,37 @@
         },
         {
           "name": "SSW",
-          "link": "https://tina.io/showcase#ssw",
+          "link": "/showcase#ssw",
           "logo": "/svg/logos/ssw-logo-charcoal.svg",
           "size": 150
         },
         {
           "name": "Comedia",
-          "link": "https://tina.io/showcase#comedia",
+          "link": "/showcase#comedia",
           "logo": "/svg/logos/comedia.svg",
           "size": 110
         },
         {
           "name": "RRE Ventures",
-          "link": "https://tina.io/showcase#rre-ventures",
+          "link": "/showcase#rre-ventures",
           "logo": "/svg/logos/rreventures.svg",
           "size": 220
         },
         {
           "name": "Shadow Lion",
-          "link": "https://tina.io/showcase#shadow-lion",
+          "link": "/showcase#shadow-lion",
           "logo": "/svg/logos/shadowlion.svg",
           "size": 220
         },
         {
           "name": "Roev",
-          "link": "https://tina.io/showcase#roev",
+          "link": "/showcase#roev",
           "logo": "/svg/logos/roe.svg",
           "size": 200
         },
         {
           "name": "Locality Bank",
-          "link": "https://tina.io/showcase#locality-bank",
+          "link": "/showcase#locality-bank",
           "logo": "/svg/logos/localitybank.svg",
           "size": 200
         }

diff --git a/content/blocksPages/pricing.json b/content/blocksPages/pricing.json
@@ -133,7 +133,7 @@
               "icon": "HiOutlineSparkles"
             },
             {
-              "name": "API",
+              "name": "API (Beta)",
               "icon": "TbPlugConnected"
             }
           ],
@@ -182,7 +182,7 @@
               "icon": "HiOutlineSparkles"
             },
             {
-              "name": "API",
+              "name": "API (Beta)",
               "icon": "TbPlugConnected"
             },
             {

diff --git a/package.json b/package.json
@@ -37,8 +37,6 @@
     "@react-three/fiber": "^8.16.8",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tinacms/auth": "1.0.6",
-    "@tinacms/datalayer-old": "npm:@tinacms/datalayer@0.2.3",
-    "@tinacms/graphql-old": "npm:@tinacms/graphql@0.60.0",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
     "@typescript-eslint/parser": "^5.42.0",
     "@vercel/postgres": "^0.5.1",

diff --git a/pages/api/feedback.ts b/pages/api/feedback.ts
@@ -1,3 +1,4 @@
+//TODO – this is no longer needed, https://github.com/tinacms/tina.io/issues/2215
 import Airtable from 'airtable'
 
 interface FeedbackRecord {

diff --git a/pages/api/graphql.ts b/pages/api/graphql.ts