diff --git a/public/fonts/PIXEAB.woff2 b/public/fonts/PIXEAB.woff2 deleted file mode 100644 index 606e772..0000000 Binary files a/public/fonts/PIXEAB.woff2 and /dev/null differ diff --git a/public/fonts/PIXEAR.woff2 b/public/fonts/PIXEAR.woff2 deleted file mode 100644 index 480bebf..0000000 Binary files a/public/fonts/PIXEAR.woff2 and /dev/null differ diff --git a/public/fonts/PixelMplus10-Bold.woff2 b/public/fonts/PixelMplus10-Bold.woff2 deleted file mode 100644 index 595b9b4..0000000 Binary files a/public/fonts/PixelMplus10-Bold.woff2 and /dev/null differ diff --git a/public/fonts/PixelMplus12-Bold.woff2 b/public/fonts/PixelMplus12-Bold.woff2 deleted file mode 100644 index 0829fbc..0000000 Binary files a/public/fonts/PixelMplus12-Bold.woff2 and /dev/null differ diff --git a/public/fonts/pixeab.woff2 b/public/fonts/pixeab.woff2 new file mode 100644 index 0000000..3479a6a Binary files /dev/null and b/public/fonts/pixeab.woff2 differ diff --git a/public/fonts/pixearg.woff2 b/public/fonts/pixearg.woff2 new file mode 100644 index 0000000..8fcfd4c Binary files /dev/null and b/public/fonts/pixearg.woff2 differ diff --git a/src/assets/border.png b/src/assets/images/border.png similarity index 100% rename from src/assets/border.png rename to src/assets/images/border.png diff --git a/src/assets/frame.png b/src/assets/images/frame.png similarity index 100% rename from src/assets/frame.png rename to src/assets/images/frame.png diff --git a/src/assets/guild-bbs-content.png b/src/assets/images/guild-bbs-content.png similarity index 100% rename from src/assets/guild-bbs-content.png rename to src/assets/images/guild-bbs-content.png diff --git a/src/assets/guild-bbs-list.png b/src/assets/images/guild-bbs-list.png similarity index 100% rename from src/assets/guild-bbs-list.png rename to src/assets/images/guild-bbs-list.png diff --git a/src/assets/guild-bbs.png b/src/assets/images/guild-bbs.png similarity index 100% rename from src/assets/guild-bbs.png rename to src/assets/images/guild-bbs.png diff --git a/src/assets/left-active.png b/src/assets/images/left-active.png similarity index 100% rename from src/assets/left-active.png rename to src/assets/images/left-active.png diff --git a/src/assets/left-hover.png b/src/assets/images/left-hover.png similarity index 100% rename from src/assets/left-hover.png rename to src/assets/images/left-hover.png diff --git a/src/assets/left-normal.png b/src/assets/images/left-normal.png similarity index 100% rename from src/assets/left-normal.png rename to src/assets/images/left-normal.png diff --git a/src/assets/portrait-0025.png b/src/assets/images/portrait-0025.png similarity index 100% rename from src/assets/portrait-0025.png rename to src/assets/images/portrait-0025.png diff --git a/src/assets/right-active.png b/src/assets/images/right-active.png similarity index 100% rename from src/assets/right-active.png rename to src/assets/images/right-active.png diff --git a/src/assets/right-hover.png b/src/assets/images/right-hover.png similarity index 100% rename from src/assets/right-hover.png rename to src/assets/images/right-hover.png diff --git a/src/assets/right-normal.png b/src/assets/images/right-normal.png similarity index 100% rename from src/assets/right-normal.png rename to src/assets/images/right-normal.png diff --git a/src/assets/speech.png b/src/assets/images/speech.png similarity index 100% rename from src/assets/speech.png rename to src/assets/images/speech.png diff --git a/src/assets/styles/base.css b/src/assets/styles/base.css index a905c55..71155a4 100644 --- a/src/assets/styles/base.css +++ b/src/assets/styles/base.css @@ -7,7 +7,7 @@ --title-font: "Kiwi Soda", Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif; --mono-font: "Departure Mono", ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace; --serif-font: "Redaction 35", 'Iowan Old Style', 'Palatino Linotype', 'URW Palladio L', P052, serif; - --sans-font: "MLSS", 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + --sans-font: "Super Star", 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; --arial-font: "Arial Pixel", Arial, Helvetica, sans-serif; --pmd-font: "Wonder Mail", Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif; --mplus-10-font: "PixelMPlus 10", "MS Gothic", system-ui-ja, system-ui-zh-cn, system-ui-zh-tw, system-ui-zh-hk, system-ui-ko, sans-serif; diff --git a/src/assets/styles/fonts.css b/src/assets/styles/fonts.css index 164f4d2..afde59c 100644 --- a/src/assets/styles/fonts.css +++ b/src/assets/styles/fonts.css @@ -1,12 +1,12 @@ @font-face { font-family: "Arial Pixel"; - src: url("/fonts/PIXEAR.woff2") format("woff2"); + src: url("/fonts/pixearg.woff2") format("woff2"); font-weight: normal; } @font-face { font-family: "Arial Pixel"; - src: url("/fonts/PIXEAB.woff2") format("woff2"); + src: url("/fonts/pixeab.woff2") format("woff2"); font-weight: bold; } @@ -23,33 +23,21 @@ } @font-face { - font-family: "MLSS"; + font-family: "Super Star"; src: url("/fonts/mario-luigi-rpg-speech-text.woff2") format("woff2"); font-weight: normal; } @font-face { font-family: "PixelMPlus 10"; - src: url("/fonts/PixelMplus10-Regular.woff2") format("woff"); - font-weight: normal; -} - -@font-face { - font-family: "PixelMPlus 10"; - src: url("/fonts/PixelMplus10-Bold.woff2") format("woff"); - font-weight: bold; -} - -@font-face { - font-family: "PixelMPlus 12"; - src: url("/fonts/PixelMplus12-Regular.woff2") format("woff"); + src: url("/fonts/PixelMplus10-Regular.woff2") format("woff2"); font-weight: normal; } @font-face { font-family: "PixelMPlus 12"; - src: url("/fonts/PixelMplus12-Bold.woff2") format("woff"); - font-weight: bold; + src: url("/fonts/PixelMplus12-Regular.woff2") format("woff2"); + font-weight: normal; } @font-face { diff --git a/src/content/blog/hi-world.md b/src/content/blog/hi-world.md index dbb700f..3827ef1 100644 --- a/src/content/blog/hi-world.md +++ b/src/content/blog/hi-world.md @@ -1,6 +1,9 @@ --- title: hmhmhm! pubDate: 2024-02-04 +currently: + mood: sad + reading: sad fanfic --- hey there this is a test \ No newline at end of file diff --git a/src/layouts/About.astro b/src/layouts/About.astro index 7025406..5284e45 100644 --- a/src/layouts/About.astro +++ b/src/layouts/About.astro @@ -1,11 +1,11 @@ --- import type { MarkdownLayoutProps } from "astro"; import Layout from "./Layout.astro"; -import Navbar from "@/components/Navbar.astro"; -import Figure from "@/components/Figure.astro"; +import Navbar from "~/Navbar.astro"; +import Figure from "~/Figure.astro"; -import border from "@/assets/border.png"; -import frame from "@/assets/frame.png"; +import border from "$/images/border.png"; +import frame from "$/images/frame.png"; type Props = MarkdownLayoutProps<{ avatar?: string; diff --git a/src/layouts/Blog.astro b/src/layouts/Blog.astro index d553c34..6228ba5 100644 --- a/src/layouts/Blog.astro +++ b/src/layouts/Blog.astro @@ -4,12 +4,12 @@ import { getCollection } from "astro:content"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import Layout from "./Layout.astro"; -import Navbar from "@/components/Navbar.astro"; +import Navbar from "~/Navbar.astro"; import moods from "@/utils/moods"; -import outerBBS from "@/assets/guild-bbs.png"; -import innerBBS from "@/assets/guild-bbs-content.png"; -import sideBBS from "@/assets/guild-bbs-list.png"; +import outerBBS from "$/images/guild-bbs.png"; +import innerBBS from "$/images/guild-bbs-content.png"; +import sideBBS from "$/images/guild-bbs-list.png"; interface Props { title: string; @@ -36,7 +36,7 @@ dayjs.extend(utc);
-
-
-
-
-

{title}

-
-
- -
-
- -
- +
+
+
+

{title}

+
+
+
+
- {currently && ( - - )} +
+
-
-
+ + {currently && ( + + )} + +
@@ -238,7 +236,7 @@ dayjs.extend(utc); } } - hgroup { + .nav-section { margin: 0 4px; background-color: var(--bg-0); @@ -317,7 +315,7 @@ dayjs.extend(utc); .content { position: relative; background-attachment: local; - background-image: linear-gradient(to right, var(--bg-0) 5px, transparent 2px), linear-gradient(var(--bg-4) 2px, transparent 2px); + background-image: linear-gradient(to right, var(--bg-0) 5px, transparent 2px), linear-gradient(var(--bg-4) 2px, transparent 2px); background-size: 10px 1lh; background-position-y: calc(2lh - 2px); margin: 2rem 1rem; diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index e9af73a..c198272 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -1,5 +1,5 @@ --- -import "@/assets/styles/base.css"; +import "$/styles/base.css"; interface Props { title?: string; } @@ -16,9 +16,9 @@ const { title = "haetae" }: Props = Astro.props; {title} diff --git a/src/pages/about.md b/src/pages/about.md index e5b4f21..33eb74a 100644 --- a/src/pages/about.md +++ b/src/pages/about.md @@ -1,12 +1,28 @@ --- title: about me layout: ../layouts/About.astro -avatar: /src/assets/portrait-0025.png +avatar: /src/assets/images/portrait-0025.png avatarText: pikachu from pokemon mystery dungeon --- # hello! - -it's me, the weirdo. here's a bunch of my images: +hey there, i go by haetae (or tae, for short) and i use he/him pronouns. ## badges... +# credits +i used a bunch of assets that require attribution but i also wanted to link people to the authors because their works are great! + +## images +- [Pikachu portrait](https://sprites.pmdcollab.org/#/0025?form=0) by SPIKE CHUNSOFT, curated by the PMD Collab project +- [This about page's frame images](https://www.spriters-resource.com/ds_dsi/pokemonmysterydungeonexplorersoftimedarkness/sheet/5986/) by redblueyellow +- The blog's frame images and additional assets (such as the mood emoticons) were graciously provided by AymShade on the MapleLegends forums! I can't directly link because I'm scared of a Certain Company™ being evil +- [The guestbook's speech bubble images](https://www.spriters-resource.com/game_boy_advance/mlss/sheet/7573/) by MajinPiccolo + +## fonts +- [Departure Mono](https://departuremono.com/) by [Helena Zhang](https://www.helenazhang.com/) is licensed under [OFL 1.1](https://www.tldrlegal.com/license/open-font-license-ofl-explained) +- [Kiwi Soda](https://fontenddev.com/fonts/kiwi-soda/) from fontenddev.com is licensed under [CC by 4.0](https://creativecommons.org/licenses/by/4.0/) +- [Mario & Luigi RPG Speech Text](https://fontstruct.com/fontstructions/show/1102228) by DarkMaxX is licensed under [CC by Share Alike 3.0](http://creativecommons.org/licenses/by-sa/3.0/) +- [PixelMplus](https://itouhiro.hatenablog.com/entry/20130602/font) by itouhiro is licensed under [M+ font license](https://web.archive.org/web/20221024231351/http://mplus-fonts.osdn.jp/mplus-bitmap-fonts/#license) +- [Redaction](https://www.redaction.us/) by [Forest Young](https://www.moma.org/interactives/exhibitions/2011/talktome/objects/140027/) and [Jeremy Mickel](https://mckltype.com/) is dual-licensed under [LGPL 2.1](https://www.tldrlegal.com/license/gnu-lesser-general-public-license-v2-1-lgpl-2-1) and [OFL 1.1](https://www.tldrlegal.com/license/open-font-license-ofl-explained) +- [sq](https://github.com/leahneukirchen/sq) by [Leah Neukirchen](https://leahneukirchen.org/) is in public domain +- [Wonder Mail](https://www.dafont.com/wonder-mail.font) by ShinxHijinx is free for personal use \ No newline at end of file diff --git a/src/pages/blog/[...id].astro b/src/pages/blog/[...id].astro index f4f9988..4a859d9 100644 --- a/src/pages/blog/[...id].astro +++ b/src/pages/blog/[...id].astro @@ -2,12 +2,12 @@ import Blog from '@/layouts/Blog.astro'; import type { GetStaticPaths } from 'astro'; import { getCollection, render } from 'astro:content'; -import leftNormal from "@/assets/left-normal.png"; -import leftHover from "@/assets/left-hover.png"; -import leftActive from "@/assets/left-active.png"; -import rightNormal from "@/assets/right-normal.png"; -import rightHover from "@/assets/right-hover.png"; -import rightActive from "@/assets/right-active.png"; +import leftNormal from "$/images/left-normal.png"; +import leftHover from "$/images/left-hover.png"; +import leftActive from "$/images/left-active.png"; +import rightNormal from "$/images/right-normal.png"; +import rightHover from "$/images/right-hover.png"; +import rightActive from "$/images/right-active.png"; export const getStaticPaths = (async () => { const blog = await getCollection("blog"); diff --git a/src/pages/guestbook.astro b/src/pages/guestbook.astro index 00c55de..5f39352 100644 --- a/src/pages/guestbook.astro +++ b/src/pages/guestbook.astro @@ -1,65 +1,98 @@ --- -import { actions, isInputError } from "astro:actions"; -import { db, Guestbook as table } from "astro:db"; import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import Layout from "@/layouts/Layout.astro"; -import ThemeSwitch from "@/components/ThemeSwitch.astro"; +import ThemeSwitch from "~/ThemeSwitch.astro"; +import speech from "$/images/speech.png"; -export const prerender = false; +type GuestBookEntry = { + ID: number; + CreatedAt: string; + UpdatedAt: string; + DeletedAt: null | string; + Name: string; + Text: string; + Website: null | string; + Approved: true; + GuestBookID: number; + Guestbook: object; +} dayjs.extend(utc); -const result = Astro.getActionResult(actions.guestbook); -const errors = isInputError(result?.error) ? result.error.fields : {}; -const entries = await db.select().from(table); -entries.sort((a, b) => b.date.valueOf() - a.date.valueOf()); +const response = await fetch("https://guestbooks.meadow.cafe/api/v1/get-guestbook-messages/500"); +const entries: Array = await response.json(); +entries.sort((a, b) => new Date(b.CreatedAt).valueOf() - new Date(a.CreatedAt).valueOf()); --- +

Guestbook

-
- click me for a secret! - -

-
-
- - - {errors.username &&

{errors.username.join(",")}

} +
+ + + - - - {errors.website &&

{errors.website.join(",")}

} + + - - - {errors.body &&

{errors.body.join(",")}

} + + + + + + + + + - - - {errors.password &&

{errors.password.join(",")}

} + +
+ +
- - +
+

Messages

+ {entries.map(({ Name, Website, Text, CreatedAt}) => ( +
+
+

+ {Website + ? {Name} + : {Name} + } +

+ +
- {entries.map(({ username, website, body, date }) => ( -
-
-

{username}

- - {website && website} -
- {body} -
- ))} + {Text} +
+ ))} +
+ + + +
+ Successfully posted! Messages are manually approved. New entries should show up in a day or two! :) + + + +
+
- \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index fe56bdf..507a67d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,8 +5,9 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@/*": ["src/*"], "~/*": ["src/components/*"], + "$/*": ["src/assets/*"], + "@/*": ["src/*"], } } } \ No newline at end of file