From c7f8845446b17295049fc19978d2c2223b725b88 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Mon, 8 Jan 2024 13:54:14 +0300 Subject: [PATCH] Add clock --- .gitignore | 1 + server/src/alert.js | 20 ++++++++++++++------ server/src/main.rs | 2 +- server/src/view.css | 40 ++++++++++++++++++++++++++++++++++++++++ server/src/view.rs | 45 +++------------------------------------------ 5 files changed, 59 insertions(+), 49 deletions(-) create mode 100644 server/src/view.css diff --git a/.gitignore b/.gitignore index 3b90369..7ccc2f3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ !.gitignore +!*.css !*.js !*.md !*.py diff --git a/server/src/alert.js b/server/src/alert.js index 1c0b143..99d8dde 100644 --- a/server/src/alert.js +++ b/server/src/alert.js @@ -22,7 +22,6 @@ const alertIfTime = () => { }; alertIfTime(); - setInterval(() => { location.reload(); alertIfTime(); @@ -30,10 +29,19 @@ setInterval(() => { const updateClock = () => { const now = new Date(); - const hours = now.getHours().toString().padStart(2, '0'); - const minutes = now.getMinutes().toString().padStart(2, '0'); - const seconds = now.getSeconds().toString().padStart(2, '0'); - document.querySelector(".clock").innerText = `${hours}:${minutes}:${seconds}`; + const options = { + hour: "2-digit", + minute: "2-digit", + weekday: "long", + year: "numeric", + month: "long", + day: "numeric" + }; + + const dateString = now.toLocaleDateString("tr-TR", options); + + document.querySelector(".clock").innerHTML = dateString; }; -setInterval(updateClock, 1000); +updateClock(); +setInterval(updateClock, 1 * 60 * 1000); diff --git a/server/src/main.rs b/server/src/main.rs index de73848..8a51422 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -45,7 +45,7 @@ async fn main() -> io::Result<()> { .service(submit::submit_form) .service(view::view) }) - .bind(("0.0.0.0", 8080))? + .bind(("0.0.0.0", 8088))? .run() .await } diff --git a/server/src/view.css b/server/src/view.css new file mode 100644 index 0000000..61bf72b --- /dev/null +++ b/server/src/view.css @@ -0,0 +1,40 @@ +body { + font-family: sans; + background-color: #f4f4f4; + margin: 0; + padding: 20px; +} + +ul { + list-style: none; + padding: 0; +} + +ul li { + background-color: #fff; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + padding: 20px; + margin-bottom: 20px; +} + +ul li h3 { + margin-bottom: 10px; + font-size: 18px; + color: #333; +} + +ul li p { + color: #666; +} + +.clock { + position: absolute; + top: 0px; + right: 0px; + font-size: 32px; + background-color: #fff; + border-radius: 8px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + padding: 20px; +} \ No newline at end of file diff --git a/server/src/view.rs b/server/src/view.rs index 14c6fd2..326b917 100644 --- a/server/src/view.rs +++ b/server/src/view.rs @@ -48,48 +48,9 @@ async fn view(data: Data) -> web::Result { Ok(html! { (DOCTYPE) - style {r#" - body { - font-family: sans; - background-color: #f4f4f4; - margin: 0; - padding: 20px; - } - - ul { - list-style: none; - padding: 0; - } - - ul li { - background-color: #fff; - border-radius: 8px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); - padding: 20px; - margin-bottom: 20px; - } - - ul li h3 { - margin-bottom: 10px; - font-size: 18px; - color: #333; - } - - ul li p { - color: #666; - } - - .clock { - position: absolute; - top: 20px; - right: 20px; - font-size: 24px; - background-color: #fff; - border-radius: 8px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); - padding: 20px; - } - "#} + style { + (PreEscaped(embed::string!("view.css"))) + } ul id="reminders" { @for reminder in formatted_reminders {