Skip to content

refactor(ui): unify envVariables.ts #5544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
Merged

refactor(ui): unify envVariables.ts #5544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ui/.env
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ui/admin/src/components/Announcement/AnnouncementEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 0 additions & 4 deletions ui/admin/src/envVariables.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ui/admin/src/layouts/AppLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -292,7 +292,7 @@ const items = reactive([
icon: "mdi-bullhorn",
title: "Announcements",
path: "/announcements",
hidden: !envVariables.announcementsEnable,
hidden: !envVariables.isAnnouncementsEnabled,
},
{
icon: "mdi-cog",
Expand Down
2 changes: 1 addition & 1 deletion ui/admin/src/views/NewAnnouncement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/User/UserWarning.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const setShowDeviceChooser = async () => {
};

const checkForNewAnnouncements = async () => {
if (!envVariables.announcementsEnable) return;
if (!envVariables.isAnnouncementsEnabled) return;

try {
const announcements = await announcementStore.fetchAnnouncements();
Expand Down
3 changes: 2 additions & 1 deletion ui/src/envVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down