diff --git a/src/main.rs b/src/main.rs index f31c16b3..17b273da 100644 --- a/src/main.rs +++ b/src/main.rs @@ -98,6 +98,9 @@ pub type AppData = actix_web::web::Data>; #[actix_web::main] async fn main() -> std::io::Result<()> { use api::v1; + + env::set_var("RUST_LOG", "info"); + pretty_env_logger::init(); info!( "{}: {}.\nFor more information, see: {}\nBuild info:\nVersion: {} commit: {}", diff --git a/src/pages/panel/sitekey/mod.rs b/src/pages/panel/sitekey/mod.rs index 73d890d5..f4cf6d85 100644 --- a/src/pages/panel/sitekey/mod.rs +++ b/src/pages/panel/sitekey/mod.rs @@ -31,7 +31,7 @@ pub mod routes { Sitekey { list: "/sitekey/list", add: "/sitekey/add", - view: "/sitekey/{key}/view", + view: "/sitekey/{key}", } } } diff --git a/src/pages/panel/sitekey/view.rs b/src/pages/panel/sitekey/view.rs index d5ba868c..f1cc6a83 100644 --- a/src/pages/panel/sitekey/view.rs +++ b/src/pages/panel/sitekey/view.rs @@ -125,7 +125,7 @@ mod test { let app = get_app!(data).await; - let url = format!("/sitekey/{}/view", &key.key); + let url = format!("/sitekey/{}/", &key.key); let list_sitekey_resp = test::call_service( &app, diff --git a/src/settings.rs b/src/settings.rs index 043af0ef..912bc307 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -18,7 +18,7 @@ use std::env; use std::path::Path; use config::{Config, ConfigError, Environment, File}; -use log::debug; +use log::{debug, warn}; use serde::Deserialize; use url::Url; @@ -138,7 +138,7 @@ impl Settings { Ok(val) => { s.set("server.port", val).unwrap(); } - Err(e) => println!("couldn't interpret PORT: {}", e), + Err(e) => warn!("couldn't interpret PORT: {}", e), } match env::var("DATABASE_URL") { @@ -147,7 +147,7 @@ impl Settings { let database_conf = DatabaseBuilder::extract_database_url(&url); set_from_database_url(&mut s, &database_conf); } - Err(e) => println!("couldn't interpret DATABASE_URL: {}", e), + Err(e) => warn!("couldn't interpret DATABASE_URL: {}", e), } set_database_url(&mut s); diff --git a/static/cache/img/svg/check.svg b/static/cache/img/svg/check.svg new file mode 100644 index 00000000..1c209899 --- /dev/null +++ b/static/cache/img/svg/check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/cache/img/svg/edit.svg b/static/cache/img/svg/edit.svg new file mode 100644 index 00000000..ec7b4ca2 --- /dev/null +++ b/static/cache/img/svg/edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/cache/img/svg/x-circle.svg b/static/cache/img/svg/x-circle.svg new file mode 100644 index 00000000..94aad5e5 --- /dev/null +++ b/static/cache/img/svg/x-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/index.ts b/templates/index.ts index 03f8c19c..58f60339 100644 --- a/templates/index.ts +++ b/templates/index.ts @@ -33,6 +33,7 @@ import './components/error/main.scss'; import './components/showPassword/main.scss'; import './panel/css/main.scss'; import './panel/navbar/main.scss'; +import './panel/notifications/main.scss'; import './panel/header/taskbar/main.scss'; import './panel/help-banner/main.scss'; import './panel/sitekey/add/css/main.scss'; diff --git a/templates/panel/header/taskbar/main.scss b/templates/panel/header/taskbar/main.scss index e2c7aaa8..98f86f18 100644 --- a/templates/panel/header/taskbar/main.scss +++ b/templates/panel/header/taskbar/main.scss @@ -43,14 +43,17 @@ opacity: 0.8; width: 1.5rem; margin: auto 20px; -} - -.taskbar__icon { + border-radius: 50px; color: $light-text; } .taskbar__icon:hover { cursor: grab; + background-color: $light-grey; + color: $green; + background-color: $light-grey; + filter: invert(58%) sepia(60%) saturate(331%) hue-rotate(76deg) + brightness(91%) contrast(92%); } .taskbar__add-site { diff --git a/templates/panel/index.html b/templates/panel/index.html index 51387c50..83e0ca50 100644 --- a/templates/panel/index.html +++ b/templates/panel/index.html @@ -19,7 +19,7 @@