Skip to content

Commit

Permalink
Merge branch 'master' into tina/content-ai-blog-post
Browse files Browse the repository at this point in the history
  • Loading branch information
@logan-anderson
logan-anderson committed Jul 18, 2023
2 parents 4b3b572 + 3328fd3 commit 87781ba
Show file tree
Hide file tree
Showing 13 changed files with 170 additions and 112 deletions.
44 changes: 22 additions & 22 deletions components/blocks/Testimonials.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ const Testimonial = ({ data, ...props }) => {

return (
<Elem
className={`group px-7 lg:px-8 py-6 lg:py-7 mb-6 break-inside-avoid rounded-md bg-gradient-to-b from-white to-white/30 shadow-[inset_0_0_0_1px_rgba(223,219,252,0.15),_0_0_1px_1px_rgba(223,219,252,0.5)] flex flex-col gap-5 text-gray-700 ${
data.link
? 'cursor-pointer hover:shadow-lg hover:bg-white hover:scale-[1.01] transition-all duration-150 ease-out'
: ''
}`}
className={`group px-7 lg:px-8 py-6 lg:py-7 mb-6 break-inside-avoid rounded-md bg-gradient-to-b from-white to-white/30 shadow-[inset_0_0_0_1px_rgba(223,219,252,0.15),_0_0_1px_1px_rgba(223,219,252,0.5)] flex flex-col gap-5 text-gray-700 ${data.link
? 'cursor-pointer hover:shadow-lg hover:bg-white hover:scale-[1.01] transition-all duration-150 ease-out'
: ''
}`}
href={data.link}
{...props}
>
Expand All @@ -27,11 +26,10 @@ const Testimonial = ({ data, ...props }) => {
{data.avatar && (
<div className="relative shrink-0 w-14 h-14 rounded-full shadow-[0_1px_3px_1px_rgba(66,_153,_225,0.3)] overflow-hidden">
<img
className={`block absolute w-full h-full top-0 left-0 object-fill ${
data.link
? 'group-hover:scale-105 transition-all duration-300 ease-in-out'
: ''
}`}
className={`block absolute w-full h-full top-0 left-0 object-fill ${data.link
? 'group-hover:scale-105 transition-all duration-300 ease-in-out'
: ''
}`}
src={data.avatar}
/>
<div className="block absolute w-full h-full top-0 left-0 rounded-full shadow-[inset_0_0_0_1px_rgba(66,_153,_225,_0.2)]"></div>
Expand Down Expand Up @@ -64,17 +62,19 @@ const Testimonial = ({ data, ...props }) => {

export function TestimonialsBlock({ data, index }) {
return (
<section
key={index}
className={`relative px-8 py-12 lg:py-16 columns-md gap-6`}
style={{
columnFill: 'balance-all',
}}
>
{data.testimonials &&
data.testimonials.map((testimonial, index) => {
return <Testimonial data={testimonial} key={index} />
})}
</section>
<>
<h1 className={`font-tuner inline-block text-3xl lg:text-5xl lg:leading-tight bg-gradient-to-br from-orange-400 via-orange-500 to-orange-600 bg-clip-text text-transparent text-balance text-center mt-12`}>Loved by Developers</h1><section
key={index}
className={`relative px-8 py-12 lg:py-16 columns-md gap-6`}
style={{
columnFill: 'balance-all',
}}
>
{data.testimonials &&
data.testimonials.map((testimonial, index) => {
return <Testimonial data={testimonial} key={index} />
})}
</section>
</>
)
}
4 changes: 2 additions & 2 deletions content/blocksPages/editorial-workflow.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"text": "Create content on new branches without going to GitHub.",
"media": [
{
"image": "http://res.cloudinary.com/forestry-demo/image/upload/v1689258281/blog-media/editorial-workflow/create-branch-small_kzubqs.png",
"image": "https://res.cloudinary.com/forestry-demo/image/upload/v1689258281/blog-media/editorial-workflow/create-branch-small_kzubqs.png",
"_template": "image"
}
]
Expand Down Expand Up @@ -84,4 +84,4 @@
"title": "Editorial Workflow with TinaCMS",
"description": "Efficiently manage and review your team's content changes through an integrated Git workflow. "
}
}
}
13 changes: 11 additions & 2 deletions content/blocksPages/enterprise.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,16 @@
},
{
"headline": "Editorial Workflow",
"text": "Editorial workflows backed by Git are built into Tina. Your content team can make Pull Requests (PRs) without leaving the CMS. "
"text": "Editorial workflows backed by Git are built into Tina. Your content team can make Pull Requests (PRs) without leaving the CMS. ",
"actions": [
{
"label": "Learn More",
"icon": false,
"variant": "white",
"size": "small",
"url": "https://tina.io/editorial-workflow/"
}
]
},
{
"headline": "Performance and Scalability",
Expand Down Expand Up @@ -118,4 +127,4 @@
"title": "Enterprise",
"description": ""
}
}
}
181 changes: 116 additions & 65 deletions content/blocksPages/home.json
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,109 @@
{
"blocks": [
{
"headline": "Own Your Content",
"text": "Tina is an open-source headless CMS that supports Markdown",
"actions": [
{
"label": "Getting Started",
"icon": false,
"variant": "blue",
"size": "medium",
"url": "https://tina.io/docs/setup-overview/"
},
{
"label": "npx create-tina-app@latest",
"icon": true,
"variant": "command",
"url": "/"
}
],
"media": [
{
"src": "tina-io/new-homepage/homepage-demo-2",
"_template": "video"
}
],
"_template": "hero"
},
{
"testimonials": [
{
"name": "",
"username": "ccapndave",
"avatar": "https://res.cloudinary.com/forestry-demo/image/upload/v1689355588/testimonials/avatars/ccapndave_ka7f5u.webp",
"date": "2023-06-02T03:00:00.000Z",
"testimonial": "I’ve been playing with TinaCMS for the last week and it’s absolutely amazing. Its so simple to install, the typed NextJS integration is amazing, the live editor is as good as it gets and compared to other CMSs the admin is incredibly easy for editors to understand and use.\n",
"link": "https://discord.com/channels/835168149439643678/848932514911354880/1113764832668299274"
},
{
"name": "Vatosteve",
"username": "vatosteve",
"avatar": "https://res.cloudinary.com/forestry-demo/image/upload/v1689356052/testimonials/avatars/vatosteve_ppkbvj.webp",
"date": "2023-01-30T04:00:00.000Z",
"testimonial": "Loving Tina CMS so far. It is exactly what I’ve been looking for.\n",
"link": "https://discord.com/channels/835168149439643678/835168149439643681/1069765204130398247"
},
{
"name": "david.oviedo",
"username": "david.oviedo",
"avatar": "https://res.cloudinary.com/forestry-demo/image/upload/v1689355030/testimonials/avatars/david-oviedo_htuynx.png",
"date": "2023-07-30T03:00:00.000Z",
"testimonial": "Been running a project with Tina for a few months now, and I have to say we absolutely love it. I had been for quite a time looking for a CMS that let us build our sites the way we wanted to while letting the non-techies edit the content in a visual and painless way, and Tina just lets you do that. Awesome work really.\n",
"link": "https://discord.com/channels/835168149439643678/848932514911354880/1124253741802061934"
},
{
"name": "Sean Pearce",
"avatar": "https://res.cloudinary.com/forestry-demo/image/upload/v1689356500/testimonials/avatars/sean_bnwhd9.png",
"date": "2023-03-30T03:00:00.000Z",
"testimonial": "We really liked using Tina and we will definitely suggest it to clients in the future. Tina's in-context editor cannot be beaten. We are actually planning on using it for our new website as well, so we’re all in on it.\n"
},
{
"name": "Mravec",
"username": "mravec",
"avatar": "https://res.cloudinary.com/forestry-demo/image/upload/v1689354995/testimonials/avatars/mravec_tglyht.webp",
"date": "2023-06-14T03:00:00.000Z",
"testimonial": "Just tried out click-to-edit and wanted to let you know it's really awesome, great feature, super easy to use and to setup, love that it's fully typed and works passed down as a prop, kinda feels like magic tbh.\n",
"link": "https://discord.com/channels/835168149439643678/848932514911354880/1118255235706663103"
},
{
"name": "rascode",
"username": "rascode11",
"avatar": "https://res.cloudinary.com/forestry-demo/image/upload/v1689354758/testimonials/avatars/rascode11_elrciv.jpg",
"date": "2022-12-06T04:00:00.000Z",
"testimonial": "@tinacms is a dream come true.\n",
"link": "https://twitter.com/rascode11/status/1600175861621088266"
}
],
"_template": "testimonials"
},
{
"features": [
{
"headline": "Edit Markdown, Visually",
"text": "Tina is an open-source, headless CMS for Markdown, MDX, and JSON.",
"headline": "Configure with Code",
"text": "Define your content's schema and Tina will provide you with a user friendly editing experience.",
"actions": [
{
"label": "Get Started",
"icon": false,
"variant": "blue",
"size": "large",
"url": "docs/setup-overview/"
},
{
"label": "npx create-tina-app@latest",
"label": "Read The Docs",
"icon": false,
"variant": "command",
"variant": "default",
"size": "large",
"url": "/"
"url": "docs/schema/"
}
],
"media": [
{
"src": "tina-io/new-homepage/homepage-demo-2",
"_template": "video"
"file": "config.tsx",
"code": "{\n type: \"string\",\n label: \"Title\",\n name: \"title\"\n},\n{\n type: 'string',\n label: 'Body',\n name: 'body',\n isBody: true,\n},",
"language": "javascript",
"scale": 1.25,
"_template": "code"
}
]
},
{
"headline": "Own Your Content",
"text": "Store content in your repo. Tina saves to MDX, Markdown, and JSON and provides a powerful data layer on top of your static files.",
"text": "Tina saves to MDX, Markdown, and JSON and provides a queryable data layer on top of your static files.",
"actions": [
{
"label": "Learn More",
Expand All @@ -51,29 +124,7 @@
]
},
{
"headline": "Simple CMS Configuration",
"text": "Define your content's schema and Tina will provide you with a user friendly editing experience.",
"actions": [
{
"label": "Read The Docs",
"icon": false,
"variant": "default",
"size": "large",
"url": "docs/schema/"
}
],
"media": [
{
"file": "config.tsx",
"code": "{\n type: \"string\",\n label: \"Title\",\n name: \"title\"\n},\n{\n type: 'string',\n label: 'Body',\n name: 'body',\n isBody: true,\n},",
"language": "javascript",
"scale": 1.25,
"_template": "code"
}
]
},
{
"headline": "Powered by Git",
"headline": "Built-in Version Control ",
"text": "Let your editorial team focus on writing content, while Tina commits to your repository.",
"actions": [
{
Expand All @@ -87,7 +138,7 @@
"media": [
{
"file": "",
"code": "commit 4ca9edc2ee64c1ab5127a1fd4519a83426731cd7\nAuthor: Scott Gallant <scottgallant@gmail.com>\nDate: Thu May 26 13:31:02 2022 -0300\nMessage: Update From Tina",
"code": "commit 4ca9edc2ee64c1ab5127a1fd4519a83426731cd7\nAuthor: Scott Gallant <scott@acme.com>\nDate: Thu May 26 13:31:02 2022 -0300\nMessage: Update From Tina",
"language": "md",
"scale": 1,
"_template": "code"
Expand All @@ -97,6 +148,32 @@
],
"_template": "features"
},
{
"title": "Trusted by",
"items": [
{
"name": "Devolver Digital",
"logo": "/svg/logos/devolverdigital.svg",
"size": 209
},
{
"name": "Planet Scale",
"logo": "/svg/logos/planetscale.svg",
"size": 110
},
{
"name": "Protocol Labs",
"logo": "/svg/logos/protocollabs.svg",
"size": 110
},
{
"name": "Smashing Magazine",
"logo": "/svg/logos/smashing.svg",
"size": 128
}
],
"_template": "logoGrid"
},
{
"items": [
{
Expand Down Expand Up @@ -162,32 +239,6 @@
],
"_template": "featureGrid"
},
{
"title": "Trusted by",
"items": [
{
"name": "Devolver Digital",
"logo": "/svg/logos/devolverdigital.svg",
"size": 209
},
{
"name": "Planet Scale",
"logo": "/svg/logos/planetscale.svg",
"size": 110
},
{
"name": "Protocol Labs",
"logo": "/svg/logos/protocollabs.svg",
"size": 110
},
{
"name": "Smashing Magazine",
"logo": "/svg/logos/smashing.svg",
"size": 128
}
],
"_template": "logoGrid"
},
{
"title": "Recent Posts",
"_template": "recentPosts"
Expand Down
6 changes: 3 additions & 3 deletions content/blog/Introducing-Editorial-Workflow-Features-for-your-Team.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ In Tina Cloud, you can assign a "protected branch".

If an editor tries to make a change on a protected branch, they will be prompted to create a new branch where those changes will be applied.

![](http://res.cloudinary.com/forestry-demo/image/upload/v1689033651/blog-media/editorial-workflow/create-branch_bgpgwn.png)
![](https://res.cloudinary.com/forestry-demo/image/upload/v1689033651/blog-media/editorial-workflow/create-branch_bgpgwn.png)

## Sharing Previews

When on a branch, editors now have an accessible link to a configurable preview link. This allows editors to easily share their site preview with other stakeholders.

![](http://res.cloudinary.com/forestry-demo/image/upload/v1689035096/blog-media/editorial-workflow/share-btn_xvmxii.png)
![](https://res.cloudinary.com/forestry-demo/image/upload/v1689035096/blog-media/editorial-workflow/share-btn_xvmxii.png)

## Leverage GitHub's Reviews

When editors make changes, commits and pull-requests are made to GitHub under the hood. Reviewers are able to use the Git workflow that they're comfortable with to review changes. This also allows teams to ensure that their CI/CD workflow all passes before merging any content updates to their main branch.

![](http://res.cloudinary.com/forestry-demo/image/upload/v1689035294/blog-media/editorial-workflow/github-pr_vbyqbs.png)
![](https://res.cloudinary.com/forestry-demo/image/upload/v1689035294/blog-media/editorial-workflow/github-pr_vbyqbs.png)

## Improved Branch UI

Expand Down
2 changes: 1 addition & 1 deletion content/blog/Introducing-the-Deep-Dive-Video-Series.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ author: Jeff See

Today I'm excited to announce the Deep Dive tutorial series, an A to Z introduction of all things Tina. In this series, I'll take you through every step of integrating content into your NextJS website, providing clear explanations and practical demonstrations along the way.

![LLamaLink Website Screenshot](http://res.cloudinary.com/forestry-demo/image/upload/v1689181932/llama-link_gzdv9e.png "Introducing the Llama Link Deep Dive series")
![LLamaLink Website Screenshot](https://res.cloudinary.com/forestry-demo/image/upload/v1689181932/llama-link_gzdv9e.png "Introducing the Llama Link Deep Dive series")

The website we'll be building is a fictional (obviously) SaaS company where you can chat live with Llama's online! Check it out [here.](https://llama-link.vercel.app/)

Expand Down
2 changes: 1 addition & 1 deletion content/blog/TinaCMS-Version-1-5-9.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ When repo-based media is setup on a project, we need to trigger an initial sync
\
We've since added a "Media" tab to the Tina Cloud dashboard to improve this experience.

![](http://res.cloudinary.com/forestry-demo/image/upload/v1686670223/tina-io/blog/changelog/media-dashboard_qjwkr2.png)
![](https://res.cloudinary.com/forestry-demo/image/upload/v1686670223/tina-io/blog/changelog/media-dashboard_qjwkr2.png)

When new projects are setup, Tina media can be enabled from this tab.\
We plan on adding configuration to this tab in the future, and we hope it improves the initial media setup in the meantime.
Expand Down
2 changes: 1 addition & 1 deletion content/blog/self-hosted-datalayer.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ We're excited to get this in the community's hands so that we can learn, iterate

The Tina Data Layer provides a GraphQL API that serves Markdown and JSON files backed by a database. You can think of the database as more of an ephemeral cache, since the single source of truth for your content is really your Markdown/JSON files.

![TinaCMS GraphQL Data Layer](http://res.cloudinary.com/forestry-demo/image/upload/v1675375259/tinacms-data-layer_geyrv8.png "TinaCMS Data Layer")
![TinaCMS GraphQL Data Layer](https://res.cloudinary.com/forestry-demo/image/upload/v1675375259/tinacms-data-layer_geyrv8.png "TinaCMS Data Layer")

## Why does TinaCMS need a Data Layer when I store my content in Markdown files?

Expand Down
Loading

0 comments on commit 87781ba

Please sign in to comment.