mass view refactoring

remove unused header check
delay lock until it is needed
2024-08-30 23:23:13 -07:00 · 2024-08-30 23:16:18 -07:00 · 2024-08-30 23:08:32 -07:00 · 2024-08-30 23:06:54 -07:00 · 2024-08-30 21:31:35 -07:00 · 2024-08-30 20:29:40 -07:00
11 changed files with 30 additions and 109 deletions
--- a/dist/link.html
+++ b/dist/link.html
@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <title></title>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="css/link.css" rel="stylesheet">
-
-    <script>
-        document.addEventListener("DOMContentLoaded", () => {
-            const params = new Proxy(new URLSearchParams(window.location.search), {
-                get: (searchParams, prop) => searchParams.get(prop),
-            });
-
-
-            if (params.link !== null) {
-                let link = `${window.location.origin}/download/${params.link}`;
-
-                let link_el = document.getElementById("link");
-
-                link_el.href = link;
-                link_el.innerHTML = link;
-            }
-        });
-
-        function clipboard() {
-            let copyText = document.getElementById("link");
-
-            navigator.clipboard.writeText(copyText.href).then(() => alert("Copied: " + copyText.href));
-        }
-    </script>
-</head>
-
-<body>
-    <div class="link-wrapper">
-        <a id="link" href=""></a>
-    </div>
-
-    <button class="return-button" onclick="clipboard()">Copy to Clipboard</button>
-
-    <a href="/" class="return-button">Return to home</a>
-</body>
-
-</html>
--- a/dist/scripts/cat_fact_fetcher.js
+++ b/dist/scripts/cat_fact_fetcher.js
@ -1,5 +0,0 @@
-fetch("https://catfact.ninja/fact")
-  .then(data => data.json())
-  .then(data => {
-    document.getElementById("cat-fact").innerHTML = data.fact;
-  });
--- a/dist/scripts/link.js
+++ b/dist/scripts/link.js
@ -1,19 +1,3 @@
-document.addEventListener("DOMContentLoaded", () => {
-  const params = new Proxy(new URLSearchParams(window.location.search), {
-    get: (searchParams, prop) => searchParams.get(prop),
-  });
-
-
-  if (params.link !== null) {
-    let link = `${window.location.origin}/download/${params.link}`;
-
-    let link_el = document.getElementById("link");
-
-    link_el.href = link;
-    link_el.innerHTML = link;
-  }
-});
-
 function clipboard() {
  let copyText = document.getElementById("link");

--- a/src/main.rs
+++ b/src/main.rs
@ -51,9 +51,9 @@ async fn main() -> io::Result<()> {
 }

 async fn welcome() -> impl IntoResponse {
-    let cat_fact = views::get_cat_fact().await;
+    let fact = views::get_cat_fact().await;
    Html(ssr::render(move || {
-        leptos::view! { <WelcomePage fact=cat_fact /> }
+        leptos::view! { <WelcomePage fact /> }
    }))
 }

--- a/src/router/download.rs
+++ b/src/router/download.rs
@ -1,7 +1,6 @@
 use axum::{
    body::Body,
    extract::State,
-    http::HeaderMap,
    response::{IntoResponse, Redirect},
    routing::get,
    Router,
@ -17,20 +16,10 @@ pub fn get_download_router() -> Router<AppState> {

 async fn download(
    axum::extract::Path(id): axum::extract::Path<String>,
-    headers: HeaderMap,
    State(state): State<AppState>,
 ) -> Result<axum::response::Response, (StatusCode, String)> {
    {
        let mut records = state.records.lock().await;
-        if headers.get("hx-request").is_some() {
-            return Ok(axum::http::Response::builder()
-                .header("HX-Redirect", format!("/download/{id}"))
-                .status(204)
-                .body("".to_owned())
-                .unwrap()
-                .into_response());
-        }
-
        if let Some(record) = records
            .get_mut(&id)
            .filter(|record| record.can_be_downloaded())
--- a/src/router/link.rs
+++ b/src/router/link.rs
@ -28,9 +28,7 @@ async fn link(
        {
            return Ok(Html(ssr::render({
                let record = record.clone();
-                || {
-                    leptos::view! { <DownloadLinkPage id=id record=record /> }
-                }
+                || leptos::view! { <DownloadLinkPage id record /> }
            })));
        }
    }
--- a/src/router/records.rs
+++ b/src/router/records.rs
@ -4,6 +4,7 @@ use axum::{
    routing::get,
    Json, Router,
 };
+use leptos::CollectView;

 use crate::{util::ssr, AppState, HtmxPage};

@ -22,31 +23,32 @@ pub(crate) async fn records(State(state): State<AppState>) -> impl IntoResponse
 // this behind some kind of authentication
 pub async fn records_links(State(state): State<AppState>) -> impl IntoResponse {
    let records = state.records.lock().await.clone();
+
+    let records_list_view = records
+        .keys()
+        .map(|key| {
+            leptos::view! {
+                <li class="link-wrapper">
+                    <a href="/link/{key}">{key}</a>
+                    <button
+                        style="margin-left: 1em;"
+                        hx-target="closest .link-wrapper"
+                        hx-swap="outerHTML"
+                        hx-delete="/link/{key}"
+                    >
+                        "X"
+                    </button>
+                </li>
+            }
+        })
+        .collect_view();
+
    Html(ssr::render(move || {
        leptos::view! {
            <HtmxPage>
                <div class="form-wrapper">
                    <div class="column-container">
-                        <ul>
-                            {records
-                                .keys()
-                                .map(|key| {
-                                    leptos::view! {
-                                        <li class="link-wrapper">
-                                            <a href="/link/{key}">{key}</a>
-                                            <button
-                                                style="margin-left: 1em;"
-                                                hx-target="closest .link-wrapper"
-                                                hx-swap="outerHTML"
-                                                hx-delete="/link/{key}"
-                                            >
-                                                X
-                                            </button>
-                                        </li>
-                                    }
-                                })
-                                .collect::<Vec<_>>()}
-                        </ul>
+                        <ul>{records_list_view}</ul>
                    </div>
                </div>
            </HtmxPage>
--- a/src/router/upload.rs
+++ b/src/router/upload.rs
@ -92,9 +92,7 @@ async fn upload_to_zip(
        .status(200)
        .header("Content-Type", "text/html")
        .header("HX-Push-Url", format!("/link/{}", &id))
-        .body(ssr::render(|| {
-            leptos::view! { <LinkView id record /> }
-        }))
+        .body(ssr::render(|| leptos::view! { <LinkView id record /> }))
        .unwrap();

    Ok(response)
--- a/src/views/base_page.rs
+++ b/src/views/base_page.rs
@ -19,7 +19,7 @@ pub fn HtmxPage(children: Children) -> impl IntoView {
        </head>

        <body>
-            <h1>NyaZoom<sup>2</sup></h1>
+            <h1>"NyaZoom"<sup>"2"</sup></h1>
            {children()}
        </body>
    }
--- a/src/views/links.rs
+++ b/src/views/links.rs
@ -24,7 +24,7 @@ pub fn LinkView(id: String, record: UploadRecord) -> impl IntoView {
        <div class="column-container">
            <div class="link-wrapper">
                <a id="link" href="/download/{id}">
-                    Download Now!
+                    "Download Now!"
                </a>
            </div>

@ -40,7 +40,7 @@ pub fn LinkView(id: String, record: UploadRecord) -> impl IntoView {
            </button>

            <a href="/" class="return-button">
-                Return to home
+                "Return to home"
            </a>
        </div>
    }
--- a/src/views/welcome.rs
+++ b/src/views/welcome.rs
@ -38,7 +38,7 @@ pub fn WelcomeView(fact: String) -> impl IntoView {
                data-multiple-caption="{{count}} files selected"
                multiple
            />
-            <label for="file">Select Files</label>
+            <label for="file">"Select Files"</label>

            <input type="submit" value="Get Link~" />
            <p id="cat-fact">{fact}</p>
Author	SHA1	Message	Date
Zynh Ludwig	b167d6d586	mass view refactoring	2024-08-30 23:23:13 -07:00
Zynh Ludwig	d85ccdf025	remove unused header check	2024-08-30 23:16:18 -07:00
Zynh Ludwig	92d756741a	delay lock until it is needed	2024-08-30 23:08:32 -07:00
Zynh Ludwig	7f62c9b6a8	simpler render syntax	2024-08-30 23:06:54 -07:00
Zynh Ludwig	c9aac19f8b	leptos CollectView	2024-08-30 21:31:35 -07:00
Zynh Ludwig	139ec47e5d	remove unused javascript page	2024-08-30 20:29:40 -07:00
Zynh Ludwig	57479e144d	remove unused javascript	2024-08-30 20:27:37 -07:00