Zynh0722/nyazoom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mass view refactoring

Browse source
This commit is contained in:
Zynh Ludwig 2024-08-30 23:23:13 -07:00
parent d85ccdf025
commit b167d6d586
6 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -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 /> }
}))
}

2
src/router/link.rs
View file

@ -28,7 +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 /> }
})));
}
}

21
src/router/records.rs
View file

@ -23,13 +23,8 @@ 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();
Html(ssr::render(move || {
leptos::view! {
<HtmxPage>
<div class="form-wrapper">
<div class="column-container">
<ul>
{records
let records_list_view = records
.keys()
.map(|key| {
leptos::view! {
@ -41,13 +36,19 @@ pub async fn records_links(State(state): State<AppState>) -> impl IntoResponse {
hx-swap="outerHTML"
hx-delete="/link/{key}"
>
X
"X"
</button>
</li>
}
})
.collect_view()}
</ul>
.collect_view();
Html(ssr::render(move || {
leptos::view! {
<HtmxPage>
<div class="form-wrapper">
<div class="column-container">
<ul>{records_list_view}</ul>
</div>
</div>
</HtmxPage>

2
src/views/base_page.rs
View file

@ -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>
}

4
src/views/links.rs
View file

@ -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>
}

2
src/views/welcome.rs
View file

@ -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>