fix: merge conflict

.env

@@ -1,5 +1,3 @@
 API_KEY_LASTFM=
 API_KEY_TRAKT=
 API_KEY_WEBMENTIONS_CORYD_DEV=
-TINA_CLIENT_ID=
-TINA_TOKEN=

package.json

@@ -4,7 +4,7 @@
   "description": "The source for my personal site, blog and portfolio. Build using 11ty and hosted on Vercel.",
   "main": "index.html",
   "scripts": {
-    "start": "tinacms dev -c 'eleventy --serve & npx tailwindcss -i ./tailwind.css -o _site/assets/styles/tailwind.css --watch'",
+    "start": "eleventy --serve & npx tailwindcss -i ./tailwind.css -o _site/assets/styles/tailwind.css --watch",
     "debug": "DEBUG=Eleventy* npx @11ty/eleventy --serve & npx tailwindcss -i ./tailwind.css -o _site/assets/styles/tailwind.css --watch",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -37,7 +37,6 @@
     "@sherby/eleventy-plugin-files-minifier": "^1.1.1",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/typography": "^0.5.1",
-    "@tinacms/cli": "^1.5.6",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.59.0",
     "autoprefixer": "^10.4.2",
@@ -53,8 +52,7 @@
     "markdownlint-cli": "^0.33.0",
     "marked": "^4.3.0",
     "tailwind-dracula": "^1.1.0",
-    "tailwindcss": "^3.3.1",
+    "tailwindcss": "^3.3.1"
-    "tinacms": "^1.4.6"
   },
   "lint-staged": {
     "**/*.{js,ts,json}": [

src/_data/albums.js

@@ -2,7 +2,6 @@ const EleventyFetch = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
   const MUSIC_KEY = process.env.API_KEY_LASTFM
-  if (!MUSIC_KEY) return
   const url = `http://ws.audioscrobbler.com/2.0/?method=user.gettopalbums&user=cdme_&api_key=${MUSIC_KEY}&limit=8&format=json&period=7day`
   const res = EleventyFetch(url, {
     duration: '1h',

src/_data/artists.js

@@ -2,7 +2,6 @@ const EleventyFetch = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
   const MUSIC_KEY = process.env.API_KEY_LASTFM
-  if (!MUSIC_KEY) return
   const url = `http://ws.audioscrobbler.com/2.0/?method=user.gettopartists&user=cdme_&api_key=${MUSIC_KEY}&limit=8&format=json&period=7day`
   const res = EleventyFetch(url, {
     duration: '1h',

src/_data/webmentions.js

@@ -2,7 +2,6 @@ const EleventyFetch = require('@11ty/eleventy-fetch')
 
 module.exports = async function () {
   const KEY_CORYD = process.env.API_KEY_WEBMENTIONS_CORYD_DEV
-  if (!KEY_CORYD) return
   const url = `https://webmention.io/api/mentions.jf2?token=${KEY_CORYD}&per-page=1000`
   const res = EleventyFetch(url, {
     duration: '1h',

src/admin/.gitignore

@@ -1,2 +0,0 @@
-index.html
-assets/

src/assets/admin/.gitignore

@@ -1,2 +0,0 @@
-index.html
-assets/

src/assets/img/admin/.gitignore

@@ -1,2 +0,0 @@
-index.html
-assets/

tina/.gitignore

@@ -1 +0,0 @@
-__generated__

tina/config.ts

@@ -1,63 +0,0 @@
-import { defineConfig } from 'tinacms'
-
-// Your hosting provider likely exposes this as an environment variable
-const branch = process.env.HEAD || process.env.VERCEL_GIT_COMMIT_REF || 'main'
-
-export default defineConfig({
-  branch,
-  clientId: process.env.TINA_CLIENT_ID || '',
-  token: process.env.TINA_TOKEN || '',
-
-  build: {
-    outputFolder: 'admin',
-    publicFolder: 'src/assets/img',
-  },
-  media: {
-    tina: {
-      mediaRoot: '',
-      publicFolder: 'src/assets/img',
-    },
-  },
-  schema: {
-    collections: [
-      {
-        name: 'post',
-        label: 'Posts',
-        path: 'src/posts',
-        fields: [
-          {
-            type: 'string',
-            name: 'title',
-            label: 'Title',
-            isTitle: true,
-            required: true,
-          },
-          {
-            type: 'datetime',
-            name: 'date',
-            label: 'Date',
-            required: true,
-          },
-          {
-            type: 'boolean',
-            name: 'draft',
-            label: 'Draft',
-            required: true,
-          },
-          {
-            type: 'string',
-            name: 'tags',
-            label: 'Tags',
-            required: false,
-          },
-          {
-            type: 'rich-text',
-            name: 'body',
-            label: 'Body',
-            isBody: true,
-          },
-        ],
-      },
-    ],
-  },
-})