From eef86a95d5cc04e544e27227456a292b4f76330c Mon Sep 17 00:00:00 2001 From: SebClem Date: Thu, 16 Jun 2022 15:19:29 +0200 Subject: [PATCH] :hammer: Responsive --- .env.development | 2 +- src/components/Header/HeaderComponent.vue | 20 ++++++++++++- src/components/Header/ServerListComponent.vue | 24 ++++++++++++++- .../guild/home/SettingPreviewComponent.vue | 23 +++++++++++++-- src/data/Guild.ts | 4 +-- src/router/index.ts | 11 +++++++ src/views/GuildHomeView.vue | 29 +++++++++---------- src/views/GuildSettingView.vue | 7 +++++ 8 files changed, 98 insertions(+), 22 deletions(-) create mode 100644 src/views/GuildSettingView.vue diff --git a/.env.development b/.env.development index 7fe5c7a..cfea4a0 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_OAUTH_REDIRECT_URL="https://discord.com/api/oauth2/authorize?client_id=238351507634913280&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Foauth2%2Fcallback&response_type=code&scope=identify" -VITE_API_BASE_URL="http://localhost:8080/api/v2/" +VITE_API_BASE_URL="https://next.api.claptrapbot.com/api/v2/" VITE_DISCORD_USER_AVATAR_URL="https://cdn.discordapp.com/avatars/" diff --git a/src/components/Header/HeaderComponent.vue b/src/components/Header/HeaderComponent.vue index 75b08cc..bde785f 100644 --- a/src/components/Header/HeaderComponent.vue +++ b/src/components/Header/HeaderComponent.vue @@ -6,8 +6,21 @@ Claptrap Bot + + mdi-home + - + diff --git a/src/components/guild/home/SettingPreviewComponent.vue b/src/components/guild/home/SettingPreviewComponent.vue index 46c03a8..5945e25 100644 --- a/src/components/guild/home/SettingPreviewComponent.vue +++ b/src/components/guild/home/SettingPreviewComponent.vue @@ -1,11 +1,30 @@ - + diff --git a/src/data/Guild.ts b/src/data/Guild.ts index 7110304..5c0ffb2 100644 --- a/src/data/Guild.ts +++ b/src/data/Guild.ts @@ -1,8 +1,8 @@ -type Guild = { +interface Guild { id: string; name: string; iconUrl: string; canManage: boolean; -}; +} export type { Guild }; diff --git a/src/router/index.ts b/src/router/index.ts index 3cc524a..1c4190d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,6 +3,7 @@ import { getMutualGuilds } from "@/services/guildService"; import { useMutualGuildsStore } from "@/stores/mutualGuilds"; import { useUserStore } from "@/stores/user"; import GuildHomeViewVue from "@/views/GuildHomeView.vue"; +import GuildSettingViewVue from "@/views/GuildSettingView.vue"; import OauthCallbackViewVue from "@/views/oauth/OauthCallbackView.vue"; import OauthRedirectViewVue from "@/views/oauth/OauthRedirectView.vue"; import { createRouter, createWebHistory } from "vue-router"; @@ -36,6 +37,15 @@ const router = createRouter({ title: "Home", }, }, + { + path: "/guild/:guildId/settings", + name: "guildSetting", + component: GuildSettingViewVue, + meta: { + requiresAuth: true, + title: "Settings", + }, + }, { path: "/oauth2/callback", name: "oauth-callback", @@ -60,6 +70,7 @@ const router = createRouter({ router.beforeEach((to, from) => { const store = useUserStore(); document.title = `${import.meta.env.VITE_APP_TITLE} - ${to.meta.title}`; + if (to.meta.requiresAuth && !store.isLoggedIn) { return { name: "oauth-redirect" }; } else { diff --git a/src/views/GuildHomeView.vue b/src/views/GuildHomeView.vue index dc079a2..479f4a0 100644 --- a/src/views/GuildHomeView.vue +++ b/src/views/GuildHomeView.vue @@ -23,19 +23,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + @@ -43,12 +41,12 @@ + +