diff --git a/src/app/main/home/components/Welcome.js b/src/app/main/home/components/Welcome.js index cd5b9ca..1275c4f 100644 --- a/src/app/main/home/components/Welcome.js +++ b/src/app/main/home/components/Welcome.js @@ -8,7 +8,6 @@ function Welcome({ t }) { const onInputType = (event) => { const { target } = event; const value = target?.value ?? ''; - console.log(value); setQuery(value); }; @@ -26,6 +25,7 @@ function Welcome({ t }) { {t('subtitle')}

({ '& .FusePageSimple-header': { @@ -16,21 +52,39 @@ const Root = styled(FusePageSimple)(({ theme }) => ({ '& .FusePageSimple-sidebarContent': {}, })); -function DashboardPage(props) { - const { t } = useTranslation('dashboardPage'); +function DashboardPage({ t }) { + const [query, setQuery] = useState(''); + + const onInputType = (event) => { + const { target } = event; + const value = target?.value ?? ''; + setQuery(value); + }; + + const onSearch = () => { + // query + }; return ( - //

{t('TITLE')}

- // - // } content={ -
-

Content

-
- +
+
+ {categoriesMock.map(({ title, value, valueColor }) => ( + + ))} +
+ + + +
} scroll="content" @@ -38,4 +92,4 @@ function DashboardPage(props) { ); } -export default DashboardPage; +export default withTranslation('dashboardPage')(DashboardPage); diff --git a/src/app/main/navigationPages/dashboard/i18n/en.js b/src/app/main/navigationPages/dashboard/i18n/en.js index 2d905d1..c01a08a 100644 --- a/src/app/main/navigationPages/dashboard/i18n/en.js +++ b/src/app/main/navigationPages/dashboard/i18n/en.js @@ -1,3 +1,5 @@ -const locale = {}; +const locale = { + search_input_btn: 'calculate', +}; export default locale; diff --git a/src/app/main/navigationPages/favorites/Favorites.js b/src/app/main/navigationPages/favorites/Favorites.js index 8067e7f..1a72647 100644 --- a/src/app/main/navigationPages/favorites/Favorites.js +++ b/src/app/main/navigationPages/favorites/Favorites.js @@ -1,5 +1,5 @@ import FusePageSimple from '@fuse/core/FusePageSimple'; -import { Paper } from '@mui/material'; +import Paper from '@mui/material/Paper'; import { styled } from '@mui/material/styles'; import { PROPERTIES_LAYOUTS } from 'app/configs/consts'; import { selectUserFavorites, updateUserFavorites } from 'app/store/userSlice'; diff --git a/src/app/main/navigationPages/history/History.js b/src/app/main/navigationPages/history/History.js index aa9d71f..bf59b92 100644 --- a/src/app/main/navigationPages/history/History.js +++ b/src/app/main/navigationPages/history/History.js @@ -1,5 +1,5 @@ import FusePageSimple from '@fuse/core/FusePageSimple'; -import { Paper } from '@mui/material'; +import Paper from '@mui/material/Paper'; import { styled } from '@mui/material/styles'; import { PROPERTIES_LAYOUTS } from 'app/configs/consts'; import { selectUserHistory, updateUserFavorites, updateUserHistory } from 'app/store/userSlice'; diff --git a/src/app/main/navigationPages/shared-components/DashboardCategory.js b/src/app/main/navigationPages/shared-components/DashboardCategory.js new file mode 100644 index 0000000..c5d456b --- /dev/null +++ b/src/app/main/navigationPages/shared-components/DashboardCategory.js @@ -0,0 +1,27 @@ +import Typography from '@mui/material/Typography'; +import clsx from 'clsx'; +import { memo } from 'react'; + +function DashboardCategory({ className, title, value, valueColor }) { + return ( + + ); +} + +export default memo(DashboardCategory); diff --git a/src/app/main/shared-components/SearchInput.js b/src/app/main/shared-components/SearchInput.js index 66d4f3b..cee74f2 100644 --- a/src/app/main/shared-components/SearchInput.js +++ b/src/app/main/shared-components/SearchInput.js @@ -1,7 +1,14 @@ -import { forwardRef, memo, useCallback } from 'react'; -import TextField from '@mui/material/TextField'; -import Button from '@mui/material/Button'; import _ from '@lodash'; +import Button from '@mui/material/Button'; +// import Select from '@mui/material/Select'; +import TextField from '@mui/material/TextField'; +import clsx from 'clsx'; +import { forwardRef, memo, useCallback } from 'react'; + +const SEARCH_INPUT_MODES = { + simple: 'simple', + manual: 'manual', +}; const StyledTextField = forwardRef((props, ref) => ( ( /> )); -function SearchInput({ mode, placeholder, btnText, query, onType, onSearch }) { - const isSimpleMode = mode === 'simple'; +function SearchInput({ className, mode, placeholder, btnText, query, onType, onSearch }) { + const isSimpleMode = mode === SEARCH_INPUT_MODES.simple; + const isManualMode = mode === SEARCH_INPUT_MODES.manual; + const hasBtn = isSimpleMode || isManualMode; const debouncedOnType = useCallback(_.debounce(onType, 250), [onType]); return ( -
+ - {isSimpleMode && ( + {/* {isManualMode &&