From 4ad695eed6c2a3fa7fb164c4a0e4972dab2691d2 Mon Sep 17 00:00:00 2001 From: Lukas Stabe Date: Fri, 25 Sep 2020 05:23:23 +0200 Subject: [wip] client-side color-scheme handling --- src/file_upload.rs | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/file_upload.rs') diff --git a/src/file_upload.rs b/src/file_upload.rs index 394afbc..3f713cd 100644 --- a/src/file_upload.rs +++ b/src/file_upload.rs @@ -12,7 +12,6 @@ use std::{ use crate::errors::{self, ContextualError}; use crate::listing::{self, SortingMethod, SortingOrder}; use crate::renderer; -use crate::themes::ColorScheme; /// Create future to save file. fn save_file( @@ -109,7 +108,6 @@ fn handle_multipart( pub fn upload_file( req: HttpRequest, payload: actix_web::web::Payload, - default_color_scheme: ColorScheme, uses_random_route: bool, favicon_route: String, ) -> Pin>>> { @@ -121,7 +119,6 @@ pub fn upload_file( }; let query_params = listing::extract_query_parameters(&req); - let color_scheme = query_params.theme.unwrap_or(default_color_scheme); let upload_path = match query_params.path.clone() { Some(path) => match path.strip_prefix(Component::RootDir) { Ok(stripped_path) => stripped_path.to_owned(), @@ -137,8 +134,6 @@ pub fn upload_file( &return_path, query_params.sort, query_params.order, - color_scheme, - default_color_scheme, uses_random_route, &favicon_route, )); @@ -158,8 +153,6 @@ pub fn upload_file( &return_path, query_params.sort, query_params.order, - color_scheme, - default_color_scheme, uses_random_route, &favicon_route, )); @@ -179,8 +172,6 @@ pub fn upload_file( &return_path, query_params.sort, query_params.order, - color_scheme, - default_color_scheme, uses_random_route, &favicon_route, )); @@ -205,8 +196,6 @@ pub fn upload_file( &return_path, query_params.sort, query_params.order, - color_scheme, - default_color_scheme, uses_random_route, &favicon_route, ), @@ -222,8 +211,6 @@ fn create_error_response( return_path: &str, sorting_method: Option, sorting_order: Option, - color_scheme: ColorScheme, - default_color_scheme: ColorScheme, uses_random_route: bool, favicon_route: &str, ) -> future::Ready> { @@ -238,8 +225,6 @@ fn create_error_response( return_path, sorting_method, sorting_order, - color_scheme, - default_color_scheme, true, !uses_random_route, &favicon_route, -- cgit v1.2.3 From dab13c9bb3336aac4e44171f3074c4ce973b9782 Mon Sep 17 00:00:00 2001 From: Lukas Stabe Date: Sat, 26 Sep 2020 04:45:31 +0200 Subject: move css out of html into its own route --- src/file_upload.rs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/file_upload.rs') diff --git a/src/file_upload.rs b/src/file_upload.rs index 3f713cd..3afa755 100644 --- a/src/file_upload.rs +++ b/src/file_upload.rs @@ -110,6 +110,7 @@ pub fn upload_file( payload: actix_web::web::Payload, uses_random_route: bool, favicon_route: String, + css_route: String, ) -> Pin>>> { let conf = req.app_data::().unwrap(); let return_path = if let Some(header) = req.headers().get(header::REFERER) { @@ -136,6 +137,7 @@ pub fn upload_file( query_params.order, uses_random_route, &favicon_route, + &css_route, )); } }; @@ -155,6 +157,7 @@ pub fn upload_file( query_params.order, uses_random_route, &favicon_route, + &css_route, )); } }; @@ -174,6 +177,7 @@ pub fn upload_file( query_params.order, uses_random_route, &favicon_route, + &css_route, )); } }; @@ -198,6 +202,7 @@ pub fn upload_file( query_params.order, uses_random_route, &favicon_route, + &css_route, ), }), ) @@ -213,6 +218,7 @@ fn create_error_response( sorting_order: Option, uses_random_route: bool, favicon_route: &str, + css_route: &str, ) -> future::Ready> { errors::log_error_chain(description.to_string()); future::ok( @@ -228,6 +234,7 @@ fn create_error_response( true, !uses_random_route, &favicon_route, + &css_route, ) .into_string(), ), -- cgit v1.2.3 From 47895cad827180787a8f305ddac0372d2dbd266a Mon Sep 17 00:00:00 2001 From: Lukas Stabe Date: Thu, 1 Oct 2020 18:08:05 +0200 Subject: restore default theme cli option and add default theme dark option --- src/file_upload.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/file_upload.rs') diff --git a/src/file_upload.rs b/src/file_upload.rs index 3afa755..14aadfc 100644 --- a/src/file_upload.rs +++ b/src/file_upload.rs @@ -111,6 +111,8 @@ pub fn upload_file( uses_random_route: bool, favicon_route: String, css_route: String, + default_color_scheme: &str, + default_color_scheme_dark: &str, ) -> Pin>>> { let conf = req.app_data::().unwrap(); let return_path = if let Some(header) = req.headers().get(header::REFERER) { @@ -138,6 +140,8 @@ pub fn upload_file( uses_random_route, &favicon_route, &css_route, + default_color_scheme, + default_color_scheme_dark, )); } }; @@ -158,6 +162,8 @@ pub fn upload_file( uses_random_route, &favicon_route, &css_route, + default_color_scheme, + default_color_scheme_dark, )); } }; @@ -178,10 +184,15 @@ pub fn upload_file( uses_random_route, &favicon_route, &css_route, + default_color_scheme, + default_color_scheme_dark, )); } }; let overwrite_files = conf.overwrite_files; + let default_color_scheme = conf.default_color_scheme.clone(); + let default_color_scheme_dark = conf.default_color_scheme_dark.clone(); + Box::pin( actix_multipart::Multipart::new(req.headers(), payload) .map_err(ContextualError::MultipartError) @@ -203,6 +214,8 @@ pub fn upload_file( uses_random_route, &favicon_route, &css_route, + &default_color_scheme, + &default_color_scheme_dark, ), }), ) @@ -219,6 +232,8 @@ fn create_error_response( uses_random_route: bool, favicon_route: &str, css_route: &str, + default_color_scheme: &str, + default_color_scheme_dark: &str, ) -> future::Ready> { errors::log_error_chain(description.to_string()); future::ok( @@ -235,6 +250,8 @@ fn create_error_response( !uses_random_route, &favicon_route, &css_route, + default_color_scheme, + default_color_scheme_dark, ) .into_string(), ), -- cgit v1.2.3