diff --git a/README.md b/README.md index ecdb2d5..b86a3a8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Nuxt Minimal Starter - - Look at the [Nuxt documentation](https://nuxt.com/docs/getting-started/introduction) to learn more. ## Setup diff --git a/components/Button.vue b/components/Button.vue deleted file mode 100644 index db8bb8e..0000000 --- a/components/Button.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/GuildOptionsMenu.vue b/components/GuildOptionsMenu.vue new file mode 100644 index 0000000..d024ec8 --- /dev/null +++ b/components/GuildOptionsMenu.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/components/Settings/AppSettings/Appearance.vue b/components/Settings/AppSettings/Appearance.vue deleted file mode 100644 index 135c0a1..0000000 --- a/components/Settings/AppSettings/Appearance.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/AppSettings/Keybinds.vue b/components/Settings/AppSettings/Keybinds.vue deleted file mode 100644 index ea54137..0000000 --- a/components/Settings/AppSettings/Keybinds.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/AppSettings/Language.vue b/components/Settings/AppSettings/Language.vue deleted file mode 100644 index b1c3a8a..0000000 --- a/components/Settings/AppSettings/Language.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/AppSettings/Notifications.vue b/components/Settings/AppSettings/Notifications.vue deleted file mode 100644 index 2e6de9c..0000000 --- a/components/Settings/AppSettings/Notifications.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/UserSettings/Account.vue b/components/Settings/UserSettings/Account.vue deleted file mode 100644 index 0fe5013..0000000 --- a/components/Settings/UserSettings/Account.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/UserSettings/Connections.vue b/components/Settings/UserSettings/Connections.vue deleted file mode 100644 index 97190ec..0000000 --- a/components/Settings/UserSettings/Connections.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/UserSettings/Devices.vue b/components/Settings/UserSettings/Devices.vue deleted file mode 100644 index 7006a12..0000000 --- a/components/Settings/UserSettings/Devices.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/Settings/UserSettings/Privacy.vue b/components/Settings/UserSettings/Privacy.vue deleted file mode 100644 index 0f1387d..0000000 --- a/components/Settings/UserSettings/Privacy.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/UserPopup.vue b/components/UserPopup.vue deleted file mode 100644 index 092e7d5..0000000 --- a/components/UserPopup.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - - \ No newline at end of file diff --git a/composables/auth.ts b/composables/auth.ts index 0ac2e8b..19ac694 100644 --- a/composables/auth.ts +++ b/composables/auth.ts @@ -75,7 +75,7 @@ export const useAuth = () => { async function fetchUser() { if (!accessToken.value) return; console.log("fetchuser access token:", accessToken.value); - const res = await fetchWithApi("/me") as UserResponse; + const res = await fetchWithApi("/users/me") as UserResponse; user.value = res; return user.value; } @@ -88,20 +88,6 @@ export const useAuth = () => { return user.value; } - - // as in email the password link - async function resetPassword() { - // ... - } - - async function disableAccount() { - // ... - } - - async function deleteAccount() { - // ... - } - return { accessToken, register, diff --git a/layouts/client.vue b/layouts/client.vue index 73a40d6..fdce980 100644 --- a/layouts/client.vue +++ b/layouts/client.vue @@ -6,14 +6,21 @@ main bar -
- - - -
- - +
+
+ + +
+ + + +
+
+
+
@@ -26,6 +33,9 @@ import type { GuildResponse } from '~/types/interfaces'; const loading = useState("loading", () => false); const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds"); +for (let i = 0; i < 20; i++) { + guilds?.push(guilds[0]); +} //const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[]; //console.log("servers:", servers); @@ -124,13 +134,24 @@ const members = [ } #left-column { + display: grid; + grid-template-rows: 1fr auto; + overflow-y: hidden; + border-right: 1px solid rgb(70, 70, 70); + padding-top: 1dvh; + padding-bottom: 1dvh; +} + +#left-column-top { display: flex; flex-direction: column; - gap: 2dvh; - padding-left: .5dvw; - padding-right: .5dvw; - border-right: 1px solid rgb(70, 70, 70); - padding-top: 1.5dvh; + gap: 1.5dvh; + overflow-y: scroll; +} + +#left-column-bottom { + padding-top: 1dvh; + border-top: 1px solid rgb(70, 70, 70); } #middle-left-column { @@ -148,6 +169,21 @@ const members = [ display: flex; flex-direction: column; gap: 1dvh; + overflow-y: scroll; +} + +#join-server-button { + color: white; + background-color: transparent; + border: none; + cursor: pointer; + font-size: 2rem; + padding: 0; + display: inline-block; +} + +#join-server-icon { + float: left; } \ No newline at end of file diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue index c9aa8d2..b3d492a 100644 --- a/pages/servers/[serverId]/channels/[channelId].vue +++ b/pages/servers/[serverId]/channels/[channelId].vue @@ -1,21 +1,13 @@