Compare commits
2 Commits
master
...
102d4716e0
| Author | SHA1 | Date | |
|---|---|---|---|
| 102d4716e0 | |||
| a116090136 |
@@ -1,6 +1,6 @@
|
|||||||
// @ts-check
|
// @ts-check
|
||||||
import { defineConfig } from "astro/config";
|
import { defineConfig } from "astro/config";
|
||||||
import fulldev from "fulldev-ui/integration";
|
// import fulldev from "fulldev-ui/integration";
|
||||||
import UnoCSS from "unocss/astro";
|
import UnoCSS from "unocss/astro";
|
||||||
import mdx from "@astrojs/mdx";
|
import mdx from "@astrojs/mdx";
|
||||||
import cloudflare from "@astrojs/cloudflare";
|
import cloudflare from "@astrojs/cloudflare";
|
||||||
@@ -18,35 +18,24 @@ export default defineConfig({
|
|||||||
integrations: [
|
integrations: [
|
||||||
mdx(),
|
mdx(),
|
||||||
UnoCSS({
|
UnoCSS({
|
||||||
// injectReset: true, // or a path to the reset file
|
injectReset: "@unocss/reset/normalize.css",
|
||||||
// preflights: [
|
}),
|
||||||
// {
|
// fulldev({
|
||||||
// getCSS: ({ theme }) => `
|
// // css: '/src/css/custom.css',
|
||||||
// * {
|
// colors: {
|
||||||
// color: ${theme.colors.gray?.[200] ?? "#ccc"};
|
// theme: "dark",
|
||||||
// padding: 0;
|
// dark: {
|
||||||
// margin: 0;
|
// background: "#111110",
|
||||||
// }
|
// base: "#3E63DD",
|
||||||
// `,
|
// brand: "#359",
|
||||||
// },
|
// },
|
||||||
// ],
|
// light: {
|
||||||
}),
|
// background: "#EEEEEC",
|
||||||
fulldev({
|
// base: "#6F6D66",
|
||||||
// css: '/src/css/custom.css',
|
// brand: "#3E63DD",
|
||||||
colors: {
|
// },
|
||||||
theme: "dark",
|
// },
|
||||||
dark: {
|
// }),
|
||||||
background: "#111110",
|
|
||||||
base: "#3E63DD",
|
|
||||||
brand: "#359",
|
|
||||||
},
|
|
||||||
light: {
|
|
||||||
background: "#EEEEEC",
|
|
||||||
base: "#6F6D66",
|
|
||||||
brand: "#3E63DD",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
],
|
],
|
||||||
|
|
||||||
vite: {
|
vite: {
|
||||||
@@ -14,12 +14,15 @@
|
|||||||
"@astrojs/check": "^0.9.4",
|
"@astrojs/check": "^0.9.4",
|
||||||
"@astrojs/cloudflare": "^12.0.1",
|
"@astrojs/cloudflare": "^12.0.1",
|
||||||
"@astrojs/mdx": "^4.0.1",
|
"@astrojs/mdx": "^4.0.1",
|
||||||
|
"@radix-ui/colors": "^3.0.0",
|
||||||
"astro": "^5.0.3",
|
"astro": "^5.0.3",
|
||||||
"fulldev-ui": "^0.4.33",
|
"fulldev-ui": "^0.4.33",
|
||||||
"typescript": "^5.7.2"
|
"typescript": "^5.7.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@iconify-json/mdi": "^1.2.1",
|
||||||
"@unocss/preset-uno": "^0.64.1",
|
"@unocss/preset-uno": "^0.64.1",
|
||||||
|
"@unocss/reset": "^0.65.1",
|
||||||
"unocss": "^0.64.1",
|
"unocss": "^0.64.1",
|
||||||
"wrangler": "^3.93.0"
|
"wrangler": "^3.93.0"
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+21
@@ -17,6 +17,9 @@ importers:
|
|||||||
'@astrojs/mdx':
|
'@astrojs/mdx':
|
||||||
specifier: ^4.0.1
|
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))
|
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:
|
astro:
|
||||||
specifier: ^5.0.3
|
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)
|
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
|
specifier: ^5.7.2
|
||||||
version: 5.7.2
|
version: 5.7.2
|
||||||
devDependencies:
|
devDependencies:
|
||||||
|
'@iconify-json/mdi':
|
||||||
|
specifier: ^1.2.1
|
||||||
|
version: 1.2.1
|
||||||
'@unocss/preset-uno':
|
'@unocss/preset-uno':
|
||||||
specifier: ^0.64.1
|
specifier: ^0.64.1
|
||||||
version: 0.64.1
|
version: 0.64.1
|
||||||
|
'@unocss/reset':
|
||||||
|
specifier: ^0.65.1
|
||||||
|
version: 0.65.1
|
||||||
unocss:
|
unocss:
|
||||||
specifier: ^0.64.1
|
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))
|
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==}
|
resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
|
||||||
engines: {node: '>=14'}
|
engines: {node: '>=14'}
|
||||||
|
|
||||||
|
'@iconify-json/mdi@1.2.1':
|
||||||
|
resolution: {integrity: sha512-dSkQU78gsZV6Yxnq78+LuX7jzeFC/5NAmz7O3rh558GimGFcwMVY/OtqRowIzjqJBmMmWZft7wkFV4TrwRXjlg==}
|
||||||
|
|
||||||
'@iconify-json/tabler@1.2.10':
|
'@iconify-json/tabler@1.2.10':
|
||||||
resolution: {integrity: sha512-P58U/e0rZNYptzMjnExcFOtSt712xJnqwJI7KoF4iaUJ7EeFQNJawjUXT8X1rvbLMUk/O/fgrzAfhD163XuckA==}
|
resolution: {integrity: sha512-P58U/e0rZNYptzMjnExcFOtSt712xJnqwJI7KoF4iaUJ7EeFQNJawjUXT8X1rvbLMUk/O/fgrzAfhD163XuckA==}
|
||||||
|
|
||||||
@@ -1445,6 +1457,9 @@ packages:
|
|||||||
'@unocss/reset@0.64.1':
|
'@unocss/reset@0.64.1':
|
||||||
resolution: {integrity: sha512-xx36rWcrIpyvI1l/v+szQLrxWAgsmk6GH85QQ5iE1qccQbL9IlhWHB1KEd3cRbJ1TFeZ2Mzca/qsjg0LU9ZVnA==}
|
resolution: {integrity: sha512-xx36rWcrIpyvI1l/v+szQLrxWAgsmk6GH85QQ5iE1qccQbL9IlhWHB1KEd3cRbJ1TFeZ2Mzca/qsjg0LU9ZVnA==}
|
||||||
|
|
||||||
|
'@unocss/reset@0.65.1':
|
||||||
|
resolution: {integrity: sha512-qyxF7rKGX+Cu3FpV8KCRQbtCvFcBpmzvx5A2wal77tIhrFR5VSH7NzCVmgs2+V9FXvU3aWVNZ79i1KMnLZ5Mjg==}
|
||||||
|
|
||||||
'@unocss/rule-utils@0.62.4':
|
'@unocss/rule-utils@0.62.4':
|
||||||
resolution: {integrity: sha512-XUwLbLUzL+VSHCJNK5QBHC9RbFehumge1/XJmsRfmh0+oxgJoO1gvEvxi57gYEmdJdMRJHRJZ66se6+cB0Ymvw==}
|
resolution: {integrity: sha512-XUwLbLUzL+VSHCJNK5QBHC9RbFehumge1/XJmsRfmh0+oxgJoO1gvEvxi57gYEmdJdMRJHRJZ66se6+cB0Ymvw==}
|
||||||
engines: {node: '>=14'}
|
engines: {node: '>=14'}
|
||||||
@@ -4335,6 +4350,10 @@ snapshots:
|
|||||||
|
|
||||||
'@fastify/busboy@2.1.1': {}
|
'@fastify/busboy@2.1.1': {}
|
||||||
|
|
||||||
|
'@iconify-json/mdi@1.2.1':
|
||||||
|
dependencies:
|
||||||
|
'@iconify/types': 2.0.0
|
||||||
|
|
||||||
'@iconify-json/tabler@1.2.10':
|
'@iconify-json/tabler@1.2.10':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@iconify/types': 2.0.0
|
'@iconify/types': 2.0.0
|
||||||
@@ -4981,6 +5000,8 @@ snapshots:
|
|||||||
|
|
||||||
'@unocss/reset@0.64.1': {}
|
'@unocss/reset@0.64.1': {}
|
||||||
|
|
||||||
|
'@unocss/reset@0.65.1': {}
|
||||||
|
|
||||||
'@unocss/rule-utils@0.62.4':
|
'@unocss/rule-utils@0.62.4':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@unocss/core': 0.62.4
|
'@unocss/core': 0.62.4
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<div class:list={["flex", "flex-justify-between"]}>
|
||||||
|
<div class:list={["flex", "flex-content-start"]}>
|
||||||
|
<slot name="left" />
|
||||||
|
</div>
|
||||||
|
<div class:list={["flex", "flex-content-center"]}>
|
||||||
|
<slot name="center" />
|
||||||
|
</div>
|
||||||
|
<div class:list={["flex", "flex-content-end"]}>
|
||||||
|
<slot name="right" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
+15
-28
@@ -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 {
|
interface Props {
|
||||||
title: string;
|
title: string;
|
||||||
}
|
}
|
||||||
@@ -14,36 +18,19 @@ const { title } = Astro.props;
|
|||||||
<meta name="description" content="A practical coding blog in the form of journal entries and articles." />
|
<meta name="description" content="A practical coding blog in the form of journal entries and articles." />
|
||||||
<meta name="viewport" content="width=device-width" />
|
<meta name="viewport" content="width=device-width" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||||
|
<link rel="preload" href="/hero.png" />
|
||||||
<meta name="generator" content={Astro.generator} />
|
<meta name="generator" content={Astro.generator} />
|
||||||
<title>{title}</title>
|
<title>{title}</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body class="text-brand-1">
|
||||||
<Header
|
<LeftRightSplit class="px-8">
|
||||||
heading="The Clog"
|
<Heading slot="left"><a href="/" class="text-brand-3 decoration-none">The Clog</a></Heading>
|
||||||
links={[
|
<Row slot="right" >
|
||||||
{
|
<NavLink href="/journal">Journal</NavLink>
|
||||||
text: 'Journal',
|
<NavLink href="/articles">Articles</NavLink>
|
||||||
href: '/journal',
|
<NavLink class="i-mdi-git" href="https://git.sakal.us/avraham/">Gitea</NavLink>
|
||||||
},
|
</Row>
|
||||||
{
|
</LeftRightSplit>
|
||||||
text: 'Articles',
|
|
||||||
href: '/articles',
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
buttons={[
|
|
||||||
{
|
|
||||||
title: 'Gitea',
|
|
||||||
icon: 'brand-git',
|
|
||||||
href: 'https://git.sakal.us/avraham/',
|
|
||||||
target: '_blank',
|
|
||||||
contrast: true,
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
frame="fill"
|
|
||||||
position="relative"
|
|
||||||
color="brand"
|
|
||||||
class:list={["mb-6"]}
|
|
||||||
/>
|
|
||||||
<slot />
|
<slot />
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
---
|
|
||||||
import Text from 'fulldev-ui/components/Text.astro';
|
|
||||||
---
|
|
||||||
<Text contrast={true}><slot /></Text>
|
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
---
|
---
|
||||||
import { getCollection } from 'astro:content';
|
import { getCollection } from 'astro:content';
|
||||||
import Layout from '../../layouts/Layout.astro';
|
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 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;
|
export const prerender = true;
|
||||||
|
|
||||||
@@ -22,10 +23,14 @@ const { Content } = await journalEntry.render();
|
|||||||
---
|
---
|
||||||
<Layout title={journalEntry.data.title}>
|
<Layout title={journalEntry.data.title}>
|
||||||
<main>
|
<main>
|
||||||
|
<DownTheCenter>
|
||||||
|
<ReadableWidth>
|
||||||
<Heading>{journalEntry.data.title}</Heading>
|
<Heading>{journalEntry.data.title}</Heading>
|
||||||
<Content components={{
|
<Content components={{
|
||||||
p: RegularText,
|
// p: RegularText,
|
||||||
a: Link,
|
a: Link,
|
||||||
}} />
|
}} />
|
||||||
|
</ReadableWidth>
|
||||||
|
</DownTheCenter>
|
||||||
</main>
|
</main>
|
||||||
</Layout>
|
</Layout>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<div class="max-w-3xl">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<div class="flex flex-col items-center justify-center">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
---
|
||||||
|
<div class={`flex flex-row justify-between ${Astro.props.class||''}`}>
|
||||||
|
<slot name="left" />
|
||||||
|
<slot name="right" />
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<div class="flex flex-row gap-3 items-center justify-start">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<h1 class="text-4xl font-bold text-brand-1">
|
||||||
|
<slot />
|
||||||
|
</h1>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<a class="text-brand underline-dotted" href={Astro.props.href}>
|
||||||
|
<slot />
|
||||||
|
</a>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
---
|
||||||
|
<a class="text-brand-3 px-4 py-2 decoration-none border-brand-3 border-solid border-rounded border-width-1 border-transparent hover:border-brand-3" href={Astro.props.href}>
|
||||||
|
<slot />
|
||||||
|
</a>
|
||||||
+24
-4
@@ -1,12 +1,32 @@
|
|||||||
import { defineConfig } from "unocss";
|
import { defineConfig, presetIcons } from "unocss";
|
||||||
import presetUno from "@unocss/preset-uno";
|
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({
|
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: [
|
presets: [
|
||||||
presetUno,
|
presetUno,
|
||||||
//@ts-ignore
|
//@ts-ignore
|
||||||
fulldevUI,
|
// fulldevUI,
|
||||||
|
presetIcons(),
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,5 +2,7 @@
|
|||||||
name = "blog"
|
name = "blog"
|
||||||
compatibility_date = "2024-12-06"
|
compatibility_date = "2024-12-06"
|
||||||
|
|
||||||
|
pages_build_output_dir = "dist"
|
||||||
|
|
||||||
[env]
|
[env]
|
||||||
production = { }
|
production = { }
|
||||||
|
|||||||
Reference in New Issue
Block a user