gorb/frontend
4
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into fallback-server-icons

Browse source
This commit is contained in:
Twig 2025-07-16 04:49:59 +02:00
commit 29243aa86f
No known key found for this signature in database
2 changed files with 5 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/Message.vue
View file

@ -5,9 +5,7 @@
<div v-if="props.replyMessage" class="message-reply-svg"> <div v-if="props.replyMessage" class="message-reply-svg">
<svg <svg
width="1.5em" height="1.5em" width="1.5em" height="1.5em"
viewBox="0 0 151.14355 87.562065" version="1.1" id="svg1" viewBox="0 0 150 87.5" version="1.1" id="svg1"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
style="overflow: visible;"> style="overflow: visible;">
<defs id="defs1" /> <defs id="defs1" />
<g id="layer1" <g id="layer1"
@ -68,9 +66,12 @@
import DOMPurify from 'dompurify'; import DOMPurify from 'dompurify';
import { parse } from 'marked'; import { parse } from 'marked';
import type { MessageProps } from '~/types/props'; import type { MessageProps } from '~/types/props';
import generateIrcColor from '~/utils/generateIrcColor';
import MessageMedia from './MessageMedia.vue'; import MessageMedia from './MessageMedia.vue';
import MessageReply from './UserInterface/MessageReply.vue'; import MessageReply from './UserInterface/MessageReply.vue';
=========
import generateIrcColor from '~/utils/generateIrcColor'; import generateIrcColor from '~/utils/generateIrcColor';
>>>>>>>>> Temporary merge branch 2
const props = defineProps<MessageProps>(); const props = defineProps<MessageProps>();

43
layouts/client.vue
View file

@ -36,7 +36,7 @@
<div class="left-column-segment"> <div class="left-column-segment">
<div ref="createButtonContainer"> <div ref="createButtonContainer">
<button id="create-button" class="sidebar-bottom-buttons" @click.prevent="createDropdown"> <button id="create-button" class="sidebar-bottom-buttons" @click.prevent="createDropdown">
<Icon id="create-icon" name="lucide:square-plus" alt="Create guild"/> <Icon id="create-icon" name="lucide:square-plus" alt="Create or join guild"/>
</button> </button>
</div> </div>
<NuxtLink id="settings-menu" class="sidebar-bottom-buttons" href="/settings"> <NuxtLink id="settings-menu" class="sidebar-bottom-buttons" href="/settings">
@ -153,47 +153,6 @@ const options = [
const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds"); const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
//const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[];
//console.log("servers:", servers);
const members = [
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
},
{
id: "3287484395",
displayName: "SauceyRed"
}
];
function createDropdown() { function createDropdown() {
const dropdown = h(GuildDropdown, { options }); const dropdown = h(GuildDropdown, { options });
const div = document.createElement("div"); const div = document.createElement("div");