Remove my custom Image struct

file-service/src/html.rs

@@ -236,92 +236,3 @@ impl Html for Button {
         )
     }
 }
-
-#[derive(Clone, Debug)]
-pub struct Image {
-    path: String,
-    attributes: Attributes,
-}
-
-impl Image {
-    pub fn new(path: &str) -> Self {
-        Self {
-            path: path.to_owned(),
-            attributes: Attributes::default(),
-        }
-    }
-
-    pub fn with_attributes<'a>(
-        mut self,
-        values: impl IntoIterator<Item = (&'a str, &'a str)>,
-    ) -> Self {
-        self.attributes = Attributes(
-            values
-                .into_iter()
-                .map(|(a, b)| (a.to_owned(), b.to_owned()))
-                .collect::<Vec<(String, String)>>(),
-        );
-        self
-    }
-}
-
-impl Html for Image {
-    fn to_html_string(&self) -> String {
-        format!(
-            "<img src={path} {attrs} />",
-            path = self.path,
-            attrs = self.attributes.to_string()
-        )
-    }
-}
-
-#[derive(Debug)]
-pub struct UnorderedList {
-    children: Vec<String>,
-    attributes: Attributes,
-}
-
-impl UnorderedList {
-    pub fn new() -> Self {
-        Self {
-            children: vec![],
-            attributes: Attributes::default(),
-        }
-    }
-
-    pub fn with_attributes<'a>(
-        mut self,
-        values: impl IntoIterator<Item = (&'a str, &'a str)>,
-    ) -> Self {
-        self.attributes = Attributes(
-            values
-                .into_iter()
-                .map(|(a, b)| (a.to_owned(), b.to_owned()))
-                .collect::<Vec<(String, String)>>(),
-        );
-        self
-    }
-}
-
-impl Html for UnorderedList {
-    fn to_html_string(&self) -> String {
-        let children = self
-            .children
-            .iter()
-            .map(|item| format!("<li>{}</li>", item.to_html_string()))
-            .collect::<Vec<String>>();
-        format!(
-            "<ul {attrs}>
-    {children}
-            </ul>",
-            attrs = self.attributes.to_string(),
-            children = children.join("\n")
-        )
-    }
-}
-
-impl HtmlContainer for UnorderedList {
-    fn add_html<H: Html>(&mut self, html: H) {
-        self.children.push(html.to_html_string())
-    }
-}

file-service/src/pages.rs

@@ -87,15 +87,16 @@ pub fn thumbnail(info: &FileInfo) -> Container {
         .with_html(
             Container::new(ContainerType::Div).with_link(
                 format!("/{}", *info.id),
-                Image::new(&format!("{}/tn", *info.id))
-                    .with_attributes([("class", "thumbnail__image")])
+                Container::default()
+                    .with_attributes([("class", "thumbnail")])
+                    .with_image(&format!("{}/tn", *info.id), "test data")
                     .to_html_string(),
             ),
         )
         .with_html(
             Container::new(ContainerType::Div)
                 .with_html(
-                    UnorderedList::new()
+                    Container::new(ContainerType::UnorderedList)
                         .with_attributes(vec![("class", "thumbnail__metadata")])
                         .with_html(info.name.clone())
                         .with_html(format!("{}", info.created.format("%Y-%m-%d"))),