From 4e17a0ee52efadf97be6a5c98b03fc339555a3c5 Mon Sep 17 00:00:00 2001
From: Oracle <kms0219kms@naver.com>
Date: Mon, 1 Jan 2024 15:25:59 +0000
Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20feat:=20=EC=8B=A0=EA=B7=9C=20v3=20A?=
 =?UTF-8?q?PI=EB=A1=9C=20=EC=BD=94=EB=93=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/auth/callback.vue    |  4 +-
 pages/bot/callback.vue     |  2 +-
 pages/dashboard/index.vue  |  2 +-
 pages/dashboard/invite.vue | 80 +++++++++++++++++++-------------------
 pages/dashboard/verify.vue |  6 ++-
 5 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/pages/auth/callback.vue b/pages/auth/callback.vue
index 62cfe37..2f363b4 100644
--- a/pages/auth/callback.vue
+++ b/pages/auth/callback.vue
@@ -54,14 +54,14 @@ export default {
         staging: Boolean(window.location.origin == 'https://console-v2stg.nguard.dev'),
       })
 
-      localStorage.setItem('access_token', login.access_token)
+      localStorage.setItem('access_token', login.data.access_token)
 
       setTimeout(() => {
         this.$router.push(`/${this.$route.query.state || this.$i18n.locale || 'ko'}/servers`)
       }, 1000)
     } catch (e) {
       if (e.response.status != 400 && e.response.status != 429) {
-        alert(e.response.data.error.error_description || e)
+        alert(e.response.data.message || e)
       }
 
       this.$router.push(`/${this.$route.query.state || this.$i18n.locale || 'ko'}/auth/login`)
diff --git a/pages/bot/callback.vue b/pages/bot/callback.vue
index dc1ba8f..13cd614 100644
--- a/pages/bot/callback.vue
+++ b/pages/bot/callback.vue
@@ -8,7 +8,7 @@ export default {
     }
 
     try {
-      opener.load_servers()
+      opener.location.reload(true)
       window.close()
     } catch (e) {
       this.$router.push('/servers')
diff --git a/pages/dashboard/index.vue b/pages/dashboard/index.vue
index 4143635..c33dfc1 100644
--- a/pages/dashboard/index.vue
+++ b/pages/dashboard/index.vue
@@ -456,7 +456,7 @@ export default {
   async mounted() {
     window.addEventListener('resize', this.resizeAlerts)
 
-    const socket = io('https://api.nguard.xyz/')
+    const socket = io('https://ws-api.nguard.xyz/')
 
     socket.on('push:load', pushs => {
       this.alerts.contents = pushs
diff --git a/pages/dashboard/invite.vue b/pages/dashboard/invite.vue
index 8a58002..7f4f7ec 100644
--- a/pages/dashboard/invite.vue
+++ b/pages/dashboard/invite.vue
@@ -81,51 +81,51 @@
           </form>
         </div>
 
-        <div class="mb-6">
-          <h2>
+        <!-- <div class="mb-6"> -->
+          <!-- <h2> -->
             <!-- 커스텀 초대링크 -->
-            {{ $t('invite.category2.title') }}
-          </h2>
-          <p>
+            <!-- {{ $t('invite.category2.title') }} -->
+          <!-- </h2> -->
+          <!-- <p> -->
             <!-- 소유하고 계신 도메인에 NGuard 초대링크를 설정할 수 있습니다. -->
-            {{ $t('invite.category2.description') }}
-          </p>
-          <form>
-            <div>
-              <label>
+            <!-- {{ $t('invite.category2.description') }} -->
+          <!-- </p> -->
+          <!-- <form> -->
+            <!-- <div> -->
+              <!-- <label> -->
                 <!-- 커스텀 초대링크 -->
-                {{ $t('invite.category2.toggle') }}
-              </label>
-              <div @click="inputSwitch('domain')" :class="{ switch_on: switch_.domain }" class="switch"></div>
-            </div>
+                <!-- {{ $t('invite.category2.toggle') }} -->
+              <!-- </label> -->
+              <!-- <div @click="inputSwitch('domain')" :class="{ switch_on: switch_.domain }" class="switch"></div> -->
+            <!-- </div> -->
 
-            <div class="vert" v-if="switch_.domain">
-              <p>
+            <!-- <div class="vert" v-if="switch_.domain"> -->
+              <!-- <p> -->
                 <!-- 도메인 설정 -->
-                {{ $t('invite.category2.link') }}
-              </p>
-              <div class="flex items-center">
-                <input
-                  class="input-m"
-                  id="inviteDomain_input"
-                  type="text"
-                  placeholder="도메인 입력"
-                  v-model="select.domain"
-                  v-bind:readonly="!isEnterprise"
-                  @click="clickCustomDomain()"
-                />
-              </div>
-            </div>
-
-            <div class="flex" v-if="switch_.domain">
-              <label>
+                <!-- {{ $t('invite.category2.link') }} -->
+              <!-- </p> -->
+              <!-- <div class="flex items-center"> -->
+                <!-- <input -->
+                  <!-- class="input-m" -->
+                  <!-- id="inviteDomain_input" -->
+                  <!-- type="text" -->
+                  <!-- placeholder="도메인 입력" -->
+                  <!-- v-model="select.domain" -->
+                  <!-- v-bind:readonly="!isEnterprise" -->
+                  <!-- @click="clickCustomDomain()" -->
+                <!-- /> -->
+              <!-- </div> -->
+            <!-- </div> -->
+
+            <!-- <div class="flex" v-if="switch_.domain"> -->
+              <!-- <label> -->
                 <!-- SSL 설정 -->
-                {{ $t('invite.category2.ssl') }}
-              </label>
-              <div @click="inputSwitch('domain_ssl')" :class="{ switch_on: switch_.domain_ssl }" class="switch"></div>
-            </div>
-          </form>
-        </div>
+                <!-- {{ $t('invite.category2.ssl') }} -->
+              <!-- </label> -->
+              <!-- <div @click="inputSwitch('domain_ssl')" :class="{ switch_on: switch_.domain_ssl }" class="switch"></div> -->
+            <!-- </div> -->
+          <!-- </form> -->
+        <!-- </div> -->
 
         <button class="btn-save" @click="checkSaveSettings()">
           <!-- 저장하기 -->
@@ -349,7 +349,7 @@ export default {
         })
       ).data
 
-      this.isPermission = settings.koreanbots.data.voted
+      this.isPermission = settings.koreanbots.voted
       this.isEnterprise = settings.payData?.type === 'ENTERPRISE' && new Date().getTime() < settings.payData?.expire
 
       if (settings.settings) {
diff --git a/pages/dashboard/verify.vue b/pages/dashboard/verify.vue
index 76b388e..2e25987 100644
--- a/pages/dashboard/verify.vue
+++ b/pages/dashboard/verify.vue
@@ -73,11 +73,13 @@
             <!-- 성공적으로 저장했습니다! -->
           </h2>
           <div class="flex flex-col text-gray-400 pt-3 gap-2">
-            <span v-if="switch_.confirm" v-html="$t('verify.modal.applied')">
+            <span v-if="switch_.confirm">
               <!-- 새로운 유저가 <code>/verify</code> 명령어로 인증할 수 있습니다. -->
+              {{ $t('verify.modal.applied') }}
             </span>
-            <span v-else v-html="$t('verify.modal.deleted')">
+            <span v-else>
               <!-- 새로운 유저는 더 이상 <code>/verify</code> 명령어로 인증할 수 없습니다. -->
+              {{ $t('verify.modal.deleted') }}
             </span>
 
             <br />

From fb8e60f842eb41bb0b8b257f2f158143ae371371 Mon Sep 17 00:00:00 2001
From: Oracle <kms0219kms@naver.com>
Date: Tue, 2 Jan 2024 11:26:45 +0000
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EA=B0=9C=EB=B0=9C=20=ED=99=98?=
 =?UTF-8?q?=EA=B2=BD=20NODE=5FENV=EC=97=90=20=EB=94=B0=EB=9D=BC=20apiEndpo?=
 =?UTF-8?q?int=20=EB=B3=80=EA=B2=BD=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nuxt.config.js | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index 9cb579d..43e9725 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,4 +1,5 @@
-import { apiEndpoint } from './config.json'
+import { apiEndpoint, apiTestEndpoint } from './config.json'
+const { NODE_ENV } = process.env
 
 export default {
   // Global page headers: https://go.nuxtjs.dev/config-head
@@ -17,17 +18,29 @@ export default {
       { rel: 'icon', href: '/favicon.ico' },
 
       /* Preconnect CDNs */
-      { rel: 'preconnect', href:'https://cdn.jsdelivr.net', crossorigin: 'anonymous' },
-      { rel: 'preconnect', href:'https://fonts.googleapis.com', crossorigin: 'anonymous' },
-      { rel: 'preconnect', href:'https://fonts.gstatic.com', crossorigin: 'anonymous' },
+      { rel: 'preconnect', href: 'https://cdn.jsdelivr.net', crossorigin: 'anonymous' },
+      { rel: 'preconnect', href: 'https://fonts.googleapis.com', crossorigin: 'anonymous' },
+      { rel: 'preconnect', href: 'https://fonts.gstatic.com', crossorigin: 'anonymous' },
 
       /* Import Pretendard & Pretendard-Like font familes */
-      { rel: 'stylesheet', href: 'https://cdn.jsdelivr.net/gh/wanteddev/wanted-sans@v1.0.0/packages/wanted-sans/fonts/webfonts/variable/split/WantedSansVariable.min.css' },
-      { rel: 'stylesheet', href: 'https://cdn.jsdelivr.net/gh/wanteddev/wanted-sans@v1.0.0/packages/wanted-sans-std/fonts/webfonts/variable/split/WantedSansStdVariable.min.css' },
-      { rel: 'stylesheet', href: 'https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/packages/pretendard-jp/dist/web/variable/pretendardvariable-jp-dynamic-subset.min.css' },
+      {
+        rel: 'stylesheet',
+        href: 'https://cdn.jsdelivr.net/gh/wanteddev/wanted-sans@v1.0.0/packages/wanted-sans/fonts/webfonts/variable/split/WantedSansVariable.min.css',
+      },
+      {
+        rel: 'stylesheet',
+        href: 'https://cdn.jsdelivr.net/gh/wanteddev/wanted-sans@v1.0.0/packages/wanted-sans-std/fonts/webfonts/variable/split/WantedSansStdVariable.min.css',
+      },
+      {
+        rel: 'stylesheet',
+        href: 'https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/packages/pretendard-jp/dist/web/variable/pretendardvariable-jp-dynamic-subset.min.css',
+      },
 
       /* Import Be Vietnam Pro for support Vietnamese */
-      { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Be+Vietnam+Pro:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap' },
+      {
+        rel: 'stylesheet',
+        href: 'https://fonts.googleapis.com/css2?family=Be+Vietnam+Pro:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap',
+      },
     ],
   },
 
@@ -92,7 +105,7 @@ export default {
   // Axios module configuration: https://go.nuxtjs.dev/config-axios
   axios: {
     // Workaround to avoid enforcing hard-coded localhost:3000: https://github.com/nuxt-community/axios-module/issues/308
-    baseURL: apiEndpoint || '/',
+    baseURL: (NODE_ENV === 'production' ? apiEndpoint : apiTestEndpoint) || '/',
   },
 
   // PWA module configuration: https://go.nuxtjs.dev/pwa