Merge branch 'main' into main

components/blocks/CarouselFeature.tsx

@@ -1,3 +1,4 @@
+import Image from 'next/image';
 import React, { useEffect, useRef, useState } from 'react';
 import { tinaField } from 'tinacms/dist/react';
 import { sanitizeLabel } from 'utils/sanitizeLabel';
@@ -170,12 +171,16 @@ export function CarouselFeatureBlock({ data, index }) {
     const fileExtension = fullVideoUrl.split('.').pop();
 
     if (fileExtension === 'gif') {
+      // Width and height values *must* be provided to NextJS's Image component to build,
+      // but they will not determine the rendered size of the image in this case.
       return (
         <div className="flex justify-center items-center">
-          <img
+          <Image
             key={index}
             src={fullVideoUrl}
             alt={`Media item ${index}`}
+            width={1200}
+            height={800}
             className="w-full h-auto mt-10 lg:mt-0 rounded-xl shadow-lg"
           />
         </div>

content/blocksPages/home.json

@@ -137,7 +137,9 @@
           "headline": "Visual Editing",
           "text": "See content changes in real-time as you edit",
           "icon2": "FaClock",
-          "videoSrc": "/gif/key-features/visual-editing.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060174/tinaio-webm/2024-09-13-key-features-visual-editing-v3_pwfxyo.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -150,7 +152,9 @@
           "headline": "Open Source",
           "text": "Tina is licensed under Apache 2.0. It can be self-hosted or hosted on TinaCloud",
           "icon2": "FaUnlock",
-          "videoSrc": "/gif/key-features/open-source.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060169/tinaio-webm/2024-09-13-key-features-open-source_f57aej.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -163,7 +167,9 @@
           "headline": "Develop Locally",
           "text": "Easily set up and run Tina locally to talk to your local filesystem",
           "icon2": "FaCodeBranch",
-          "videoSrc": "/gif/key-features/local.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060183/tinaio-webm/2024-09-19-key-features-local_xxqx30.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -176,7 +182,9 @@
           "headline": "3rd Party Media",
           "text": "Store Media assets is your repo or connect to S3, Cloudinary, DigitalOcean Spaces, etc. Or, use TinaCloud",
           "icon2": "FaCloudDownloadAlt",
-          "videoSrc": "/gif/key-features/3rd-party-media.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060179/tinaio-webm/2024-09-19-key-features-3rd-party-media_wyjzwm.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -189,7 +197,9 @@
           "headline": "Control your Components",
           "text": "Use pre-built templates or create custom components from scratch - you have full control to build your site how you want",
           "icon2": "FaPuzzlePiece",
-          "videoSrc": "/gif/key-features/control-components.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060150/tinaio-webm/2024-09-13-key-features-control-components_fnakly.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -202,7 +212,9 @@
           "headline": "Markdown at Scale",
           "text": "Tina powers super-fast sites with 10,000+ pages using Markdown, the best language for your site content",
           "icon2": "FaMarkdown",
-          "videoSrc": "/gif/key-features/markdown.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060165/tinaio-webm/2024-09-13-key-features-markdown_dhrwjy.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -215,7 +227,9 @@
           "headline": "Git Integration",
           "text": "Users can edit, save changes, and request approval from within the UI - while devs see the branches, commits, and pull requests in GitHub",
           "icon2": "FaGithub",
-          "videoSrc": "/gif/key-features/github-integration.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060160/tinaio-webm/2024-09-13-key-features-github-integration_pcyz2i.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -228,7 +242,9 @@
           "headline": "Easy Documentation",
           "text": "Tina's docs run on TinaCMS - check it out!",
           "icon2": "FaFileAlt",
-          "videoSrc": "/gif/key-features/easy-docs.gif",
+
+          "videoSrc": "https://res.cloudinary.com/forestry-demo/video/upload/v1729060155/tinaio-webm/2024-09-13-key-features-docs_v2zbci.webm",
+
           "button": {
             "label": "READ MORE",
             "icon": true,
@@ -527,7 +543,8 @@
           "name": "Sean Pearce",
           "avatar": "https://res.cloudinary.com/forestry-demo/image/upload/c_scale,w_56/v1689356500/testimonials/avatars/sean_bnwhd9.png",
           "date": "2023-03-30T03:00:00.000Z",
-          "testimonial": "Tina's in-context editor cannot be beaten, we’re all in on it.\n"
+          "testimonial": "Tina's in-context editor cannot be beaten, we’re all in on it.\n",
+          "link": "https://www.shaunpearce.ie/"
         },
         {
           "name": "rascode",

content/blocksPages/pricing.json

@@ -119,7 +119,7 @@
               "icon": "BiBadge"
             },
             {
-              "name": "Premium Business Support",
+              "name": "Business Support",
               "icon": "BiSupport"
             },
             {

content/blog/annual-billing.mdx

@@ -0,0 +1,20 @@
+---
+title: Annual Billing
+date: '2024-10-14T13:00:00.000Z'
+last_edited: '2024-10-14T13:00:00.000Z'
+author: Landon Maxwell
+prev: content/blog/Pricing-Updates-its-now-cheaper-to-use-Tinas-best-feature-.mdx
+next: ''
+---
+
+We’ve had such great feedback from all of you in the herd about our last pricing update, so while we're on a roll we are excited to roll out a **new annual billing option** for TinaCMS users!
+
+📅 What’s changing? Previously, TinaCMS only offered monthly subscriptions, but now you can switch to annual billing and enjoy more value for your money.
+
+💰 What’s the deal? When you choose the annual plan, you **get 12 months of TinaCMS for the price of just 10**. That means you’re saving the cost of 2 full months — more time to build and less to worry about budget! 😍
+
+If you’re ready to streamline your content management and save on costs, this new pricing plan is for you! 🙌
+
+👉 **Check out the details and upgrade your plan today!** [https://tina.io/pricing/](https://tina.io/pricing/)
+
+![](https://res.cloudinary.com/forestry-demo/image/upload/v1729060928/blog-media/annual-pricing/annual-pricing_jfw49j.jpg)Figure: Flick the annual switch to start saving.