Skip to content

Commit

Permalink
Merge branch 'main' into gatsby-blog-conversion-guide-live-editing
Browse files Browse the repository at this point in the history
  • Loading branch information
Calinator444 authored Nov 12, 2024
2 parents 2203e18 + 2c6ca77 commit 27b1a45
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 53 deletions.
1 change: 1 addition & 0 deletions components/blocks/CompareBox/CompareBox.template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export const compareBoxTemplate: Template = {
{ name: 'criteria7', label: 'Criteria 7', type: 'boolean' },
{ name: 'criteria8', label: 'Criteria 8', type: 'boolean' },
{ name: 'criteria9', label: 'Criteria 9', type: 'boolean' },
{ name: 'criteria10', label: 'Criteria 10', type: 'boolean' },
],
},
],
Expand Down
10 changes: 5 additions & 5 deletions components/blocks/CompareBox/CompareBox.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useState, useEffect, useRef } from 'react';
import Image from 'next/image';
import React, { useEffect, useRef, useState } from 'react';
import { FaCircle } from 'react-icons/fa';
import { IoMdInformationCircleOutline } from 'react-icons/io';
import Slider from 'react-slick';
import 'slick-carousel/slick/slick.css';
import 'slick-carousel/slick/slick-theme.css';
import 'slick-carousel/slick/slick.css';
import css from 'styled-jsx/css';
import Image from 'next/image';
import { tinaField } from 'tinacms/dist/react';
import { IoMdInformationCircleOutline } from 'react-icons/io';


//Function to use alpha values to create a background gradient with any input hex colour
Expand Down Expand Up @@ -118,7 +118,7 @@ const CompanyCard = ({ company }) => {
</div>

<div className="w-full">
{Array.from({ length: 9 }, (_, idx) => (
{Array.from({ length: 10 }, (_, idx) => (
<div key={idx} className="flex flex-col items-center w-full">
<div
className="flex items-center justify-center w-full"
Expand Down
10 changes: 8 additions & 2 deletions content/blocksPages/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@
{
"criteria": "Self-hosted Option",
"description": "Option to self-host"
},
{
"criteria": "Repo-based Media",
"description": "Store assets alongside your content in GitHub."
}
],
"companies": [
Expand All @@ -298,7 +302,8 @@
"criteria6": true,
"criteria7": true,
"criteria8": true,
"criteria9": true
"criteria9": true,
"criteria10": true
},
{
"headline": "Prepr CMS",
Expand Down Expand Up @@ -329,7 +334,8 @@
"criteria1": true,
"criteria4": true,
"criteria5": true,
"criteria8": true
"criteria8": true,
"criteria10": true
},
{
"headline": "Adobe (AEM)",
Expand Down
83 changes: 41 additions & 42 deletions content/docs-toc/docs-toc.json
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,47 @@
}
]
},
{
"title": "Media",
"items": [
{
"title": "Overview",
"slug": "content/docs/reference/media/overview.mdx",
"_template": "item"
},
{
"title": "Repo-based Media",
"slug": "content/docs/reference/media/repo-based.mdx",
"_template": "item"
},
{
"title": "External Media Providers",
"items": [
{
"title": "Setting up Authentication",
"slug": "content/docs/reference/media/external/authentication.mdx",
"_template": "item"
},
{
"title": "Digital Ocean Spaces",
"slug": "content/docs/reference/media/external/do-spaces.mdx",
"_template": "item"
},
{
"title": "Cloudinary",
"slug": "content/docs/reference/media/external/cloudinary.mdx",
"_template": "item"
},
{
"title": "AWS S3 Bucket",
"slug": "content/docs/reference/media/external/s3.mdx",
"_template": "item"
}
],
"_template": "items"
}
]
},
{
"title": "Drafts",
"items": [
Expand Down Expand Up @@ -636,48 +677,6 @@
"slug": "content/docs/cli-overview.mdx",
"_template": "item"
},
{
"title": "Media",
"items": [
{
"title": "Overview",
"slug": "content/docs/reference/media/overview.mdx",
"_template": "item"
},
{
"title": "Repo-based Media",
"slug": "content/docs/reference/media/repo-based.mdx",
"_template": "item"
},
{
"title": "External Media Providers",
"items": [
{
"title": "Setting up Authentication",
"slug": "content/docs/reference/media/external/authentication.mdx",
"_template": "item"
},
{
"title": "Cloudinary",
"slug": "content/docs/reference/media/external/cloudinary.mdx",
"_template": "item"
},
{
"title": "Digital Ocean Spaces",
"slug": "content/docs/reference/media/external/do-spaces.mdx",
"_template": "item"
},
{
"title": "AWS S3 Bucket",
"slug": "content/docs/reference/media/external/s3.mdx",
"_template": "item"
}
],
"_template": "items"
}
],
"_template": "items"
},
{
"title": "Search",
"items": [
Expand Down
10 changes: 8 additions & 2 deletions content/docs/reference/media/overview.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
title: Media Overview
last_edited: '2022-06-29T00:00:00.000Z'
last_edited: '2024-11-12T22:59:50.498Z'
next: ''
previous: ''
---

TinaCMS provides multiple options for managing media.
Expand Down Expand Up @@ -37,6 +39,10 @@ export default defineConfig({

With the built-in repo-based media option, media is stored within the site's repository.

Repo-based media keeps your assets alongside your content, making it easy to track changes and roll back versions for both code and media.

This approach simplifies workflows by eliminating the need for external media servers, as all updates happen within a unified system.

[Read more about repo-based media here](/docs/reference/media/repo-based)

## External Media Providers
Expand All @@ -47,6 +53,6 @@ TinaCMS also supports pluggable external media providers.

## Video Tutorial

For those who prefer to learn from video, you can check out a snippet on media from our ["TinaCMS Deep Dive"](https://www.youtube.com/watch?v=PcgnJDILv4w&list=PLPar4H9PHKVqoCwZy79PHr8-W_vA3lAOB&pp=iAQB) series.
For those who prefer to learn from video, you can check out a snippet on media from our ["TinaCMS Deep Dive"](https://www.youtube.com/watch?v=PcgnJDILv4w\&list=PLPar4H9PHKVqoCwZy79PHr8-W_vA3lAOB\&pp=iAQB) series.

<Youtube embedSrc="https://www.youtube.com/embed/x0ACBQeNcts?start=388&end=469" />
6 changes: 5 additions & 1 deletion content/docs/reference/media/repo-based.mdx
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
---
title: Repo-based Media (default)
last_edited: '2024-09-23T23:07:32.817Z'
last_edited: '2024-11-12T23:12:35.189Z'
next: ''
previous: ''
---

Repo-based media storage is the default media storage solution for TinaCMS.

For static site generators, it allows for local development and preview environments to show the exact content and media as in production.

This can also reduce dependencies, usage of external APIs.

## Configuration

To configure repo-based media in your project, add the following to your schema definition in `tina/config.{ts,js}`
Expand Down
2 changes: 1 addition & 1 deletion tina/tina-lock.json

Large diffs are not rendered by default.

0 comments on commit 27b1a45

Please sign in to comment.