Ready for first tests

MBoui · Feb 12, 2022 · eca84d5 · eca84d5
1 parent 0f12443
commit eca84d5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/public/default.css b/public/default.css
@@ -1,3 +1,5 @@
+@import url('./fonts/fonts.css');
+
 button {
     outline: none;
     border: none;
@@ -30,6 +32,7 @@ input {
 
     color: #dddddd;
     background-color: #444444;
+    font-family: NotoSans;
 }
 
 input:hover {

diff --git a/src/App.svelte b/src/App.svelte
@@ -26,9 +26,9 @@ onMount(() => {
 	<Titlebar />
 
 	<div class="background">
-		<Router primary={true}>
+		<Router>
 			<Route path="/"><Login /></Route>
-			<Route path="home"><Home /></Route>
+			<Route path="home" primary={true}><Home /></Route>
 		</Router>
 	</div>
 

diff --git a/src/core/storage.ts b/src/core/storage.ts
@@ -3,10 +3,10 @@ import * as store from "@/stores";
 export default function initStorage() {
 
     // Save the username into local storage.
-    if (localStorage.getItem("username") != null && localStorage.getItem("username") != 'null')
-		store.user.set({ id: '...', name: localStorage.getItem("username") });
+    if (sessionStorage.getItem("username") != null && sessionStorage.getItem("username") != 'null')
+		store.user.set({ id: '...', name: sessionStorage.getItem("username") });
     else store.user.set(null);
-	store.user.subscribe(user => localStorage.setItem("username", (user ? user.name : null)));
+	store.user.subscribe(user => sessionStorage.setItem("username", (user ? user.name : null)));
 
     // Save the global chat into local storage.
     if (localStorage.getItem("globalchat") != null && localStorage.getItem("globalchat") != 'null')

diff --git a/src/nav/Home.svelte b/src/nav/Home.svelte
@@ -13,7 +13,7 @@ onMount(() => {
     store.user.subscribe((user) => {
         currentUser = user;
     });
-	if (!currentUser) navigate('/');
+	if (!currentUser || !localStorage.getItem("username")) navigate('/');
 });
 
 </script>

diff --git a/src/nav/Login.svelte b/src/nav/Login.svelte
@@ -71,7 +71,7 @@ const join = () => {
         input {
             border-top-right-radius: 0;
             border-bottom-right-radius: 0;
-            font-family: CascadiaCode;
+            font-family: NotoSans;
         }
 
         button {