From b0e46a5ed681f375504f01487753bfb2d908e84c Mon Sep 17 00:00:00 2001
From: phga <phga@posteo.de>
Date: Sat, 26 Nov 2022 23:58:43 +0100
Subject: [PATCH] fix: Removed last couple instances of window.location

---
 rust_solid_cassandra/frontend/src/pages/Home.tsx | 4 +---
 rust_solid_cassandra/frontend/src/ui/Navbar.tsx  | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/rust_solid_cassandra/frontend/src/pages/Home.tsx b/rust_solid_cassandra/frontend/src/pages/Home.tsx
index f86ec94..b5b7209 100644
--- a/rust_solid_cassandra/frontend/src/pages/Home.tsx
+++ b/rust_solid_cassandra/frontend/src/pages/Home.tsx
@@ -191,9 +191,7 @@ const Home: Component = () => {
               <Button
                 backgroundColor='red'
                 onClick={() => {
-                  RestClient.DELETE(`/todo/${todo.id}`).then(
-                    () => (window.location.href = '/')
-                  );
+                  RestClient.DELETE(`/todo/${todo.id}`).then(() => fetchTodos());
                 }}
               >
                 🗑
diff --git a/rust_solid_cassandra/frontend/src/ui/Navbar.tsx b/rust_solid_cassandra/frontend/src/ui/Navbar.tsx
index e0f9f9a..6108da9 100644
--- a/rust_solid_cassandra/frontend/src/ui/Navbar.tsx
+++ b/rust_solid_cassandra/frontend/src/ui/Navbar.tsx
@@ -1,4 +1,4 @@
-import { useNavigate } from '@solidjs/router';
+import { A, useNavigate } from '@solidjs/router';
 import { Component, Show } from 'solid-js';
 import RestClient from '../api/RestClient';
 import { user, setUser } from '../App';
@@ -9,12 +9,12 @@ const Navbar: Component = () => {
   return (
     <div class='flex justify-between items-center bg-sh-bg p-3'>
       <div class='flex items-center'>
-        <a
+        <A
           href='/'
           class='pl-2 text-xl font-bold no-underline text-sh-yellow hover:text-sh-yellowM1'
         >
           Just todo it!
-        </a>
+        </A>
       </div>
       <h1 class='flex -ml-20 text-xl font-bold no-underline text-sh-yellow'>
         Hey {user().login}!
@@ -33,7 +33,7 @@ const Navbar: Component = () => {
           onClick={() => {
             RestClient.DELETE('/logout');
             setUser({ id: '', login: '' });
-            ('/login');
+            nav('/login');
           }}
           backgroundColor='magenta'
           color='black'