Skip to content

Commit

Permalink
Packages updated
Browse files Browse the repository at this point in the history
  • Loading branch information
yurykurylovich committed Feb 2, 2021
1 parent 470aca7 commit 7abb8c0
Show file tree
Hide file tree
Showing 9 changed files with 18,812 additions and 3,046 deletions.
1 change: 1 addition & 0 deletions .eslintcache

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Built with [React](https://facebook.github.io/react/), [Material-UI](https://material-ui.com), [React Router](https://reacttraining.com/react-router/).
**No jQuery and Bootstrap!**

**This version uses React 16.8.6, React Router v5, MaterialUI v4, built with React Hooks and React Context (No Redux)**
**This version uses React 16.14.2, React Router v5, MaterialUI v4, built with React Hooks and React Context (No Redux)**

[Demo](https://flatlogic.com/admin-dashboards/react-material-admin/demo). Use any credentials to log in.

Expand All @@ -15,7 +15,7 @@ This is a limited version of [**Full React Material Admin**](https://flatlogic.c

## Features

- React (**16.8.6**)
- React (**16.14.2**)
- React Hooks
- React Context
- **No jQuery and Bootstrap!**
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

# [1.3.2]

### Updated
- Packages updated
- Edited README.md

# [1.3.1]

Expand Down
14,808 changes: 14,808 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@
"node-fetch": "^2.6.1"
},
"dependencies": {
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.10.0",
"@mdi/js": "^5.8.55",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/styles": "^4.11.3",
"@mdi/js": "^5.9.55",
"@mdi/react": "^1.4.0",
"apexcharts": "^3.20.0",
"apexcharts": "^3.24.0",
"classnames": "^2.2.6",
"font-awesome": "^4.7.0",
"mui-datatables": "^3.4.1",
"react": "^16.13.1",
"mui-datatables": "^3.7.4",
"react": "^16.14.0",
"react-apexcharts": "^1.3.7",
"react-dom": "^16.13.1",
"react-dom": "^16.14.0",
"react-google-maps": "^9.4.5",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3",
"react-syntax-highlighter": "^13.5.3",
"react-toastify": "^6.0.8",
"recharts": "^1.6.2",
"tinycolor2": "^1.4.1"
"react-scripts": "4.0.1",
"react-syntax-highlighter": "^15.4.3",
"react-toastify": "^7.0.3",
"recharts": "^2.0.4",
"tinycolor2": "^1.4.2"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -54,4 +54,4 @@
"@babel/helper-call-delegate": "^7.11.4",
"prettier": "^2.1.1"
}
}
}
4 changes: 3 additions & 1 deletion src/pages/dashboard/mock.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
const mock = {
tasks: [
{
id: 0,
Expand Down Expand Up @@ -180,3 +180,5 @@ export default {
}
]
};

export default mock;
4 changes: 3 additions & 1 deletion src/themes/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const info = "#9013FE";
const lightenRate = 7.5;
const darkenRate = 15;

export default {
const defaultTheme = {
palette: {
primary: {
main: primary,
Expand Down Expand Up @@ -136,3 +136,5 @@ export default {
}
},
};

export default defaultTheme;
4 changes: 3 additions & 1 deletion src/themes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ const overrides = {
},
};

export default {
const themes = {
default: createMuiTheme({ ...defaultTheme, ...overrides }),
};

export default themes;
Loading

0 comments on commit 7abb8c0

Please sign in to comment.