asonix/hyaenidae
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make more use of extension traits, change Update to Edit

Browse source
This commit is contained in:
asonix 2021-01-22 20:19:58 -06:00
parent 0591969ccd
commit b2fb2f6283
3 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
server/src/home.rs
View file

@ -1,6 +1,6 @@
use crate::{
error::Error,
extensions::SubmissionExt,
extensions::{ProfileExt, SubmissionExt},
images::IconImage,
middleware::UserProfile,
nav::NavState,
@ -94,14 +94,9 @@ impl ViewHomeState {
let file = self.cache.file_map.get(&file_id)?;
let key = file.pictrs_key()?;
let tile = Tile::new(IconImage::new(key, submission.title()))
.title(submission.title())
.description(
&author
.display_name()
.map(|dn| dn.to_owned())
.unwrap_or(format!("@{}@{}", author.handle(), author.domain())),
)
let tile = Tile::new(IconImage::new(key, &submission.title_text()))
.title(&submission.title_text())
.description(&author.name())
.link(&submission.view_path());
if submission.files().len() > 1 {

9
server/src/profiles/state.rs
View file

@ -84,13 +84,8 @@ impl ViewProfileState {
let key = file.pictrs_key()?;
let tile = Tile::new(IconImage::new(key, submission.title()))
.title(submission.title())
.description(
&author
.display_name()
.map(|dn| dn.to_owned())
.unwrap_or(format!("@{}@{}", author.handle(), author.domain())),
)
.title(&submission.title_text())
.description(&author.name())
.link(&submission.view_path());
if submission.files().len() > 1 {

10
server/templates/submissions/public.rs.html
View file

@ -14,12 +14,12 @@
@(view: &ViewSubmissionState, nav_state: &NavState)
@:home(&view.submission.title(), view.submission.description().unwrap_or(&format!("{} hosted on Hyaenidae", view.submission.title())), nav_state, {
@:home(&view.submission.title_text(), view.submission.description_text().unwrap_or(&format!("{} hosted on Hyaenidae", view.submission.title_text())), nav_state, {
@:button_js()
}, {
@:card(&Card::full_width().dark(nav_state.dark()), {
@:card_title({
@view.submission.title()
@view.submission.title_text()
})
@:card_section({
@if let Some(img) = view.image() {
@ -47,7 +47,7 @@
})
@:card_body({
@:profile_box(&view.poster(), view.submission.published(), nav_state.dark(), {
@if let Some(description) = view.submission.description() {
@if let Some(description) = view.submission.description_text() {
@description
}
})
@ -55,10 +55,10 @@
})
@if view.is_self {
@:card(&Card::full_width().dark(nav_state.dark()), {
@:card_title({ Update Submission })
@:card_title({ Edit Submission })
@:card_body({
@:button_group(&[
Button::primary("Update").href(&view.submission.update_path()),
Button::primary("Edit").href(&view.submission.update_path()),
])
})
})