Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions web/components/UserProfile/DropdownLaunchpad.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<script lang="ts" setup>
import { BrandButton, BrandLoadingWhite } from '@unraid/ui';
import { BrandButton, BrandLoading } from '@unraid/ui';
import { useServerStore } from '~/store/server';
import { useUnraidApiStore } from '~/store/unraidApi';
import { storeToRefs } from 'pinia';
import { h } from 'vue';
import type { ComposerTranslation } from 'vue-i18n';

defineProps<{ t: ComposerTranslation }>();
Expand Down Expand Up @@ -34,7 +35,11 @@ const showExpireTime = computed(
<BrandButton
class="w-full"
:disabled="unraidApiStatus === 'connecting' || unraidApiStatus === 'restarting'"
:icon="unraidApiStatus === 'restarting' ? BrandLoadingWhite : unraidApiRestartAction?.icon"
:icon="
unraidApiStatus === 'restarting'
? h(BrandLoading, { variant: 'white' })
: unraidApiRestartAction?.icon
"
:text="
unraidApiStatus === 'restarting' ? t('Restarting unraid-api…') : t('Restart unraid-api')
"
Expand Down
11 changes: 8 additions & 3 deletions web/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default defineNuxtConfig({
},

devtools: {
enabled: true,
enabled: process.env.NODE_ENV === 'development',
},

modules: [
Expand Down Expand Up @@ -87,6 +87,10 @@ export default defineNuxtConfig({
includes: ['log', 'info', 'debug'],
}),
],
define: {
'globalThis.__DEV__': process.env.NODE_ENV === 'development',
__VUE_PROD_DEVTOOLS__: false,
},
build: {
minify: 'terser',
terserOptions: {
Expand Down Expand Up @@ -151,8 +155,9 @@ export default defineNuxtConfig({
name: 'UnraidWelcomeModal',
path: '@/components/WelcomeModal.ce',
},
{ name: 'UnraidSsoButton',
path: '@/components/SsoButton.ce'
{
name: 'UnraidSsoButton',
path: '@/components/SsoButton.ce',
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"prebuild:webgui": "./scripts/prebuild-webgui-set-env.sh",
"build:webgui": "npm run type-check && nuxt build && npm run manifest-ts && npm run copy-to-webgui-repo",
"postbuild:webgui": "./scripts/postbuild-webgui-restore-env.sh",
"build": "npm run type-check && nuxt build && npm run manifest-ts",
"build": "NODE_ENV=production npm run type-check && nuxt build && npm run manifest-ts",
"deploy-to-unraid:dev": "./scripts/deploy-dev.sh",
"copy-to-webgui-repo": "./scripts/copy-to-webgui-repo.sh",
"manifest-ts": "node ./scripts/add-timestamp-webcomponent-manifest.js",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
"serve": "serve dist/nuxt-custom-elements/unraid-components",
"serve": "NODE_ENV=production PORT=${PORT:-4321} node .output/server/index.mjs",
"codegen": "graphql-codegen --config codegen.ts -r dotenv/config",
"codegen:watch": "graphql-codegen --config codegen.ts --watch -r dotenv/config",
"test": "vitest",
Expand Down
Loading