Cargo.lock

@@ -816,7 +816,7 @@ dependencies = [
 
 [[package]]
 name = "file-service"
-version = "0.1.1"
+version = "0.1.0"
 dependencies = [
  "base64ct",
  "build_html",

file-service/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "file-service"
-version = "0.1.1"
+version = "0.1.0"
 authors = ["savanni@luminescent-dreams.com"]
 edition = "2018"
 

file-service/src/handlers.rs

@@ -9,8 +9,6 @@ use warp::{filters::multipart::FormData, http::Response, multipart::Part};
 
 use crate::{pages, App, AuthToken, FileId, FileInfo, ReadFileError, SessionToken};
 
-const CSS: &str = include_str!("../templates/style.css");
-
 pub async fn handle_index(
     app: App,
     token: Option<SessionToken>,
@@ -24,13 +22,6 @@ pub async fn handle_index(
     }
 }
 
-pub async fn handle_css() -> Result<Response<String>, Error> {
-    Response::builder()
-        .header("content-type", "text/css")
-        .status(StatusCode::OK)
-        .body(CSS.to_owned())
-}
-
 pub fn render_auth_page(message: Option<String>) -> Result<Response<String>, Error> {
     Response::builder()
         .status(StatusCode::OK)

file-service/src/html.rs

@@ -1,38 +1,5 @@
 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 {
     path: String,
@@ -74,11 +41,11 @@ impl Html for Form {
             None => "".to_owned(),
         };
         format!(
-            "<form action=\"{path}\" method=\"{method}\" {encoding}\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(),
+            elements = self.elements.to_html_string()
         )
     }
 }
@@ -95,7 +62,7 @@ pub struct Input {
     name: String,
     id: Option<String>,
     value: Option<String>,
-    attributes: Attributes,
+    content: Option<String>,
 }
 
 impl Html for Input {
@@ -108,15 +75,14 @@ impl Html for Input {
             Some(ref value) => format!("value=\"{}\"", value),
             None => "".to_owned(),
         };
-        let attrs = self.attributes.to_string();
 
         format!(
-            "<input type=\"{ty}\" name=\"{name}\" {id} {value} {attrs} />\n",
+            "<input type=\"{ty}\" name=\"{name}\" {id} {value}>{content}</input>\n",
             ty = self.ty,
             name = self.name,
             id = id,
             value = value,
-            attrs = attrs,
+            content = self.content.clone().unwrap_or("".to_owned()),
         )
     }
 }
@@ -128,7 +94,7 @@ impl Input {
             name: name.to_owned(),
             id: None,
             value: None,
-            attributes: Attributes::default(),
+            content: None,
         }
     }
 
@@ -142,18 +108,12 @@ impl Input {
         self
     }
 
-    pub fn with_attributes<'a>(
+    /*
-        mut self,
+    pub fn with_content(mut self, val: &str) -> Self {
-        values: impl IntoIterator<Item = (&'a str, &'a str)>,
+        self.content = Some(val.to_owned());
-    ) -> Self {
-        self.attributes = Attributes(
-            values
-                .into_iter()
-                .map(|(a, b)| (a.to_owned(), b.to_owned()))
-                .collect::<Vec<(String, String)>>(),
-        );
         self
     }
+    */
 }
 
 #[derive(Clone, Debug)]
@@ -186,7 +146,6 @@ pub struct Button {
     ty: Option<String>,
     name: Option<String>,
     label: String,
-    attributes: Attributes,
 }
 
 impl Button {
@@ -195,7 +154,6 @@ impl Button {
             ty: None,
             name: None,
             label: label.to_owned(),
-            attributes: Attributes::default(),
         }
     }
 
@@ -203,19 +161,6 @@ 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 {
@@ -229,10 +174,9 @@ impl Html for Button {
             None => "".to_owned(),
         };
         format!(
-            "<button {ty} {name} {attrs}>{label}</button>",
+            "<button {ty} {name}>{label}</button>",
             name = name,
-            label = self.label,
+            label = self.label
-            attrs = self.attributes.to_string()
         )
     }
 }
@@ -240,37 +184,18 @@ 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!(
+        format!("<img src={path} />", path = self.path,)
-            "<img src={path} {attrs} />",
-            path = self.path,
-            attrs = self.attributes.to_string()
-        )
     }
 }

file-service/src/main.rs

@@ -1,7 +1,7 @@
 extern crate log;
 
 use cookie::Cookie;
