Skip to content

Commit d9d4c2c

Browse files
committed
Merge branch 'premium-master-holder'
2 parents a18bff7 + 5b721ab commit d9d4c2c

File tree

479 files changed

+55146
-24590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

479 files changed

+55146
-24590
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
NODE_PATH=src/
2+
GENERATE_SOURCEMAP=false

.gitignore

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2-
3-
# dependencies
4-
/node_modules
5-
/.pnp
6-
.pnp.js
7-
.idea/
8-
9-
# testing
10-
/coverage
11-
12-
# production
13-
/build
14-
15-
# misc
16-
.DS_Store
17-
.env.local
18-
.env.development.local
19-
.env.test.local
20-
.env.production.local
21-
22-
npm-debug.log*
23-
yarn-debug.log*
24-
yarn-error.log*
1+
/node_modules/
2+
/.idea/
3+
build

.prettierrc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
2+
"singleQuote": true,
23
"tabWidth": 2,
3-
"singleQuote": false,
4-
"semi": true,
5-
"trailingComma": "all"
6-
}
4+
"trailingComma": "all",
5+
"quoteProps": "as-needed",
6+
"jsxSingleQuote": true,
7+
"bracketSpacing": true,
8+
"bracketSameLine": false,
9+
"arrowParens": "always"
10+
}

.prettierrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
trailingComma: "es5",
3+
tabWidth: 4,
4+
semi: false,
5+
singleQuote: true
6+
};

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2019 Flatlogic LLC.
3+
Copyright (c) 2022 Flatlogic LLC.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
1-
# React Material Admin — Material-UI Dashboard Template
1+
# React Material Admin Full — Material-UI Dashboard Template
22

