Merge pull request #2 from Somespi/main

Solve the compatibility problem for large screens
geekcord · Dec 13, 2023 · 8b9ef87 · 8b9ef87
2 parents ffe61fa + fb964ec
commit 8b9ef87
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/lib/ChannelsList.svelte b/src/lib/ChannelsList.svelte
@@ -9,11 +9,14 @@
             <div class="channel-catagory">
                 MAIN
             </div>
-            <div class="flex channel-active" >
+            <!-- svelte-ignore a11y-click-events-have-key-events -->
+            <!-- svelte-ignore a11y-no-static-element-interactions -->
+            <!-- svelte-ignore a11y-interactive-supports-focus -->
+            <div class="flex channel-active"  on:click={() => document.querySelector("#nav-toggle")?.click()} role="button">
                 <div>
                     <svg width="24" height="24" viewBox="0 0 24 24" class="channel-hashtag" aria-hidden="true" role="img"><path fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" d="M5.88657 21C5.57547 21 5.3399 20.7189 5.39427 20.4126L6.00001 17H2.59511C2.28449 17 2.04905 16.7198 2.10259 16.4138L2.27759 15.4138C2.31946 15.1746 2.52722 15 2.77011 15H6.35001L7.41001 9H4.00511C3.69449 9 3.45905 8.71977 3.51259 8.41381L3.68759 7.41381C3.72946 7.17456 3.93722 7 4.18011 7H7.76001L8.39677 3.41262C8.43914 3.17391 8.64664 3 8.88907 3H9.87344C10.1845 3 10.4201 3.28107 10.3657 3.58738L9.76001 7H15.76L16.3968 3.41262C16.4391 3.17391 16.6466 3 16.8891 3H17.8734C18.1845 3 18.4201 3.28107 18.3657 3.58738L17.76 7H21.1649C21.4755 7 21.711 7.28023 21.6574 7.58619L21.4824 8.58619C21.4406 8.82544 21.2328 9 20.9899 9H17.41L16.35 15H19.7549C20.0655 15 20.301 15.2802 20.2474 15.5862L20.0724 16.5862C20.0306 16.8254 19.8228 17 19.5799 17H16L15.3632 20.5874C15.3209 20.8261 15.1134 21 14.8709 21H13.8866C13.5755 21 13.3399 20.7189 13.3943 20.4126L14 17H8.00001L7.36325 20.5874C7.32088 20.8261 7.11337 21 6.87094 21H5.88657ZM9.41045 9L8.35045 15H14.3504L15.4104 9H9.41045Z"></path></svg>
                 </div>
-                <div>
+                <div >
                     💬・general
                 </div>
             </div>

diff --git a/src/lib/Messages.svelte b/src/lib/Messages.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+	import { afterUpdate, onMount } from "svelte";
+
+
+    $: bottomPosition = 0
     let messages = [
         {
             username: 'Geek',
@@ -17,6 +21,19 @@
         // we dont need this :P
         return 0
     }
+
+    function calculateBottom() {
+        bottomPosition = window.innerHeight - 275
+    }
+
+    onMount(() => {
+        calculateBottom()
+        
+        window.addEventListener("resize", () => {
+            calculateBottom()
+        })
+    })
+
 </script>
 
 
@@ -30,7 +47,7 @@
     </div>
 
     <div class="flex-1 overflow-y-auto">
-            <div class="ml-3 mt-10 space-y-5 overflow-y-auto">
+            <div class="ml-3 mt-10 space-y-5 overflow-y-auto" style="height: {bottomPosition}px">
                 {#each messages as message}
 
                 <div class="flex flex-row overflow-y-auto hover:bg-[#303237]">
@@ -81,7 +98,7 @@
     </div>
 
     <div class="m-3 mb-5">
-        <form class="w-full" on:submit={() => addMessage(document.getElementById('inp')?.value.trim())}>
+        <form class="w-full"  on:submit={() => addMessage(document.getElementById('inp')?.value.trim())}>
             <input class="rounded-md w-full text-white p-3 bg-[#383A40] ring-0 border-0" 
             placeholder="Message #💬・general. (Enter to send)"
             autocomplete="off" type="text" name="text" id="inp" />