diff --git a/src/lib/modals/chats/BanMember.svelte b/src/lib/modals/chats/BanMember.svelte index 853a3f5c..d90a8d59 100644 --- a/src/lib/modals/chats/BanMember.svelte +++ b/src/lib/modals/chats/BanMember.svelte @@ -1,38 +1,38 @@ -

Remove {username}

- -
- Are you sure you want to ban {username} from this chat? -
{ - fetch(`${apiUrl}chats/${$chat._id}/bans/${username}`, { - method: "PUT", - headers: { - ...$authHeader - }, - body: reason - }) - modals.closeLastModal(); - }}> - - - - - - -
-
-
\ No newline at end of file +

Remove {username}

+ +
+ Are you sure you want to ban {username} from this chat? +
{ + fetch(`${apiUrl}chats/${$chat._id}/bans/${username}`, { + method: "PUT", + headers: { + ...$authHeader, + }, + body: reason, + }); + modals.closeLastModal(); + }} + > + + + + +
+
+ diff --git a/src/lib/modals/chats/BannedMembers.svelte b/src/lib/modals/chats/BannedMembers.svelte index 63679e81..011f637b 100644 --- a/src/lib/modals/chats/BannedMembers.svelte +++ b/src/lib/modals/chats/BannedMembers.svelte @@ -1,81 +1,81 @@ -

Banned Users

-
- {#await fetchBannedMembers()} - - {:then _} - - - {#each $chat.banned_users as member} - - - -
-

Reason: {member.message}

+

Banned Users

+
+ {#await fetchBannedMembers()} + + {:then _} + {#each $chat.banned_users as member} + + +
+

Reason: {member.message}

- -
-
- {/each} - {/await} -
- + +
+
+ {/each} + {/await} +
+
\ No newline at end of file + .inline p { + justify-self: center; + align-self: center; + } + diff --git a/src/lib/modals/chats/GCMember.svelte b/src/lib/modals/chats/GCMember.svelte index 6eb48f1d..f9c94f4e 100644 --- a/src/lib/modals/chats/GCMember.svelte +++ b/src/lib/modals/chats/GCMember.svelte @@ -1,5 +1,5 @@ -

- Chat Invites -

- -
- {#await fetchInvites()} - - {/await} - - {#each $chat.invites as invite} - -
- - https://app.meower.org/invite/{invite._id} - -
- -
-
- -
- {/each} -
- -
+ {#each $chat.invites as invite} + +
+ + https://app.meower.org/invite/{invite._id} + +
+ +
+
+
+ {/each} +
+ +
\ No newline at end of file + .inline a { + justify-self: center; + align-self: center; + } + diff --git a/src/lib/stores.js b/src/lib/stores.js index 31730ac3..87fe8c93 100644 --- a/src/lib/stores.js +++ b/src/lib/stores.js @@ -40,7 +40,7 @@ export const chat = writable({ last_active: 0, deleted: false, banned_users: [], - invites: [] + invites: [], }); // User list diff --git a/src/lib/urls.js b/src/lib/urls.js index 931adbb3..71c1c336 100644 --- a/src/lib/urls.js +++ b/src/lib/urls.js @@ -4,8 +4,10 @@ export const beta = false; export const linkUrl = - localStorage.getItem("meower_linkurl") || "wss://meower-ws.showierdata.xyz/" + localStorage.getItem("meower_linkurl") || + "wss://meower-ws.showierdata.xyz/"; export const apiUrl = - localStorage.getItem("meower_apiurl") || "https://meower-api.showierdata.xyz/" + localStorage.getItem("meower_apiurl") || + "https://meower-api.showierdata.xyz/"; export const encodeApiURLParams = localStorage.getItem("meower_encodeapi") || false; diff --git a/src/pages/_layout.svelte b/src/pages/_layout.svelte index 472f1770..13961994 100644 --- a/src/pages/_layout.svelte +++ b/src/pages/_layout.svelte @@ -167,7 +167,11 @@ --orange: #4d97ff; --orange-light: rgb(140, 189, 245); --orange-dark: #3888f1; - --orange-scrollbar-back: color-mix(in srgb, #000000 20%, var(--orange-dark)); + --orange-scrollbar-back: color-mix( + in srgb, + #000000 20%, + var(--orange-dark) + ); --background: white; --foreground: black; --foreground-orange: white; diff --git a/src/pages/chats/[chatid].svelte b/src/pages/chats/[chatid].svelte index ca28eea0..2507a312 100644 --- a/src/pages/chats/[chatid].svelte +++ b/src/pages/chats/[chatid].svelte @@ -2,7 +2,7 @@ Home but it's a group chat. --> @@ -183,14 +183,20 @@ /> {/if} {#if $chat.owner === $user.name || ($params.admin && hasPermission(adminPermissions.EDIT_CHATS))} - - {/each} -

@@ -318,7 +323,6 @@ } else { modals.showModal(AddMemberModeModal); } - }} /> {/if} @@ -434,6 +438,4 @@ #HoverOver-Members { cursor: pointer; } - - diff --git a/src/pages/invite/[invite].svelte b/src/pages/invite/[invite].svelte index 979f2862..fbfa5d41 100644 --- a/src/pages/invite/[invite].svelte +++ b/src/pages/invite/[invite].svelte @@ -5,9 +5,9 @@ import {onMount} from "svelte"; import Container from "../../lib/Container.svelte"; import Spinner from "../../lib/Spinner.svelte"; - import { writable } from "svelte/store"; + import {writable} from "svelte/store"; - let ok = writable(true); + let ok = writable(true); onMount(() => { (async () => { let response = await fetch( @@ -23,17 +23,16 @@ if (response.status === 404) { $goto("/404"); } else if (!response.ok) { - $goto("/500"); - } + $goto("/500"); + } - let data = await response.json(); + let data = await response.json(); - // Cursed code because the server does not seem to want to send a packet - let chat = $chats.findLast( - chat => chat._id === data.chat - ) + // Cursed code because the server does not seem to want to send a packet + let chat = $chats.findLast(chat => chat._id === data.chat); - if (chat.members.indexOf($user.name) === -1) chat.members.push($user.name); + if (chat.members.indexOf($user.name) === -1) + chat.members.push($user.name); $goto(`/chats/${data.chat}`); })(); @@ -41,13 +40,13 @@ -

Joining Invite...

+

Joining Invite...

- {#if $ok} - - {:else} -

Invalid Invite

+ {#if $ok} + + {:else} +

Invalid Invite

- Or you could have been banned. - {/if} -
\ No newline at end of file + Or you could have been banned. + {/if} +