diff --git a/src/themes/overrides/Checkbox.js b/src/themes/overrides/Checkbox.js
index 0bf2a99..1cc4056 100644
--- a/src/themes/overrides/Checkbox.js
+++ b/src/themes/overrides/Checkbox.js
@@ -1,11 +1,18 @@
// ==============================|| OVERRIDES - CHECKBOX ||============================== //
export default function Checkbox(theme) {
+
+ const checkboxSize = "2rem"
+
return {
MuiCheckbox: {
styleOverrides: {
root: {
- color: theme.palette.secondary[300]
+ color: theme.palette.secondary[300],
+ svg: {
+ width: checkboxSize,
+ height: checkboxSize,
+ }
}
}
}
diff --git a/src/themes/overrides/DataGrid.js b/src/themes/overrides/DataGrid.js
index a400e26..778a5a0 100644
--- a/src/themes/overrides/DataGrid.js
+++ b/src/themes/overrides/DataGrid.js
@@ -6,6 +6,7 @@ export default function DataGrid() {
const cellHeaderFontSize = "1.1rem"
const selectedNumberFontSize = "1.2rem"
const actionIconSize = "2rem"
+ const actionCellIconSize = "1.7rem"
const cellFontWeight = 600
const cellFooterFontWeight = 600
@@ -16,7 +17,6 @@ export default function DataGrid() {
MuiDataGrid: {
styleOverrides: {
root: {
- // fontSize: "3rem"
'& .MuiDataGrid-cell': {
fontSize: cellFontSize,
fontWeight: cellFontWeight
@@ -50,6 +50,14 @@ export default function DataGrid() {
height: actionIconSize,
}
},
+ '& .MuiDataGrid-actionsCell': {
+ fontSize: cellFooterFontSize,
+ fontWeight: cellFooterFontWeight,
+ svg: {
+ width: actionCellIconSize,
+ height: actionCellIconSize,
+ },
+ },
'& .MuiDataGrid-rowCount': {
fontSize: cellFooterFontSize,
fontWeight: cellFooterFontWeight
diff --git a/src/themes/overrides/FormControlLabel.js b/src/themes/overrides/FormControlLabel.js
new file mode 100644
index 0000000..8683f16
--- /dev/null
+++ b/src/themes/overrides/FormControlLabel.js
@@ -0,0 +1,19 @@
+// ==============================|| OVERRIDES - FORMCONTROLLABEL ||============================== //
+
+export default function FormControlLabel() {
+ const fontSize = "1.275rem"
+ const fontWeight = 600
+
+ return {
+ MuiFormControlLabel: {
+ styleOverrides: {
+ root: {
+ "& .MuiFormControlLabel-label": {
+ fontSize: fontSize,
+ fontWeight: fontWeight,
+ },
+ },
+ }
+ }
+ };
+}
diff --git a/src/themes/overrides/index.js b/src/themes/overrides/index.js
index 43864f2..bb2888c 100644
--- a/src/themes/overrides/index.js
+++ b/src/themes/overrides/index.js
@@ -19,6 +19,7 @@ import Tabs from './Tabs';
import Typography from './Typography';
import Textfield from './Textfield';
import DataGrid from './DataGrid';
+import FormControlLabel from './FormControlLabel';
// ==============================|| OVERRIDES - MAIN ||============================== //
@@ -30,6 +31,7 @@ export default function ComponentsOverrides(theme) {
Checkbox(theme),
Chip(theme),
DataGrid(),
+ FormControlLabel(),
IconButton(theme),
InputLabel(theme),
LinearProgress(),
diff --git a/src/utils/CommonFunction.js b/src/utils/CommonFunction.js
index c1e6f9b..2101d28 100644
--- a/src/utils/CommonFunction.js
+++ b/src/utils/CommonFunction.js
@@ -113,6 +113,18 @@ export const notifyLockSuccess = () => {
theme: "light",
})};
+export const notifyUnlockSuccess = () => {
+ toast.success('Unlock success!', {
+ position: "bottom-right",
+ autoClose: 5000,
+ hideProgressBar: false,
+ closeOnClick: true,
+ pauseOnHover: true,
+ draggable: true,
+ progress: undefined,
+ theme: "light",
+})};
+
export const notifyActiveSuccess = () => {
toast.success('Active success!', {
position: "bottom-right",
diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js
index f48ed13..945cd50 100644
--- a/src/utils/FieldUtils.js
+++ b/src/utils/FieldUtils.js
@@ -1,6 +1,6 @@
import {
- Grid, TextField, Stack
+ Grid, TextField, Stack, Typography
} from '@mui/material';
import Combo from "./Combo";
@@ -13,7 +13,7 @@ export const notNullFieldLabel = (label) => {
export const getDateField = ({ label, valueName, form, disabled }) => {
return
- {label}
+ {label}
{initField({
@@ -30,7 +30,7 @@ export const getTextField = ({ label, valueName, form, disabled }) => {
return
- {label}
+ {label}
{initField({
@@ -47,7 +47,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
return
- {label}
+ {label}
{initField({
@@ -79,7 +79,7 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => {
return
- {label}
+ {label}
@@ -88,7 +88,7 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => {
valueName: valueName.code,
form: form,
disabled: disabled,
- width: '25%'
+ width: '35%'
})}
{initField({
type: "tel",
@@ -103,59 +103,61 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => {
export const getAddressField = ({ label, valueName, form, disabled }) => {
- return
-
- {label}
+ return
+
+
+ {label}
-
-
- {initField({
- type: "text",
- valueName: valueName[0],
- form: form,
- disabled: disabled
- })}
-
-
- {initField({
- type: "text",
- valueName: valueName[1],
- form: form,
- disabled: disabled
- })}
-
-
- {initField({
- type: "text",
- valueName: valueName[2],
- form: form,
- disabled: disabled
- })}
-
+
+
+
+ {initField({
+ type: "text",
+ valueName: valueName[0],
+ form: form,
+ disabled: disabled
+ })}
+
+
+ {initField({
+ type: "text",
+ valueName: valueName[1],
+ form: form,
+ disabled: disabled
+ })}
+
+
+ {initField({
+ type: "text",
+ valueName: valueName[2],
+ form: form,
+ disabled: disabled
+ })}
- ;
+
+ ;
}
export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => {
return
-
- {label}
-
-
-
-
-
- ;
+
+ {label}
+
+
+
+
+
+ ;
}
export const initField = ({ type, valueName, form, disabled, multiline, placeholder, inputProps, width, ...props }) => {