diff --git a/astro.config.mjs b/astro.config.ts similarity index 60% rename from astro.config.mjs rename to astro.config.ts index 4f6d1e2..50a08e5 100644 --- a/astro.config.mjs +++ b/astro.config.ts @@ -1,6 +1,6 @@ // @ts-check import { defineConfig } from "astro/config"; -import fulldev from "fulldev-ui/integration"; +// import fulldev from "fulldev-ui/integration"; import UnoCSS from "unocss/astro"; import mdx from "@astrojs/mdx"; import cloudflare from "@astrojs/cloudflare"; @@ -18,35 +18,24 @@ export default defineConfig({ integrations: [ mdx(), UnoCSS({ - // injectReset: true, // or a path to the reset file - // preflights: [ - // { - // getCSS: ({ theme }) => ` - // * { - // color: ${theme.colors.gray?.[200] ?? "#ccc"}; - // padding: 0; - // margin: 0; - // } - // `, - // }, - // ], - }), - fulldev({ - // css: '/src/css/custom.css', - colors: { - theme: "dark", - dark: { - background: "#111110", - base: "#3E63DD", - brand: "#359", - }, - light: { - background: "#EEEEEC", - base: "#6F6D66", - brand: "#3E63DD", - }, - }, + injectReset: "@unocss/reset/normalize.css", }), + // fulldev({ + // // css: '/src/css/custom.css', + // colors: { + // theme: "dark", + // dark: { + // background: "#111110", + // base: "#3E63DD", + // brand: "#359", + // }, + // light: { + // background: "#EEEEEC", + // base: "#6F6D66", + // brand: "#3E63DD", + // }, + // }, + // }), ], vite: { diff --git a/package.json b/package.json index d5ec8b9..24b606c 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,15 @@ "@astrojs/check": "^0.9.4", "@astrojs/cloudflare": "^12.0.1", "@astrojs/mdx": "^4.0.1", + "@radix-ui/colors": "^3.0.0", "astro": "^5.0.3", "fulldev-ui": "^0.4.33", "typescript": "^5.7.2" }, "devDependencies": { + "@iconify-json/mdi": "^1.2.1", "@unocss/preset-uno": "^0.64.1", + "@unocss/reset": "^0.65.1", "unocss": "^0.64.1", "wrangler": "^3.93.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24d4ebb..e371138 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ importers: '@astrojs/mdx': specifier: ^4.0.1 version: 4.0.1(astro@5.0.3(@types/node@22.10.1)(jiti@1.21.6)(rollup@4.28.1)(sass@1.82.0)(tsx@4.19.2)(typescript@5.7.2)(yaml@2.6.1)) + '@radix-ui/colors': + specifier: ^3.0.0 + version: 3.0.0 astro: specifier: ^5.0.3 version: 5.0.3(@types/node@22.10.1)(jiti@1.21.6)(rollup@4.28.1)(sass@1.82.0)(tsx@4.19.2)(typescript@5.7.2)(yaml@2.6.1) @@ -27,9 +30,15 @@ importers: specifier: ^5.7.2 version: 5.7.2 devDependencies: + '@iconify-json/mdi': + specifier: ^1.2.1 + version: 1.2.1 '@unocss/preset-uno': specifier: ^0.64.1 version: 0.64.1 + '@unocss/reset': + specifier: ^0.65.1 + version: 0.65.1 unocss: specifier: ^0.64.1 version: 0.64.1(postcss@8.4.49)(rollup@4.28.1)(vite@5.4.11(@types/node@22.10.1)(sass@1.82.0))(vue@3.5.13(typescript@5.7.2)) @@ -863,6 +872,9 @@ packages: resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==} engines: {node: '>=14'} + '@iconify-json/mdi@1.2.1': + resolution: {integrity: sha512-dSkQU78gsZV6Yxnq78+LuX7jzeFC/5NAmz7O3rh558GimGFcwMVY/OtqRowIzjqJBmMmWZft7wkFV4TrwRXjlg==} + '@iconify-json/tabler@1.2.10': resolution: {integrity: sha512-P58U/e0rZNYptzMjnExcFOtSt712xJnqwJI7KoF4iaUJ7EeFQNJawjUXT8X1rvbLMUk/O/fgrzAfhD163XuckA==} @@ -1445,6 +1457,9 @@ packages: '@unocss/reset@0.64.1': resolution: {integrity: sha512-xx36rWcrIpyvI1l/v+szQLrxWAgsmk6GH85QQ5iE1qccQbL9IlhWHB1KEd3cRbJ1TFeZ2Mzca/qsjg0LU9ZVnA==} + '@unocss/reset@0.65.1': + resolution: {integrity: sha512-qyxF7rKGX+Cu3FpV8KCRQbtCvFcBpmzvx5A2wal77tIhrFR5VSH7NzCVmgs2+V9FXvU3aWVNZ79i1KMnLZ5Mjg==} + '@unocss/rule-utils@0.62.4': resolution: {integrity: sha512-XUwLbLUzL+VSHCJNK5QBHC9RbFehumge1/XJmsRfmh0+oxgJoO1gvEvxi57gYEmdJdMRJHRJZ66se6+cB0Ymvw==} engines: {node: '>=14'} @@ -4335,6 +4350,10 @@ snapshots: '@fastify/busboy@2.1.1': {} + '@iconify-json/mdi@1.2.1': + dependencies: + '@iconify/types': 2.0.0 + '@iconify-json/tabler@1.2.10': dependencies: '@iconify/types': 2.0.0 @@ -4981,6 +5000,8 @@ snapshots: '@unocss/reset@0.64.1': {} + '@unocss/reset@0.65.1': {} + '@unocss/rule-utils@0.62.4': dependencies: '@unocss/core': 0.62.4 diff --git a/src/components/Header.astro b/src/components/Header.astro new file mode 100644 index 0000000..78512d7 --- /dev/null +++ b/src/components/Header.astro @@ -0,0 +1,13 @@ +--- +--- +
+
+ +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index fd88efd..0108fc9 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,5 +1,9 @@ --- -import Header from 'fulldev-ui/components/Header.astro' +import LeftRightSplit from '../structure/LeftRightSplit.astro'; +import Heading from '../typography/Heading.astro'; +import Row from '../structure/Row.astro'; +import NavLink from '../widgets/NavLink.astro'; + interface Props { title: string; } @@ -14,36 +18,19 @@ const { title } = Astro.props; + {title} - -
+ + + The Clog + + Journal + Articles + Gitea + + diff --git a/src/pages/journal/RegularText.astro b/src/pages/journal/RegularText.astro deleted file mode 100644 index ca73abd..0000000 --- a/src/pages/journal/RegularText.astro +++ /dev/null @@ -1,4 +0,0 @@ ---- -import Text from 'fulldev-ui/components/Text.astro'; ---- - \ No newline at end of file diff --git a/src/pages/journal/[...slug].astro b/src/pages/journal/[...slug].astro index 0f7fafe..ecdb6d7 100644 --- a/src/pages/journal/[...slug].astro +++ b/src/pages/journal/[...slug].astro @@ -1,9 +1,10 @@ --- import { getCollection } from 'astro:content'; import Layout from '../../layouts/Layout.astro'; -import Heading from 'fulldev-ui/components/Heading.astro'; +import Heading from '../../typography/Heading.astro'; import Link from 'fulldev-ui/components/Link.astro'; -import RegularText from './RegularText.astro'; +import DownTheCenter from '../../structure/DownTheCenter.astro'; +import ReadableWidth from '../../sizing/ReadableWidth.astro'; export const prerender = true; @@ -22,10 +23,14 @@ const { Content } = await journalEntry.render(); ---
- {journalEntry.data.title} - + + + {journalEntry.data.title} + + +
\ No newline at end of file diff --git a/src/sizing/ReadableWidth.astro b/src/sizing/ReadableWidth.astro new file mode 100644 index 0000000..d4954f7 --- /dev/null +++ b/src/sizing/ReadableWidth.astro @@ -0,0 +1,5 @@ +--- +--- +
+ +
\ No newline at end of file diff --git a/src/structure/DownTheCenter.astro b/src/structure/DownTheCenter.astro new file mode 100644 index 0000000..049bae6 --- /dev/null +++ b/src/structure/DownTheCenter.astro @@ -0,0 +1,5 @@ +--- +--- +
+ +
\ No newline at end of file diff --git a/src/structure/LeftRightSplit.astro b/src/structure/LeftRightSplit.astro new file mode 100644 index 0000000..e380576 --- /dev/null +++ b/src/structure/LeftRightSplit.astro @@ -0,0 +1,7 @@ +--- + +--- +
+ + +
\ No newline at end of file diff --git a/src/structure/Row.astro b/src/structure/Row.astro new file mode 100644 index 0000000..e494ba9 --- /dev/null +++ b/src/structure/Row.astro @@ -0,0 +1,5 @@ +--- +--- +
+ +
\ No newline at end of file diff --git a/src/typography/Heading.astro b/src/typography/Heading.astro new file mode 100644 index 0000000..2bb1b12 --- /dev/null +++ b/src/typography/Heading.astro @@ -0,0 +1,5 @@ +--- +--- +

