diff --git a/ui/.env b/ui/.env deleted file mode 100644 index a3b90844fd7..00000000000 --- a/ui/.env +++ /dev/null @@ -1 +0,0 @@ -SHELLHUB_VERSION=0.9.3 \ No newline at end of file diff --git a/ui/admin/src/components/Announcement/AnnouncementEdit.vue b/ui/admin/src/components/Announcement/AnnouncementEdit.vue index 096a12a3b09..1c00b8efc4e 100644 --- a/ui/admin/src/components/Announcement/AnnouncementEdit.vue +++ b/ui/admin/src/components/Announcement/AnnouncementEdit.vue @@ -74,7 +74,7 @@ import * as yup from "yup"; import useAnnouncementStore from "@admin/store/modules/announcement"; import { IAdminAnnouncementShort } from "@admin/interfaces/IAnnouncement"; import useSnackbar from "@/helpers/snackbar"; -import { envVariables } from "../../envVariables"; +import { envVariables } from "@/envVariables"; import handleError from "@/utils/handleError"; import FormDialog from "@/components/Dialogs/FormDialog.vue"; diff --git a/ui/admin/src/envVariables.ts b/ui/admin/src/envVariables.ts deleted file mode 100644 index 3cff2feda91..00000000000 --- a/ui/admin/src/envVariables.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const envVariables = { - announcementsEnable: process.env.SHELLHUB_ANNOUNCEMENTS === "true", - tinyMceKey: process.env.TINYMCE_API_KEY, -}; diff --git a/ui/admin/src/layouts/AppLayout.vue b/ui/admin/src/layouts/AppLayout.vue index b9471c5699a..43e264e69d9 100644 --- a/ui/admin/src/layouts/AppLayout.vue +++ b/ui/admin/src/layouts/AppLayout.vue @@ -187,7 +187,7 @@ import Snackbar from "@/components/Snackbar/Snackbar.vue"; import Namespace from "@/components/Namespace/Namespace.vue"; import Logo from "@/assets/logo-inverted.png"; import { createNewAdminClient } from "@/api/http"; -import { envVariables } from "../envVariables"; +import { envVariables } from "@/envVariables"; type MenuItem = { title: string; @@ -292,7 +292,7 @@ const items = reactive([ icon: "mdi-bullhorn", title: "Announcements", path: "/announcements", - hidden: !envVariables.announcementsEnable, + hidden: !envVariables.isAnnouncementsEnabled, }, { icon: "mdi-cog", diff --git a/ui/admin/src/views/NewAnnouncement.vue b/ui/admin/src/views/NewAnnouncement.vue index 35fdb1d6349..2cfc44b413e 100644 --- a/ui/admin/src/views/NewAnnouncement.vue +++ b/ui/admin/src/views/NewAnnouncement.vue @@ -72,7 +72,7 @@ import * as yup from "yup"; import { useRouter } from "vue-router"; import useAnnouncementStore from "@admin/store/modules/announcement"; import useSnackbar from "@/helpers/snackbar"; -import { envVariables } from "../envVariables"; +import { envVariables } from "@/envVariables"; import handleError from "@/utils/handleError"; const router = useRouter(); diff --git a/ui/src/components/User/UserWarning.vue b/ui/src/components/User/UserWarning.vue index d0bd047b4b0..198275a82a6 100644 --- a/ui/src/components/User/UserWarning.vue +++ b/ui/src/components/User/UserWarning.vue @@ -102,7 +102,7 @@ const setShowDeviceChooser = async () => { }; const checkForNewAnnouncements = async () => { - if (!envVariables.announcementsEnable) return; + if (!envVariables.isAnnouncementsEnabled) return; try { const announcements = await announcementStore.fetchAnnouncements(); diff --git a/ui/src/envVariables.ts b/ui/src/envVariables.ts index f4ceb3f5212..943091c8cf5 100644 --- a/ui/src/envVariables.ts +++ b/ui/src/envVariables.ts @@ -27,7 +27,8 @@ export const envVariables = { chatWootWebsiteToken: env.VUE_APP_SHELLHUB_CHATWOOT_WEBSITE_TOKEN as string, chatWootBaseURL: env.VUE_APP_SHELLHUB_CHATWOOT_BASEURL as string, version: env.VUE_APP_SHELLHUB_VERSION as string, - announcementsEnable: env.VUE_APP_SHELLHUB_ANNOUNCEMENTS === "true", + isAnnouncementsEnabled: env.VUE_APP_SHELLHUB_ANNOUNCEMENTS === "true", + tinyMceKey: env.VUE_APP_SHELLHUB_TINYMCE_API_KEY as string, stripeKey: env.VUE_APP_SHELLHUB_STRIPE_PUBLISHABLE_KEY as string, sentryDsn: env.VUE_APP_SHELLHUB_SENTRY_DSN_VERSION as string, googleAnalyticsID: env.VUE_APP_SHELLHUB_GOOGLE_ANALYTICS_ID as string,