diff --git a/03_source/frontend/src/actions/calendar.ts b/03_source/frontend/src/actions/calendar.ts index 70e3e04..b53ed7f 100644 --- a/03_source/frontend/src/actions/calendar.ts +++ b/03_source/frontend/src/actions/calendar.ts @@ -1,11 +1,9 @@ -import type { SWRConfiguration } from 'swr'; -import type { ICalendarEvent } from 'src/types/calendar'; - import { useMemo } from 'react'; +import axios, { endpoints, fetcher } from 'src/lib/axios'; +import type { ICalendarEvent } from 'src/types/calendar'; +import type { SWRConfiguration } from 'swr'; import useSWR, { mutate } from 'swr'; -import axios, { fetcher, endpoints } from 'src/lib/axios'; - // ---------------------------------------------------------------------- const enableServer = false; diff --git a/03_source/frontend/src/components/custom-dialog/confirm-dialog.tsx b/03_source/frontend/src/components/custom-dialog/confirm-dialog.tsx index 0f8ae28..8c5edef 100644 --- a/03_source/frontend/src/components/custom-dialog/confirm-dialog.tsx +++ b/03_source/frontend/src/components/custom-dialog/confirm-dialog.tsx @@ -1,15 +1,21 @@ import Button from '@mui/material/Button'; import Dialog from '@mui/material/Dialog'; -import DialogTitle from '@mui/material/DialogTitle'; import DialogActions from '@mui/material/DialogActions'; import DialogContent from '@mui/material/DialogContent'; - -import type { ConfirmDialogProps } from './types'; +import DialogTitle from '@mui/material/DialogTitle'; import { useTranslation } from 'react-i18next'; +import type { ConfirmDialogProps } from './types'; // ---------------------------------------------------------------------- -export function ConfirmDialog({ open, title, action, content, onClose, ...other }: ConfirmDialogProps) { +export function ConfirmDialog({ + open, + title, + action, + content, + onClose, + ...other +}: ConfirmDialogProps) { const { t } = useTranslation(); return ( diff --git a/03_source/frontend/src/components/hook-form/fields.tsx b/03_source/frontend/src/components/hook-form/fields.tsx index 9b08b50..05aa31a 100644 --- a/03_source/frontend/src/components/hook-form/fields.tsx +++ b/03_source/frontend/src/components/hook-form/fields.tsx @@ -1,22 +1,22 @@ // src/components/hook-form/fields.tsx // -import { RHFCode } from './rhf-code'; -import { RHFRating } from './rhf-rating'; -import { RHFEditor } from './rhf-editor'; -import { RHFSlider } from './rhf-slider'; -import { RHFUpload } from './rhf-upload'; -import { RHFTextField } from './rhf-text-field'; -import { RHFUploadBox } from './rhf-upload-box'; -import { RHFRadioGroup } from './rhf-radio-group'; -import { RHFPhoneInput } from './rhf-phone-input'; -import { RHFNumberInput } from './rhf-number-input'; import { RHFAutocomplete } from './rhf-autocomplete'; -import { RHFUploadAvatar } from './rhf-upload-avatar'; -import { RHFCountrySelect } from './rhf-country-select'; -import { RHFSwitch, RHFMultiSwitch } from './rhf-switch'; -import { RHFSelect, RHFMultiSelect } from './rhf-select'; import { RHFCheckbox, RHFMultiCheckbox } from './rhf-checkbox'; +import { RHFCode } from './rhf-code'; +import { RHFCountrySelect } from './rhf-country-select'; import { RHFDatePicker, RHFMobileDateTimePicker } from './rhf-date-picker'; +import { RHFEditor } from './rhf-editor'; +import { RHFNumberInput } from './rhf-number-input'; +import { RHFPhoneInput } from './rhf-phone-input'; +import { RHFRadioGroup } from './rhf-radio-group'; +import { RHFRating } from './rhf-rating'; +import { RHFMultiSelect, RHFSelect } from './rhf-select'; +import { RHFSlider } from './rhf-slider'; +import { RHFMultiSwitch, RHFSwitch } from './rhf-switch'; +import { RHFTextField } from './rhf-text-field'; +import { RHFUpload } from './rhf-upload'; +import { RHFUploadAvatar } from './rhf-upload-avatar'; +import { RHFUploadBox } from './rhf-upload-box'; // ---------------------------------------------------------------------- diff --git a/03_source/frontend/src/components/mega-menu/components/nav-sub-list.tsx b/03_source/frontend/src/components/mega-menu/components/nav-sub-list.tsx index cde488f..7e778c4 100644 --- a/03_source/frontend/src/components/mega-menu/components/nav-sub-list.tsx +++ b/03_source/frontend/src/components/mega-menu/components/nav-sub-list.tsx @@ -1,17 +1,13 @@ -import { isEqualPath } from 'minimal-shared/utils'; - import Link from '@mui/material/Link'; import { styled } from '@mui/material/styles'; import Typography from '@mui/material/Typography'; - -import { usePathname } from 'src/routes/hooks'; -import { RouterLink } from 'src/routes/components'; - -import { megaMenuClasses } from '../styles'; -import { NavUl, NavLi } from './nav-elements'; - -import type { NavSubItemProps, NavSubListProps } from '../types'; +import { isEqualPath } from 'minimal-shared/utils'; import { useTranslation } from 'react-i18next'; +import { RouterLink } from 'src/routes/components'; +import { usePathname } from 'src/routes/hooks'; +import { megaMenuClasses } from '../styles'; +import type { NavSubItemProps, NavSubListProps } from '../types'; +import { NavLi, NavUl } from './nav-elements'; // ---------------------------------------------------------------------- @@ -24,7 +20,13 @@ export function NavSubList({ data, slotProps, ...other }: NavSubListProps) { {data?.map((list) => ( {list?.subheader && ( - + {list.subheader} )} diff --git a/03_source/frontend/src/components/nav-section/components/nav-subheader.tsx b/03_source/frontend/src/components/nav-section/components/nav-subheader.tsx index 90eb24c..cd3284a 100644 --- a/03_source/frontend/src/components/nav-section/components/nav-subheader.tsx +++ b/03_source/frontend/src/components/nav-section/components/nav-subheader.tsx @@ -1,20 +1,25 @@ import type { ListSubheaderProps } from '@mui/material/ListSubheader'; - -import { mergeClasses } from 'minimal-shared/utils'; - -import { styled } from '@mui/material/styles'; import ListSubheader from '@mui/material/ListSubheader'; - -import { navSectionClasses } from '../styles'; +import { styled } from '@mui/material/styles'; +import { mergeClasses } from 'minimal-shared/utils'; import { Iconify, iconifyClasses } from '../../iconify'; +import { navSectionClasses } from '../styles'; // ---------------------------------------------------------------------- export type NavSubheaderProps = ListSubheaderProps & { open?: boolean }; export const NavSubheader = styled(({ open, children, className, ...other }: NavSubheaderProps) => ( - - + + {children} ))(({ theme }) => ({ diff --git a/03_source/frontend/src/sections/user/user-table-row.tsx b/03_source/frontend/src/sections/user/user-table-row.tsx index 464eb3f..6b81814 100644 --- a/03_source/frontend/src/sections/user/user-table-row.tsx +++ b/03_source/frontend/src/sections/user/user-table-row.tsx @@ -11,6 +11,7 @@ import TableCell from '@mui/material/TableCell'; import TableRow from '@mui/material/TableRow'; import Tooltip from '@mui/material/Tooltip'; import { useBoolean, usePopover } from 'minimal-shared/hooks'; +import { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ConfirmDialog } from 'src/components/custom-dialog'; import { CustomPopover } from 'src/components/custom-popover'; @@ -19,7 +20,6 @@ import { Label } from 'src/components/label'; import { RouterLink } from 'src/routes/components'; import type { IUserItem } from 'src/types/user'; import { UserQuickEditForm } from './user-quick-edit-form'; -import { useState } from 'react'; // ---------------------------------------------------------------------- diff --git a/03_source/frontend/yarn.lock b/03_source/frontend/yarn.lock index 767a9ff..c44f965 100644 --- a/03_source/frontend/yarn.lock +++ b/03_source/frontend/yarn.lock @@ -1604,6 +1604,11 @@ resolved "https://registry.npmjs.org/@fontsource-variable/nunito-sans/-/nunito-sans-5.2.5.tgz" integrity sha512-J8Bi9OBUQvXwDvt9QofXD4joorYy3O9+4AU7cPx/ioa+xlH4HjAJNhA/N+nCu7IOMjFsbEbM2ZZCWQrsmQMsQw== +"@fontsource-variable/public-sans@^5.2.5": + version "5.2.6" + resolved "https://registry.yarnpkg.com/@fontsource-variable/public-sans/-/public-sans-5.2.6.tgz#bd000ef86cdcdb60abd42b71050dc32cab83f04d" + integrity sha512-NXUIBhVuxk0n0S5ZUQvEJNw6k2vtgh4GIHHGMNm1hPt2dyyl7ScsDoygzUi1Q/LD4+nj6mlb1qjITzNcBAo4dw== + "@fontsource/barlow@^5.2.5": version "5.2.5" resolved "https://registry.npmjs.org/@fontsource/barlow/-/barlow-5.2.5.tgz" @@ -1716,10 +1721,10 @@ resolved "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz" integrity sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ== -"@ianvs/prettier-plugin-sort-imports@^4.4.1": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.4.1.tgz#d8a182fc1a74d687df335b2b17b347e232b6f495" - integrity sha512-F0/Hrcfpy8WuxlQyAWJTEren/uxKhYonOGY4OyWmwRdeTvkh9mMSCxowZLjNkhwi/2ipqCgtXwwOk7tW0mWXkA== +"@ianvs/prettier-plugin-sort-imports@^4.4.2": + version "4.4.2" + resolved "https://registry.yarnpkg.com/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.4.2.tgz#b4e0fa40249ffe5b80a3d65b294b1c49f0a7757e" + integrity sha512-KkVFy3TLh0OFzimbZglMmORi+vL/i2OFhEs5M07R9w0IwWAGpsNNyE4CY/2u0YoMF5bawKC2+8/fUH60nnNtjw== dependencies: "@babel/generator" "^7.26.2" "@babel/parser" "^7.26.2"