chore: clean up repo and rebrand

.gitignore

@@ -1 +1,2 @@
 target/
+public/

Cargo.toml

@@ -1,19 +1,14 @@
 [package]
-name = "malachite"
+name = "delivery"
 version = "1.0.0"
 edition = "2024"
 authors = ["trisuaso"]
-repository = "https://trisua.com/t/malachite"
+repository = "https://trisua.com/t/delivery"
 license = "AGPL-3.0-or-later"
-homepage = "https://trisua.com"
+homepage = "https://trisua.com/t/delivery"
 
 [dependencies]
-tetratto-core = "15.0.1"
-tetratto-shared = "12.0.6"
 tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] }
-pathbufd = "0.1.4"
-serde = { version = "1.0.219", features = ["derive"] }
-tera = "1.20.0"
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 tower-http = { version = "0.6.6", features = [
@@ -23,12 +18,4 @@ tower-http = { version = "0.6.6", features = [
     "set-header",
 ] }
 axum = { version = "0.8.4", features = ["macros", "ws"] }
-axum-extra = { version = "0.10.1", features = ["cookie"] }
-nanoneo = "0.2.0"
 dotenv = "0.15.0"
-glob = "0.3.2"
-serde_json = "1.0.142"
-toml = "0.9.4"
-serde_valid = { version = "1.0.5", features = ["toml"] }
-regex = "1.11.1"
-oiseau = { version = "0.1.2", default-features = false, features = ["postgres", "redis",] }

README.md

@@ -1,3 +1,5 @@
-# 🪨 malachite
+# 📦 delivery
 
-simple template for building backends with a structure similar to how the [tetratto](https://trisua.com/t/tetratto) repository is organized
+static file server
+
+always serves the `./public` directory as the root path

app/.gitignore

@@ -1,7 +0,0 @@
-docs/**/*
-!docs/example.md
-icons/
-templates_build/
-public/favicon.svg
-.env
-app.toml

app/docs/example.md

@@ -1 +0,0 @@
-# hi :)

app/public/app.js

@@ -1,208 +0,0 @@
-// theme preference
-function media_theme_pref() {
-    document.documentElement.removeAttribute("class");
-
-    if (
-        window.matchMedia("(prefers-color-scheme: dark)").matches &&
-        (!window.localStorage.getItem("malachite.app:theme") ||
-            window.localStorage.getItem("malachite.app:theme") === "Auto")
-    ) {
-        document.documentElement.classList.add("dark");
-
-        document.getElementById("switch_light").classList.add("hidden");
-        document.getElementById("switch_dark").classList.remove("hidden");
-    } else if (
-        window.matchMedia("(prefers-color-scheme: light)").matches &&
-        (!window.localStorage.getItem("malachite.app:theme") ||
-            window.localStorage.getItem("malachite.app:theme") === "Auto")
-    ) {
-        document.documentElement.classList.remove("dark");
-
-        document.getElementById("switch_light").classList.remove("hidden");
-        document.getElementById("switch_dark").classList.add("hidden");
-    } else if (window.localStorage.getItem("malachite.app:theme")) {
-        /* restore theme */
-        const current = window.localStorage.getItem("malachite.app:theme");
-        document.documentElement.className = current.toLowerCase();
-
-        if (current === "Light") {
-            document.getElementById("switch_light").classList.remove("hidden");
-            document.getElementById("switch_dark").classList.add("hidden");
-        } else {
-            document.getElementById("switch_light").classList.add("hidden");
-            document.getElementById("switch_dark").classList.remove("hidden");
-        }
-    }
-}
-
-globalThis.temporary_set_theme = (theme) => {
-    document.documentElement.className = theme.toLowerCase();
-
-    if (theme === "Light") {
-        document.getElementById("switch_light").classList.remove("hidden");
-        document.getElementById("switch_dark").classList.add("hidden");
-    } else {
-        document.getElementById("switch_light").classList.add("hidden");
-        document.getElementById("switch_dark").classList.remove("hidden");
-    }
-};
-
-globalThis.set_theme = (theme) => {
-    window.localStorage.setItem("malachite.app:theme", theme);
-    document.documentElement.className = theme;
-    media_theme_pref();
-};
-
-media_theme_pref();
-
-// messages
-function get_cookie(key) {
-    return (document.cookie.split(`${key}=`)[1] || "").split(";")[0];
-}
-
-function check_message() {
-    const element = document.getElementById("messages");
-
-    const message = get_cookie("App-Message");
-    const message_good = get_cookie("App-Message-Good") === "true";
-
-    if (message) {
-        element.style.marginBottom = "1rem";
-        element.style.paddingLeft = "1rem";
-        element.innerHTML = `<li class="${message_good ? "green" : "red"}">${message.replaceAll('"', "")}</li>`;
-    }
-
-    // clear cookies
-    for (cookie of document.cookie.split(";")) {
-        // biome-ignore lint/suspicious/noDocumentCookie: cookie store is barely supported
-        document.cookie = `${cookie.split("=")[0]}=; expires=${new Date(0).toUTCString()}; path=/`;
-    }
-}
-
-globalThis.show_message = (message, message_good = true) => {
-    const element = document.getElementById("messages");
-    element.style.marginBottom = "1rem";
-    element.style.paddingLeft = "1rem";
-    element.innerHTML = `<li class="${message_good ? "green" : "red"}">${message.replaceAll('"', "")}</li>`;
-};
-
-check_message();
-
-// components
-function close_dropdowns() {
-    for (const dropdown of Array.from(
-        document.querySelectorAll(".inner.open"),
-    )) {
-        dropdown.classList.remove("open");
-    }
-}
-
-globalThis.open_dropdown = (event) => {
-    event.stopImmediatePropagation();
-    let target = event.target;
-
-    while (!target.matches(".dropdown")) {
-        target = target.parentElement;
-    }
-
-    // close all others
-    close_dropdowns();
-
-    // open
-    setTimeout(() => {
-        for (const dropdown of Array.from(target.querySelectorAll(".inner"))) {
-            // check y
-            const box = target.getBoundingClientRect();
-
-            let parent = dropdown.parentElement;
-
-            while (!parent.matches("html, .window")) {
-                parent = parent.parentElement;
-            }
-
-            let parent_height = parent.getBoundingClientRect().y;
-
-            if (parent.nodeName === "HTML") {
-                parent_height = window.screen.height;
-            }
-
-            const scroll = window.scrollY;
-            const height = parent_height;
-            const y = box.y + scroll;
-
-            if (y > height - scroll - 375) {
-                dropdown.classList.add("top");
-            } else {
-                dropdown.classList.remove("top");
-            }
-
-            // open
-            dropdown.classList.add("open");
-
-            if (dropdown.classList.contains("open")) {
-                dropdown.removeAttribute("aria-hidden");
-            } else {
-                dropdown.setAttribute("aria-hidden", "true");
-            }
-        }
-    }, 5);
-};
-
-globalThis.init_dropdowns = (bind_to) => {
-    for (const dropdown of Array.from(document.querySelectorAll(".inner"))) {
-        dropdown.setAttribute("aria-hidden", "true");
-    }
-
-    bind_to.addEventListener("click", (event) => {
-        if (
-            event.target.matches(".dropdown") ||
-            event.target.matches("[exclude=dropdown]")
-        ) {
-            return;
-        }
-
-        for (const dropdown of Array.from(
-            document.querySelectorAll(".inner.open"),
-        )) {
-            dropdown.classList.remove("open");
-        }
-    });
-};
-
-globalThis.hash_check = (hash) => {
-    if (hash.startsWith("#/")) {
-        for (const x of Array.from(document.querySelectorAll(".subpage"))) {
-            x.classList.add("hidden");
-        }
-
-        document.getElementById(hash).classList.remove("hidden");
-    }
-};
-
-window.addEventListener("hashchange", (_) => hash_check(window.location.hash));
-
-setTimeout(() => {
-    // run initial hash check
-    hash_check(window.location.hash);
-}, 150);
-
-globalThis.submitter_load = (submitter) => {
-    return {
-        load() {
-            submitter.querySelector("[ui_ident=text]").classList.add("hidden");
-            submitter
-                .querySelector("[ui_ident=loader]")
-                .classList.remove("hidden");
-            submitter.setAttribute("disabled", "true");
-        },
-        failed() {
-            submitter
-                .querySelector("[ui_ident=text]")
-                .classList.remove("hidden");
-            submitter
-                .querySelector("[ui_ident=loader]")
-                .classList.add("hidden");
-            submitter.removeAttribute("disabled");
-        },
-    };
-};

app/public/reference

@@ -1 +0,0 @@
-../../target/doc

app/public/style.css

@@ -1,702 +0,0 @@
-:root {
-    color-scheme: light dark;
-
-    --color-super-lowered: oklch(87.1% 0.006 286.286);
-    --color-lowered: oklch(96.7% 0.001 286.375);
-    --color-surface: oklch(92.9% 0.013 255.508);
-    --color-raised: oklch(98.4% 0.003 247.858);
-    --color-super-raised: oklch(96.8% 0.007 247.896);
-    --color-text: hsl(0, 0%, 5%);
-
-    --color-link: #2949b2;
-    --color-shadow: rgba(0, 0, 0, 0.08);
-    --color-red: hsl(0, 84%, 40%);
-    --color-green: hsl(100, 84%, 20%);
-    --color-yellow: oklch(47% 0.157 37.304);
-    --color-purple: hsl(284, 84%, 20%);
-    --color-green-lowered: hsl(100, 84%, 15%);
-    --color-red-lowered: hsl(0, 84%, 35%);
-
-    --shadow-x-offset: 0;
-    --shadow-y-offset: 0.125rem;
-    --shadow-size: var(--pad-1);
-
-    --pad-1: 0.2rem;
-    --pad-2: 0.35rem;
-    --pad-3: 0.5rem;
-    --pad-4: 1rem;
-
-    --radius: 0.2rem;
-    --nav-height: 36px;
-}
-
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    font-size: 16px;
-}
-
-.dark,
-.dark * {
-    --color-super-lowered: var(--color-super-raised);
-    --color-lowered: var(--color-raised);
-    --color-surface: oklch(21% 0.006 285.885);
-    --color-raised: oklch(27.4% 0.006 286.033);
-    --color-super-raised: oklch(37% 0.013 285.805);
-    --color-text: hsl(0, 0%, 95%);
-
-    --color-link: #93c5fd;
-    --color-red: hsl(0, 94%, 82%);
-    --color-green: hsl(100, 94%, 82%);
-    --color-yellow: oklch(90.1% 0.076 70.697);
-    --color-purple: hsl(284, 94%, 82%);
-}
-
-html,
-body {
-    line-height: 1.5;
-    letter-spacing: 0.15px;
-    font-family:
-        "Inter",
-        "Poppins",
-        "Roboto",
-        ui-sans-serif,
-        -apple-system,
-        BlinkMacSystemFont,
-        system-ui,
-        sans-serif,
-        "Apple Color Emoji",
-        "Segoe UI Emoji",
-        "Segoe UI Symbol",
-        "Noto Color Emoji";
-    color: var(--color-text);
-    background: var(--color-surface);
-    overflow: auto auto;
-    height: 100dvh;
-    scroll-behavior: smooth;
-    overflow-x: hidden;
-}
-
-main {
-    width: 80ch;
-    margin: var(--pad-4) auto;
-    padding: var(--pad-3) var(--pad-4);
-}
-
-article {
-    margin: var(--pad-2) 0;
-    height: calc(100dvh - var(--pad-4) - var(--nav-height) * 2);
-}
-
-.tab {
-    flex: 1 0 auto;
-    overflow: auto;
-}
-
-.tabs .tab {
-    height: 100%;
-}
-
-.fadein {
-    animation: fadein ease-in-out 1 0.5s forwards running;
-}
-
-nav {
-    /* background: var(--color-raised); */
-    height: var(--nav-height);
-    /* position: sticky;
-    z-index: 2;
-    top: 2; */
-}
-
-@media screen and (max-width: 900px) {
-    main,
-    article,
-    nav,
-    header,
-    footer {
-        width: 100%;
-    }
-
-    article {
-        margin-top: 0;
-    }
-
-    main {
-        padding: 0;
-    }
-
-    .flex_collapse_rev {
-        flex-direction: column-reverse !important;
-    }
-}
-
-.container:not(#preview_tab):not(#tabs_group) {
-    margin: 10px auto 0;
-    width: 100%;
-}
-
-.content_container {
-    margin: 0 auto var(--pad-2);
-    width: 100%;
-}
-
-@media screen and (min-width: 500px) {
-    .content_container {
-        max-width: 540px;
-    }
-}
-
-@media (min-width: 768px) {
-    .content_container {
-        max-width: 720px;
-    }
-}
-
-@media (min-width: 900px) {
-    .content_container {
-        max-width: 960px;
-    }
-
-    @media (min-width: 1200px) {
-        article {
-            padding: 0;
-        }
-
-        .content_container {
-            max-width: 1100px;
-        }
-    }
-}
-
-video {
-    max-width: 100%;
-    border-radius: var(--radius);
-}
-
-/* card */
-.card {
-    padding: var(--pad-4);
-    background: var(--color-raised);
-    color: var(--color-text);
-}
-
-.card_nest .card:nth-child(1) {
-    background: var(--color-super-raised);
-    padding: var(--pad-2) var(--pad-4);
-}
-
-/* button */
-.button {
-    --h: 36px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    gap: var(--pad-2);
-    padding: var(--pad-2) calc(var(--pad-3) * 1.5);
-    cursor: pointer;
-    background: var(--color-raised);
-    color: var(--color-text);
-    outline: none;
-    border: none;
-    width: max-content;
-    height: var(--h);
-    line-height: var(--h);
-    transition: background 0.15s;
-    text-decoration: none !important;
-    user-select: none;
-    appearance: none;
-}
-
-.button:disabled {
-    opacity: 50%;
-    cursor: not-allowed;
-}
-
-.button.small {
-    --h: 28px;
-}
-
-.button:not(:has(.button:hover)):not(.camo):hover {
-    background: var(--color-super-raised);
-}
-
-.button.camo {
-    background: transparent;
-    color: inherit;
-}
-
-.bar .button:not(.simple).camo:hover {
-    color: var(--color-link);
-}
-
-.button.simple {
-    --size: 18px;
-    font-weight: 600;
-    padding: var(--pad-2) !important;
-    border-radius: var(--radius);
-    width: var(--size);
-    height: var(--size);
-    aspect-ratio: 1 / 1;
-    font-size: 12px;
-}
-
-.button.surface {
-    background: var(--color-surface);
-}
-
-.button.surface.simple:is(.camo *) {
-    background: var(--color-super-raised);
-}
-
-.button.green:not(.dark *) {
-    background: var(--color-green);
-    color: white !important;
-
-    &:hover {
-        background: var(--color-green-lowered) !important;
-    }
-}
-
-.button.red:not(.dark *) {
-    background: var(--color-red);
-    color: white !important;
-
-    &:hover {
-        background: var(--color-red-lowered) !important;
-    }
-}
-
-/* dropdown */
-.dropdown {
-    position: relative;
-}
-
-.dropdown .inner {
-    display: none;
-    flex-direction: column;
-    box-shadow: var(--shadow-x-offset) var(--shadow-y-offset) var(--shadow-size)
-        var(--color-shadow);
-    background: var(--color-raised);
-    color: inherit;
-    position: absolute;
-    z-index: 2;
-    top: 100%;
-    right: 0;
-    width: max-content;
-    max-width: 15rem;
-}
-
-.dropdown .inner.left {
-    right: unset;
-    left: 0;
-}
-
-.dropdown .inner.open {
-    display: flex;
-}
-
-.dropdown .inner .button,
-.dropdown .inner .title {
-    padding: var(--pad-3) var(--pad-4);
-    justify-content: flex-start;
-    width: 100%;
-}
-
-.dropdown .inner .title {
-    font-weight: 600;
-    font-size: 14px;
-}
-
-.dropdown:has(.inner.open) .button:nth-child(1):not(.inner *) {
-    background: var(--color-raised);
-}
-
-.dropdown .inner.top {
-    top: unset;
-    bottom: 100%;
-}
-
-.dropdown .inner.left {
-    left: 0;
-    right: unset;
-}
-
-/* input */
-input {
-    --h: 36px;
-    padding: var(--pad-2) calc(var(--pad-3) * 1.5);
-    background: var(--color-raised);
-    color: var(--color-text);
-    outline: none;
-    border: none;
-    width: max-content;
-    transition:
-        background 0.15s,
-        border 0.15s;
-    height: var(--h);
-    line-height: var(--h);
-    border-left: solid 0px transparent;
-}
-
-input:not([type="checkbox"]):focus {
-    outline: solid 2px var(--color-primary);
-    box-shadow: 0 0 0 4px oklch(87% 0.065 274.039 / 25%);
-    background: var(--color-super-raised);
-}
-
-input:user-invalid,
-input[data-invalid] {
-    border-left: inset 5px var(--color-red);
-}
-
-input.surface {
-    background: var(--color-surface);
-}
-
-input[type="checkbox"] {
-    height: max-content;
-}
-
-/* typo */
-p,
-ul,
-ol {
-    margin-bottom: var(--pad-4) !important;
-
-    &:last-child {
-        margin-bottom: 0 !important;
-    }
-}
-
-.post_right:not(.repost) {
-    max-width: calc(100% - 52px);
-}
-
-.rhs {
-    width: 100% !important;
-}
-
-.name {
-    max-width: 250px;
-    overflow: hidden;
-    /* overflow-wrap: break-word; */
-    overflow-wrap: anywhere;
-    text-overflow: ellipsis;
-}
-
-@media screen and (min-width: 901px) {
-    .name.shorter {
-        max-width: 200px;
-    }
-
-    .name.lg\:long {
-        max-width: unset;
-    }
-
-    .rhs {
-        width: calc(100% - 23rem) !important;
-    }
-}
-
-ul,
-ol {
-    margin: var(--pad-2) 0 var(--pad-2) var(--pad-4);
-}
-
-pre {
-    padding: var(--pad-2) var(--pad-4);
-    border-left: solid 5px var(--color-primary);
-    background: var(--color-surface);
-    border-radius: var(--radius);
-    margin-bottom: var(--pad-4);
-}
-
-code {
-    padding: 0;
-}
-
-pre,
-code {
-    font-family: "Jetbrains Mono", "Fire Code", monospace;
-    width: 100%;
-    max-width: 100%;
-    overflow: auto;
-    border-radius: var(--radius);
-    font-size: 0.8rem !important;
-    color: inherit;
-}
-
-code * {
-    font-size: 0.8rem !important;
-}
-
-code:not(pre *) {
-    padding: var(--pad-1) var(--pad-2);
-    background: oklch(98% 0.016 73.684 / 25%);
-    color: oklch(90.1% 0.076 70.697);
-    border-radius: var(--radius);
-    white-space: break-spaces;
-}
-
-code:not(pre *):not(.dark *) {
-    background: oklch(83.7% 0.128 66.29 / 25%);
-    color: oklch(47% 0.157 37.304);
-}
-
-svg.icon {
-    stroke: currentColor;
-    fill: currentColor;
-    width: 18px;
-    height: 1em;
-}
-
-svg.icon.filled {
-    fill: currentColor;
-}
-
-.no_fill svg.icon {
-    fill: transparent;
-}
-
-button svg {
-    pointer-events: none;
-}
-
-hr {
-    border-top: solid 1px var(--color-super-lowered) !important;
-    border-left: 0;
-    border-bottom: 0;
-    border-right: 0;
-}
-
-hr.margin,
-.container hr {
-    margin: var(--pad-4) 0;
-}
-
-span.img_sizer {
-    display: inline-block;
-}
-
-p,
-li,
-span,
-code {
-    max-width: 100%;
-    overflow-wrap: normal;
-    text-wrap: stable;
-    word-wrap: break-word;
-}
-
-h1 {
-    font-size: 2rem;
-}
-
-h2 {
-    font-size: 1.75rem;
-}
-
-h3 {
-    font-size: 1.5rem;
-}
-
-h4 {
-    font-size: 1.25rem;
-}
-
-h5 {
-    font-size: var(--pad-4);
-}
-
-h6 {
-    font-size: var(--pad-3);
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-    margin: var(--pad-4) 0;
-    font-weight: 700;
-    width: -moz-max-content;
-    position: relative;
-    max-width: 100%;
-}
-
-h1 {
-    text-align: center;
-    margin: 2rem 0;
-    width: 100%;
-}
-
-a {
-    text-decoration: none;
-    color: var(--color-link);
-}
-
-.color_block a {
-    color: inherit;
-}
-
-a.flush {
-    color: inherit;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-img {
-    display: inline;
-    max-width: 100%;
-    vertical-align: middle;
-}
-
-.img_sizer img {
-    width: 100%;
-    height: 100%;
-}
-
-.avatar {
-    --size: 18px;
-    width: var(--size);
-    height: var(--size);
-    aspect-ratio: 1 / 1;
-}
-
-blockquote {
-    padding-left: 1rem;
-    border-left: solid 5px var(--color-green);
-    color: var(--color-green);
-    opacity: 75%;
-}
-
-p,
-span {
-    font-size: inherit;
-}
-
-/* extra */
-@keyframes fadein {
-    from {
-        opacity: 0%;
-    }
-
-    to {
-        opacity: 100%;
-    }
-}
-
-.loader {
-    animation: spin linear infinite 2s forwards running;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-@keyframes spin {
-    from {
-        transform: rotateZ(0deg);
-    }
-
-    to {
-        transform: rotateZ(360deg);
-    }
-}
-
-.items-end {
-    align-items: flex-end;
-}
-
-/* table */
-table {
-    width: 100%;
-    table-layout: auto;
-    margin: var(--pad-4) 0;
-    border-collapse: separate;
-    border-spacing: 0;
-    border: solid 1px var(--color-super-raised);
-}
-
-table td,
-table th {
-    padding: var(--pad-2) var(--pad-4);
-}
-
-table tr:not(thead *):nth-child(odd) {
-    background: var(--color-super-raised);
-}
-
-table thead th {
-    text-align: left;
-}
-
-/* details */
-details {
-    width: 100%;
-    margin: var(--pad-4) 0;
-}
-
-details summary {
-    background: var(--color-super-raised);
-    padding: var(--pad-2) var(--pad-4);
-    cursor: pointer;
-}
-
-details .content {
-    padding: var(--pad-4);
-    background: var(--color-surface);
-}
-
-/* dialog */
-dialog {
-    background: var(--color-surface);
-    color: var(--color-text);
-    box-shadow: var(--shadow-x-offset) var(--shadow-y-offset) var(--shadow-size)
-        var(--color-shadow);
-    animation: fadein ease-in-out 1 0.25s forwards running;
-    max-width: 95%;
-    width: 30rem;
-    margin: auto;
-    padding: var(--pad-4);
-    border: 0;
-}
-
-dialog.inner {
-    display: flex;
-    flex-direction: column;
-    gap: var(--pad-2);
-}
-
-dialog::backdrop {
-    background: hsla(0, 0%, 0%, 25%);
-    backdrop-filter: blur(2px);
-}
-
-dialog:is(.dark *)::backdrop {
-    background: hsla(0, 0%, 100%, 15%);
-}
-
-/* menus */
-menu {
-    display: flex;
-}
-
-menu .button {
-    justify-content: flex-start;
-    width: 100%;
-}
-
-menu .button.active {
-    background: var(--color-super-raised);
-}
-
-menu.col {
-    flex-direction: column;
-    width: 25rem;
-    max-width: 100%;
-}

app/templates_src/error.lisp

@@ -1,9 +0,0 @@
-(text "{% extends \"root.lisp\" %} {% block head %}")
-(title
-    (text "Error - {{ name }}"))
-(link ("rel" "icon") ("href" "/public/favicon.svg"))
-(text "{% endblock %} {% block body %}")
-(div
-    ("class" "card")
-    (p (text "{{ error }}")))
-(text "{% endblock %}")

app/templates_src/index.lisp

@@ -1,10 +0,0 @@
-(text "{% extends \"root.lisp\" %} {% block head %}")
-(title
-    (text "{{ name }}"))
-
-(meta ("property" "og:title") ("content" "{{ name }}"))
-(meta ("property" "twitter:title") ("content" "{{ name }}"))
-(link ("rel" "icon") ("href" "/public/favicon.svg"))
-(text "{% endblock %} {% block body %}")
-(h1 (text "{{ name }}"))
-(text "{% endblock %}")

app/templates_src/root.lisp

@@ -1,75 +0,0 @@
-(text "<!doctype html>")
-(html
-    ("lang" "en")
-    (head
-        (meta ("charset" "UTF-8"))
-        (meta ("name" "viewport") ("content" "width=device-width, initial-scale=1.0"))
-        (meta ("http-equiv" "X-UA-Compatible") ("content" "ie=edge"))
-
-        (link ("rel" "stylesheet") ("href" "https://repodelivery.trisua.com/tetratto/crates/app/src/public/css/utility.css"))
-        (link ("rel" "stylesheet") ("href" "/public/style.css?v={{ build_code }}"))
-
-        (style (text ":root { --color-primary: {{ theme_color }}; }"))
-
-        (meta ("name" "theme-color") ("content" "{{ theme_color }}"))
-        (meta ("property" "og:type") ("content" "website"))
-        (meta ("property" "og:site_name") ("content" "{{ name }}"))
-
-        (script ("src" "/public/app.js?v={{ build_code }}") ("defer"))
-
-        (text "{% block head %}{% endblock %}"))
-
-    (body
-        ; nav
-        (nav
-            ("class" "flex w_full justify_between gap_2")
-            (div
-                ("class" "flex side")
-                (div
-                    ("class" "dropdown")
-                    (button
-                        ("onclick" "open_dropdown(event)")
-                        ("exclude" "dropdown")
-                        ("class" "button camo fade")
-                        (text "{{ icon \"menu\" }}"))
-                    (div
-                        ("class" "inner left")
-                        (a
-                            ("class" "button")
-                            ("href" "/")
-                            (text "home"))
-                        (a
-                            ("class" "button")
-                            ("href" "https://trisua.com/t/malachite")
-                            (text "source"))
-                        (text "{% block dropdown %}{% endblock %}")))
-                (a ("href" "/") (b (text "{{ name }}"))))
-
-            (div
-                ("class" "side flex")
-                (text "{% block nav_extras %}{% endblock %}")
-
-                ; theme switches
-                (button
-                    ("class" "button camo fade")
-                    ("id" "switch_light")
-                    ("title" "Switch theme")
-                    ("onclick" "set_theme('Dark')")
-                    (text "{{ icon \"sun\" }}"))
-
-                (button
-                    ("class" "button camo fade hidden")
-                    ("id" "switch_dark")
-                    ("title" "Switch theme")
-                    ("onclick" "set_theme('Light')")
-                    (text "{{ icon \"moon\" }}"))))
-
-        ; page
-        (article
-            ("class" "content_container flex flex_col")
-            ("id" "page")
-            (ul ("id" "messages"))
-            (text "{% block body %}{% endblock %}")
-            (div ("style" "min-height: 32px")))
-
-        (script (text "setTimeout(() => init_dropdowns(document.body), 150);"))))

src/config.rs

@@ -1,75 +0,0 @@
-use oiseau::config::{Configuration, DatabaseConfig};
-use pathbufd::PathBufD;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Config {
-    /// The name of the site. Shown in the UI.
-    #[serde(default = "default_name")]
-    pub name: String,
-    /// The (CSS) theme color of the site. Shown in the UI.
-    #[serde(default = "default_theme_color")]
-    pub theme_color: String,
-    /// Real IP header (for reverse proxy).
-    #[serde(default = "default_real_ip_header")]
-    pub real_ip_header: String,
-    /// Database configuration.
-    #[serde(default = "default_database")]
-    pub database: DatabaseConfig,
-}
-
-fn default_name() -> String {
-    "App".to_string()
-}
-
-fn default_theme_color() -> String {
-    "#6ee7b7".to_string()
-}
-
-fn default_real_ip_header() -> String {
-    "CF-Connecting-IP".to_string()
-}
-
-fn default_database() -> DatabaseConfig {
-    DatabaseConfig::default()
-}
-
-impl Configuration for Config {
-    fn db_config(&self) -> DatabaseConfig {
-        self.database.to_owned()
-    }
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            name: default_name(),
-            theme_color: default_theme_color(),
-            real_ip_header: default_real_ip_header(),
-            database: default_database(),
-        }
-    }
-}
-
-impl Config {
-    /// Read the configuration file.
-    pub fn read() -> Self {
-        toml::from_str(
-            &match std::fs::read_to_string(PathBufD::current().join("app.toml")) {
-                Ok(x) => x,
-                Err(_) => {
-                    let x = Config::default();
-
-                    std::fs::write(
-                        PathBufD::current().join("app.toml"),
-                        &toml::to_string_pretty(&x).expect("failed to serialize config"),
-                    )
-                    .expect("failed to write config");
-
-                    return x;
-                }
-            },
-        )
-        .expect("failed to deserialize config")
-    }
-}

src/database/mod.rs

@@ -1,29 +0,0 @@
-mod sql;
-
-use crate::config::Config;
-use oiseau::{execute, postgres::DataManager as OiseauManager, postgres::Result as PgResult};
-use tetratto_core::model::{Error, Result};
-
-pub const NAME_REGEX: &str = r"[^\w_\-\.,!]+";
-
-#[derive(Clone)]
-pub struct DataManager(pub OiseauManager<Config>);
-
-impl DataManager {
-    /// Create a new [`DataManager`].
-    pub async fn new(config: Config) -> PgResult<Self> {
-        Ok(Self(OiseauManager::new(config).await?))
-    }
-
-    /// Initialize tables.
-    pub async fn init(&self) -> Result<()> {
-        let conn = match self.0.connect().await {
-            Ok(c) => c,
-            Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
-        };
-
-        // execute!(&conn, sql::CREATE_TABLE_ENTRIES).unwrap();
-
-        Ok(())
-    }
-}

src/database/sql/mod.rs

@@ -1 +0,0 @@
-// pub const CREATE_TABLE_ENTRIES: &str = include_str!("./create_entries.sql");

src/main.rs

@@ -1,52 +1,12 @@
 #![doc = include_str!("../README.md")]
-mod config;
+use axum::{Router, routing::get_service};
-mod database;
+use std::{env::var, net::SocketAddr};
-mod markdown;
-mod model;
-mod routes;
-
-use crate::database::DataManager;
-use axum::{Extension, Router};
-use config::Config;
-use nanoneo::core::element::Render;
-use std::{collections::HashMap, env::var, net::SocketAddr, process::exit, sync::Arc};
-use tera::{Tera, Value};
-use tetratto_core::html;
-use tetratto_shared::hash::salt;
-use tokio::sync::RwLock;
 use tower_http::{
     catch_panic::CatchPanicLayer,
     trace::{self, TraceLayer},
 };
 use tracing::{Level, info};
 
-pub(crate) type InnerState = (DataManager, Tera, String);
-pub(crate) type State = Arc<RwLock<InnerState>>;
-
-fn render_markdown(value: &Value, _: &HashMap<String, Value>) -> tera::Result<Value> {
-    Ok(markdown::render_markdown(value.as_str().unwrap())
-        .replace("\\@", "@")
-        .replace("%5C@", "@")
-        .into())
-}
-
-fn remove_script_tags(value: &Value, _: &HashMap<String, Value>) -> tera::Result<Value> {
-    Ok(value
-        .as_str()
-        .unwrap()
-        .replace("</script>", "&lt;/script&gt;")
-        .into())
-}
-
-#[macro_export]
-macro_rules! create_dir_if_not_exists {
-    ($dir_path:expr) => {
-        if !std::fs::exists(&$dir_path).unwrap() {
-            std::fs::create_dir($dir_path).unwrap();
-        }
-    };
-}
-
 #[tokio::main(flavor = "multi_thread")]
 async fn main() {
     dotenv::dotenv().ok();
@@ -60,53 +20,12 @@ async fn main() {
         Err(_) => 8020,
     };
 
-    // ...
-    let database = DataManager::new(Config::read())
-        .await
-        .expect("failed to connect to database");
-    database.init().await.expect("failed to init database");
-
-    // build lisp
-    create_dir_if_not_exists!("./templates_build");
-    create_dir_if_not_exists!("./icons");
-
-    for x in glob::glob("./templates_src/**/*").expect("failed to read pattern") {
-        match x {
-            Ok(x) => std::fs::write(
-                x.to_str()
-                    .unwrap()
-                    .replace("templates_src/", "templates_build/"),
-                html::pull_icons(
-                    nanoneo::parse(&std::fs::read_to_string(x).expect("failed to read template"))
-                        .render(&mut HashMap::new()),
-                    "./icons",
-                )
-                .await,
-            )
-            .expect("failed to write template"),
-            Err(e) => panic!("{e}"),
-        }
-    }
-
-    // create docs dir
-    create_dir_if_not_exists!("./docs");
-
-    // ...
-    let mut tera = match Tera::new(&format!("./templates_build/**/*")) {
-        Ok(t) => t,
-        Err(e) => {
-            println!("{e}");
-            exit(1);
-        }
-    };
-
-    tera.register_filter("markdown", render_markdown);
-    tera.register_filter("remove_script_tags", remove_script_tags);
-
     // create app
     let app = Router::new()
-        .merge(routes::routes())
+        .nest_service(
-        .layer(Extension(Arc::new(RwLock::new((database, tera, salt())))))
+            "/",
+            get_service(tower_http::services::ServeDir::new("./public")),
+        )
         .layer(axum::extract::DefaultBodyLimit::max(
             var("BODY_LIMIT")
                 .unwrap_or("8388608".to_string())
@@ -125,7 +44,7 @@ async fn main() {
         .await
         .unwrap();
 
-    info!("🪨 malachite.");
+    info!("📦 delivery.");
     info!("listening on http://0.0.0.0:{}", port);
     axum::serve(
         listener,

src/model.rs

@@ -1 +0,0 @@
-//! Base types matching SQL table structures.

src/routes.rs

@@ -1,88 +0,0 @@
-use crate::{State, config::Config};
-use axum::{
-    Extension, Router,
-    extract::Path,
-    response::{Html, IntoResponse},
-    routing::{get, get_service},
-};
-use pathbufd::PathBufD;
-use tera::Context;
-use tetratto_core::model::Error;
-
-pub fn routes() -> Router {
-    Router::new()
-        .nest_service(
-            "/public",
-            get_service(tower_http::services::ServeDir::new("./public")),
-        )
-        .fallback(not_found_request)
-        .route("/docs/{name}", get(view_doc_request))
-        // pages
-        .route("/", get(index_request))
-    // api
-    // ...
-}
-
-fn default_context(config: &Config, build_code: &str) -> Context {
-    let mut ctx = Context::new();
-    ctx.insert("name", &config.name);
-    ctx.insert("theme_color", &config.theme_color);
-    ctx.insert("build_code", &build_code);
-    ctx
-}
-
-// pages
-async fn not_found_request(Extension(data): Extension<State>) -> impl IntoResponse {
-    let (ref data, ref tera, ref build_code) = *data.read().await;
-
-    let mut ctx = default_context(&data.0.0, &build_code);
-    ctx.insert(
-        "error",
-        &Error::GeneralNotFound("page".to_string()).to_string(),
-    );
-    return Html(tera.render("error.lisp", &ctx).unwrap());
-}
-
-async fn index_request(Extension(data): Extension<State>) -> impl IntoResponse {
-    let (ref data, ref tera, ref build_code) = *data.read().await;
-    Html(
-        tera.render("index.lisp", &default_context(&data.0.0, &build_code))
-            .unwrap(),
-    )
-}
-
-async fn view_doc_request(
-    Extension(data): Extension<State>,
-    Path(name): Path<String>,
-) -> impl IntoResponse {
-    let (ref data, ref tera, ref build_code) = *data.read().await;
-    let path = PathBufD::current().extend(&["docs", &format!("{name}.md")]);
-
-    if !std::fs::exists(&path).unwrap_or(false) {
-        let mut ctx = default_context(&data.0.0, &build_code);
-        ctx.insert(
-            "error",
-            &Error::GeneralNotFound("entry".to_string()).to_string(),
-        );
-        return Html(tera.render("error.lisp", &ctx).unwrap());
-    }
-
-    let text = match std::fs::read_to_string(&path) {
-        Ok(t) => t,
-        Err(e) => {
-            let mut ctx = default_context(&data.0.0, &build_code);
-            ctx.insert("error", &Error::MiscError(e.to_string()).to_string());
-            return Html(tera.render("error.lisp", &ctx).unwrap());
-        }
-    };
-
-    let mut ctx = default_context(&data.0.0, &build_code);
-
-    ctx.insert("text", &text);
-    ctx.insert("file_name", &name);
-
-    return Html(tera.render("doc.lisp", &ctx).unwrap());
-}
-
-// api
-// ...