From ac52322b2b25af8e50ac462d29e26ae7beb667e1 Mon Sep 17 00:00:00 2001 From: willem640 Date: Wed, 24 May 2023 14:48:15 +0000 Subject: [PATCH] Add helper, updaet TODO, add app.db to gitignore --- .gitignore | 1 + TODO | 3 ++- src/helpers.rs | 18 ++++++++++++++++++ src/main.rs | 8 ++++++-- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 src/helpers.rs diff --git a/.gitignore b/.gitignore index ea8c4bf..4c977a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +app.db \ No newline at end of file diff --git a/TODO b/TODO index 59c20e5..886a119 100644 --- a/TODO +++ b/TODO @@ -6,6 +6,7 @@ - ip blacklist - clear/delete hits - move db operations out of db_delegate + - email notification on hit - ORM? - async? - - pipelining? \ No newline at end of file + - pipelining? diff --git a/src/helpers.rs b/src/helpers.rs new file mode 100644 index 0000000..a18ff1d --- /dev/null +++ b/src/helpers.rs @@ -0,0 +1,18 @@ +use rouille::Response; + +pub fn javascript_redirect(path: &str) -> Response { + Response::html(format!(" + + + + Redirecting... + + + + +

Redirecting...

+ + ")) +} \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 4c1cf64..dc7790c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,6 +8,7 @@ use pixel::{Hit, PixelManager, PixelManagerDelegate, TrackingPixel, User}; mod db; mod pixel; +mod helpers; fn main() { @@ -162,7 +163,8 @@ fn create_pixel(request: &Request, manager_delegate: &PixelManagerDelegate) -> R Ok(pixel) => pixel, Err(_) => return Response::empty_400() }; - Response::redirect_303("/manage") + // Response::redirect_303("/manage") + helpers::javascript_redirect("/manage") } fn delete_pixel(request: &Request, manager_delegate: &PixelManagerDelegate) -> Response { @@ -186,7 +188,9 @@ fn delete_pixel(request: &Request, manager_delegate: &PixelManagerDelegate) -> R } else { return Response::empty_400(); // could not find pixel } - Response::redirect_303("/manage") + // Response::redirect_303("/manage") + helpers::javascript_redirect("/manage") + } fn register_hit(pixel_id: &str, request: &Request, manager_delegate: &PixelManagerDelegate) {