diff --git a/.eslintrc.json b/.eslintrc.json index ed51af67..3adb9b94 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,34 +1,25 @@ { - "env": { - "browser": true, - "commonjs": true, - "es2020": true, - "node": true - }, - "extends": "eslint:recommended", - "parserOptions": { - "ecmaVersion": 11 - }, - "rules": { - "indent": [ - "error", - 2 - ], - "linebreak-style": [ - "error", - "unix" - ], - "quotes": [ - "error", - "single" - ], - "semi": [ - "error", - "never" - ], - "array-element-newline": ["error", { - "ArrayExpression": "consistent", - "ArrayPattern": { "minItems": 3 } - }] - } + "env": { + "browser": true, + "commonjs": true, + "es2020": true, + "node": true + }, + "extends": "eslint:recommended", + "parserOptions": { + "ecmaVersion": 11 + }, + "rules": { + "indent": ["error", 2], + "linebreak-style": ["error", "unix"], + "quotes": ["error", "single"], + "semi": ["error", "never"], + "array-element-newline": [ + "error", + { + "ArrayExpression": "consistent", + "ArrayPattern": { "minItems": 3 } + } + ] + } } diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d1f0d085..122534f0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,6 @@ version: 2 updates: - - package-ecosystem: "npm" - directory: "/" + - package-ecosystem: 'npm' + directory: '/' schedule: - interval: "daily" + interval: 'daily' diff --git a/.github/workflows/manual-build.yaml b/.github/workflows/manual-build.yaml index 59f6846a..841cf2ed 100644 --- a/.github/workflows/manual-build.yaml +++ b/.github/workflows/manual-build.yaml @@ -1,18 +1,18 @@ name: Manual Vercel build env: - VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} - VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: [workflow_dispatch] jobs: - cron: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install Vercel CLI - run: npm install --global vercel@latest - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + cron: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} diff --git a/.github/workflows/scheduled-build.yaml b/.github/workflows/scheduled-build.yaml index 482094b3..460462a5 100644 --- a/.github/workflows/scheduled-build.yaml +++ b/.github/workflows/scheduled-build.yaml @@ -1,20 +1,20 @@ name: Scheduled Vercel build env: - VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} - VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: - schedule: - - cron: '0 * * * *' + schedule: + - cron: '0 * * * *' jobs: - cron: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install Vercel CLI - run: npm install --global vercel@latest - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + cron: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} diff --git a/config/dateFilters.js b/config/dateFilters.js index d86dfd29..bba425ff 100644 --- a/config/dateFilters.js +++ b/config/dateFilters.js @@ -1,44 +1,44 @@ const { DateTime } = require('luxon') module.exports = { - dateForFeed: (date) => { - return new Date(date).toISOString() - }, - toDateTime: (date) => { - const formatted = DateTime.fromISO(date) + dateForFeed: (date) => { + return new Date(date).toISOString() + }, + toDateTime: (date) => { + const formatted = DateTime.fromISO(date) - const trail = (number) => { - return parseInt(number, 10) < 10 ? `0${number}` : number - } + const trail = (number) => { + return parseInt(number, 10) < 10 ? `0${number}` : number + } - return `${formatted.year}-${trail(formatted.month)}-${trail(formatted.day)} ${trail( - formatted.hour - )}:${trail(formatted.minute)}` - }, - toDateTimeFromUnix: (date) => { - const formatted = DateTime.fromSeconds(parseInt(date, 10)) + return `${formatted.year}-${trail(formatted.month)}-${trail(formatted.day)} ${trail( + formatted.hour + )}:${trail(formatted.minute)}` + }, + toDateTimeFromUnix: (date) => { + const formatted = DateTime.fromSeconds(parseInt(date, 10)) - const trail = (number) => { - return parseInt(number, 10) < 10 ? `0${number}` : number - } + const trail = (number) => { + return parseInt(number, 10) < 10 ? `0${number}` : number + } - return `${trail(formatted.month)}.${trail(formatted.day)}.${formatted.year} ${trail( - formatted.hour - )}:${trail(formatted.minute)}` - }, - isoDateOnly: (date) => { - let d = new Date(date) - let month = '' + (d.getMonth() + 1) - let day = '' + d.getDate() - let year = d.getFullYear() + return `${trail(formatted.month)}.${trail(formatted.day)}.${formatted.year} ${trail( + formatted.hour + )}:${trail(formatted.minute)}` + }, + isoDateOnly: (date) => { + let d = new Date(date) + let month = '' + (d.getMonth() + 1) + let day = '' + d.getDate() + let year = d.getFullYear() - if (month.length < 2) month = '0' + month - if (day.length < 2) day = '0' + day + if (month.length < 2) month = '0' + month + if (day.length < 2) day = '0' + day - return [month, day, year].join('.') - }, - rssLastUpdatedDate: (collection) => { - if (!collection || !collection.length) return '' - return collection[0].publishedAt - }, + return [month, day, year].join('.') + }, + rssLastUpdatedDate: (collection) => { + if (!collection || !collection.length) return '' + return collection[0].publishedAt + }, } diff --git a/config/filters.js b/config/filters.js index 71817142..96b4b327 100644 --- a/config/filters.js +++ b/config/filters.js @@ -2,66 +2,66 @@ const marked = require('marked') const sanitizeHTML = require('sanitize-html') module.exports = { - trim: (string, limit) => { - return string.length <= limit ? string : `${string.slice(0, limit)}...` - }, - postPath: (path) => { - if (path.includes('micro/')) return path - return `/micro/${path}` - }, - stripIndex: (path) => { - return path.replace('/index.html', '/') - }, - mdToHtml: (content) => { - return marked.parse(content) - }, - getFirstAttachment: (post) => { - if (post && post.attachments && post.attachments.length > 0) { - return post.attachments[0].url ? post.attachments[0].url : post.attachments[0] + trim: (string, limit) => { + return string.length <= limit ? string : `${string.slice(0, limit)}...` + }, + postPath: (path) => { + if (path.includes('micro/')) return path + return `/micro/${path}` + }, + stripIndex: (path) => { + return path.replace('/index.html', '/') + }, + mdToHtml: (content) => { + return marked.parse(content) + }, + getFirstAttachment: (post) => { + if (post && post.attachments && post.attachments.length > 0) { + return post.attachments[0].url ? post.attachments[0].url : post.attachments[0] + } + + return '/assets/img/social-card.png' + }, + webmentionsByUrl: (webmentions, url) => { + const allowedTypes = ['mention-of', 'in-reply-to', 'like-of', 'repost-of'] + + const data = { + 'like-of': [], + 'repost-of': [], + 'in-reply-to': [], + } + + const hasRequiredFields = (entry) => { + const { author, published, content } = entry + return author.name && published && content + } + + const filtered = + webmentions + ?.filter((entry) => entry['wm-target'] === `https://coryd.dev${url}`) + .filter((entry) => allowedTypes.includes(entry['wm-property'])) || [] + + filtered.forEach((m) => { + if (data[m['wm-property']]) { + const isReply = m['wm-property'] === 'in-reply-to' + const isValidReply = isReply && hasRequiredFields(m) + if (isReply) { + if (isValidReply) { + m.sanitized = sanitizeHTML(m.content.html) + data[m['wm-property']].unshift(m) + } + + return } - return '/assets/img/social-card.png' - }, - webmentionsByUrl: (webmentions, url) => { - const allowedTypes = ['mention-of', 'in-reply-to', 'like-of', 'repost-of'] + data[m['wm-property']].unshift(m) + } + }) - const data = { - 'like-of': [], - 'repost-of': [], - 'in-reply-to': [], - } + data['in-reply-to'].sort((a, b) => + a.published > b.published ? 1 : b.published > a.published ? -1 : 0 + ) - const hasRequiredFields = (entry) => { - const { author, published, content } = entry - return author.name && published && content - } - - const filtered = - webmentions - ?.filter((entry) => entry['wm-target'] === `https://coryd.dev${url}`) - .filter((entry) => allowedTypes.includes(entry['wm-property'])) || [] - - filtered.forEach((m) => { - if (data[m['wm-property']]) { - const isReply = m['wm-property'] === 'in-reply-to' - const isValidReply = isReply && hasRequiredFields(m) - if (isReply) { - if (isValidReply) { - m.sanitized = sanitizeHTML(m.content.html) - data[m['wm-property']].unshift(m) - } - - return - } - - data[m['wm-property']].unshift(m) - } - }) - - data['in-reply-to'].sort((a, b) => - a.published > b.published ? 1 : b.published > a.published ? -1 : 0 - ) - - return data - }, + return data + }, } diff --git a/config/mediaFilters.js b/config/mediaFilters.js index e6cd107e..2e319931 100644 --- a/config/mediaFilters.js +++ b/config/mediaFilters.js @@ -1,12 +1,12 @@ const ALBUM_DENYLIST = ['no-love-deep-web'] module.exports = { - artist: (media) => - `https://cdn.coryd.dev/artists/${media.replace(/\s+/g, '-').toLowerCase()}.jpg`, - album: (media) => { - const img = !ALBUM_DENYLIST.includes(media.name.replace(/\s+/g, '-').toLowerCase()) - ? media.image[media.image.length - 1]['#text'] - : `https://cdn.coryd.dev/artists/${media.name.replace(/\s+/g, '-').toLowerCase()}.jpg` - return img - }, + artist: (media) => + `https://cdn.coryd.dev/artists/${media.replace(/\s+/g, '-').toLowerCase()}.jpg`, + album: (media) => { + const img = !ALBUM_DENYLIST.includes(media.name.replace(/\s+/g, '-').toLowerCase()) + ? media.image[media.image.length - 1]['#text'] + : `https://cdn.coryd.dev/artists/${media.name.replace(/\s+/g, '-').toLowerCase()}.jpg` + return img + }, } diff --git a/config/rssLastUpdated.js b/config/rssLastUpdated.js index 0c1749f9..c1635f51 100644 --- a/config/rssLastUpdated.js +++ b/config/rssLastUpdated.js @@ -1,6 +1,6 @@ const { DateTime } = require('luxon') module.exports = (collection) => { - if (!collection || !collection.length) return '' - return collection[0].publishedAt + if (!collection || !collection.length) return '' + return collection[0].publishedAt } diff --git a/package.json b/package.json index 6681e549..d0045b0f 100644 --- a/package.json +++ b/package.json @@ -53,9 +53,12 @@ "tailwindcss": "^3.0.18" }, "lint-staged": { - "**/*.{js,jsx,ts,tsx}": [ + "**/*.{js,jsx,ts,tsx,json}": [ "npx prettier --write", "npx eslint --fix" + ], + "**/*.{scss}": [ + "npx prettier --write" ] } } diff --git a/src/assets/scripts/isDarkMode.js b/src/assets/scripts/isDarkMode.js index 230fab87..43eaabe3 100644 --- a/src/assets/scripts/isDarkMode.js +++ b/src/assets/scripts/isDarkMode.js @@ -1,10 +1,10 @@ ;(function () { - const isDarkMode = () => - localStorage.theme === 'dark' || - (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches) - if (isDarkMode()) { - document.documentElement.classList.add('dark') - } else { - document.documentElement.classList.remove('dark') - } + const isDarkMode = () => + localStorage.theme === 'dark' || + (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches) + if (isDarkMode()) { + document.documentElement.classList.add('dark') + } else { + document.documentElement.classList.remove('dark') + } })() diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index 52d69135..832d0e60 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -1,5 +1,5 @@ .header-anchor { - text-decoration: none!important; + text-decoration: none !important; } h1 > a.header-anchor { @@ -8,4 +8,4 @@ h1 > a.header-anchor { h2 > a.header-anchor { font-weight: 700; -} \ No newline at end of file +} diff --git a/src/assets/styles/prism.css b/src/assets/styles/prism.css index 27653f50..1c6d78c3 100644 --- a/src/assets/styles/prism.css +++ b/src/assets/styles/prism.css @@ -1,138 +1,138 @@ :root { - --background: #282a36; - --comment: #6272a4; - --foreground: #f8f8f2; - --selection: #44475a; - --cyan: #8be9fd; - --green: #50fa7b; - --orange: #ffb86c; - --pink: #ff79c6; - --purple: #bd93f9; - --red: #ff5555; - --yellow: #f1fa8c; - --background-30: #282a3633; - --comment-30: #6272a433; - --foreground-30: #f8f8f233; - --selection-30: #44475a33; - --cyan-30: #8be9fd33; - --green-30: #50fa7b33; - --orange-30: #ffb86c33; - --pink-30: #ff79c633; - --purple-30: #bd93f933; - --red-30: #ff555533; - --yellow-30: #f1fa8c33; - --background-40: #282a3666; - --comment-40: #6272a466; - --foreground-40: #f8f8f266; - --selection-40: #44475a66; - --cyan-40: #8be9fd66; - --green-40: #50fa7b66; - --orange-40: #ffb86c66; - --pink-40: #ff79c666; - --purple-40: #bd93f966; - --red-40: #ff555566; - --yellow-40: #f1fa8c66; + --background: #282a36; + --comment: #6272a4; + --foreground: #f8f8f2; + --selection: #44475a; + --cyan: #8be9fd; + --green: #50fa7b; + --orange: #ffb86c; + --pink: #ff79c6; + --purple: #bd93f9; + --red: #ff5555; + --yellow: #f1fa8c; + --background-30: #282a3633; + --comment-30: #6272a433; + --foreground-30: #f8f8f233; + --selection-30: #44475a33; + --cyan-30: #8be9fd33; + --green-30: #50fa7b33; + --orange-30: #ffb86c33; + --pink-30: #ff79c633; + --purple-30: #bd93f933; + --red-30: #ff555533; + --yellow-30: #f1fa8c33; + --background-40: #282a3666; + --comment-40: #6272a466; + --foreground-40: #f8f8f266; + --selection-40: #44475a66; + --cyan-40: #8be9fd66; + --green-40: #50fa7b66; + --orange-40: #ffb86c66; + --pink-40: #ff79c666; + --purple-40: #bd93f966; + --red-40: #ff555566; + --yellow-40: #f1fa8c66; } pre::-webkit-scrollbar { - width: 14px; + width: 14px; } pre::-webkit-scrollbar-track { - background-color: var(--comment); - border-radius: 0; + background-color: var(--comment); + border-radius: 0; } pre::-webkit-scrollbar-thumb { - background-color: var(--purple); - border-radius: 0; + background-color: var(--purple); + border-radius: 0; } code[class*='language-'] ::-moz-selection, code[class*='language-']::-moz-selection, pre[class*='language-'] ::-moz-selection, pre[class*='language-']::-moz-selection { - text-shadow: none; - background-color: var(--selection); + text-shadow: none; + background-color: var(--selection); } code[class*='language-'] ::selection, code[class*='language-']::selection, pre[class*='language-'] ::selection, pre[class*='language-']::selection { - text-shadow: none; - background-color: var(--selection); + text-shadow: none; + background-color: var(--selection); } pre.line-numbers { - position: relative; - padding-left: 3.8em; - counter-reset: linenumber; + position: relative; + padding-left: 3.8em; + counter-reset: linenumber; } pre.line-numbers > code { - position: relative; - white-space: inherit; + position: relative; + white-space: inherit; } .line-numbers .line-numbers-rows { - position: absolute; - pointer-events: none; - top: 0; - font-size: 100%; - left: -3.8em; - width: 3em; - letter-spacing: -1px; - border-right: 1px solid #999; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + position: absolute; + pointer-events: none; + top: 0; + font-size: 100%; + left: -3.8em; + width: 3em; + letter-spacing: -1px; + border-right: 1px solid #999; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .line-numbers-rows > span { - pointer-events: none; - display: block; - counter-increment: linenumber; + pointer-events: none; + display: block; + counter-increment: linenumber; } .line-numbers-rows > span:before { - content: counter(linenumber); - color: #999; - display: block; - padding-right: 0.8em; - text-align: right; + content: counter(linenumber); + color: #999; + display: block; + padding-right: 0.8em; + text-align: right; } div.code-toolbar { - position: relative; + position: relative; } div.code-toolbar > .toolbar { - position: absolute; - top: 0.3em; - right: 0.2em; - transition: opacity 0.3s ease-in-out; - opacity: 0; + position: absolute; + top: 0.3em; + right: 0.2em; + transition: opacity 0.3s ease-in-out; + opacity: 0; } div.code-toolbar:hover > .toolbar { - opacity: 1; + opacity: 1; } div.code-toolbar > .toolbar .toolbar-item { - display: inline-block; - padding-right: 20px; + display: inline-block; + padding-right: 20px; } div.code-toolbar > .toolbar a { - cursor: pointer; + cursor: pointer; } div.code-toolbar > .toolbar button { - background: 0 0; - border: 0; - color: inherit; - font: inherit; - line-height: normal; - overflow: visible; - padding: 0; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; + background: 0 0; + border: 0; + color: inherit; + font: inherit; + line-height: normal; + overflow: visible; + padding: 0; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; } div.code-toolbar > .toolbar a, div.code-toolbar > .toolbar button, div.code-toolbar > .toolbar span { - color: var(--foreground); - font-size: 0.8em; - padding: 0.5em; - background: var(--comment); - border-radius: 0.5em; + color: var(--foreground); + font-size: 0.8em; + padding: 0.5em; + background: var(--comment); + border-radius: 0.5em; } div.code-toolbar > .toolbar a:focus, div.code-toolbar > .toolbar a:hover, @@ -140,236 +140,236 @@ div.code-toolbar > .toolbar button:focus, div.code-toolbar > .toolbar button:hover, div.code-toolbar > .toolbar span:focus, div.code-toolbar > .toolbar span:hover { - color: inherit; - text-decoration: none; - background-color: var(--green); + color: inherit; + text-decoration: none; + background-color: var(--green); } @media print { - code[class*='language-'], - pre[class*='language-'] { - text-shadow: none; - } + code[class*='language-'], + pre[class*='language-'] { + text-shadow: none; + } } code[class*='language-'], pre[class*='language-'] { - color: var(--foreground); - background: var(--background); - text-shadow: none; - font-family: PT Mono, Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; - text-align: left; - white-space: pre; - word-spacing: normal; - word-break: normal; - word-wrap: normal; - line-height: 1.5; - -moz-tab-size: 2; - -o-tab-size: 2; - tab-size: 2; - -webkit-hyphens: none; - -moz-hyphens: none; - -ms-hyphens: none; - hyphens: none; + color: var(--foreground); + background: var(--background); + text-shadow: none; + font-family: PT Mono, Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + -moz-tab-size: 2; + -o-tab-size: 2; + tab-size: 2; + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; } pre[class*='language-'] { - background: var(--background); - border-radius: 0.5em; - padding: 1em; - margin: 0.5em 0; - overflow: auto; - height: auto; + background: var(--background); + border-radius: 0.5em; + padding: 1em; + margin: 0.5em 0; + overflow: auto; + height: auto; } :not(pre) > code[class*='language-'], pre[class*='language-'] { - background: var(--background); + background: var(--background); } :not(pre) > code[class*='language-'] { - padding: 4px 7px; - border-radius: 0.3em; - white-space: normal; + padding: 4px 7px; + border-radius: 0.3em; + white-space: normal; } .limit-300 { - height: 300px !important; + height: 300px !important; } .limit-300 { - height: 400px !important; + height: 400px !important; } .limit-500 { - height: 500px !important; + height: 500px !important; } .limit-600 { - height: 600px !important; + height: 600px !important; } .limit-700 { - height: 700px !important; + height: 700px !important; } .limit-800 { - height: 800px !important; + height: 800px !important; } .language-css { - color: var(--purple); + color: var(--purple); } .token { - color: var(--pink); + color: var(--pink); } .language-css .token { - color: var(--pink); + color: var(--pink); } .token.script { - color: var(--foreground); + color: var(--foreground); } .token.bold { - font-weight: 700; + font-weight: 700; } .token.italic { - font-style: italic; + font-style: italic; } .token.atrule, .token.attr-name, .token.attr-value { - color: var(--green); + color: var(--green); } .language-css .token.atrule { - color: var(--purple); + color: var(--purple); } .language-html .token.attr-value, .language-markup .token.attr-value { - color: var(--yellow); + color: var(--yellow); } .token.boolean { - color: var(--purple); + color: var(--purple); } .token.builtin, .token.class-name { - color: var(--cyan); + color: var(--cyan); } .token.comment { - color: var(--comment); + color: var(--comment); } .token.constant { - color: var(--purple); + color: var(--purple); } .language-javascript .token.constant { - color: var(--orange); - font-style: italic; + color: var(--orange); + font-style: italic; } .token.entity { - color: var(--pink); + color: var(--pink); } .language-css .token.entity { - color: var(--green); + color: var(--green); } .language-html .token.entity.named-entity { - color: var(--purple); + color: var(--purple); } .language-html .token.entity:not(.named-entity) { - color: var(--pink); + color: var(--pink); } .language-markup .token.entity.named-entity { - color: var(--purple); + color: var(--purple); } .language-markup .token.entity:not(.named-entity) { - color: var(--pink); + color: var(--pink); } .token.function { - color: var(--green); + color: var(--green); } .language-css .token.function { - color: var(--cyan); + color: var(--cyan); } .token.important, .token.keyword { - color: var(--pink); + color: var(--pink); } .token.prolog { - color: var(--foreground); + color: var(--foreground); } .token.property { - color: var(--orange); + color: var(--orange); } .language-css .token.property { - color: var(--cyan); + color: var(--cyan); } .token.punctuation { - color: var(--pink); + color: var(--pink); } .language-css .token.punctuation { - color: var(--orange); + color: var(--orange); } .language-html .token.punctuation, .language-markup .token.punctuation { - color: var(--foreground); + color: var(--foreground); } .token.selector { - color: var(--pink); + color: var(--pink); } .language-css .token.selector { - color: var(--green); + color: var(--green); } .token.regex { - color: var(--red); + color: var(--red); } .language-css .token.rule:not(.atrule) { - color: var(--foreground); + color: var(--foreground); } .token.string { - color: var(--yellow); + color: var(--yellow); } .token.tag { - color: var(--pink); + color: var(--pink); } .token.url { - color: var(--cyan); + color: var(--cyan); } .language-css .token.url { - color: var(--orange); + color: var(--orange); } .token.variable { - color: var(--comment); + color: var(--comment); } .token.number { - color: rgba(189, 147, 249, 1); + color: rgba(189, 147, 249, 1); } .token.operator { - color: rgba(139, 233, 253, 1); + color: rgba(139, 233, 253, 1); } .token.char { - color: rgba(255, 135, 157, 1); + color: rgba(255, 135, 157, 1); } .token.symbol { - color: rgba(255, 184, 108, 1); + color: rgba(255, 184, 108, 1); } .token.deleted { - color: #e2777a; + color: #e2777a; } .token.namespace { - color: #e2777a; + color: #e2777a; } .highlight-line { - color: inherit; - display: inline-block; - text-decoration: none; - border-radius: 4px; - padding: 2px 10px; + color: inherit; + display: inline-block; + text-decoration: none; + border-radius: 4px; + padding: 2px 10px; } .highlight-line:empty:before { - content: ' '; + content: ' '; } .highlight-line:not(:last-child) { - min-width: 100%; + min-width: 100%; } .highlight-line .highlight-line:not(:last-child) { - min-width: 0; + min-width: 0; } .highlight-line-isdir { - color: var(--foreground); - background-color: var(--selection-30); + color: var(--foreground); + background-color: var(--selection-30); } .highlight-line-active { - background-color: var(--comment-30); + background-color: var(--comment-30); } .highlight-line-add { - background-color: var(--green-30); + background-color: var(--green-30); } .highlight-line-remove { - background-color: var(--red-30); + background-color: var(--red-30); } diff --git a/src/contribute.json b/src/contribute.json index a0ca870d..d5eaea42 100644 --- a/src/contribute.json +++ b/src/contribute.json @@ -1,9 +1,9 @@ { - "name": "coryd.dev", - "description": "Cory Dransfeldt's personal blog.", - "repository": { - "url": "https://github.com/mozilla/contribute.json", - "license": "ISC" - }, - "keywords": ["11ty", "Eleventy", "Javascript", "Liquid.js", "Markdown"] + "name": "coryd.dev", + "description": "Cory Dransfeldt's personal blog.", + "repository": { + "url": "https://github.com/mozilla/contribute.json", + "license": "ISC" + }, + "keywords": ["11ty", "Eleventy", "Javascript", "Liquid.js", "Markdown"] } diff --git a/src/index.html b/src/index.html index de0059ec..358d3c2b 100644 --- a/src/index.html +++ b/src/index.html @@ -1,20 +1,20 @@ --- layout: default pagination: - data: collections.posts - size: 10 - reverse: true - alias: posts + data: collections.posts + size: 10 + reverse: true + alias: posts --- {% include "now-topper.liquid" %} {% for post in pagination.items %} {% if post.data.published %}
-
+

{{ post.data.title }}

@@ -22,7 +22,7 @@ pagination:

{{ post.data.post_excerpt | markdown }}

@@ -31,4 +31,4 @@ pagination:
-{% endif %} {% endfor %} {% include "paginator.liquid" %} \ No newline at end of file +{% endif %} {% endfor %} {% include "paginator.liquid" %} diff --git a/src/posts/2014/leaving-google-apps-for-fastmail.md b/src/posts/2014/leaving-google-apps-for-fastmail.md index dfde67a4..cccc8ed2 100644 --- a/src/posts/2014/leaving-google-apps-for-fastmail.md +++ b/src/posts/2014/leaving-google-apps-for-fastmail.md @@ -63,9 +63,9 @@ I've been using Fastmail since the end of November and couldn't be happier with I did quite a bit of research before switching to Fastmail and the following posts helped push me to make the move: -- [Switching from Gmail to FastMail / Max Masnick](http://www.maxmasnick.com/2013/07/19/fastmail/ 'Switching from Gmail to FastMail / Max Masnick') -- [From Gmail to FastMail: Moving Away from Google – ReadWrite](http://readwrite.com/2012/03/19/from-gmail-to-fastmail-moving#awesm=~othfJ88hm9Tp8X 'From Gmail to FastMail: Moving Away from Google – ReadWrite') -- [FastMail is My Favourite Email Provider](http://web.appstorm.net/reviews/email-apps/fastmail-is-my-favourite-email-provider/ 'FastMail is My Favourite Email Provider') +- [Switching from Gmail to FastMail / Max Masnick](http://www.maxmasnick.com/2013/07/19/fastmail/ 'Switching from Gmail to FastMail / Max Masnick') +- [From Gmail to FastMail: Moving Away from Google – ReadWrite](http://readwrite.com/2012/03/19/from-gmail-to-fastmail-moving#awesm=~othfJ88hm9Tp8X 'From Gmail to FastMail: Moving Away from Google – ReadWrite') +- [FastMail is My Favourite Email Provider](http://web.appstorm.net/reviews/email-apps/fastmail-is-my-favourite-email-provider/ 'FastMail is My Favourite Email Provider') Have you moved to Fastmail? Are you thinking of doing so? [Let me know your thoughts](mailto:coryd@hey.com) on it or the move to it. You can sign up for Fastmail [here](https://www.fastmail.com). diff --git a/src/posts/2016/generating-responsive-css-grid-neat.md b/src/posts/2016/generating-responsive-css-grid-neat.md index 6571dc1a..c18598ba 100644 --- a/src/posts/2016/generating-responsive-css-grid-neat.md +++ b/src/posts/2016/generating-responsive-css-grid-neat.md @@ -9,61 +9,61 @@ I use a responsive grid system for this site (and a number of other projects) th ```scss .grid { - &-main-container { - @include outer-container; + &-main-container { + @include outer-container; + } + + &-row { + @include row; + @include pad(0 10%); + + @media only screen and (max-width: 640px) { + @include pad(0 10%); } - &-row { - @include row; - @include pad(0 10%); - - @media only screen and (max-width: 640px) { - @include pad(0 10%); - } - - &.collapse { - @media only screen and (max-width: 640px) { - @include pad(0); - } - } - - .grid-row { - // collapse nested grid rows - @include pad(0); - } + &.collapse { + @media only screen and (max-width: 640px) { + @include pad(0); + } } - $grid-columns: 12; - - @for $i from 0 through $grid-columns { - &-columns-#{$i} { - @include span-columns($i); - } - - &-columns-small-#{$i} { - @include span-columns($i); - - @media only screen and (max-width: 640px) { - @include span-columns(12); - } - } + .grid-row { + // collapse nested grid rows + @include pad(0); } - @for $i from 0 through $grid-columns { - &-shift-left-#{$i} { - @include shift(-$i); - } + } - &-shift-right-#{$i} { - @include shift($i); - } + $grid-columns: 12; - @media only screen and (max-width: 640px) { - &-shift-left-#{$i}, - &-shift-right-#{$i} { - @include shift(0); - } - } + @for $i from 0 through $grid-columns { + &-columns-#{$i} { + @include span-columns($i); } + + &-columns-small-#{$i} { + @include span-columns($i); + + @media only screen and (max-width: 640px) { + @include span-columns(12); + } + } + } + @for $i from 0 through $grid-columns { + &-shift-left-#{$i} { + @include shift(-$i); + } + + &-shift-right-#{$i} { + @include shift($i); + } + + @media only screen and (max-width: 640px) { + &-shift-left-#{$i}, + &-shift-right-#{$i} { + @include shift(0); + } + } + } } ``` diff --git a/src/posts/2021/2021-reading-list.md b/src/posts/2021/2021-reading-list.md index 6e778c66..60a2d5b4 100644 --- a/src/posts/2021/2021-reading-list.md +++ b/src/posts/2021/2021-reading-list.md @@ -9,24 +9,24 @@ I've been working on making reading a habit again for the past few years (my str **Finished** -- [Kill Switch: The Rise of the Modern Senate and the Crippling of American Democracy](https://www.harvard.com/book/kill_switch_the_rise_of_the_modern_senate_and_the_crippling_of_american_dem/), by Adam Jentleson -- [Working in Public: The Making and Maintenance of Open Source Software](https://blas.com/working-in-public/), by Nadia Eghbal -- [Let My People Go Surfing](https://www.patagonia.com/product/let-my-people-go-surfing-revised-paperback-book/BK067.html), by Yvon Chouinard -- [The Responsible Company](https://www.patagonia.com/product/the-responsible-company-what-weve-learned-from-patagonias-first-forty-years-paperback-book/BK233.html), by Yvon Chouinard & Vincent Stanley -- [Dark Mirror](https://www.penguinrandomhouse.com/books/316047/dark-mirror-by-barton-gellman/), by Barton Gellmen -- [Get Together](https://gettogether.world/), by Bailey Richardson, Kevin Huynh & Kai Elmer Sotto -- [Zucked](https://www.penguinrandomhouse.com/books/598206/zucked-by-roger-mcnamee/), by Roger McNamee -- [Fentanyl, Inc.](https://groveatlantic.com/book/fentanyl-inc/), by Ben Weshoff -- [A Promised Land](https://obamabook.com/), by Barack Obama +- [Kill Switch: The Rise of the Modern Senate and the Crippling of American Democracy](https://www.harvard.com/book/kill_switch_the_rise_of_the_modern_senate_and_the_crippling_of_american_dem/), by Adam Jentleson +- [Working in Public: The Making and Maintenance of Open Source Software](https://blas.com/working-in-public/), by Nadia Eghbal +- [Let My People Go Surfing](https://www.patagonia.com/product/let-my-people-go-surfing-revised-paperback-book/BK067.html), by Yvon Chouinard +- [The Responsible Company](https://www.patagonia.com/product/the-responsible-company-what-weve-learned-from-patagonias-first-forty-years-paperback-book/BK233.html), by Yvon Chouinard & Vincent Stanley +- [Dark Mirror](https://www.penguinrandomhouse.com/books/316047/dark-mirror-by-barton-gellman/), by Barton Gellmen +- [Get Together](https://gettogether.world/), by Bailey Richardson, Kevin Huynh & Kai Elmer Sotto +- [Zucked](https://www.penguinrandomhouse.com/books/598206/zucked-by-roger-mcnamee/), by Roger McNamee +- [Fentanyl, Inc.](https://groveatlantic.com/book/fentanyl-inc/), by Ben Weshoff +- [A Promised Land](https://obamabook.com/), by Barack Obama **In progress** -- [This Is How They Tell Me the World Ends](https://www.bloomsbury.com/us/this-is-how-they-tell-me-the-world-ends-9781635576061/), by Nicole Perlroth -- [Revelation Space](http://www.alastairreynolds.com/release/revelation-space/), by Alastair Reynolds +- [This Is How They Tell Me the World Ends](https://www.bloomsbury.com/us/this-is-how-they-tell-me-the-world-ends-9781635576061/), by Nicole Perlroth +- [Revelation Space](http://www.alastairreynolds.com/release/revelation-space/), by Alastair Reynolds **Next up** -- [JavaScript for Impatient Programmers](https://exploringjs.com/impatient-js/), by Dr. Axel Rauschmayer -- [Deep JavaScript: Theory and Techniques](https://exploringjs.com/deep-js/), by Dr. Axel Rauschmayer -- [Don't Think of an Elephant!](https://georgelakoff.com/books/dont_think_of_an_elephant_know_your_values_and_frame_the_debatethe_essential_guide_for_progressives-119190455949080/), by George Lakoff -- [The Assassination of Fred Hampton](https://www.amazon.com/Assassination-Fred-Hampton-Chicago-Murdered/dp/1569767092), by Jeffrey Haas +- [JavaScript for Impatient Programmers](https://exploringjs.com/impatient-js/), by Dr. Axel Rauschmayer +- [Deep JavaScript: Theory and Techniques](https://exploringjs.com/deep-js/), by Dr. Axel Rauschmayer +- [Don't Think of an Elephant!](https://georgelakoff.com/books/dont_think_of_an_elephant_know_your_values_and_frame_the_debatethe_essential_guide_for_progressives-119190455949080/), by George Lakoff +- [The Assassination of Fred Hampton](https://www.amazon.com/Assassination-Fred-Hampton-Chicago-Murdered/dp/1569767092), by Jeffrey Haas diff --git a/src/posts/2021/a-brief-intro-to-git.md b/src/posts/2021/a-brief-intro-to-git.md index 460597f5..53e18302 100644 --- a/src/posts/2021/a-brief-intro-to-git.md +++ b/src/posts/2021/a-brief-intro-to-git.md @@ -97,9 +97,9 @@ git revert Each of these commands has numerous options associated with it and allows for broad control over the flow and history of your project. There are a number of other options I'd suggest for learning more about git: -- [Github's git tutorial](https://try.github.io) -- [Pro Git book](https://git-scm.com/book) -- [Oh shit, git!](http://ohshitgit.com/) -- [Github guides](https://guides.github.com) -- [Git Real](https://courses.codeschool.com/courses/git-real) -- [Git documentation](https://git-scm.com/documentation) +- [Github's git tutorial](https://try.github.io) +- [Pro Git book](https://git-scm.com/book) +- [Oh shit, git!](http://ohshitgit.com/) +- [Github guides](https://guides.github.com) +- [Git Real](https://courses.codeschool.com/courses/git-real) +- [Git documentation](https://git-scm.com/documentation) diff --git a/src/posts/2021/apple-music-a-tale-of-woe.md b/src/posts/2021/apple-music-a-tale-of-woe.md index bdbf96b0..4de3bec9 100644 --- a/src/posts/2021/apple-music-a-tale-of-woe.md +++ b/src/posts/2021/apple-music-a-tale-of-woe.md @@ -13,15 +13,15 @@ A few weeks ago I read through a [Brooklyn Vegan](https://brooklynvegan.com) on My next steps were pretty standard, escalating, troubleshooting: -- [x] Log out of Apple Music on all devices -- [x] Reboot -- [x] Log in +- [x] Log out of Apple Music on all devices +- [x] Reboot +- [x] Log in Welcome back _Glow On_! -- [x] Reset my Apple Music library[^3] -- [x] Reconstruct my collection[^4] -- [x] Notice that I _still_ can't update metadata and Apple fingerprints your tracks, tries to overwrite the metadata and creates duplicate tracks if there's the _slightest_ mismatch. Notice that these duplicates can't be deleted. +- [x] Reset my Apple Music library[^3] +- [x] Reconstruct my collection[^4] +- [x] Notice that I _still_ can't update metadata and Apple fingerprints your tracks, tries to overwrite the metadata and creates duplicate tracks if there's the _slightest_ mismatch. Notice that these duplicates can't be deleted. So, here I am: I've had swapped a phone after the service launched and cooked the battery. I gave it a second try, it worked for a while exactly how I'd liked — as a cloud locker with a supplemental catalog of music I was less invested in — and then it hit a wall. diff --git a/src/posts/2021/digital-privacy-tools.md b/src/posts/2021/digital-privacy-tools.md index fc372d67..b7d823fc 100644 --- a/src/posts/2021/digital-privacy-tools.md +++ b/src/posts/2021/digital-privacy-tools.md @@ -13,22 +13,22 @@ This is a helpful, albeit basic, guide to online privacy tools. **Private email providers** -- [Fastmail](https://fastmail.com) -- [mailbox.org](mailbox.org) -- [Proton Mail](http://protonmail.com) +- [Fastmail](https://fastmail.com) +- [mailbox.org](mailbox.org) +- [Proton Mail](http://protonmail.com) Ubiquitous free email providers profit by mining user data (whether humans are involved or not). Your inbox acts as a key to your digital life and you should avoid using any provider that monetizes its contents. **Adblockers** -- [1Blocker](https://1blocker.com) -- [Better](https://better.fyi) +- [1Blocker](https://1blocker.com) +- [Better](https://better.fyi) These are both light-weight, independently developed ad and tracker blockers. 1Blocker is considerably more configurable, but could be daunting to new users (the defaults offer a nice balance though). **DNS providers** -- [nextDNS](https://nextdns.io) -- [Cloudflare 1.1.1.1](https://www.cloudflare.com/learning/dns/what-is-1.1.1.1) +- [nextDNS](https://nextdns.io) +- [Cloudflare 1.1.1.1](https://www.cloudflare.com/learning/dns/what-is-1.1.1.1) I use nextDNS on my home network for basic security and have a more restrictive configuration that heavily filters ads at the DNS level on specific devices. Cloudflare's 1.1.1.1 service doesn't offer the same features, but is still preferable to Google's offering or your ISP's default. diff --git a/src/posts/2022/2022-reading-list.md b/src/posts/2022/2022-reading-list.md index a52ab65c..380e4437 100644 --- a/src/posts/2022/2022-reading-list.md +++ b/src/posts/2022/2022-reading-list.md @@ -9,41 +9,41 @@ I'm still plugging away with my reading habit and my streak is now at 772 days.< **Finished** -- [The Extended Mind by Annie Murphy Paul](https://oku.club/book/the-extended-mind-by-annie-murphy-paul-Mzlrf) -- [Drive by James S. A. Corey](https://oku.club/book/drive-by-james-s-a-corey-DXapB) -- [MBS by Ben Hubbard](https://oku.club/book/mbs-by-ben-hubbard-HTrlr) -- [Putin’s People by Catherine Belton](https://oku.club/book/putins-people-by-catherine-belton-cHBSw) -- [The Sins of Our Fathers by James S. A. Corey](https://oku.club/book/the-sins-of-our-fathers-by-james-s-a-corey-HKXjt) -- [The Complete Redux Book by Ilya Gelman and Boris Dinkevich](https://leanpub.com/redux-book) -- [Off the Edge by Kelly Weill](https://oku.club/book/off-the-edge-by-kelly-weill-SKujn) -- [The Cryptopians by Laura Shin](https://oku.club/book/the-cryptopians-by-laura-shin-S43ey) -- [The Intersectional Environmentalist by Leah Thomas](https://oku.club/book/the-intersectional-environmentalist-by-leah-thomas-3o8nH) -- [The Compatriots by Andrei Soldatov](https://oku.club/book/the-compatriots-by-andrei-soldatov-UMhCz) -- [The Wretched of the Earth by Frantz Fanon](https://oku.club/book/the-wretched-of-the-earth-by-frantz-fanon-8On3n) -- [Lords of Chaos by Michael Moynihan](https://oku.club/book/lords-of-chaos-by-michael-moynihan-TQeVA) -- [Going Clear by Lawrence Wright](https://oku.club/book/going-clear-by-lawrence-wright-ChtJe) -- [Blitzed by Norman Ohler](https://oku.club/book/blitzed-by-norman-ohler-CZnyf) -- [Paradise by Lizzie Johnson](https://oku.club/book/paradise-by-lizzie-johnson-BHfRA) -- [Pedagogy of the Oppressed by Paulo Freire](https://oku.club/book/pedagogy-of-the-oppressed-by-paulo-freire-nGgoW) -- [Missoula by Jon Krakauer](https://oku.club/book/missoula-by-jon-krakauer-ggUIz) -- [Free by Lea Ypi](https://oku.club/book/free-by-lea-ypi-k3V1u) -- [Reign of Terror by Spencer Ackerman](https://oku.club/book/reign-of-terror-by-spencer-ackerman-vNJMb) -- [Narconomics by Tom Wainwright](https://oku.club/book/narconomics-by-tom-wainwright-qRrxi) -- [Capitalist Realism by Mark Fisher](https://oku.club/book/capitalist-realism-by-mark-fisher-Lq4Gm) -- [An Ugly Truth by Sheera Frenkel](https://oku.club/book/an-ugly-truth-by-sheera-frenkel-RxLoN) -- [Sellout by Dan Ozzi](https://oku.club/book/sellout-by-dan-ozzi-wXvCV) -- [Will by Will Smith and Mark Manson](https://oku.club/book/will-by-will-manson-smith-mark-YfBE1) +- [The Extended Mind by Annie Murphy Paul](https://oku.club/book/the-extended-mind-by-annie-murphy-paul-Mzlrf) +- [Drive by James S. A. Corey](https://oku.club/book/drive-by-james-s-a-corey-DXapB) +- [MBS by Ben Hubbard](https://oku.club/book/mbs-by-ben-hubbard-HTrlr) +- [Putin’s People by Catherine Belton](https://oku.club/book/putins-people-by-catherine-belton-cHBSw) +- [The Sins of Our Fathers by James S. A. Corey](https://oku.club/book/the-sins-of-our-fathers-by-james-s-a-corey-HKXjt) +- [The Complete Redux Book by Ilya Gelman and Boris Dinkevich](https://leanpub.com/redux-book) +- [Off the Edge by Kelly Weill](https://oku.club/book/off-the-edge-by-kelly-weill-SKujn) +- [The Cryptopians by Laura Shin](https://oku.club/book/the-cryptopians-by-laura-shin-S43ey) +- [The Intersectional Environmentalist by Leah Thomas](https://oku.club/book/the-intersectional-environmentalist-by-leah-thomas-3o8nH) +- [The Compatriots by Andrei Soldatov](https://oku.club/book/the-compatriots-by-andrei-soldatov-UMhCz) +- [The Wretched of the Earth by Frantz Fanon](https://oku.club/book/the-wretched-of-the-earth-by-frantz-fanon-8On3n) +- [Lords of Chaos by Michael Moynihan](https://oku.club/book/lords-of-chaos-by-michael-moynihan-TQeVA) +- [Going Clear by Lawrence Wright](https://oku.club/book/going-clear-by-lawrence-wright-ChtJe) +- [Blitzed by Norman Ohler](https://oku.club/book/blitzed-by-norman-ohler-CZnyf) +- [Paradise by Lizzie Johnson](https://oku.club/book/paradise-by-lizzie-johnson-BHfRA) +- [Pedagogy of the Oppressed by Paulo Freire](https://oku.club/book/pedagogy-of-the-oppressed-by-paulo-freire-nGgoW) +- [Missoula by Jon Krakauer](https://oku.club/book/missoula-by-jon-krakauer-ggUIz) +- [Free by Lea Ypi](https://oku.club/book/free-by-lea-ypi-k3V1u) +- [Reign of Terror by Spencer Ackerman](https://oku.club/book/reign-of-terror-by-spencer-ackerman-vNJMb) +- [Narconomics by Tom Wainwright](https://oku.club/book/narconomics-by-tom-wainwright-qRrxi) +- [Capitalist Realism by Mark Fisher](https://oku.club/book/capitalist-realism-by-mark-fisher-Lq4Gm) +- [An Ugly Truth by Sheera Frenkel](https://oku.club/book/an-ugly-truth-by-sheera-frenkel-RxLoN) +- [Sellout by Dan Ozzi](https://oku.club/book/sellout-by-dan-ozzi-wXvCV) +- [Will by Will Smith and Mark Manson](https://oku.club/book/will-by-will-manson-smith-mark-YfBE1) **In progress** -- [Rotting Ways to Misery by Markus Makkonen](https://oku.club/book/rotting-ways-to-misery-by-markus-makkonen-MPt17) -- [Absolution Gap by Alastair Reynolds](https://oku.club/book/absolution-gap-by-alastair-reynolds-RHAFH) -- [Moneyland by Oliver Bullough, Marianne Palm](https://oku.club/book/moneyland-by-oliver-bullough-s9wvO) +- [Rotting Ways to Misery by Markus Makkonen](https://oku.club/book/rotting-ways-to-misery-by-markus-makkonen-MPt17) +- [Absolution Gap by Alastair Reynolds](https://oku.club/book/absolution-gap-by-alastair-reynolds-RHAFH) +- [Moneyland by Oliver Bullough, Marianne Palm](https://oku.club/book/moneyland-by-oliver-bullough-s9wvO) **Next up** -- [Miles by Miles Davis](https://oku.club/book/miles-by-miles-davis-UG9m7) -- [The Nineties by Chuck Klosterman](https://oku.club/book/the-nineties-by-chuck-klosterman-QNgHC) -- [Old Man's War by John Scalzi](https://oku.club/book/old-mans-war-by-john-scalzi-H7UHv) +- [Miles by Miles Davis](https://oku.club/book/miles-by-miles-davis-UG9m7) +- [The Nineties by Chuck Klosterman](https://oku.club/book/the-nineties-by-chuck-klosterman-QNgHC) +- [Old Man's War by John Scalzi](https://oku.club/book/old-mans-war-by-john-scalzi-H7UHv) I've been listening to podcasts again as well, so I'll have to see how that impacts my pacing and reading. diff --git a/src/posts/2022/apple-centric-digital-privacy-tools.md b/src/posts/2022/apple-centric-digital-privacy-tools.md index e88e0e1b..8f0c290d 100644 --- a/src/posts/2022/apple-centric-digital-privacy-tools.md +++ b/src/posts/2022/apple-centric-digital-privacy-tools.md @@ -12,41 +12,41 @@ A rundown of privacy tools that work well with Apple's technology ecosystem. -[^1]: Which is awesome — it works perfectly. \ No newline at end of file +[^1]: Which is awesome — it works perfectly. diff --git a/src/posts/2023/scheduled-eleventy-builds-cron-github-actions.md b/src/posts/2023/scheduled-eleventy-builds-cron-github-actions.md index ed7e2704..98140d96 100644 --- a/src/posts/2023/scheduled-eleventy-builds-cron-github-actions.md +++ b/src/posts/2023/scheduled-eleventy-builds-cron-github-actions.md @@ -14,24 +14,24 @@ To update my feeds ([feed.xml](https://coryd.dev/feed.xml) and [follow.xml](http ```yaml name: Scheduled Vercel build env: - VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} - VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: - schedule: - - cron: '0 * * * *' + schedule: + - cron: '0 * * * *' jobs: - cron: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install Vercel CLI - run: npm install --global vercel@latest - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + cron: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} ``` {% endraw %} @@ -47,22 +47,22 @@ If you need to manually trigger a build, you can do so using a workflow with a { ```yaml name: Manual Vercel build env: - VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} - VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: [workflow_dispatch] jobs: - cron: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install Vercel CLI - run: npm install --global vercel@latest - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + cron: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} ``` {% endraw %} diff --git a/src/posts/2023/webmentions-in-eleventy.md b/src/posts/2023/webmentions-in-eleventy.md index 93dcd1ae..e7ba1a86 100644 --- a/src/posts/2023/webmentions-in-eleventy.md +++ b/src/posts/2023/webmentions-in-eleventy.md @@ -17,16 +17,16 @@ I'm fetching data from [webmention.io](https://webmention.io) at build time in ` const EleventyFetch = require('@11ty/eleventy-fetch') module.exports = async function () { - const KEY_CORYD = process.env.API_KEY_WEBMENTIONS_CORYD_DEV - const url = `https://webmention.io/api/mentions.jf2?token=${KEY_CORYD}&per-page=1000` - const res = EleventyFetch(url, { - duration: '1h', - type: 'json', - }) - const webmentions = await res - return { - mentions: webmentions.children, - } + const KEY_CORYD = process.env.API_KEY_WEBMENTIONS_CORYD_DEV + const url = `https://webmention.io/api/mentions.jf2?token=${KEY_CORYD}&per-page=1000` + const res = EleventyFetch(url, { + duration: '1h', + type: 'json', + }) + const webmentions = await res + return { + mentions: webmentions.children, + } } ``` @@ -35,29 +35,30 @@ I have cache duration set to `1h` and a scheduled build operating on approximate ```yaml name: Scheduled Vercel build env: - VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} - VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: - schedule: - - cron: '0 * * * *' + schedule: + - cron: '0 * * * *' jobs: - cron: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install Vercel CLI - run: npm install --global vercel@latest - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + cron: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} ``` When the build runs, it renders any mentions of a given post via a [liquid.js](https://liquidjs.com/) template that looks like this: {% raw %} + ```liquid {% if webmentions %}
@@ -130,6 +131,7 @@ When the build runs, it renders any mentions of a given post via a [liquid.js](h
{% endif %} ``` + {% endraw %} This conditionally displays different mention types based on the available data after being passed through the `webmentionsByUrl` filter which I shamelessly lifted from [Robb](https://github.com/rknightuk/rknight.me/blob/8e2a5c5f886cae6c04add7893b8bf8a2d6295ddf/config/filters.js#L48-L84). diff --git a/src/posts/posts.json b/src/posts/posts.json index 7bb3b96a..0a27d50c 100644 --- a/src/posts/posts.json +++ b/src/posts/posts.json @@ -1,5 +1,5 @@ { - "layout": "post.liquid", - "tags": ["posts"], - "published": true -} \ No newline at end of file + "layout": "post.liquid", + "tags": ["posts"], + "published": true +} diff --git a/src/referrals.md b/src/referrals.md index 85700df5..2a1baa2c 100644 --- a/src/referrals.md +++ b/src/referrals.md @@ -11,10 +11,10 @@ title: Referrals Referral links for services I use. I save some money and you do as well if you choose to use them. -- Google Workspace -- SavvyCal -- Fathom Analytics -- NextDNS -- DNSimple -- Bunny.net -- DigitalOcean \ No newline at end of file +- Google Workspace +- SavvyCal +- Fathom Analytics +- NextDNS +- DNSimple +- Bunny.net +- DigitalOcean diff --git a/src/sitemap.md b/src/sitemap.md index 07e756b1..4d720e69 100644 --- a/src/sitemap.md +++ b/src/sitemap.md @@ -2,6 +2,7 @@ permalink: /sitemap.xml eleventyExcludeFromCollections: true --- + {% for page in collections.all %} @@ -10,4 +11,4 @@ eleventyExcludeFromCollections: true {{page.data.changeFreq}} {% endfor %} - \ No newline at end of file + diff --git a/src/tagList.md b/src/tagList.md index 712b0f9e..e4e3fd03 100644 --- a/src/tagList.md +++ b/src/tagList.md @@ -1,16 +1,17 @@ --- layout: default pagination: - data: collections - size: 1 - alias: tag + data: collections + size: 1 + alias: tag permalink: /tags/{{ tag }}/ eleventyComputed: - title: '{{ tag }}' + title: '{{ tag }}' templateEngineOverride: liquid,md --- {% for post in collections[tag] %} +

Hardware

-- Midnight MacBook Air (2022 - M2) -- 27" Dell Monitor (courtesy of a previous employer that didn't want it back) -- Apple Magic Keyboard -- Apple Magic Trackpad -- Homepod Mini for audio -- Raspberry Pi for Homebridge +- Midnight MacBook Air (2022 - M2) +- 27" Dell Monitor (courtesy of a previous employer that didn't want it back) +- Apple Magic Keyboard +- Apple Magic Trackpad +- Homepod Mini for audio +- Raspberry Pi for Homebridge

macOS + iOS

-- [Todoist](https://todoist.com) -- [Obsidian](https://obsidian.md) -- [Fantastical](https://flexibits.com/) -- [Ivory](https://tapbots.com/ivory) -- [Flighty](https://www.flightyapp.com) -- [Parcel](https://parcelapp.net) +- [Todoist](https://todoist.com) +- [Obsidian](https://obsidian.md) +- [Fantastical](https://flexibits.com/) +- [Ivory](https://tapbots.com/ivory) +- [Flighty](https://www.flightyapp.com) +- [Parcel](https://parcelapp.net)

iOS

-- [Marvis Pro](https://apps.apple.com/app/marvis-pro/id1447768809) -- [status.log](https://apps.apple.com/ca/app/status-log/id6444921793) +- [Marvis Pro](https://apps.apple.com/app/marvis-pro/id1447768809) +- [status.log](https://apps.apple.com/ca/app/status-log/id6444921793)

macOS

-- [VS Code](https://code.visualstudio.com) + [Dracula Pro](https://draculatheme.com/pro) -- [iTerm2](https://iterm2.com) -- [Alfred](https://alfredapp.com) -- [Webcatalog](https://webcatalog.io) -- [Keyboard Maestro](https://www.keyboardmaestro.com/) -- [Arq](https://www.arqbackup.com) -- [Sleeve](https://replay.software/sleeve) -- [Magnet](https://magnet.crowdcafe.com) -- [Hazel](https://www.noodlesoft.com) -- [Bartender](https://www.macbartender.com) -- [AirBuddy](https://v2.airbuddy.app) -- [Lingon](https://www.peterborgapps.com/lingon) -- [Meta](https://www.nightbirdsevolve.com/meta) -- [Permute](https://software.charliemonroe.net/permute) +- [VS Code](https://code.visualstudio.com) + [Dracula Pro](https://draculatheme.com/pro) +- [iTerm2](https://iterm2.com) +- [Alfred](https://alfredapp.com) +- [Webcatalog](https://webcatalog.io) +- [Keyboard Maestro](https://www.keyboardmaestro.com/) +- [Arq](https://www.arqbackup.com) +- [Sleeve](https://replay.software/sleeve) +- [Magnet](https://magnet.crowdcafe.com) +- [Hazel](https://www.noodlesoft.com) +- [Bartender](https://www.macbartender.com) +- [AirBuddy](https://v2.airbuddy.app) +- [Lingon](https://www.peterborgapps.com/lingon) +- [Meta](https://www.nightbirdsevolve.com/meta) +- [Permute](https://software.charliemonroe.net/permute)

Services

-- Google Workspace -- SavvyCal -- Fathom Analytics -- NextDNS -- DNSimple -- Bunny.net -- [1Password](https://1password.com) -- [IVPN](https://www.ivpn.net) -- [Jumpshare](https://jumpshare.com) -- [Apple Music](https://music.apple.com) -- [Slack](http://slack.com) -- [Discord](http://discord.com) -- [Trakt](https://trakt.tv) -- [Letterboxd](https://letterboxd.com) -- [Oku](https://oku.club) -- [Glass](https://glass.photo) -- [Reader](https://readwise.io/read) +- Google Workspace +- SavvyCal +- Fathom Analytics +- NextDNS +- DNSimple +- Bunny.net +- [1Password](https://1password.com) +- [IVPN](https://www.ivpn.net) +- [Jumpshare](https://jumpshare.com) +- [Apple Music](https://music.apple.com) +- [Slack](http://slack.com) +- [Discord](http://discord.com) +- [Trakt](https://trakt.tv) +- [Letterboxd](https://letterboxd.com) +- [Oku](https://oku.club) +- [Glass](https://glass.photo) +- [Reader](https://readwise.io/read) Check out [uses.tech](https://uses.tech) for more lists like this one.