+ +

\ No newline at end of file diff --git a/src/typography/Link.astro b/src/typography/Link.astro new file mode 100644 index 0000000..b48d6f9 --- /dev/null +++ b/src/typography/Link.astro @@ -0,0 +1,5 @@ +--- +--- + + + \ No newline at end of file diff --git a/src/widgets/NavLink.astro b/src/widgets/NavLink.astro new file mode 100644 index 0000000..edac9c6 --- /dev/null +++ b/src/widgets/NavLink.astro @@ -0,0 +1,5 @@ +--- +--- + + + \ No newline at end of file diff --git a/uno.config.ts b/uno.config.ts index 195d970..3ea66f3 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -1,12 +1,32 @@ -import { defineConfig } from "unocss"; +import { defineConfig, presetIcons } from "unocss"; import presetUno from "@unocss/preset-uno"; -import fulldevUI from "fulldev-ui/unocss"; +import { indigo } from "@radix-ui/colors"; +// import fulldevUI from "fulldev-ui/unocss"; export default defineConfig({ - injectReset: true, + // injectReset: true, + theme: { + colors: { + brand: { + "1": indigo.indigo1, + "2": indigo.indigo2, + "3": indigo.indigo3, + "4": indigo.indigo4, + "5": indigo.indigo5, + "6": indigo.indigo6, + "7": indigo.indigo7, + "8": indigo.indigo8, + "9": indigo.indigo9, + "10": indigo.indigo10, + "11": indigo.indigo11, + "12": indigo.indigo12, + }, + }, + }, presets: [ presetUno, //@ts-ignore - fulldevUI, + // fulldevUI, + presetIcons(), ], });