From 00053bda7bbcaaf359074c3b35573ee0afc1409d Mon Sep 17 00:00:00 2001 From: Thomas Camlong Date: Wed, 16 Apr 2025 11:34:33 +0200 Subject: [PATCH] feat: Prefer primary color (#2665) --- .../src/app/[locale]/boards/[name]/settings/_appereance.tsx | 2 +- .../src/app/[locale]/boards/[name]/settings/_background.tsx | 2 +- .../src/app/[locale]/boards/[name]/settings/_behavior.tsx | 2 +- .../src/app/[locale]/boards/[name]/settings/_customCss.tsx | 2 +- .../src/app/[locale]/boards/[name]/settings/_general.tsx | 2 +- .../src/app/[locale]/boards/[name]/settings/_layout.tsx | 2 +- .../[userId]/general/_components/_change-home-board.tsx | 2 +- .../general/_components/_change-search-preferences.tsx | 2 +- .../[userId]/general/_components/_first-day-of-week.tsx | 2 +- .../[userId]/general/_components/_ping-icons-enabled.tsx | 2 +- .../users/[userId]/general/_components/_profile-form.tsx | 2 +- .../[userId]/security/_components/_change-password-form.tsx | 2 +- .../manage/users/groups/[id]/_rename-group-form.tsx | 2 +- .../manage/users/groups/[id]/members/_add-group-member.tsx | 6 +----- .../groups/[id]/permissions/_group-permission-form.tsx | 4 ++-- .../users/groups/[id]/settings/_group-home-boards.tsx | 2 +- .../nextjs/src/app/[locale]/manage/users/groups/_client.tsx | 6 +----- .../src/app/[locale]/manage/users/groups/_groups-table.tsx | 2 +- .../manage/users/invites/_components/invite-list.tsx | 6 +----- apps/nextjs/src/components/access/group-access-form.tsx | 2 +- apps/nextjs/src/components/access/user-access-form.tsx | 2 +- .../board/sections/category/category-edit-modal.tsx | 4 +--- .../board/sections/dynamic/dynamic-edit-modal.tsx | 4 +--- packages/modals-collection/src/boards/add-board-modal.tsx | 2 +- packages/modals-collection/src/groups/add-group-modal.tsx | 2 +- .../modals-collection/src/invites/invite-create-modal.tsx | 3 +-- .../src/health-monitoring/cluster/resource-popover.tsx | 2 +- .../widgets/src/modals/widget-advanced-options-modal.tsx | 4 +--- packages/widgets/src/modals/widget-edit-modal.tsx | 4 +--- 29 files changed, 30 insertions(+), 51 deletions(-) diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_appereance.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_appereance.tsx index 0da5fa64a..706ca27df 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_appereance.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_appereance.tsx @@ -123,7 +123,7 @@ export const ColorSettingsContent = ({ board }: Props) => { - diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_background.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_background.tsx index 2607e60f4..71a0450da 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_background.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_background.tsx @@ -159,7 +159,7 @@ export const BackgroundSettingsContent = ({ board }: Props) => { - diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_behavior.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_behavior.tsx index fdfd0042b..9eded5ec4 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_behavior.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_behavior.tsx @@ -38,7 +38,7 @@ export const BehaviorSettingsContent = ({ board }: Props) => { /> - diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_customCss.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_customCss.tsx index 4e007388f..e0d8ec565 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_customCss.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_customCss.tsx @@ -46,7 +46,7 @@ export const CustomCssSettingsContent = ({ board }: Props) => { - diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_general.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_general.tsx index 10d27037f..51be38157 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_general.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_general.tsx @@ -116,7 +116,7 @@ export const GeneralSettingsContent = ({ board }: Props) => { - diff --git a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx index 2c6661cde..fdd14d84b 100644 --- a/apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx +++ b/apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx @@ -105,7 +105,7 @@ export const LayoutSettingsContent = ({ board }: Props) => { - diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx index 1ad8c30b2..52854e744 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx @@ -73,7 +73,7 @@ export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormPro /> - diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx index 5a8a051bd..739f6da2b 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx @@ -66,7 +66,7 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS /> - diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx index d15379b76..5492023ee 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx @@ -71,7 +71,7 @@ export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => { - diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx index 6c5010d52..5ddcc09f0 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx @@ -57,7 +57,7 @@ export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => { /> - diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx index f94458108..2db358cae 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_profile-form.tsx @@ -81,7 +81,7 @@ export const UserProfileForm = ({ user }: UserProfileFormProps) => { {isProviderCredentials && ( - diff --git a/apps/nextjs/src/app/[locale]/manage/users/[userId]/security/_components/_change-password-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/[userId]/security/_components/_change-password-form.tsx index 9fac22f51..32c894b0e 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/[userId]/security/_components/_change-password-form.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/[userId]/security/_components/_change-password-form.tsx @@ -85,7 +85,7 @@ export const ChangePasswordForm = ({ user }: ChangePasswordFormProps) => { /> - diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/_rename-group-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/_rename-group-form.tsx index 23585056d..7cb614b78 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/_rename-group-form.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/_rename-group-form.tsx @@ -68,7 +68,7 @@ export const RenameGroupForm = ({ group, disabled }: RenameGroupFormProps) => { {!disabled && ( - diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/_add-group-member.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/_add-group-member.tsx index 4dddfdca3..2b304a1f9 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/_add-group-member.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/members/_add-group-member.tsx @@ -40,9 +40,5 @@ export const AddGroupMember = ({ groupId, presentUserIds }: AddGroupMemberProps) ); }, [openModal, presentUserIds, groupId, mutateAsync, tMembersAdd]); - return ( - - {tMembersAdd("label")} - - ); + return {tMembersAdd("label")}; }; diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/permissions/_group-permission-form.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/permissions/_group-permission-form.tsx index bcf0d3639..64bc5162c 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/permissions/_group-permission-form.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/permissions/_group-permission-form.tsx @@ -1,7 +1,7 @@ "use client"; -import { useCallback } from "react"; import type { PropsWithChildren } from "react"; +import { useCallback } from "react"; import { Button, Card, Group, Switch, Text, Transition } from "@mantine/core"; import { clientApi } from "@homarr/api/client"; @@ -108,7 +108,7 @@ export const SaveAffix = ({ groupId }: SaveAffixProps) => { - diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx index 62c7e1989..0c1a331ac 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx @@ -71,7 +71,7 @@ export const GroupHomeBoards = ({ homeBoardId, mobileHomeBoardId, groupId }: Gro /> - diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx index 0c46cf7fc..7ca382bff 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx @@ -57,9 +57,5 @@ const AddGroup = () => { openModal(); }, [openModal]); - return ( - - {t("group.action.create.label")} - - ); + return {t("group.action.create.label")}; }; diff --git a/apps/nextjs/src/app/[locale]/manage/users/groups/_groups-table.tsx b/apps/nextjs/src/app/[locale]/manage/users/groups/_groups-table.tsx index d81b902d3..95d5bdfaa 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/groups/_groups-table.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/groups/_groups-table.tsx @@ -264,7 +264,7 @@ const SaveAffix = ({ visible, isPending, onDiscard, onSave }: SaveAffixProps) => - diff --git a/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx b/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx index 8e6d59e62..5fa1b5eff 100644 --- a/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx +++ b/apps/nextjs/src/app/[locale]/manage/users/invites/_components/invite-list.tsx @@ -89,11 +89,7 @@ const RenderTopToolbarCustomActions = () => { openModal(); }, [openModal]); - return ( - - ); + return ; }; const RenderRowActions = ({ row }: { row: MRT_Row }) => { diff --git a/apps/nextjs/src/components/access/group-access-form.tsx b/apps/nextjs/src/components/access/group-access-form.tsx index 4f62f6335..64dee26ab 100644 --- a/apps/nextjs/src/components/access/group-access-form.tsx +++ b/apps/nextjs/src/components/access/group-access-form.tsx @@ -82,7 +82,7 @@ export const GroupAccessForm = ({ - diff --git a/apps/nextjs/src/components/access/user-access-form.tsx b/apps/nextjs/src/components/access/user-access-form.tsx index bf30db619..20b032861 100644 --- a/apps/nextjs/src/components/access/user-access-form.tsx +++ b/apps/nextjs/src/components/access/user-access-form.tsx @@ -104,7 +104,7 @@ export const UsersAccessForm = ({ - diff --git a/apps/nextjs/src/components/board/sections/category/category-edit-modal.tsx b/apps/nextjs/src/components/board/sections/category/category-edit-modal.tsx index 56bbb57a1..55e4780e9 100644 --- a/apps/nextjs/src/components/board/sections/category/category-edit-modal.tsx +++ b/apps/nextjs/src/components/board/sections/category/category-edit-modal.tsx @@ -40,9 +40,7 @@ export const CategoryEditModal = createModal(({ actions, innerProps - + diff --git a/apps/nextjs/src/components/board/sections/dynamic/dynamic-edit-modal.tsx b/apps/nextjs/src/components/board/sections/dynamic/dynamic-edit-modal.tsx index 3ce026800..e01052b36 100644 --- a/apps/nextjs/src/components/board/sections/dynamic/dynamic-edit-modal.tsx +++ b/apps/nextjs/src/components/board/sections/dynamic/dynamic-edit-modal.tsx @@ -48,9 +48,7 @@ export const DynamicSectionEditModal = createModal(({ actions, inner - + diff --git a/packages/modals-collection/src/boards/add-board-modal.tsx b/packages/modals-collection/src/boards/add-board-modal.tsx index 83a5d3509..2b6c70cf4 100644 --- a/packages/modals-collection/src/boards/add-board-modal.tsx +++ b/packages/modals-collection/src/boards/add-board-modal.tsx @@ -82,7 +82,7 @@ export const AddBoardModal = createModal(({ actions }) => { - diff --git a/packages/modals-collection/src/groups/add-group-modal.tsx b/packages/modals-collection/src/groups/add-group-modal.tsx index 178d89581..8b994d3fb 100644 --- a/packages/modals-collection/src/groups/add-group-modal.tsx +++ b/packages/modals-collection/src/groups/add-group-modal.tsx @@ -44,7 +44,7 @@ export const AddGroupModal = createModal(({ actions }) => { - diff --git a/packages/modals-collection/src/invites/invite-create-modal.tsx b/packages/modals-collection/src/invites/invite-create-modal.tsx index b211745ca..85d373474 100644 --- a/packages/modals-collection/src/invites/invite-create-modal.tsx +++ b/packages/modals-collection/src/invites/invite-create-modal.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { Button, Group, Stack, Text } from "@mantine/core"; import { DateTimePicker } from "@mantine/dates"; import dayjs from "dayjs"; @@ -63,7 +62,7 @@ export const InviteCreateModal = createModal(({ actions }) => { - diff --git a/packages/widgets/src/health-monitoring/cluster/resource-popover.tsx b/packages/widgets/src/health-monitoring/cluster/resource-popover.tsx index 1ce8f54fc..eae3e3b30 100644 --- a/packages/widgets/src/health-monitoring/cluster/resource-popover.tsx +++ b/packages/widgets/src/health-monitoring/cluster/resource-popover.tsx @@ -189,7 +189,7 @@ const StorageType = ({ item }: { item: StorageResource }) => { if (item.isShared) { return {t("shared")}; } else { - return {t("local")}; + return {t("local")}; } }; diff --git a/packages/widgets/src/modals/widget-advanced-options-modal.tsx b/packages/widgets/src/modals/widget-advanced-options-modal.tsx index f2dd98db9..1c2996926 100644 --- a/packages/widgets/src/modals/widget-advanced-options-modal.tsx +++ b/packages/widgets/src/modals/widget-advanced-options-modal.tsx @@ -47,9 +47,7 @@ export const WidgetAdvancedOptionsModal = createModal(({ actions, in - + diff --git a/packages/widgets/src/modals/widget-edit-modal.tsx b/packages/widgets/src/modals/widget-edit-modal.tsx index 05fca7fd4..4d0f172bb 100644 --- a/packages/widgets/src/modals/widget-edit-modal.tsx +++ b/packages/widgets/src/modals/widget-edit-modal.tsx @@ -142,9 +142,7 @@ export const WidgetEditModal = createModal>(({ actions, i - +