diff --git a/astro.config.mjs b/astro.config.mjs index 75939b2..c920f4e 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -9,7 +9,6 @@ export default defineConfig({ markdown: { shikiConfig: { theme: "catppuccin-macchiato" - // TODO: light theme } } }) \ No newline at end of file diff --git a/public/buttons/512kb-club.gif b/public/buttons/512kb-club.gif deleted file mode 100644 index b3c9bf5..0000000 Binary files a/public/buttons/512kb-club.gif and /dev/null differ diff --git a/public/buttons/aman.webp b/public/buttons/aman.webp deleted file mode 100644 index c6d6168..0000000 Binary files a/public/buttons/aman.webp and /dev/null differ diff --git a/public/buttons/astro.png b/public/buttons/astro.png deleted file mode 100644 index fbf4725..0000000 Binary files a/public/buttons/astro.png and /dev/null differ diff --git a/public/buttons/aubrey.png b/public/buttons/aubrey.png deleted file mode 100644 index 6b565ea..0000000 Binary files a/public/buttons/aubrey.png and /dev/null differ diff --git a/public/buttons/dam.png b/public/buttons/dam.png deleted file mode 100644 index fddf237..0000000 Binary files a/public/buttons/dam.png and /dev/null differ diff --git a/public/buttons/emortal.png b/public/buttons/emortal.png deleted file mode 100644 index 2835c16..0000000 Binary files a/public/buttons/emortal.png and /dev/null differ diff --git a/public/buttons/firefox.png b/public/buttons/firefox.png deleted file mode 100644 index 0edcfbf..0000000 Binary files a/public/buttons/firefox.png and /dev/null differ diff --git a/public/buttons/golden.png b/public/buttons/golden.png deleted file mode 100644 index 8fb4d95..0000000 Binary files a/public/buttons/golden.png and /dev/null differ diff --git a/public/buttons/mat.png b/public/buttons/mat.png deleted file mode 100644 index a9946e6..0000000 Binary files a/public/buttons/mat.png and /dev/null differ diff --git a/public/buttons/mudkip.png b/public/buttons/mudkip.png deleted file mode 100644 index e7f8497..0000000 Binary files a/public/buttons/mudkip.png and /dev/null differ diff --git a/public/buttons/niko.png b/public/buttons/niko.png deleted file mode 100644 index ebfe14a..0000000 Binary files a/public/buttons/niko.png and /dev/null differ diff --git a/public/buttons/paddy.png b/public/buttons/paddy.png deleted file mode 100644 index b5f76a0..0000000 Binary files a/public/buttons/paddy.png and /dev/null differ diff --git a/public/buttons/red.png b/public/buttons/red.png deleted file mode 100644 index 08119d0..0000000 Binary files a/public/buttons/red.png and /dev/null differ diff --git a/public/buttons/ssi.gif b/public/buttons/ssi.gif deleted file mode 100644 index e550a4e..0000000 Binary files a/public/buttons/ssi.gif and /dev/null differ diff --git a/public/buttons/ublock.png b/public/buttons/ublock.png deleted file mode 100644 index b834061..0000000 Binary files a/public/buttons/ublock.png and /dev/null differ diff --git a/public/buttons/vsc.gif b/public/buttons/vsc.gif deleted file mode 100644 index 0c0e365..0000000 Binary files a/public/buttons/vsc.gif and /dev/null differ diff --git a/public/terminus-bold.ttf b/public/terminus-bold.ttf new file mode 100644 index 0000000..098ebc3 Binary files /dev/null and b/public/terminus-bold.ttf differ diff --git a/public/terminus.ttf b/public/terminus.ttf new file mode 100644 index 0000000..d125e63 Binary files /dev/null and b/public/terminus.ttf differ diff --git a/src/components/Date.astro b/src/components/Date.astro index eb86947..07c6968 100644 --- a/src/components/Date.astro +++ b/src/components/Date.astro @@ -17,7 +17,7 @@ const { date } = Astro.props; \ No newline at end of file diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 00caff5..18918c4 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -1,26 +1,22 @@ --- +const year = new Date().getFullYear(); --- \ No newline at end of file diff --git a/src/components/Header.astro b/src/components/Header.astro index d971f24..28c425b 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,30 +1,44 @@ --- --- \ No newline at end of file diff --git a/src/components/Profile.astro b/src/components/Profile.astro new file mode 100644 index 0000000..723bbec --- /dev/null +++ b/src/components/Profile.astro @@ -0,0 +1,37 @@ +--- +interface Props { + path: string; +} + +const { path } = Astro.props; +--- +
+ +
+

mudkip

+

{path}

+
+
+ +
+ + \ No newline at end of file diff --git a/src/components/cards/Card.astro b/src/components/cards/Card.astro index 8f579f1..14d9dbf 100644 --- a/src/components/cards/Card.astro +++ b/src/components/cards/Card.astro @@ -9,11 +9,11 @@ const { title, description, url } = Astro.props; ---
-

{ - url == null - ? title - : {title} - }

+

+ + {url == null ? title : {title}} + +

{description}

@@ -26,19 +26,14 @@ const { title, description, url } = Astro.props; padding: 1em; background-color: var(--mantle); - border-radius: 0.5em; - } - - .card * { - margin: 0; + border: 2px solid var(--surface-3); } .card a { - color: var(--text); + --color: var(--text); } - .card p { - font-size: 0.85em; + .card #title { margin-bottom: 5px; } \ No newline at end of file diff --git a/src/components/chat/Chat.astro b/src/components/chat/Chat.astro new file mode 100644 index 0000000..a845151 --- /dev/null +++ b/src/components/chat/Chat.astro @@ -0,0 +1,2 @@ +--- +--- diff --git a/src/content/blog/welcome.md b/src/content/blog/welcome.md index 23f8786..5981c8f 100644 --- a/src/content/blog/welcome.md +++ b/src/content/blog/welcome.md @@ -2,4 +2,4 @@ date: 2024-05-09 title: welcome --- -i have to add this page because of a stupid code limitation, anyways welcome to my blog \ No newline at end of file +this page only exists because of a code limitation \ No newline at end of file diff --git a/src/layouts/Page.astro b/src/layouts/Page.astro index c64a03a..23886e7 100644 --- a/src/layouts/Page.astro +++ b/src/layouts/Page.astro @@ -1,30 +1,42 @@ --- import Header from "@components/Header.astro"; +import Footer from "@components/Footer.astro"; +import Profile from "@components/Profile.astro"; import "../style.css"; -const { title } = Astro.props; + +interface Props { + title: string; + path?: string; +} + +const { title, path = "~/" + title.toLowerCase().replaceAll(" ", "-") } = Astro.props; --- - {title} + {path} - + - - - + + -

{title}

-
+ + + + +
+
+
+
- diff --git a/src/pages/about.astro b/src/pages/about.astro index a675908..55dc467 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -2,5 +2,21 @@ import Page from "@layouts/Page.astro"; --- -

work in progress

-
\ No newline at end of file +

work in progress...

+ + + \ No newline at end of file diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro index cbba24b..fabcb31 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/blog/[...slug].astro @@ -3,7 +3,6 @@ import type { InferGetStaticPropsType, GetStaticPaths } from "astro"; import { getCollection } from "astro:content"; import { stripContent } from "@content/config"; import Page from "@layouts/Page.astro"; -import Date from "@components/Date.astro"; type Props = InferGetStaticPropsType; @@ -21,46 +20,13 @@ export const getStaticPaths = (async () => { const { post, data } = Astro.props; const { Content } = await post.render(); const stripped = await stripContent(post); +const path = "~/blog/" + data.title.toLowerCase().replaceAll(" ", "-") + ".txt"; --- - + - - - -
- - -
-
- - - - \ No newline at end of file +
\ No newline at end of file diff --git a/src/pages/index.astro b/src/pages/index.astro index 4577de2..ef6f8c8 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -3,19 +3,19 @@ import Page from "@layouts/Page.astro"; const bio = "I'm a software developer and security researcher, my interests include programming, video games, and music."; --- - + + ~/ -

- {bio}
- (I also use NixOS btw) -

-
    +

    {bio}

    + (I also use NixOS btw) + + diff --git a/src/pages/projects.astro b/src/pages/projects.astro index 7e8aa1b..fa2c1d8 100644 --- a/src/pages/projects.astro +++ b/src/pages/projects.astro @@ -16,11 +16,5 @@ import Cards from "@components/cards/Cards.astro"; description="A Minecraft server featuring fun and unique minigames." url="https://github.com/skylite-network" /> - - \ No newline at end of file diff --git a/src/style.css b/src/style.css index b3d2336..661a1f8 100644 --- a/src/style.css +++ b/src/style.css @@ -1,183 +1,97 @@ -:root { - --latte-background: #EFF1F5; - --latte-crust: #DCE0E8; - --latte-mantle: #E6E9EF; - --latte-surface-0: #CCD0DA; - --latte-surface-1: #BCC0CC; - --latte-surface-2: #ACB0BE; - --latte-accent: #8839EF; - --latte-text: #4C4F69; - - --frappe-background: #303446; - --frappe-crust: #232634; - --frappe-mantle: #292C3C; - --frappe-surface-0: #414558; - --frappe-surface-1: #51576D; - --frappe-surface-2: #626880; - --frappe-accent: #CA9EE5; - --frappe-text: #C6D0F5; - - --macchiato-background: #24273A; - --macchiato-crust: #181926; - --macchiato-mantle: #1E2030; - --macchiato-surface-0: #363A4E; - --macchiato-surface-1: #494D64; - --macchiato-surface-2: #5B6078; - --macchiato-accent: #C6A0F6; - --macchiato-text: #CAD3F5; - - --mocha-background: #1E1E2E; - --mocha-crust: #11111B; - --mocha-mantle: #181825; - --mocha-surface-0: #313244; - --mocha-surface-1: #444759; - --mocha-surface-2: #585B6F; - --mocha-accent: #CBA5F7; - --mocha-text: #CDD6F3; - - --oled-background: #000000; - --oled-crust: #010101; - --oled-mantle: #020202; - --oled-surface-0: var(--mocha-surface-0); - --oled-surface-1: var(--mocha-surface-1); - --oled-surface-2: var(--mocha-surface-2); - --oled-accent: var(--mocha-accent); - --oled-text: var(--mocha-text); -} - -/* TODO: re-add light theme */ -:root { - --background: var(--macchiato-background); - --crust: var(--macchiato-crust); - --mantle: var(--macchiato-mantle); - --surface-0: var(--macchiato-surface-0); - --surface-1: var(--macchiato-surface-1); - --surface-2: var(--macchiato-surface-2); - --accent: var(--macchiato-accent); - --text: var(--macchiato-text); -} - -body { - background-color: var(--background); - color: var(--text); - - line-height: 1.65; - font-size: 1.5em; - font-family: Inter, - -apple-system, - BlinkMacSystemFont, - "Segoe UI", - Roboto, - Oxygen-Sans, - Ubuntu, - Cantarell, - "Helvetica Neue", - sans-serif; -} +@import url("https://unpkg.com/@catppuccin/palette/css/catppuccin.css"); -body { - max-width: 30em; - margin: auto; - padding: 5em; +@font-face { + font-family: Terminus; + src: url("/terminus.ttf"); + font-weight: 400; + font-style: normal; } -@media (max-width: 700px) { - body { - padding: 1em; - } +@font-face { + font-family: Terminus; + src: url("/terminus-bold.ttf"); + font-weight: 700; + font-style: normal; } -@media (max-width: 400px) { - body { - font-size: 1.25em; - padding: 1em; - } +:root { + --background: var(--ctp-macchiato-base); + --surface-1: var(--ctp-macchiato-crust); + --surface-2: var(--ctp-macchiato-mantle); + --surface-3: var(--ctp-macchiato-surface0); + --surface-4: var(--ctp-macchiato-surface1); + --surface-5: var(--ctp-macchiato-surface2); + --accent: var(--ctp-macchiato-mauve); + --text: var(--ctp-macchiato-text); } ::selection { - background-color: var(--accent); - color: var(--crust); + background: var(--accent); + color: var(--surface-1); } -/* Typography */ - -h1 { - font-size: 2em; +* { + padding: 0; margin: 0; } -h2 { - font-size: 1.5em; - margin: 0; +html, body { + height: 100%; } -h3 { +body { + display: flex; + flex-direction: column; + + margin: auto; + max-width: 40em; + + font-family: Terminus, monospace; font-size: 1.2em; - margin: 0; -} -a { - color: var(--accent); - font-weight: bold; + background: var(--background); + color: var(--text); } -a:hover { - filter: brightness(90%); +main { + flex: 1; + padding: 2em 3em; + background: var(--surface-2); } -nav a { - margin-right: 1em; +h1 { + font-size: 1.8em; + margin: 0.5em 0; } -/* Code Blocks */ - -/* https://github.com/shikijs/shiki/issues/3#issuecomment-830564854 */ -pre { - background-color: var(--mantle) !important; - border-radius: 0.5em; - padding: 1em; - counter-reset: step; - counter-increment: step 0; +h2 { + font-size: 1.5em; + margin: 0.4em 0; } -code .line::before { - display: inline-block; - margin-right: 1.5rem; - text-align: right; - color: var(--text); - filter: opacity(50%); - width: 1rem; - - content: counter(step); - counter-increment: step; +p, a, li, span { + font-size: 1.2em; } -/* Details */ - -details { - padding: 0.75em 1em; - background: var(--mantle); - border-radius: 0.5em; +hr { + border: 1px solid var(--surface-3); margin: 1em 0; } -details summary { - margin-left: 0.5em; - cursor: pointer; - user-select: none; +a { + color: var(--color, var(--accent)); + font-weight: bold; } -/* Checkboxes */ - -/* input[type="checkbox"] { - appearance: none; - background-color: var(--crust); - padding: 1em; - border-radius: 0.5em; - margin: 0; +a:hover { + background: var(--color, var(--accent)); + color: var(--surface-1); + text-decoration: none; } -input[type="checkbox"]:checked { - background-color: var(--accent) !important; - box-shadow: inset 0 0 0 5px var(--crust); -} */ \ No newline at end of file +ul { + margin-top: -0.8em; +} +li { + margin-left: 1em; +} \ No newline at end of file