diff --git a/.env.development b/.env.development index cfea4a0..e58ce4b 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ 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="https://next.api.claptrapbot.com/api/v2/" - +# VITE_API_BASE_URL="https://next.api.claptrapbot.com/api/v2/" +VITE_API_BASE_URL="http://localhost:8080/api/v2/" VITE_DISCORD_USER_AVATAR_URL="https://cdn.discordapp.com/avatars/" VITE_APP_TITLE="Claptrap DEV" \ No newline at end of file diff --git a/.env.staging b/.env.staging new file mode 100644 index 0000000..ee00758 --- /dev/null +++ b/.env.staging @@ -0,0 +1,5 @@ +VITE_OAUTH_REDIRECT_URL="https://discord.com/api/oauth2/authorize?client_id=986632811207348294&redirect_uri=https%3A%2F%2Fnext.claptrapbot.com%2Foauth2%2Fcallback&response_type=code&scope=identify" +VITE_API_BASE_URL="https://next.api.claptrapbot.com/api/v2/" +VITE_DISCORD_USER_AVATAR_URL="https://cdn.discordapp.com/avatars/" + +VITE_APP_TITLE="Claptrap NEXT" \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 3e55b4d..e86d67c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,6 +19,6 @@ import HeaderComponent from "./components/Header/HeaderComponent.vue"; diff --git a/src/components/guild/GuildHeaderComponent.vue b/src/components/guild/GuildHeaderComponent.vue new file mode 100644 index 0000000..8994649 --- /dev/null +++ b/src/components/guild/GuildHeaderComponent.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/components/guild/Settings/SettingGroupComponent.vue b/src/components/guild/Settings/SettingGroupComponent.vue index 8f0bf10..b9c78d7 100644 --- a/src/components/guild/Settings/SettingGroupComponent.vue +++ b/src/components/guild/Settings/SettingGroupComponent.vue @@ -2,39 +2,41 @@
{{ props.descriptor.name }} - - - - - - - + +
diff --git a/src/components/guild/Settings/SettingListComponent.vue b/src/components/guild/Settings/SettingListComponent.vue index b703ba1..e5e6f03 100644 --- a/src/components/guild/Settings/SettingListComponent.vue +++ b/src/components/guild/Settings/SettingListComponent.vue @@ -30,12 +30,16 @@ - + diff --git a/src/data/Setting/RawSettingValue.ts b/src/data/Setting/RawSettingValue.ts new file mode 100644 index 0000000..92d1ccb --- /dev/null +++ b/src/data/Setting/RawSettingValue.ts @@ -0,0 +1,6 @@ +type RawSettingValue = { + id: string; + value: string | boolean; +}; + +export type { RawSettingValue }; diff --git a/src/services/settingsService.ts b/src/services/settingsService.ts index 3dfa8bb..5d2c871 100644 --- a/src/services/settingsService.ts +++ b/src/services/settingsService.ts @@ -1,8 +1,10 @@ +import type { RawSettingValue } from "@/data/Setting/RawSettingValue"; import type { SettingDescrition } from "@/data/Setting/SettingDescription"; +import { useEventQueuStore } from "@/stores/eventQueu"; import { useUserStore } from "@/stores/user"; import axios from "axios"; -export function getSettingDescrition() { +function getSettingDescrition() { return new Promise((resole, reject) => { const userStore = useUserStore(); @@ -17,3 +19,31 @@ export function getSettingDescrition() { }); }); } + +function getSettingValues(guildId: string): Promise { + return new Promise((resolve, reject) => { + const userStore = useUserStore(); + axios + .get(`/setting/${guildId}/values`, { + headers: { + authorization: `Bearer ${userStore.token}`, + }, + }) + .then((value) => { + resolve(value.data); + }) + .catch((reason) => { + console.error(`Fail to get settings !`); + console.log(reason); + const eventQueuStore = useEventQueuStore(); + eventQueuStore.push({ + uuid: undefined, + type: "error", + text: "Fail to retrive current settings!", + }); + reject(reason); + }); + }); +} + +export { getSettingDescrition, getSettingValues }; diff --git a/src/views/GuildHomeView.vue b/src/views/GuildHomeView.vue index 0958230..d02ac03 100644 --- a/src/views/GuildHomeView.vue +++ b/src/views/GuildHomeView.vue @@ -2,23 +2,7 @@
- - - - - - - {{ guild?.name }} - - - + @@ -47,6 +31,7 @@ import { useRoute, useRouter } from "vue-router"; import MusicPreviewComponent from "../components/guild/home/MusicPreviewComponent.vue"; import SettingPreviewComponent from "../components/guild/home/SettingPreviewComponent.vue"; import StatsPreviewComponent from "../components/guild/home/StatsPreviewComponent.vue"; +import GuildHeaderComponent from "@/components/guild/GuildHeaderComponent.vue"; const guildStore = useMutualGuildsStore(); const route = useRoute(); diff --git a/src/views/GuildSettingView.vue b/src/views/GuildSettingView.vue index dfa74bc..6d15933 100644 --- a/src/views/GuildSettingView.vue +++ b/src/views/GuildSettingView.vue @@ -1,6 +1,11 @@ @@ -10,7 +15,7 @@ import { redirectIfNoGuild } from "@/tools/GuildTools"; import { ref, watch } from "vue"; import { useRoute, useRouter } from "vue-router"; import SettingListComponent from "../components/guild/Settings/SettingListComponent.vue"; - +import GuildHeaderComponent from "@/components/guild/GuildHeaderComponent.vue"; const guildStore = useMutualGuildsStore(); const route = useRoute(); const router = useRouter();