-use handlers::{file, handle_auth, handle_css, handle_upload, thumbnail};
+use handlers::{file, handle_auth, handle_upload, thumbnail};
 use std::{
     collections::{HashMap, HashSet},
     convert::Infallible,
@@ -119,8 +119,6 @@ pub async fn main() {
         .and(maybe_with_session())
         .then(handle_index);
 
-    let styles = warp::path!("css").and(warp::get()).then(handle_css);
-
     let auth = warp::path!("auth")
         .and(warp::post())
         .and(with_app(app.clone()))
@@ -147,8 +145,7 @@ pub async fn main() {
         .then(move |id, old_etags, app: App| file(app, id, old_etags));
 
     let server = warp::serve(
-        root.or(styles)
+        root.or(auth)
-            .or(auth)
             .or(upload_via_form)
             .or(thumbnail)
             .or(file)

file-service/src/pages.rs

@@ -5,48 +5,35 @@ use file_service::{FileHandle, FileId, ReadFileError};
 pub fn auth(_message: Option<String>) -> build_html::HtmlPage {
     build_html::HtmlPage::new()
         .with_title("Authentication")
-        .with_stylesheet("/css")
-        .with_container(
-            Container::new(ContainerType::Div)
-                .with_attributes([("class", "authentication-page")])
-                .with_container(
-                    Container::new(ContainerType::Div)
-                        .with_attributes([("class", "card authentication-form")])
         .with_html(
             Form::new()
                 .with_path("/auth")
                 .with_method("post")
                 .with_container(
                     Container::new(ContainerType::Div)
-                                        .with_attributes([("class", "authentication-form__label")])
+                        .with_html(Input::new("token", "token").with_id("for-token-input"))
-                                        .with_html(Label::new("for-token-input", "Authentication")),
+                        .with_html(Label::new("for-token-input", "Authentication Token")),
-                                )
-                                .with_container(
-                                    Container::new(ContainerType::Div)
-                                        .with_attributes([("class", "authentication-form__input")])
-                                        .with_html(
-                                            Input::new("token", "token")
-                                                .with_id("for-token-input")
-                                                .with_attributes([("size", "50")]),
-                                        ),
-                                ),
-                        ),
                 ),
         )
 }
 
 pub fn gallery(handles: Vec<Result<FileHandle, ReadFileError>>) -> build_html::HtmlPage {
     let mut page = build_html::HtmlPage::new()
-        .with_title("Gallery")
+        .with_title("Admin list of files")
-        .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_attributes([("class", "gallery-page")])
+                        .with_html(Input::new("file", "file").with_id("for-selector-input"))
-                .with_header(1, "Gallery")
+                        .with_html(Label::new("for-selector-input", "Select a file")),
-                .with_html(upload_form()),
+                )
+                .with_html(Button::new("Upload file").with_type("submit")),
         );
 
-    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(
@@ -61,42 +48,19 @@ pub fn gallery(handles: Vec<Result<FileHandle, ReadFileError>>) -> build_html::H
                 .with_attributes(vec![("class", "file")])
                 .with_paragraph(format!("{:?}", err)),
         };
-        gallery.add_container(container);
+        page.add_container(container)
     }
-    page.add_container(gallery);
     page
 }
 
-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)
+    let mut container = Container::new(ContainerType::Div).with_attributes(vec![("class", "file")]);
-        .with_attributes(vec![("class", "card thumbnail")])
+    let tn = Container::new(ContainerType::Div)
-        .with_html(
+        .with_attributes(vec![("class", "thumbnail")])
-            Container::new(ContainerType::Div).with_link(
+        .with_link(
             format!("/{}", **id),
-                Image::new(&format!("{}/tn", **id))
+            Image::new(&format!("{}/tn", **id)).to_html_string(),
-                    .with_attributes([("class", "thumbnail__image")])
+        );
-                    .to_html_string(),
+    container.add_html(tn);
-            ),
+    container
-        )
 }

file-service/templates/style.css

@@ -1,83 +1,29 @@
-:root {
-    --main-bg-color: #e5f0fc;
-    --fg-color: #449dfc;
-
-    --space-small: 4px;
-    --space-medium: 8px;
-    --space-large: 12px;
-
-    --hover-low: 4px 4px 4px gray;
-}
-
 body {
     font-family: 'Ariel', sans-serif;
-    background-color: var(--main-bg-color);
 }
 
-.card {
+.files {
-    border: 1px solid black;
-    border-radius: 5px;
-    box-shadow: var(--hover-low);
-    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 {
-}
-
-.authentication-form__label {
-    margin: var(--space-small);
-}
-
-.authentication-form__input {
-    margin: var(--space-small);
-}
-
-.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;
 }
 
-.thumbnail {
+.file {
-    width: 300px;
     display: flex;
-    flex-direction: column;
+    margin: 1em;
-    justify-content: space-between;
+    border: 1px solid #449dfc;
+    border-radius: 5px;
+    padding: 1em;
 }
 
-.thumbnail__image {
+.thumbnail {
+    max-width: 320px;
+    margin: 1em;
+}
+
+img {
     max-width: 100%;
-    border: none;
 }
 
-/*
 [type="submit"] {
     border-radius: 1em;
     margin: 1em;
@@ -85,10 +31,15 @@ body {
 }
 
 .uploadform {
+    display: flex;
+    margin: 1em;
+    background-color: #e5f0fc;
+    border: 1px solid #449dfc;
+    border-radius: 5px;
+    padding: 1em;
 }
-*/
 
-    /*
+/* https://benmarshall.me/styling-file-inputs/ */
 [type="file"] {
     border: 0;
     clip: rect(0, 0, 0, 0);
@@ -120,30 +71,12 @@ body {
     outline: 1px dotted #000;
     outline: -webkit-focus-ring-color auto 5px;
 }
-*/
 
-@media screen and (max-width: 1080px) { /* This is the screen width of a OnePlus 8 */
+@media screen and (max-width: 980px) { /* This is the screen width of a OnePlus 5t */
     body {
         font-size: xx-large;
     }
 
-    .authentication-form {
-        width: 100%;
-    }
-
-    .upload-form__selector {
-        font-size: larger;
-    }
-
-    .upload-form__button {
-        font-size: larger;
-    }
-
-    .thumbnail {
-        width: 100%;
-    }
-
-    /*
     [type="submit"] {
         font-size: xx-large;
         width: 100%;
@@ -167,5 +100,4 @@ body {
         flex-direction: column;
         width: 100%;
     }
-    */
 }