Fixed some bugs

(maxWidth bug, router bug)
MBoui · Feb 12, 2022 · fad001f · fad001f
1 parent ad656af
commit fad001f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/public/global.css b/public/global.css
@@ -27,8 +27,9 @@ main.unfocused {
 }
 
 main {
-	width: calc(100% - 3px);
-	height: calc(100% - 3px);
+	width: calc(100vw - 3px);
+	height: calc(100vh - 3px);
+	max-width: none !important;
 	position: absolute;
 	top: 0;
 	left: 0;

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -40,7 +40,8 @@ fn main() {
 async fn web_connect(window: Window, username: String) {
   println!("Connecting to signal server...");
 
-  let addr = env::var("SERVER_ADDRESS").expect("Can load server address from .env");
+  //let addr = env::var("SERVER_ADDRESS").expect("Can load server address from .env");
+  let addr = "ws://84.30.14.3:25656";
   let (ws_stream, _) = connect_async(addr).await.expect("Failed to connect");
   println!("WebSocket handshake has been successfully completed");
 

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -56,6 +56,8 @@
         "title": "Flux",
         "width": 800,
         "height": 600,
+        "minWidth": 350,
+        "minHeight": 280,
         "resizable": true,
         "fullscreen": false,
         "decorations": false

diff --git a/src/comp/Chat.svelte b/src/comp/Chat.svelte
@@ -12,12 +12,14 @@ store.user.subscribe(value => {
 })
 
 const sendMessage = () => {
-  invoke('send_message', { data: input });
-  store.globalChat.update(global => {
-    global.push({ sender: user, content: input });
-    return global;
-  });
-  input = "";
+  if (input.length > 0) {
+    invoke('send_message', { data: input });
+    store.globalChat.update(global => {
+      global.push({ sender: user, content: input });
+      return global;
+    });
+    input = "";
+  }
 };
 </script>
 

diff --git a/src/nav/Home.svelte b/src/nav/Home.svelte
@@ -8,7 +8,7 @@ const navigate = useNavigate();
 
 // Handle refreshes:
 onMount(() => {
-	if (sessionStorage.getItem("username") == undefined) navigate('/');
+	if (sessionStorage.getItem("username") == 'null') navigate('/');
 });
 
 </script>

diff --git a/src/nav/Login.svelte b/src/nav/Login.svelte
@@ -13,11 +13,11 @@ listen('onlogin', () => {
 });
 
 onMount(() => {
-    if (sessionStorage.getItem("username") != undefined) navigate('/home');
+    if (sessionStorage.getItem("username") != 'null') navigate('/home');
 });
 
 const join = () => {
-    if (sessionStorage.getItem("username") == undefined) {
+    if (sessionStorage.getItem("username") == 'null') {
         invoke('web_connect', { username: name });
     } else {
         navigate('/home');