Style the upload form

file-service/src/html.rs

@@ -1,8 +1,40 @@
 use build_html::{self, Html, HtmlContainer};
 
+#[derive(Clone, Debug, Default)]
+pub struct Attributes(Vec<(String, String)>);
+
+/*
+impl FromIterator<(String, String)> for Attributes {
+    fn from_iter<T>(iter: T) -> Self
+    where
+        T: IntoIterator<Item = (String, String)>,
+    {
+        Attributes(iter.collect::<Vec<(String, String)>>())
+    }
+}
+
+impl FromIterator<(&str, &str)> for Attributes {
+    fn from_iter<T>(iter: T) -> Self
+    where
+        T: IntoIterator<Item = (&str, &str)>,
+    {
+        unimplemented!()
+    }
+}
+*/
+
+impl ToString for Attributes {
+    fn to_string(&self) -> String {
+        self.0
+            .iter()
+            .map(|(key, value)| format!("{}=\"{}\"", key, value))
+            .collect::<Vec<String>>()
+            .join(" ")
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct Form {
-    classes: Option<String>,
     path: String,
     method: String,
     encoding: Option<String>,
@@ -12,7 +44,6 @@ pub struct Form {
 impl Form {
     pub fn new() -> Self {
         Self {
-            classes: None,
             path: "/".to_owned(),
             method: "get".to_owned(),
             encoding: None,
@@ -38,21 +69,16 @@ impl Form {
 
 impl Html for Form {
     fn to_html_string(&self) -> String {
-        let classes = match self.classes {
-            Some(ref classes) => format!("class=\"{}\"", classes),
-            None => "".to_owned(),
-        };
         let encoding = match self.encoding {
             Some(ref encoding) => format!("enctype=\"{encoding}\"", encoding = encoding),
             None => "".to_owned(),
         };
         format!(
-            "<form action=\"{path}\" method=\"{method}\" {encoding} {classes}>\n{elements}\n</form>\n",
+            "<form action=\"{path}\" method=\"{method}\" {encoding}\n{elements}\n</form>\n",
             path = self.path,
             method = self.method,
             encoding = encoding,
             elements = self.elements.to_html_string(),
-            classes = classes,
         )
     }
 }
@@ -69,7 +95,7 @@ pub struct Input {
     name: String,
     id: Option<String>,
     value: Option<String>,
-    attributes: Vec<(String, String)>,
+    attributes: Attributes,
 }
 
 impl Html for Input {
@@ -82,12 +108,7 @@ impl Html for Input {
             Some(ref value) => format!("value=\"{}\"", value),
             None => "".to_owned(),
         };
-        let attrs = self
-            .attributes
-            .iter()
-            .map(|(key, value)| format!("{}=\"{}\"", key, value))
-            .collect::<Vec<String>>()
-            .join(" ");
+        let attrs = self.attributes.to_string();
 
         format!(
             "<input type=\"{ty}\" name=\"{name}\" {id} {value} {attrs} />\n",
@@ -107,7 +128,7 @@ impl Input {
             name: name.to_owned(),
             id: None,
             value: None,
-            attributes: vec![],
+            attributes: Attributes::default(),
         }
     }
 
@@ -125,10 +146,12 @@ impl Input {
         mut self,
         values: impl IntoIterator<Item = (&'a str, &'a str)>,
     ) -> Self {
-        self.attributes = values
+        self.attributes = Attributes(
+            values
                 .into_iter()
                 .map(|(a, b)| (a.to_owned(), b.to_owned()))
-            .collect::<Vec<(String, String)>>();
+                .collect::<Vec<(String, String)>>(),
+        );
         self
     }
 }
@@ -163,6 +186,7 @@ pub struct Button {
     ty: Option<String>,
     name: Option<String>,
     label: String,
+    attributes: Attributes,
 }
 
 impl Button {
@@ -171,6 +195,7 @@ impl Button {
             ty: None,
             name: None,
             label: label.to_owned(),
+            attributes: Attributes::default(),
         }
     }
 
@@ -178,6 +203,19 @@ impl Button {
         self.ty = Some(ty.to_owned());
         self
     }
+
+    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 Button {
@@ -191,9 +229,10 @@ impl Html for Button {
             None => "".to_owned(),
         };
         format!(
-            "<button {ty} {name}>{label}</button>",
+            "<button {ty} {name} {attrs}>{label}</button>",
             name = name,
-            label = self.label
+            label = self.label,
+            attrs = self.attributes.to_string()
         )
     }
 }
@@ -201,18 +240,37 @@ 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} />", path = self.path,)
+        format!(
+            "<img src={path} {attrs} />",
+            path = self.path,
+            attrs = self.attributes.to_string()
+        )
     }
 }

file-service/src/pages.rs

@@ -11,7 +11,7 @@ pub fn auth(_message: Option<String>) -> build_html::HtmlPage {
                 .with_attributes([("class", "authentication-page")])
                 .with_container(
                     Container::new(ContainerType::Div)
-                        .with_attributes([("class", "authentication-form")])
+                        .with_attributes([("class", "card authentication-form")])
                         .with_html(
                             Form::new()
                                 .with_path("/auth")
@@ -37,22 +37,16 @@ pub fn auth(_message: Option<String>) -> build_html::HtmlPage {
 
 pub fn gallery(handles: Vec<Result<FileHandle, ReadFileError>>) -> build_html::HtmlPage {
     let mut page = build_html::HtmlPage::new()
-        .with_title("Admin list of files")
+        .with_title("Gallery")
         .with_stylesheet("/css")
-        .with_header(1, "Admin list of files")
-        .with_html(
-            Form::new()
-                .with_path("/upload")
-                .with_method("post")
-                .with_encoding("multipart/form-data")
         .with_container(
             Container::new(ContainerType::Div)
-                        .with_html(Input::new("file", "file").with_id("for-selector-input"))
-                        .with_html(Label::new("for-selector-input", "Select a file")),
-                )
-                .with_html(Button::new("Upload file").with_type("submit")),
+                .with_attributes([("class", "gallery-page")])
+                .with_header(1, "Gallery")
+                .with_html(upload_form()),
         );
 
+    let mut gallery = Container::new(ContainerType::Div).with_attributes([("class", "gallery")]);
     for handle in handles {
         let container = match handle {
             Ok(ref handle) => thumbnail(&handle.id).with_html(
@@ -67,19 +61,42 @@ pub fn gallery(handles: Vec<Result<FileHandle, ReadFileError>>) -> build_html::H
                 .with_attributes(vec![("class", "file")])
                 .with_paragraph(format!("{:?}", err)),
         };
-        page.add_container(container)
+        gallery.add_container(container);
     }
+    page.add_container(gallery);
     page
 }
 
-pub fn thumbnail(id: &FileId) -> Container {
-    let mut container = Container::new(ContainerType::Div).with_attributes(vec![("class", "file")]);
-    let tn = Container::new(ContainerType::Div)
-        .with_attributes(vec![("class", "thumbnail")])
-        .with_link(
-            format!("/{}", **id),
-            Image::new(&format!("{}/tn", **id)).to_html_string(),
-        );
-    container.add_html(tn);
-    container
+pub fn upload_form() -> Form {
+    Form::new()
+        .with_path("/upload")
+        .with_method("post")
+        .with_encoding("multipart/form-data")
+        .with_container(
+            Container::new(ContainerType::Div)
+                .with_attributes([("class", "card upload-form")])
+                .with_html(Input::new("file", "file").with_attributes([
+                    ("id", "for-selector-input"),
+                    ("placeholder", "select file"),
+                    ("class", "upload-form__selector"),
+                ]))
+                .with_html(
+                    Button::new("Upload file")
+                        .with_attributes([("class", "upload-form__button")])
+                        .with_type("submit"),
+                ),
+        )
+}
+
+pub fn thumbnail(id: &FileId) -> Container {
+    Container::new(ContainerType::Div)
+        .with_attributes(vec![("class", "card thumbnail")])
+        .with_html(
+            Container::new(ContainerType::Div).with_link(
+                format!("/{}", **id),
+                Image::new(&format!("{}/tn", **id))
+                    .with_attributes([("class", "thumbnail__image")])
+                    .to_html_string(),
+            ),
+        )
 }

file-service/templates/style.css

@@ -2,9 +2,9 @@
     --main-bg-color: #e5f0fc;
     --fg-color: #449dfc;
 
-    --px-4: 4px;
-    --px-8: 8px;
-    --px-12: 12px;
+    --space-small: 4px;
+    --space-medium: 8px;
+    --space-large: 12px;
 
     --hover-low: 4px 4px 4px gray;
 }
@@ -14,50 +14,71 @@ body {
     background-color: var(--main-bg-color);
 }
 
+.card {
+    border: 1px solid black;
+    border-radius: 5px;
+    border-shadow: var(--hover-low);
+    padding: var(--px-12);
+    margin: var(--space-large);
+    padding: var(--space-medium);
+
+}
+
 .authentication-page {
     display: flex;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
     height: 200px;
 }
 
 .authentication-form {
-    border: 1px solid black;
-    border-radius: 5px;
-    border-shadow: var(--hover-low);
-    padding: var(--px-12);
 }
 
 .authentication-form__label {
-    margin: var(--px-4);
+    margin: var(--space-small);
 }
 
 .authentication-form__input {
-    margin: var(--px-4);
+    margin: var(--space-small);
 }
 
-.files {
+.gallery-page {
+    display: flex;
+    flex-direction: column;
+}
+
+.upload-form {
+    display: flex;
+    flex-direction: column;
+}
+
+.upload-form__selector {
+    margin: var(--space-small);
+}
+
+.upload-form__button {
+    margin: var(--space-small);
+}
+
+.gallery {
     display: flex;
     flex-wrap: wrap;
 }
 
-.file {
-    display: flex;
-    margin: 1em;
-    border: 1px solid #449dfc;
-    border-radius: 5px;
-    padding: 1em;
-}
-
 .thumbnail {
-    max-width: 320px;
-    margin: 1em;
+    max-width: 300px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
 }
 
-img {
+.thumbnail__image {
     max-width: 100%;
+    border: none;
 }
 
+/*
 [type="submit"] {
     border-radius: 1em;
     margin: 1em;
@@ -65,12 +86,10 @@ img {
 }
 
 .uploadform {
-    display: flex;
-    margin: 1em;
-    padding: 1em;
 }
+*/
 
-/* https://benmarshall.me/styling-file-inputs/ */
+    /*
 [type="file"] {
     border: 0;
     clip: rect(0, 0, 0, 0);
@@ -102,6 +121,7 @@ img {
     outline: 1px dotted #000;
     outline: -webkit-focus-ring-color auto 5px;
 }
+*/
 
 /*
 @media screen and (max-width: 980px) { /* This is the screen width of a OnePlus 5t