Merge remote-tracking branch 'origin/ui-refactor'

Merge branch 'ui-refactor'
Merge branch 'comedical-main-bar'
2025-07-10 16:19:21 +02:00 · 2025-07-10 16:18:35 +02:00 · 2025-07-10 16:17:29 +02:00 · 2025-07-10 16:16:48 +02:00 · 2025-07-10 16:16:34 +02:00 · 2025-07-10 11:46:25 +02:00
2 changed files with 50 additions and 1 deletions
--- a/layouts/client.vue
+++ b/layouts/client.vue
@ -25,6 +25,23 @@
 			</div>
 			<slot />
 		</div>
+		<div id = "page-content">
+			<div id="left-column">
+				<NuxtLink id="home-button" href="/">
+					<img class="sidebar-icon" src="/public/icon.svg"/>
+				</NuxtLink>
+				<div id="servers-list">
+					<NuxtLink v-for="guild of guilds" :href="`/servers/${guild.uuid}`">
+						<img v-if="guild.icon" class="sidebar-icon" :src="guild.icon" :alt="guild.name"/>
+						<Icon v-else name="lucide:server" class="sidebar-icon white" :alt="guild.name" />
+					</NuxtLink>
+				</div>
+				<NuxtLink id="settings-menu" href="/settings">
+					<Icon name="lucide:settings" class="sidebar-icon white" alt="Settings menu" />
+				</NuxtLink>
+			</div>
+			<slot />
+		</div>
 	</div>
 </template>

@ -52,9 +69,11 @@ const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 .visible {
 	opacity: 100%;
 	transition: opacity 500ms;
+	transition: opacity 500ms;
 }

 #homebar {
+	min-height: 4dvh;
 	min-height: 4dvh;
 	display: flex;
 	justify-content: space-evenly;
@ -62,6 +81,7 @@ const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 	background: var(--optional-topbar-background);
 	background-color: var(--topbar-background-color);
 	border-bottom: 1px solid var(--padding-color);
+	border-bottom: 1px solid var(--padding-color);
 	padding-left: 5dvw;
 	padding-right: 5dvw;

@ -71,11 +91,18 @@ const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 	width: 100dvw;
 }

+.homebar-item {
+	width: 100dvw;
+}
+
 #page-content {
 	display: flex;
 	flex-direction: row;
 	flex-grow: 1;
    overflow: auto;
+	flex-direction: row;
+	flex-grow: 1;
+    overflow: auto;
 }

 #left-column {
@ -84,12 +111,23 @@ const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 	gap: .75em;
 	padding-left: .25em;
 	padding-right: .25em;
+	gap: .75em;
+	padding-left: .25em;
+	padding-right: .25em;
 	border-right: 1px solid var(--padding-color);
 	background: var(--optional-sidebar-background);
 	background-color: var(--sidebar-background-color);
 	padding-top: .5em;
 }

+#servers-list {
+	display: flex;
+	flex-direction: column;
+	gap: 1em;
+	width: 3.2rem;	
+	padding-top: .5em;
+}
+
 #servers-list {
 	display: flex;
 	flex-direction: column;
@ -98,9 +136,19 @@ const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 }

 #middle-left-column {
+	padding-left: .25em;
+	padding-right: .25em;
 	padding-left: .25em;
 	padding-right: .25em;
 	border-right: 1px solid var(--padding-color);
+	min-width: 13em;
+	overflow-y: scroll;
+	overflow-x: hidden;
+}
+
+.sidebar-icon {
+	width: 3rem;
+	height: 3rem;
 	min-width: 10em;
 	overflow-y: scroll;
 	overflow-x: hidden;
@ -119,6 +167,7 @@ const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 #settings-menu {
 	position: absolute;
 	bottom: .25em
+	bottom: .25em
 }

 </style>
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@ -91,7 +91,7 @@ function handleMemberClick(member: GuildMemberResponse) {
 }

 #members-container {
-	width: 12rem;
+	width: 15rem;
 	border-left: 1px solid var(--padding-color);
 	background: var(--optional-member-list-background);
 }
Author	SHA1	Message	Date
JustTemmie	a9b0eda9e2	Merge remote-tracking branch 'origin/ui-refactor' Some checks failed ci/woodpecker/push/build-and-publish Pipeline failed Details	2025-07-10 16:19:21 +02:00
JustTemmie	92c0024411	Merge branch 'ui-refactor'	2025-07-10 16:18:35 +02:00
JustTemmie	c3f3c95af6	Merge branch 'comedical-main-bar'	2025-07-10 16:17:29 +02:00
JustTemmie	53dfdd8f9d	Merge branch 'home-page'	2025-07-10 16:16:48 +02:00
JustTemmie	91d2e45559	Merge remote-tracking branch 'origin/improve-theming'	2025-07-10 16:16:34 +02:00
SauceyRed	a1cd9c482c	feat: increase width of channels and members lists All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details ci/woodpecker/pull_request_closed/build-and-publish Pipeline was successful Details	2025-07-10 11:46:25 +02:00
JustTemmie	a6572c20f9	fix: remove accidental duplication of member list All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details this was for local testing, forgot to remove it	2025-07-09 01:04:37 +02:00
JustTemmie	5cdeb36200	refactor: more dv to em All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details	2025-07-09 00:46:59 +02:00
JustTemmie	9a2fe8fb37	refactor: change a lot of dynamic sizes to em and rem this makes the client feel a LOT snappier	2025-07-09 00:43:23 +02:00
JustTemmie	730b0cb1dc	refactor: change the client from table to flexbox this makes the server, channel, and member list a constant size, making the text messages take up the entire remaining width this also fixes the text wrapping you have already fixed on one of your branches this change is required if we want to make the member list toggelable, or channel list resizable	2025-07-09 00:25:52 +02:00
JustTemmie	8932070fcc	feat: spice up the home bar All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details	2025-07-08 21:11:14 +02:00
JustTemmie	bd6307f16e	fix: rephrase sentace from "server" to "guild" All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details ci/woodpecker/pull_request_closed/build-and-publish Pipeline was successful Details	2025-07-08 21:00:05 +02:00
JustTemmie	bb5ff37509	fix: put the home page into index.vue instead All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details	2025-07-08 20:58:40 +02:00
JustTemmie	19113f1303	feat: implement basic home page All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details	2025-07-08 20:57:40 +02:00
JustTemmie	c0ad1a7c0d	feat: pretty button :3 All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details ci/woodpecker/pull_request_closed/build-and-publish Pipeline was successful Details	2025-07-07 21:27:45 +02:00
JustTemmie	f91c299575	fix: add missing commas from themes All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details ci/woodpecker/pr/build-and-publish Pipeline was successful Details	2025-07-07 21:04:41 +02:00
JustTemmie	d0fe0db374	feat: more theme styling options, and description.css All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details	2025-07-07 21:00:42 +02:00
JustTemmie	8f06f25efe	feat: start adding back button for settings All checks were successful ci/woodpecker/push/build-and-publish Pipeline was successful Details	2025-07-07 20:40:49 +02:00