diff --git a/default_static/admin.css b/default_assets/admin.css similarity index 100% rename from default_static/admin.css rename to default_assets/admin.css diff --git a/default_static/admin.js b/default_assets/admin.js similarity index 100% rename from default_static/admin.js rename to default_assets/admin.js diff --git a/default_static/favicon.ico b/default_assets/favicon.ico similarity index 100% rename from default_static/favicon.ico rename to default_assets/favicon.ico diff --git a/default_static/script.js b/default_assets/script.js similarity index 100% rename from default_static/script.js rename to default_assets/script.js diff --git a/default_static/style.css b/default_assets/style.css similarity index 100% rename from default_static/style.css rename to default_assets/style.css diff --git a/src/service/files.rs b/src/service/files.rs index a46ed06c6e2697bb95011e50f37e9be617f0049a..b5ebb5d6798bd0a7771e4cb648ca11326bfd650f 100644 --- a/src/service/files.rs +++ b/src/service/files.rs @@ -28,6 +28,8 @@ pub async fn favicon(website: web::Data<RwLock<WebSite>>) -> impl Responder { ) } +// TODO routes for robots.txt, sitemap.xml, dyn.sitemap.xml,... + fn upload_data_from_multipart_field( field: &actix_multipart::Field, ) -> Result<UploadFileData, String> { diff --git a/src/static_files/static_files.rs b/src/static_files/static_files.rs index 6f3d3dfa78cc2c19ab8a98d5692de738fe81837a..956d2109a0135483f802400cf910bb86a6815f4c 100644 --- a/src/static_files/static_files.rs +++ b/src/static_files/static_files.rs @@ -57,7 +57,7 @@ impl StaticFilesManager { )); }; - if let Err(err) = Self::copy_default_files(&dir) { + if let Err(err) = Self::copy_default_assets(&dir) { return Err(format!( "Error copying StaticFilesManager default assets directory - {}", err @@ -98,14 +98,14 @@ impl StaticFilesManager { Ok(()) } - fn copy_default_files(static_dir: &PathBuf) -> Result<(), String> { - let local_default_static = std::env::current_dir().unwrap().join("default_static"); - let default_static = static_dir.join("assets").join("default"); + fn copy_default_assets(static_dir: &PathBuf) -> Result<(), String> { + let local_default_assets = std::env::current_dir().unwrap().join("default_assets"); + let default_assets = static_dir.join("assets").join("default"); let mut cpy_options = fs_extra::dir::CopyOptions::new(); cpy_options.content_only = true; cpy_options.overwrite = true; - match fs_extra::dir::copy(local_default_static, default_static, &cpy_options) { + match fs_extra::dir::copy(local_default_assets, default_assets, &cpy_options) { Err(err) => Err(format!("{}", err)), Ok(_) => Ok(()), }