mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2025-12-31 13:39:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: style improvements

Browse Source
This commit is contained in:
Eli Bosley
2025-01-27 16:19:39 -05:00
parent e338eb9788
commit a8211cef7d
10 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/core/sso/sso-remove.ts
View File

@@ -1,6 +1,6 @@
import { existsSync, renameSync, unlinkSync } from 'node:fs';
import { cliLogger } from '@app/core/log';
import { logger } from '@app/core/log';
export const removeSso = () => {
const path = '/usr/local/emhttp/plugins/dynamix/include/.login.php';
@@ -13,8 +13,8 @@ export const removeSso = () => {
unlinkSync(path);
}
renameSync(backupPath, path);
cliLogger.debug('SSO login file restored.');
logger.debug('SSO login file restored.');
} else {
cliLogger.debug('No SSO login file backup found.');
logger.debug('No SSO login file backup found.');
}
};

1
api/src/index.ts
View File

@@ -108,7 +108,6 @@ try {
logger.info('SSO setup complete');
} else {
await removeSso();
logger.info('SSO removed');
}
} catch (err) {
logger.error('Failed to setup SSO with error: %o', err);

3
api/src/unraid-api/cli/sso/add-sso-user.command.ts
View File

@@ -40,7 +40,8 @@ export class AddSSOUserCommand extends CommandRunner {
writeConfigSync('flash');
this.logger.info(`User added ${options.username}`);
if (shouldRestart) {
this.logger.info('Restarting the Unraid API to enable to SSO button');
this.logger.info('Restarting the Unraid API in 5 seconds to enable the SSO button');
await new Promise(resolve => setTimeout(resolve, 5000));
await this.restartCommand.run([]);
}
}

11
api/src/unraid-api/cli/start.command.ts
View File

@@ -17,6 +17,17 @@ export class StartCommand extends CommandRunner {
async run(_: string[], options: StartCommandOptions): Promise<void> {
this.logger.info('Starting the Unraid API');
// Update PM2 first if necessary
const { stderr: updateErr, stdout: updateOut } = await execa(`${PM2_PATH} update`);
if (updateOut) {
this.logger.log(updateOut);
}
if (updateErr) {
this.logger.error('PM2 Update Error: ' + updateErr);
process.exit(1);
}
const envLog = options['log-level'] ? `LOG_LEVEL=${options['log-level']}` : '';
const { stderr, stdout } = await execa(`${envLog} ${PM2_PATH}`.trim(), [
'start',

2
unraid-ui/src/components/common/sheet/sheet.variants.ts
View File

@@ -1,7 +1,7 @@
import { cva } from "class-variance-authority";
export const sheetVariants = cva(
"fixed z-50 bg-background gap-4 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
"fixed z-50 bg-background gap-4 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 border-border",
{
variants: {
side: {

3
unraid-ui/src/theme/preset.ts
View File

@@ -14,6 +14,9 @@ export const unraidPreset = {
},
},
extend: {
borderColor: {
DEFAULT: "hsl(var(--border))",
},
fontFamily: {
sans: "clear-sans,ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji",
},

3
web/assets/main.css
View File

@@ -39,9 +39,6 @@ body {
@tailwind utilities;
@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}

2
web/components/Notifications/List.vue
View File

@@ -70,7 +70,7 @@ async function onLoadMore() {
<div
v-if="notifications?.length > 0"
v-infinite-scroll="[onLoadMore, { canLoadMore: () => canLoadMore }]"
class="divide-y divide-gray-200 px-7 flex flex-col overflow-y-scroll flex-1 min-h-0"
class="divide-y px-7 flex flex-col overflow-y-scroll flex-1 min-h-0"
>
<NotificationsItem
v-for="notification in notifications"

2
web/components/shadcn/sheet/index.ts
View File

@@ -10,7 +10,7 @@ export { default as SheetDescription } from './SheetDescription.vue'
export { default as SheetFooter } from './SheetFooter.vue'
export const sheetVariants = cva(
'fixed z-50 bg-muted dark:bg-background gap-4 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500',
'fixed z-50 bg-muted dark:bg-background gap-4 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500 border-border',
{
variants: {
side: {

9
web/store/theme.ts
View File

@@ -32,7 +32,7 @@ export const defaultColors: Record<string, ThemeVariables> = {
'--popover-foreground': '0 0% 98%',
'--card': '0 0% 14.9%',
'--card-foreground': '0 0% 98%',
'--border': '0 0% 14.9%',
'--border': '0 0% 20%',
'--input': '0 0% 14.9%',
'--primary': '24 100% 50%',
'--primary-foreground': '0 0% 98%',
@@ -74,8 +74,8 @@ export const defaultColors: Record<string, ThemeVariables> = {
},
} as const;
export const DARK_THEMES = ['black', 'azure'] as const;
// used to swap the UPC text color when using the azure or gray theme
export const DARK_THEMES = ['black', 'gray'] as const;
export const useThemeStore = defineStore('theme', () => {
// State
@@ -83,10 +83,11 @@ export const useThemeStore = defineStore('theme', () => {
const activeColorVariables = ref<ThemeVariables>(defaultColors.light);
// Getters
const darkMode = computed<boolean>(
() => DARK_THEMES.includes(theme.value?.name as (typeof DARK_THEMES)[number]) ?? false
);
// used to swap the UPC text color when using the azure or gray theme
const bannerGradient = computed(() => {
if (!theme.value?.banner || !theme.value?.bannerGradient) {
return undefined;