From 0b4ae0bc3c627d9e64228b255d70c0d505907c87 Mon Sep 17 00:00:00 2001
From: Jordan Doyle <jordan@doyle.la>
Date: Mon, 20 Sep 2021 00:22:58 +0100
Subject: [PATCH] Redirect back to the page requested upon login

---
 chartered-frontend/src/index.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chartered-frontend/src/index.tsx b/chartered-frontend/src/index.tsx
index 69dd4a4..eeceeda 100644
--- a/chartered-frontend/src/index.tsx
+++ a/chartered-frontend/src/index.tsx
@@ -96,7 +96,10 @@
         } else {
           return (
             <Redirect
-              to={{ pathname: "/dashboard", state: { from: props.location } }}
+              to={{
+                pathname: props.location.state?.from?.pathname ?? "/dashboard",
+                state: { from: props.location },
+              }}
             />
           );
         }
--
rgit 0.1.3