adamf/web_server
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Make sidebars take up full space
All checks were successful
Deploy with Docker Compose / deploy (push) Successful in 2m2s
Details

Browse Source
This commit is contained in:
Adam French
2026-03-13 15:30:34 +00:00
parent 15c721ea56
commit d5065d19e0
2 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
nginx/vue/src/components/util/Chat.vue
View File

@@ -80,68 +80,77 @@ onUnmounted(() => {
</script> </script>
<template> <template>
<div class="flex flex-col"> <div class="flex-1 flex-col flex">
<Header>Chat</Header> <Header>Chat</Header>
<div <div class="flex-col flex flex-1">
ref="messagesContainer" <div
class="flex flex-col flex-1 overflow-y-auto p-2" ref="messagesContainer"
> class="flex flex-col flex-1 overflow-y-auto p-2"
<p v-for="message in messages" :key="message.id">
<span class="text-tertiary">{{ message.authorId }}:</span>
<template
v-for="(part, i) in parseMessageParts(message.text || '')"
:key="i"
>
<a
v-if="part.type === 'link'"
:href="part.value"
target="_blank"
rel="noopener noreferrer"
class="text-primary underline"
>{{ part.value }}</a
>
<span v-else>{{ part.value }}</span>
</template>
<template
v-if="message.fileUrl && isSafeFileUrl(message.fileUrl)"
>
<img
v-if="isImageUrl(message.fileUrl)"
:src="message.fileUrl"
class="max-w-xs max-h-48 rounded"
@load="scrollToBottom"
/>
<video
v-else-if="isVideoUrl(message.fileUrl)"
:src="message.fileUrl"
controls
class="max-w-xs max-h-48 rounded"
@loadedmetadata="scrollToBottom"
/>
<a
v-else
:href="message.fileUrl"
target="_blank"
class="underline"
>{{ message.fileUrl.split("/").pop() }}</a
>
</template>
</p>
</div>
<input v-model="messageInput" @keyup.enter="sendMessage" />
<input
ref="fileInput"
type="file"
class="hidden"
@change="onFileSelected"
/>
<div class="flex justify-between">
<Button @click="sendMessage">Send</Button>
<Button v-if="authStore.user.admin" @click="fileInput.click()"
>Attach</Button
> >
<div class="flex gap-2"> <p v-for="message in messages" :key="message.id">
<Button @click="scrollToBottom">Bottom</Button> <span class="text-tertiary">{{ message.authorId }}:</span>
<template
v-for="(part, i) in parseMessageParts(
message.text || '',
)"
:key="i"
>
<a
v-if="part.type === 'link'"
:href="part.value"
target="_blank"
rel="noopener noreferrer"
class="text-primary underline"
>{{ part.value }}</a
>
<span v-else>{{ part.value }}</span>
</template>
<template
v-if="message.fileUrl && isSafeFileUrl(message.fileUrl)"
>
<img
v-if="isImageUrl(message.fileUrl)"
:src="message.fileUrl"
class="max-w-xs max-h-48 rounded"
@load="scrollToBottom"
/>
<video
v-else-if="isVideoUrl(message.fileUrl)"
:src="message.fileUrl"
controls
class="max-w-xs max-h-48 rounded"
@loadedmetadata="scrollToBottom"
/>
<a
v-else
:href="message.fileUrl"
target="_blank"
class="underline"
>{{ message.fileUrl.split("/").pop() }}</a
>
</template>
</p>
</div>
<div>
<input v-model="messageInput" @keyup.enter="sendMessage" />
<input
ref="fileInput"
type="file"
class="hidden"
@change="onFileSelected"
/>
<div class="flex gap-2">
<Button class="flex-1" @click="sendMessage">Send</Button>
<Button
v-if="authStore.user.admin"
class="flex-1"
@click="fileInput.click()"
>Attach</Button
>
<Button class="flex-1" @click="scrollToBottom"
>Bottom</Button
>
</div>
</div> </div>
</div> </div>
</div> </div>

10
nginx/vue/src/views/home/Home.vue
View File

@@ -28,8 +28,10 @@ import Consumption from "./Consumption.vue";
<div <div
class="sidebar flex-1 flex flex-col m-10 w-60 gap-2 place-content-between" class="sidebar flex-1 flex flex-col m-10 w-60 gap-2 place-content-between"
> >
<div class="border-children background-children"> <div
<Chat class="h-200" /> class="flex flex-col background-children border-children flex-1 gap-2"
>
<Chat class="flex-1" />
</div> </div>
<div> <div>
<Miku class="border-tertiary border bg-bg_secondary" /> <Miku class="border-tertiary border bg-bg_secondary" />
@@ -52,7 +54,7 @@ import Consumption from "./Consumption.vue";
<Gym2 class="gym" /> <Gym2 class="gym" />
</div> </div>
<div <div
class="sidebar place-content-between flex-1 flex flex-col m-10 w-60" class="sidebar place-content-between flex-1 flex flex-col m-10 w-60 gap-2"
> >
<div <div
class="flex flex-col background-children border-children flex-1 gap-2" class="flex flex-col background-children border-children flex-1 gap-2"
@@ -60,7 +62,7 @@ import Consumption from "./Consumption.vue";
<Time /> <Time />
<Timer /> <Timer />
<Radio /> <Radio />
<CommitHistory class="h-100 overflow-y-scroll" /> <CommitHistory class="flex-1 overflow-y-scroll" />
<!-- <Elle class="flex-1" /> --> <!-- <Elle class="flex-1" /> -->
<!-- <MusicPlayer /> --> <!-- <MusicPlayer /> -->