diff --git a/src/app.html b/src/app.html index 9026db4..101d17e 100644 --- a/src/app.html +++ b/src/app.html @@ -14,6 +14,6 @@ %sveltekit.head% -
%sveltekit.body%
+
%sveltekit.body%
diff --git a/src/app.postcss b/src/app.postcss index eec4416..d07ce85 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -1,7 +1,6 @@ /* Write your global styles here, in PostCSS syntax */ @tailwind base; -html, body { @apply h-full overflow-hidden; } :root { --blackish: rgba(0, 0, 0, 0.98); --gray-dark: #212121; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index d8b0e63..e4571ca 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -45,11 +45,38 @@ `} - - - - - - - - + + +
+ + + +
+ + + + diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte index 670d29a..e4f4036 100644 --- a/src/routes/chat/+layout.svelte +++ b/src/routes/chat/+layout.svelte @@ -40,10 +40,8 @@ }); -
- {#if loaded} - - {:else} - - {/if} -
+{#if loaded} + +{:else} + +{/if} diff --git a/src/routes/chat/Chat.svelte b/src/routes/chat/Chat.svelte index f580d6b..0af6fd8 100644 --- a/src/routes/chat/Chat.svelte +++ b/src/routes/chat/Chat.svelte @@ -11,6 +11,7 @@ let messageText = ''; let sendButtonText = 'Send'; let connected: boolean = false; + let currentEpoch: number = 0; $: server = $serverDataStore[$selectedServer]; $: roomGroups = server.roomGroups; $: selectedRoom = server.selectedRoom; @@ -53,6 +54,7 @@ genProof(room, messageText, identity).then((msg) => { socket.emit('validateMessage', msg); console.debug('Sending message: ', msg); + messageText = ''; }); scrollChatBottom(); } @@ -66,6 +68,15 @@ }); } + function getEpochFromTimestamp(timestamp: string | number): { + epoch: number; + timestamp: string | number; + } { + timestamp = timestamp ? new Date(timestamp).toString() : Date.now().toString(); + const epoch = Math.floor(Number(timestamp) / room.rateLimit); + return { epoch, timestamp }; + } + function onPromptKeydown(event: KeyboardEvent): void { if (['Enter'].includes(event.code)) { event.preventDefault(); @@ -117,6 +128,9 @@ $messageStore[data.room].messages = $messageStore[data.room].messages.slice(0, 500); scrollChatBottom(); }); + setInterval(() => { + currentEpoch = getEpochFromTimestamp(); + }, 1000); }); onDestroy(() => { socket.emit('leavingRoom', room?.id); @@ -124,88 +138,112 @@ }); -
-
- -