From e863ab2901aae066c1e3c46c34c155099db9b81a Mon Sep 17 00:00:00 2001 From: barbapapazes Date: Sun, 23 Jun 2024 08:58:12 +0200 Subject: [PATCH] refactor: runtime config --- nuxt.config.ts | 22 +++++++++++++--------- server/api/activity.get.ts | 4 ++-- server/api/stats.get.ts | 12 +++++++----- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index 30c37b8..b170b03 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -69,13 +69,17 @@ export default defineNuxtConfig({ }, runtimeConfig: { - discordUserId: process.env.NUXT_DISCORD_USER_ID, - discordId: process.env.NUXT_DISCORD_ID, - discordToken: process.env.NUXT_DISCORD_TOKEN, - wakatimeUserId: process.env.NUXT_WAKATIME_USER_UD, - wakatimeCodig: process.env.NUXT_WAKATIME_CODING, - wakatimeEditors: process.env.NUXT_WAKATIME_EDITORS, - wakatimeLanguages: process.env.NUXT_WAKATIME_LANGUAGES, - wakatimeOs: process.env.NUXT_WAKATIME_OS - } + discord: { + userId: "", + id: "", + token: "", + }, + wakatime: { + userId: "", + coding: "", + editors: "", + languages: "", + os: "", + }, + }, }) diff --git a/server/api/activity.get.ts b/server/api/activity.get.ts index 8785ab1..cefbaca 100644 --- a/server/api/activity.get.ts +++ b/server/api/activity.get.ts @@ -1,4 +1,4 @@ export default defineEventHandler(async (event) => { - const config = useRuntimeConfig(event) - return await $fetch(`https://api.lanyard.rest/v1/users/${config.discordUserId}`) + const { discord } = useRuntimeConfig(event) + return await $fetch(`https://api.lanyard.rest/v1/users/${discord.userId}`) }) diff --git a/server/api/stats.get.ts b/server/api/stats.get.ts index 5e0a60e..f704a1c 100644 --- a/server/api/stats.get.ts +++ b/server/api/stats.get.ts @@ -1,9 +1,11 @@ export default defineEventHandler(async (event) => { - const config = useRuntimeConfig(event) - const coding = await $fetch(`https://wakatime.com/share/${config.wakatimeUserId}/${config.wakatimeCodig}.json`) - const editors = await $fetch(`https://wakatime.com/share/${config.wakatimeUserId}/${config.wakatimeEditors}.json`) - const os = await $fetch(`https://wakatime.com/share/${config.wakatimeUserId}/${config.wakatimeOs}.json`) - const languages = await $fetch(`https://wakatime.com/share/${config.wakatimeUserId}/${config.wakatimeLanguages}.json`) + const { wakatime } = useRuntimeConfig(event) + + const coding = await $fetch(`https://wakatime.com/share/${wakatime.userId}/${wakatime.coding}.json`) + const editors = await $fetch(`https://wakatime.com/share/${wakatime.userId}/${wakatime.editors}.json`) + const os = await $fetch(`https://wakatime.com/share/${wakatime.userId}/${wakatime.os}.json`) + const languages = await $fetch(`https://wakatime.com/share/${wakatime.userId}/${wakatime.languages}.json`) + return { coding, editors,