33
Built with [React](https://facebook.github.io/react/), [Material-UI](https://material-ui.com), [React Router](https://reacttraining.com/react-router/).
44
**No jQuery and Bootstrap!**
55

6-
**This version uses React 16.14.0, React Router v5, MaterialUI v4, built with React Hooks and React Context (No Redux)**
6+
**This version uses React 17, React Router v5, MaterialUI v5, built with React Hooks and React Context (No Redux)**
77

8-
The React Material Admin template demonstrates a modern approach to dashboard design. React 16.14.0, React Router v5, and MaterialUI v4, built using React Hooks and React Context (eschewing Redux), provide a streamlined, contemporary foundation for developing [business software](https://flatlogic.com/) dashboards.
9-
10-
[View Demo](https://flatlogic.com/templates/react-material-admin/demo) | [Download](https://github.com/flatlogic/react-material-admin/archive/master.zip) | [More templates](https://flatlogic.com/templates) | [Support forum](https://flatlogic.com/forum)
8+
[Demo](https://flatlogic.com/admin-dashboards/react-material-admin/demo). Use any credentials to log in.
119

1210
[![image](https://user-images.githubusercontent.com/24964748/55800639-df780300-5adc-11e9-84b7-7c2437088516.png)](https://flatlogic.com/admin-dashboards/react-material-admin/demo)
1311

14-
## Full Version
15-
16-
This is a limited version of [**Full React Material Admin**](https://flatlogic.com/templates/react-material-admin-full/demo) with more components, pages and theme support.
17-
1812
## Features
1913

20-
- React (**16.14.0**)
14+
- React (**18.2.0**)
2115
- React Hooks
2216
- React Context
2317
- **No jQuery and Bootstrap!**
2418
- Mobile friendly layout (responsive)
2519
- Create-react-app under the hood
2620
- React Router v5
27-
- Material-UI v4
21+
- Material-UI v5
2822
- Modular Architecture
2923
- CSS-in-JS styles
24+
- Styled Components
3025
- Webpack build
3126
- Stylish, clean, responsive layout
3227
- Authentication
@@ -35,9 +30,12 @@ This is a limited version of [**Full React Material Admin**](https://flatlogic.c
3530

3631
We have implemented some basic pages, so you can see our template in action.
3732

33+
- Profile
3834
- Dashboard
35+
- E-commerce (Product Management, Products Grid, Product Page)
3936
- Typography
40-
- Tables
37+
- Tables (Static, dynamic)
38+
- Forms
4139
- Notifications
4240
- Charts
4341
- Icons
@@ -49,22 +47,24 @@ We have implemented some basic pages, so you can see our template in action.
4947

5048
#### 1. Get the latest version
5149

52-
You can start by cloning the latest version of React Dashboard on your
50+
You can start by cloning the latest version of React Material Admin on your
5351
local machine by running:
5452

5553
```shell
56-
$ git clone https://github.com/flatlogic/react-material-admin.git MyApp
57-
$ cd MyApp
54+
$ git clone https://github.com/flatlogic/react-material-admin.git
5855
```
5956

6057
#### 2. Run `yarn install`
6158

6259
This will install both run-time project dependencies and developer tools listed
6360
in [package.json](package.json) file.
6461

65-
#### 3. Run `yarn start`
62+
#### 3 Run `yarn dev`
63+
Runs the app in the development mode without backend
64+
65+
#### 3.1 Run `yarn start`
6666

67-
Runs the app in the development mode.
67+
Runs the app in the development mode with nodejs-backend (https://github.com/flatlogic/nodejs-backend)
6868

6969
Open http://localhost:3000 to view it in the browser. Whenever you modify any of the source files inside the `/src` folder,
7070
the module bundler ([Webpack](http://webpack.github.io/)) will recompile the
@@ -80,7 +80,7 @@ Your app is ready to be deployed!
8080

8181
## Support
8282

83-
For any additional information please go to our [**support forum**](https://flatlogic.com/forum) and raise your questions or feedback provide there. We highly appreciate your participation!
83+
For any additional information please refer to [Support forum](https://flatlogic.com/forum).
8484

8585
## How can I support developers?
8686

babel.config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
presets: ['react-app'],
3+
plugins: [
4+
'@babel/plugin-proposal-class-properties',
5+
'@babel/plugin-proposal-optional-chaining',
6+
],
7+
};

changelog.md

Lines changed: 87 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,119 @@
11
# Changelog
22

3-
# [1.3.2]
3+
## [2.4.1] - 22/11/2024
44

5-
### Updated
6-
- Packages updated
7-
- Edited README.md
5+
- Updated dependencies
6+
7+
## [2.4.0] - 10/09/2024
8+
9+
- Added react-scripts version 5 along with webpack version 5 support.
10+
- Added support for node.js version > 20
11+
- Removed old webpack configs.
12+
- Removed unnecessary dev dependencies.
13+
14+
# [2.3.4] - 20/12/2023
15+
16+
- Update dependencies
17+
18+
# [2.3.3] - 16/05/2023
19+
20+
- Update dependencies
21+
- Update react version
22+
23+
# [2.3.2] - 20/07/2022
24+
25+
- Fix ecommerce editing
26+
27+
# [2.3.1] - 18/07/2022
28+
29+
- Fix users management
30+
31+
# [2.3.0] - 01/06/2022
32+
33+
- Updated from MUI4 to MUI5, fixed Dark Theme
34+
- Fixed Grid actions
35+
- Fixed various bugs related to DataGrid
36+
- Updated packages
37+
38+
# [2.2.5] - 05/03/2021
39+
40+
- Fixed errors
41+
- Clear code
42+
- Hide warnings
43+
44+
# [2.2.4]
845

9-
# [1.3.1]
46+
- Updated documentation
47+
48+
# [2.2.3]
49+
50+
### New Features
51+
- Added Profile page
52+
- Added Grid page
53+
- Updated packages
54+
- Updated README.md
55+
56+
# [2.1.3]
1057

1158
### Updated
1259
- Added link to flatlogic on login and register pages
1360

14-
# [1.3.0]
61+
# [2.1.2]
1562

1663
### Updated
17-
- Update packages
64+
- Updated fullcalendar package to v5.3.0
1865

19-
### Fixed
20-
- Header button on md adjusting
21-
- Dashboard page make more responsive
22-
- Notification page fix
23-
- Tables page fix TableBody paddings
66+
# [2.1.1]
2467

25-
# [1.2.3]
68+
### Improved
69+
- Improved css
2670

27-
### Updated
28-
- Fixed security vulnerabilities in dependencies
71+
# [2.1.0]
2972

30-
# [1.2.2]
73+
### New Features
74+
- Added upload image functionality
3175

32-
### Updated
33-
- Packages updated
76+
# [2.0.0]
3477

35-
# [1.2.1]
78+
### New Features
79+
- Added user management table
80+
- Added register functionality
81+
- Added reset password functionality
82+
- User invitation functionality
83+
- Social Login
3684

37-
### Updated
38-
- Packages updated
85+
# [1.2.1]
3986

4087
### Fixed
41-
- Sign up name type of input
42-
- Dot component size prop
43-
- Performance errors
88+
- JWT token checking fix
89+
90+
### Updated
91+
- Update scrollbar color on Windows devices
92+
- Some color improvements
4493

45-
# [1.2.0]
94+
# [1.1.1]
4695

4796
### Updated
48-
- Packages update
49-
- Link to Full version
97+
- Adjust unused libs imports
98+
- Updated Docs
99+
- Minor components updates
100+
101+
### New Features
102+
- Docs full update
50103

51104
### Fixed
52-
- User login state improvements
105+
- Wrappers of the components fix
106+
- Performance improve
53107

54108
## [1.1.0]
55109

56-
### New Feactures
110+
### Fixed
111+
112+
- set localStorage item of theme
57113

58-
- React v16.8.6
59-
- React Router v5
60-
- new React Hooks
61-
- Material UI v4.3
114+
### Updated
62115

63-
Bug fixes
116+
- redux updates
64117

65118
## [1.0.0]
66119

config-overrides.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
const webpack = require('webpack');
2+
const path = require('path');
3+
module.exports = function override(config) {
4+
const fallback = config.resolve.fallback || {};
5+
Object.assign(fallback, {
6+
crypto: require.resolve('crypto-browserify'),
7+
stream: require.resolve('stream-browserify'),
8+
assert: require.resolve('assert'),
9+
http: require.resolve('stream-http'),
10+
https: require.resolve('https-browserify'),
11+
os: require.resolve('os-browserify'),
12+
url: require.resolve('url'),
13+
vm: require.resolve('vm-browserify'),
14+
});
15+
config.resolve.fallback = fallback;
16+
config.plugins = (config.plugins || []).concat([
17+
new webpack.ProvidePlugin({
18+
process: 'process/browser',
19+
Buffer: ['buffer', 'Buffer'],
20+
}),
21+
]);
22+
const modules = config.resolve.modules;
23+
config.resolve.modules = [...modules, path.resolve(__dirname, 'src')];
24+
config.module.rules.push({
25+
test: /\.m?js/,
26+
resolve: {
27+
fullySpecified: false,
28+
},
29+
});
30+
return config;
31+
};

0 commit comments

Comments
 (0)