Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Berry Free React Material UI Admin Template [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Get%20Berry%20React%20-%20The%20most%20beautiful%20Material%20designed%20Admin%20Dashboard%20Template%20&url=https://berrydashboard.io&via=codedthemes&hashtags=reactjs,webdev,developers,javascript)
# Berry Free React Material UI Admin Template [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Get%20Berry%20React%20-%20The%20most%20beautiful%20Material%20designed%20Admin%20Dashboard%20Template%20&url=https://berrydashboard.com&via=codedthemes&hashtags=reactjs,webdev,developers,javascript)

[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Price](https://img.shields.io/badge/price-FREE-0098f7.svg)](https://github.com/codedthemes/berry-free-react-admin-template/blob/main/LICENSE)
Expand All @@ -10,7 +10,7 @@ Berry is a free Material UI admin dashboard template built with React. It is mea

✨ Support us! If you like this theme, click the ⭐ (Top right) and let it shine

![IMG_8566.jpg](https://berrydashboard.io/imp-images/berry-github-free-repo-1.jpg)
![IMG_8566.jpg](https://berrydashboard.com/imp-images/berry-github-free-repo-1.jpg)

## Table of contents

Expand Down Expand Up @@ -43,10 +43,10 @@ git clone https://github.com/codedthemes/berry-free-react-admin-template.git
## Download

- Berry Free
- [Live Preview](https://berrydashboard.io/free/)
- [Live Preview](https://berrydashboard.com/free/)
- [Download](https://github.com/codedthemes/berry-free-react-admin-template)
- Berry
- [Live Preview](https://berrydashboard.io)
- [Live Preview](https://berrydashboard.com)
- [Download](https://material-ui.com/store/items/berry-react-material-admin/)

## Why Berry?
Expand All @@ -62,19 +62,19 @@ Berry offers everything you need to create dashboards. We have included the foll

## What's included in Premium Version?

[Pro version](https://berrydashboard.io) of Berry react template contains features like TypeScript, Next.js Seed versions, Apps, Authentication Methods (i.e. JWT, Auth0, Firebase, AWS, Supabase), Advance Components, Form Plugins, Layouts, Widgets, and many more.
[Pro version](https://berrydashboard.com) of Berry react template contains features like TypeScript, Next.js Seed versions, Apps, Authentication Methods (i.e. JWT, Auth0, Firebase, AWS, Supabase), Advance Components, Form Plugins, Layouts, Widgets, and many more.

| [Berry Free](https://berrydashboard.io/free/) | [Berry](https://material-ui.com/store/items/berry-react-material-admin/) |
| --------------------------------------------- | :----------------------------------------------------------------------- |
| **9** Demo pages | **45+** demo pages |
| - | ✓ Multi-language |
| - | ✓ Dark/Light Mode 🌓 |
| - | ✓ TypeScript version |
| - | ✓ Design files (Figma) |
| - | ✓ 6+ color Options |
| - | ✓ RTL |
| - | ✓ JWT, Firebase, Auth0, AWS, Supabase authentications |
| - | ✓ [More components](https://berrydashboard.io/components/autocomplete) |
| [Berry Free](https://berrydashboard.com/free/) | [Berry](https://material-ui.com/store/items/berry-react-material-admin/) |
| ---------------------------------------------- | :----------------------------------------------------------------------- |
| **9** Demo pages | **45+** demo pages |
| - | ✓ Multi-language |
| - | ✓ Dark/Light Mode 🌓 |
| - | ✓ TypeScript version |
| - | ✓ Design files (Figma) |
| - | ✓ 6+ color Options |
| - | ✓ RTL |
| - | ✓ JWT, Firebase, Auth0, AWS, Supabase authentications |
| - | ✓ [More components](https://berrydashboard.com/components/autocomplete) |

## Documentation

Expand All @@ -86,7 +86,8 @@ Berry offers everything you need to create dashboards. We have included the foll

## Technology Stack

- [Material UI V6](https://material-ui.com/)
- [Material UI V7](https://material-ui.com/)
- [React 19](https://react.dev/)
- Built with React Hooks API
- Redux & React Context API for State Management
- React Router for Navigation Routing
Expand Down
10 changes: 5 additions & 5 deletions remix/app/root.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,23 @@ export default function App() {
<meta name="author" content="CodedThemes" />
<meta property="og:locale" content="en_US" />
<meta property="og:type" content="website" />
<meta property="og:url" content="https://berrydashboard.io/" />
<meta property="og:site_name" content="berrydashboard.io" />
<meta property="og:url" content="https://berrydashboard.com/" />
<meta property="og:site_name" content="berrydashboard.com" />
<meta property="article:publisher" content="https://www.facebook.com/codedthemes" />
<meta property="og:title" content="Berry - React Material Dashboard Template" />
<meta
property="og:description"
content="Berry Dashboard is made for the faster web application development built using Material-UI, Reactjs, Redux & Hook API."
/>
<meta property="og:image" content="https://berrydashboard.io/og-image/og-facebook.png" />
<meta property="og:image" content="https://berrydashboard.com/og-image/og-facebook.png" />
<meta property="twitter:card" content="summary_large_image" />
<meta property="twitter:url" content="https://berrydashboard.io" />
<meta property="twitter:url" content="https://berrydashboard.com" />
<meta property="twitter:title" content="Berry - React Material Dashboard Template" />
<meta
property="twitter:description"
content="Berry Dashboard is made for the faster web application development built using Material-UI, Reactjs, Redux & Hook API."
/>
<meta property="twitter:image" content="https://berrydashboard.io/og-image/og-twitter.png" />
<meta property="twitter:image" content="https://berrydashboard.com/og-image/og-twitter.png" />
<meta name="twitter:creator" content="@codedthemes" />
<Links /> {typeof document === 'undefined' ? '__STYLES__' : null}
</head>
Expand Down
4 changes: 2 additions & 2 deletions remix/app/routes/utils/Typography.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ const Typography = () => (
variant="body2"
color="primary"
component={Link}
href="https://berrydashboard.io"
href="https://berrydashboard.com"
target="_blank"
display="block"
underline="hover"
gutterBottom
>
https://berrydashboard.io
https://berrydashboard.com
</MuiTypography>
</Grid>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions remix/app/ui-component/cards/AuthFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { Link, Typography, Stack } from '@mui/material';

const AuthFooter = () => (
<Stack direction="row" justifyContent="space-between">
<Typography variant="subtitle2" component={Link} href="https://berrydashboard.io" target="_blank" underline="hover">
berrydashboard.io
<Typography variant="subtitle2" component={Link} href="https://berrydashboard.com" target="_blank" underline="hover">
berrydashboard.com
</Typography>
<Typography variant="subtitle2" component={Link} href="https://codedthemes.com" target="_blank" underline="hover">
&copy; codedthemes.com
Expand Down
2 changes: 1 addition & 1 deletion vite/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VITE_APP_VERSION=v4.0.1
VITE_APP_VERSION=v4.1.0
GENERATE_SOURCEMAP=false

## PUBLIC URL
Expand Down
38 changes: 32 additions & 6 deletions vite/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,52 @@ export default [
sourceType: 'module',
parserOptions: {
ecmaFeatures: {
jsx: true // ✅ Enable JSX parsing
jsx: true
}
}
},

settings: {
react: {
version: 'detect' // ✅ Detect the installed React version
version: 'detect'
}
},

rules: {
'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx'] }],
'react/react-in-jsx-scope': 'off',
'react/jsx-filename-extension': 'off',
'no-param-reassign': 'off',
'react/prop-types': 'off',
'react/require-default-props': 'off',
'react/no-array-index-key': 'off',
'react/react-in-jsx-scope': 'off',
'react/jsx-props-no-spreading': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn',
'import/order': 'off',
'no-console': 'off',
'no-shadow': 'off',
'import/no-cycle': 'off',
'import/no-extraneous-dependencies': 'off',
'jsx-a11y/label-has-associated-control': 'off',
'jsx-a11y/no-autofocus': 'off',
'react/jsx-uses-react': 'off',
'react/jsx-uses-vars': 'error',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn',
'no-unused-vars': 'off',

'no-restricted-imports': [
'error',
{
patterns: ['@mui/*/*/*', '!@mui/material/test-utils/*']
}
],

'no-unused-vars': [
'error',
{
vars: 'all',
args: 'none'
}
],

'prettier/prettier': [
'warn',
Expand Down
60 changes: 30 additions & 30 deletions vite/package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"name": "berry-material-react-js",
"version": "4.0.1",
"version": "4.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@fontsource/inter": "5.1.0",
"@fontsource/poppins": "5.1.0",
"@fontsource/roboto": "5.1.0",
"@mui/icons-material": "6.1.9",
"@mui/material": "6.1.9",
"@fontsource/inter": "5.2.5",
"@fontsource/poppins": "5.2.6",
"@fontsource/roboto": "5.2.5",
"@mui/icons-material": "7.1.0",
"@mui/material": "7.1.0",
"@tabler/icons-react": "3.31.0",
"@vitejs/plugin-react": "4.3.4",
"apexcharts": "3.46.0",
"framer-motion": "11.12.0",
"@vitejs/plugin-react": "4.4.1",
"apexcharts": "4.7.0",
"framer-motion": "12.10.1",
"lodash-es": "4.17.21",
"material-ui-popup-state": "5.3.1",
"react": "18.3.1",
"react-apexcharts": "1.4.1",
"react-dom": "18.3.1",
"material-ui-popup-state": "5.3.5",
"react": "19.1.0",
"react-apexcharts": "1.7.0",
"react-dom": "19.1.0",
"react-perfect-scrollbar": "1.5.8",
"react-router": "7.0.2",
"react-router-dom": "7.0.2",
"react-router": "7.5.3",
"react-router-dom": "7.5.3",
"slick-carousel": "1.8.1",
"swr": "2.2.5",
"vite": "6.0.2",
"swr": "2.3.3",
"vite": "6.3.5",
"vite-jsconfig-paths": "2.0.1",
"web-vitals": "4.2.4",
"yup": "1.4.0"
"web-vitals": "5.0.0",
"yup": "1.6.1"
},
"scripts": {
"start": "vite",
Expand Down Expand Up @@ -56,17 +56,17 @@
]
},
"devDependencies": {
"@eslint/compat": "1.2.3",
"@eslint/eslintrc": "3.2.0",
"@eslint/js": "9.16.0",
"eslint": "9.16.0",
"eslint-config-prettier": "9.1.0",
"@eslint/compat": "1.2.9",
"@eslint/eslintrc": "3.3.1",
"@eslint/js": "9.26.0",
"eslint": "9.25.1",
"eslint-config-prettier": "10.1.2",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "7.37.4",
"eslint-plugin-react-hooks": "5.0.0",
"prettier": "3.4.1",
"sass": "1.81.1"
"eslint-plugin-prettier": "5.2.6",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "5.2.0",
"prettier": "3.5.3",
"sass": "1.87.0"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.9.1"
}
4 changes: 2 additions & 2 deletions vite/src/layout/Customization/BorderRadius.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// material-ui
import Grid from '@mui/material/Grid2';
import Grid from '@mui/material/Grid';
import Slider from '@mui/material/Slider';
import Stack from '@mui/material/Stack';
import Typography from '@mui/material/Typography';
Expand All @@ -13,7 +13,7 @@ function valueText(value) {
}

export default function BorderRadius() {
const { mode, borderRadius, onChangeBorderRadius } = useConfig();
const { borderRadius, onChangeBorderRadius } = useConfig();

return (
<Stack spacing={2.5} sx={{ pl: 2, pb: 2, pr: 4 }}>
Expand Down
2 changes: 1 addition & 1 deletion vite/src/layout/Customization/FontFamily.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// material-ui
import FormControlLabel from '@mui/material/FormControlLabel';
import Grid from '@mui/material/Grid2';
import Grid from '@mui/material/Grid';
import Radio from '@mui/material/Radio';
import RadioGroup from '@mui/material/RadioGroup';
import Stack from '@mui/material/Stack';
Expand Down
4 changes: 2 additions & 2 deletions vite/src/layout/Customization/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useTheme } from '@mui/material/styles';
import Divider from '@mui/material/Divider';
import Drawer from '@mui/material/Drawer';
import Fab from '@mui/material/Fab';
import Grid from '@mui/material/Grid2';
import Grid from '@mui/material/Grid';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';

Expand Down Expand Up @@ -61,7 +61,7 @@ export default function Customization() {
</AnimateButton>
</Fab>
</Tooltip>
<Drawer anchor="right" onClose={handleToggle} open={open} PaperProps={{ sx: { width: 280 } }}>
<Drawer anchor="right" onClose={handleToggle} open={open} slotProps={{ paper: { sx: { width: 280 } } }}>
<PerfectScrollbar>
<Grid container spacing={2}>
<Grid size={12}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import CardActions from '@mui/material/CardActions';
import Chip from '@mui/material/Chip';
import ClickAwayListener from '@mui/material/ClickAwayListener';
import Divider from '@mui/material/Divider';
import Grid from '@mui/material/Grid2';
import Grid from '@mui/material/Grid';
import Paper from '@mui/material/Paper';
import Popper from '@mui/material/Popper';
import Stack from '@mui/material/Stack';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import Button from '@mui/material/Button';
import Card from '@mui/material/Card';
import CardContent from '@mui/material/CardContent';
import Grid from '@mui/material/Grid2';
import Grid from '@mui/material/Grid';
import Link from '@mui/material/Link';
import Stack from '@mui/material/Stack';
import Typography from '@mui/material/Typography';
Expand Down
6 changes: 2 additions & 4 deletions vite/src/layout/MainLayout/Header/ProfileSection/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import CardContent from '@mui/material/CardContent';
import Chip from '@mui/material/Chip';
import ClickAwayListener from '@mui/material/ClickAwayListener';
import Divider from '@mui/material/Divider';
import Grid from '@mui/material/Grid2';
import Grid from '@mui/material/Grid';
import InputAdornment from '@mui/material/InputAdornment';
import List from '@mui/material/List';
import ListItemButton from '@mui/material/ListItemButton';
Expand Down Expand Up @@ -148,9 +148,7 @@ export default function ProfileSection() {
</InputAdornment>
}
aria-describedby="search-helper-text"
inputProps={{
'aria-label': 'weight'
}}
slotProps={{ input: { 'aria-label': 'weight' } }}
/>
<Divider />
</Box>
Expand Down
Loading