From 831931f5e98ee23903b63a1ad57b4eae9ed3857c Mon Sep 17 00:00:00 2001 From: Korbs Date: Wed, 5 Feb 2025 17:28:08 -0500 Subject: [PATCH] update --- Dockerfile | 2 +- bun.lock | 23 ++------------ config.json | 5 --- package.json | 5 ++- src/components/Sidebar.astro | 54 ++++++++++++--------------------- src/content/docs/components.mdx | 1 - src/layouts/Document.astro | 4 +-- src/library/ghost.ts | 8 ----- src/pages/blog/[...slug].astro | 51 ------------------------------- src/pages/blog/index.astro | 6 ---- 10 files changed, 27 insertions(+), 132 deletions(-) delete mode 100644 src/library/ghost.ts delete mode 100644 src/pages/blog/[...slug].astro delete mode 100644 src/pages/blog/index.astro diff --git a/Dockerfile b/Dockerfile index 9fff995..9442edf 100755 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ LABEL org.opencontainers.image.description="Documentations built on Astro" LABEL org.opencontainers.image.licenses="MIT NON-AI License" LABEL org.opencontainers.image.url="https://butterflyvu.docs.sudovanilla.org/" LABEL org.opencontainers.image.source="https://ark.sudovanilla.org/Korbs/ButterflyVu/" -LABEL org.opencontainers.image.version="0.1.91" +LABEL org.opencontainers.image.version="0.2.1" # Copy Files WORKDIR /app diff --git a/bun.lock b/bun.lock index 327485e..7bfee27 100644 --- a/bun.lock +++ b/bun.lock @@ -7,8 +7,7 @@ "@astrojs/mdx": "4.0.3", "@astrojs/vue": "^5.0.3", "@iconoir/vue": "^7.10.1", - "@minpluto/zorn": "^0.4.83", - "@tryghost/content-api": "^1.11.21", + "@minpluto/zorn": "^0.5.0", "astro": "5.1.1", "astro-analytics": "^2.7.0", "astro-bun-adapter": "^1.0.2", @@ -236,7 +235,7 @@ "@mdx-js/mdx": ["@mdx-js/mdx@3.1.0", "https://js.registry.sudovanilla.org/@mdx-js/mdx/-/mdx-3.1.0.tgz", { "dependencies": { "@types/estree": "^1.0.0", "@types/estree-jsx": "^1.0.0", "@types/hast": "^3.0.0", "@types/mdx": "^2.0.0", "collapse-white-space": "^2.0.0", "devlop": "^1.0.0", "estree-util-is-identifier-name": "^3.0.0", "estree-util-scope": "^1.0.0", "estree-walker": "^3.0.0", "hast-util-to-jsx-runtime": "^2.0.0", "markdown-extensions": "^2.0.0", "recma-build-jsx": "^1.0.0", "recma-jsx": "^1.0.0", "recma-stringify": "^1.0.0", "rehype-recma": "^1.0.0", "remark-mdx": "^3.0.0", "remark-parse": "^11.0.0", "remark-rehype": "^11.0.0", "source-map": "^0.7.0", "unified": "^11.0.0", "unist-util-position-from-estree": "^2.0.0", "unist-util-stringify-position": "^4.0.0", "unist-util-visit": "^5.0.0", "vfile": "^6.0.0" } }, "sha512-/QxEhPAvGwbQmy1Px8F899L5Uc2KZ6JtXwlCgJmjSTBedwOZkByYcBG4GceIGPXRDsmfxhHazuS+hlOShRLeDw=="], - "@minpluto/zorn": ["@minpluto/zorn@0.4.83", "https://js.registry.sudovanilla.org/@minpluto/zorn/-/minpluto-zorn-0.4.83.tgz", {}, "sha512-/OMlU8UgaL0XDZfw/RC6yA/0QwV/VB/T8v4ri5Dpbf8630V+UZI1aYMEoV7k5cblUbG8nIiQ3OJJ1Y5VQn2ccA=="], + "@minpluto/zorn": ["@minpluto/zorn@0.5.0", "https://js.registry.sudovanilla.org/@minpluto/zorn/-/zorn-0.5.0.tgz", {}, "sha512-aAkWrBGXY2JPKF5tDsuKEdO3ycbtYQgUEtatQdJjyhmULVStgZHKcxNWGsvEDvXIkl1j48rkWd2OiccF1XFRsA=="], "@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "https://js.registry.sudovanilla.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="], @@ -362,8 +361,6 @@ "@tootallnate/quickjs-emscripten": ["@tootallnate/quickjs-emscripten@0.23.0", "https://js.registry.sudovanilla.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", {}, "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA=="], - "@tryghost/content-api": ["@tryghost/content-api@1.11.21", "https://js.registry.sudovanilla.org/@tryghost/content-api/-/content-api-1.11.21.tgz", { "dependencies": { "axios": "^1.0.0" } }, "sha512-ozJqEMHDUO7D0SGxPbUnG+RvwBbzC3zmdGOW8cFvkcKzrhe7uOAmVKyq7/J3kRAM2QthTlmiDpqp7NEo9ZLlKg=="], - "@types/acorn": ["@types/acorn@4.0.6", "https://js.registry.sudovanilla.org/@types/acorn/-/acorn-4.0.6.tgz", { "dependencies": { "@types/estree": "*" } }, "sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ=="], "@types/cookie": ["@types/cookie@0.6.0", "https://js.registry.sudovanilla.org/@types/cookie/-/cookie-0.6.0.tgz", {}, "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="], @@ -490,12 +487,8 @@ "astro-seo": ["astro-seo@0.8.4", "https://js.registry.sudovanilla.org/astro-seo/-/astro-seo-0.8.4.tgz", { "dependencies": { "@astrojs/check": "^0.5.4" } }, "sha512-Ou1vzQSXAxa0K8rtNtXNvSpYqOGEgMhh0immMxJeXmbVZac3UKCNWAoXWyOQDFYsZvBugCRSg0N1phBqPMVgCw=="], - "asynckit": ["asynckit@0.4.0", "https://js.registry.sudovanilla.org/asynckit/-/asynckit-0.4.0.tgz", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="], - "axe-core": ["axe-core@4.10.2", "https://js.registry.sudovanilla.org/axe-core/-/axe-core-4.10.2.tgz", {}, "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w=="], - "axios": ["axios@1.7.9", "https://js.registry.sudovanilla.org/axios/-/axios-1.7.9.tgz", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } }, "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw=="], - "axobject-query": ["axobject-query@4.1.0", "https://js.registry.sudovanilla.org/axobject-query/-/axobject-query-4.1.0.tgz", {}, "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ=="], "b4a": ["b4a@1.6.7", "https://js.registry.sudovanilla.org/b4a/-/b4a-1.6.7.tgz", {}, "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg=="], @@ -580,8 +573,6 @@ "color-string": ["color-string@1.9.1", "https://js.registry.sudovanilla.org/color-string/-/color-string-1.9.1.tgz", { "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" } }, "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="], - "combined-stream": ["combined-stream@1.0.8", "https://js.registry.sudovanilla.org/combined-stream/-/combined-stream-1.0.8.tgz", { "dependencies": { "delayed-stream": "~1.0.0" } }, "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="], - "comma-separated-tokens": ["comma-separated-tokens@2.0.3", "https://js.registry.sudovanilla.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", {}, "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg=="], "common-ancestor-path": ["common-ancestor-path@1.0.1", "https://js.registry.sudovanilla.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", {}, "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="], @@ -632,8 +623,6 @@ "degenerator": ["degenerator@5.0.1", "https://js.registry.sudovanilla.org/degenerator/-/degenerator-5.0.1.tgz", { "dependencies": { "ast-types": "^0.13.4", "escodegen": "^2.1.0", "esprima": "^4.0.1" } }, "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ=="], - "delayed-stream": ["delayed-stream@1.0.0", "https://js.registry.sudovanilla.org/delayed-stream/-/delayed-stream-1.0.0.tgz", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="], - "dequal": ["dequal@2.0.3", "https://js.registry.sudovanilla.org/dequal/-/dequal-2.0.3.tgz", {}, "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="], "destr": ["destr@2.0.3", "https://js.registry.sudovanilla.org/destr/-/destr-2.0.3.tgz", {}, "sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ=="], @@ -742,10 +731,6 @@ "flattie": ["flattie@1.1.1", "https://js.registry.sudovanilla.org/flattie/-/flattie-1.1.1.tgz", {}, "sha512-9UbaD6XdAL97+k/n+N7JwX46K/M6Zc6KcFYskrYL8wbBV/Uyk0CTAMY0VT+qiK5PM7AIc9aTWYtq65U7T+aCNQ=="], - "follow-redirects": ["follow-redirects@1.15.9", "https://js.registry.sudovanilla.org/follow-redirects/-/follow-redirects-1.15.9.tgz", {}, "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="], - - "form-data": ["form-data@4.0.1", "https://js.registry.sudovanilla.org/form-data/-/form-data-4.0.1.tgz", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } }, "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw=="], - "fs-extra": ["fs-extra@11.2.0", "https://js.registry.sudovanilla.org/fs-extra/-/fs-extra-11.2.0.tgz", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw=="], "fsevents": ["fsevents@2.3.3", "https://js.registry.sudovanilla.org/fsevents/-/fsevents-2.3.3.tgz", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], @@ -1064,10 +1049,6 @@ "mime": ["mime@3.0.0", "https://js.registry.sudovanilla.org/mime/-/mime-3.0.0.tgz", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="], - "mime-db": ["mime-db@1.52.0", "https://js.registry.sudovanilla.org/mime-db/-/mime-db-1.52.0.tgz", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], - - "mime-types": ["mime-types@2.1.35", "https://js.registry.sudovanilla.org/mime-types/-/mime-types-2.1.35.tgz", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], - "mimic-fn": ["mimic-fn@4.0.0", "https://js.registry.sudovanilla.org/mimic-fn/-/mimic-fn-4.0.0.tgz", {}, "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="], "mitt": ["mitt@3.0.1", "https://js.registry.sudovanilla.org/mitt/-/mitt-3.0.1.tgz", {}, "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="], diff --git a/config.json b/config.json index 39c6047..647c795 100755 --- a/config.json +++ b/config.json @@ -9,11 +9,6 @@ "WhiteLabel": "true", "FooterVersion": "true" }, - "Ghost": { - "Enabled": true, - "Instance": "https://blog.ghost.sudovanilla.org", - "Key": "bef2ed15d9e38f7703be9412b3" - }, "FeelbackConfig": { "Enabled": false, "ContentSetId": "566e8b96-c65e-4bf7-87df-d22a9f4994a2", diff --git a/package.json b/package.json index 902fc68..cba08a6 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "butterflyvu", "type": "module", - "version": "0.2.0", + "version": "0.2.1", "license": "MIT NON-AI License", "author": { "name": "SudoVanilla" @@ -32,8 +32,7 @@ "@astrojs/mdx": "4.0.3", "@astrojs/vue": "^5.0.3", "@iconoir/vue": "^7.10.1", - "@minpluto/zorn": "^0.4.83", - "@tryghost/content-api": "^1.11.21", + "@minpluto/zorn": "^0.5.0", "astro": "5.1.1", "astro-analytics": "^2.7.0", "astro-bun-adapter": "^1.0.2", diff --git a/src/components/Sidebar.astro b/src/components/Sidebar.astro index e14fc39..5105f2b 100755 --- a/src/components/Sidebar.astro +++ b/src/components/Sidebar.astro @@ -4,43 +4,29 @@ import { SiteSettings, SidebarItems } from '@config' // Properties const { Blog } = Astro.props - -// Get Posts -import { ghostClient } from "@library/ghost"; -const posts = await ghostClient.posts - .browse({ - limit: "all", - }) - .catch(() => {null}) ---
- {Blog ?

Blog

: null} - {Blog ? - posts.map((post) => ( - {post.title} - )) - : -
- {SidebarItems.map((item) => ( - item.heading ? -

{item.heading}

- : - - {item.text} - {() => { - if (item.badge === undefined) { - return null - } else { - return {item.badge} - } - }} - - ))} -
- } + +
+ {SidebarItems.map((item) => ( + item.heading ? +

{item.heading}

+ : + + {item.text} + {() => { + if (item.badge === undefined) { + return null + } else { + return {item.badge} + } + }} + + ))} +
Menu diff --git a/src/content/docs/components.mdx b/src/content/docs/components.mdx index 2b73887..5524681 100755 --- a/src/content/docs/components.mdx +++ b/src/content/docs/components.mdx @@ -32,7 +32,6 @@ The source of both videos above are on a network with limited upload speed, the Poster="https://md.sudovanilla.org/images/eay-p-v.jpg" Video="https://md.sudovanilla.org/videos/webm/Ennie-and-Yoyki.webm" Milieu - BigPlayButton /> The source of both videos above are on a network with limited upload speed, the buffer rate is high. \ No newline at end of file diff --git a/src/layouts/Document.astro b/src/layouts/Document.astro index 1fc3496..3fce9d1 100755 --- a/src/layouts/Document.astro +++ b/src/layouts/Document.astro @@ -17,8 +17,8 @@ import {Zorn} from "@minpluto/zorn" // Styles /// When Zorn is not imported first in the layout, it's CSS does not carry /// over when importing it into your own documents. So, it's CSS here are imported. -import "../../node_modules/@minpluto/zorn/src/Styles/Index.scss" -import "../../node_modules/@minpluto/zorn/src/Styles/Iconoir.css" +import "../../node_modules/@minpluto/zorn/src/Styles/Base.scss" +import "../../node_modules/@minpluto/zorn/src/Styles/Themes/Default.scss" import "@styles/index.scss" import "@styles/feelback.css" diff --git a/src/library/ghost.ts b/src/library/ghost.ts deleted file mode 100644 index 6d3cc97..0000000 --- a/src/library/ghost.ts +++ /dev/null @@ -1,8 +0,0 @@ -import GhostContentAPI from '@tryghost/content-api' -import {Ghost} from "@config" - -export const ghostClient = new GhostContentAPI({ - url: Ghost.Instance, - key: Ghost.Key, - version: 'v5.0', -}) \ No newline at end of file diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro deleted file mode 100644 index 16c7c6c..0000000 --- a/src/pages/blog/[...slug].astro +++ /dev/null @@ -1,51 +0,0 @@ ---- -// Layout -import Default from "@layouts/Document.astro"; - -// Settings -import { Ghost } from '@config' - -// Fetch Post (Ghost) -import { ghostClient } from "@library/ghost"; - -export async function getStaticPaths() { - const posts = await ghostClient.posts - .browse({ - limit: "all", - }) - .catch((err) => { - console.error(err); - }); - - return posts.map((post) => { - return { - params: { - slug: post.slug, - }, - props: { - post: post, - }, - }; - }); -} - -const { post } = Astro.props; -export const prerender = true; - -const Id = Astro.url.href.split("?postid=").pop(); -const GhostPostFetch = Ghost.Instance + "/ghost/api/content/posts/" + Id + "/?key=" + Ghost.Key; -const GhostPostResponse = await fetch(GhostPostFetch); -const GhostPost = await GhostPostResponse.json(); ---- - - -
- -

{new Date(post.published_at).toLocaleDateString()}

- -
- \ No newline at end of file diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro deleted file mode 100644 index a7a130b..0000000 --- a/src/pages/blog/index.astro +++ /dev/null @@ -1,6 +0,0 @@ ---- -// Layout -import Default from "@layouts/Document.astro"; ---- - - \ No newline at end of file