Skip to content

Commit 3b5bc70

Browse files
einazareeinazare
authored
Merge pull request #158 from creativetimofficial/dev-main
Feature: v1.10.0
2 parents 36b7ec1 + 38e07ca commit 3b5bc70

File tree

84 files changed

+893
-820
lines changed

Some content is hidden

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

84 files changed

+893
-820
lines changed

‎.eslintrc.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ module.exports = {
33
env: {
44
es6: true,
55
node: true,
6-
browser: true
6+
browser: true,
77
},
88
parserOptions: {
99
ecmaVersion: 6,
1010
sourceType: "module",
1111
ecmaFeatures: {
12-
jsx: true
13-
}
12+
jsx: true,
13+
},
1414
},
1515
plugins: ["react"],
1616
extends: [
1717
"eslint:recommended",
1818
"plugin:react/recommended",
19-
"plugin:prettier/recommended"
20-
]
19+
"plugin:prettier/recommended",
20+
],
2121
};

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ yarn-debug.log*
2424
yarn-error.log*
2525

2626
package-lock.json
27+
28+
commit.sh

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
documentation/

‎CHANGELOG.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
11
# Change Log
22

3+
## [1.10.0] 2020-05-07
4+
### Bug fixing
5+
- https://github.com/creativetimofficial/material-dashboard-react/issues/145 (this was solved since we've changed react-google-maps with simple Google Maps API)
6+
- https://github.com/creativetimofficial/material-dashboard-react/issues/140 (this was solved since we've changed react-google-maps with simple Google Maps API)
7+
- https://github.com/creativetimofficial/material-dashboard-react/issues/138 (can be closed since it was help wanted)
8+
- https://github.com/creativetimofficial/material-dashboard-react/issues/137 (user did not respond)
9+
- https://github.com/creativetimofficial/material-dashboard-react/issues/133 (fixed it by using `useLocation` from `react-router-dom`)
10+
- https://github.com/creativetimofficial/material-dashboard-react/issues/16 (please check the following page: https://demos.creative-tim.com/material-dashboard-react/#/rtl/rtl-page)
11+
### Major style changes
12+
### Deleted components
13+
### Added components
14+
### Deleted dependencies
15+
- `react-google-maps` (we've replaced this with simple Google Maps API)
16+
- `@types/googlemaps` (we've replaced this with simple Google Maps API)
17+
- `@types/markerclustererplus` (we've replaced this with simple Google Maps API)
18+
- `ajv` (this was only installed to stop some install warnings)
19+
- `history` (we'll use `BrowserRouter` from `react-router-dom` package instead)
20+
### Added dependencies
21+
+ `@babel/[email protected]` (to stop install warnings)
22+
### Updated dependencies
23+
```
24+
@material-ui/core 4.10.0 → 4.11.4
25+
@material-ui/icons 4.9.1 → 4.11.2
26+
classnames 2.2.6 → 2.3.1
27+
perfect-scrollbar 1.5.0 → 1.5.1
28+
react 16.13.1 → 17.0.2
29+
react-chartist 0.14.3 → 0.14.4
30+
react-dom 16.13.1 → 17.0.2
31+
react-scripts 3.4.1 → 4.0.3
32+
eslint-config-prettier 6.11.0 → 8.3.0
33+
eslint-plugin-prettier 3.1.3 → 3.4.0
34+
gulp-append-prepend 1.0.8 → 1.0.9
35+
prettier 2.0.5 → 2.2.1
36+
typescript 3.9.3 → 4.2.4
37+
```
38+
### Warning
39+
_Warnings might appear while doing an npm install - they do not affect the UI or the functionality of the product, and they appear because of NodeJS and not from the product itself._
40+
```
41+
npm WARN [email protected] requires a peer of react@^15.3.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
42+
npm WARN [email protected] requires a peer of react@^16.3.0 but none is installed. You must install peer dependencies yourself.
43+
```
44+
_You will also have the following message: `found 88 vulnerabilities (1 low, 87 moderate) in 2207 scanned packages`. This comes from react-scripts, and will be fixed in the next version. NOTE: the product works as expected with these `vulnerabilities`._
45+
346
## [1.9.0] 2020-05-27
447
### Bug fixing
548
- https://github.com/creativetimofficial/material-dashboard-react/issues/121

‎LICENSE.md‎

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

3-
Copyright (c) 2020 Creative Tim
3+
Copyright (c) 2021 Creative Tim
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
![version](https://img.shields.io/badge/version-1.9.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim/material-dashboard?utm_source=share-link&utm_medium=link&utm_campaign=share-link) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
5+
![version](https://img.shields.io/badge/version-1.10.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-dashboard-react.svg?maxAge=2592000)]() [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim/material-dashboard?utm_source=share-link&utm_medium=link&utm_campaign=share-link) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
66

77
![Product Gif](src/assets/github/md-react.gif)
88

@@ -63,7 +63,7 @@ Quick start options:
6363

6464
- `npm i material-dashboard-react`
6565
- Clone the repo: `git clone https://github.com/creativetimofficial/material-dashboard-react.git`.
66-
- [Download from Github](https://github.com/creativetimofficial/material-dashboard-react/archive/master.zip).
66+
- [Download from Github](https://github.com/creativetimofficial/material-dashboard-react/archive/main.zip).
6767
- [Download from Creative Tim](https://www.creative-tim.com/product/material-dashboard-react).
6868

6969

@@ -213,8 +213,8 @@ If you have questions or need help integrating the product please [contact us](h
213213

214214
## Licensing
215215

216-
- Copyright 2020 Creative Tim (https://www.creative-tim.com)
217-
- Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
216+
- Copyright 2021 Creative Tim (https://www.creative-tim.com)
217+
- Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/main/LICENSE.md)
218218

219219
## Useful Links
220220

‎documentation/assets/css/demo-documentation.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React - v1.9.0
4+
* Material Dashboard React - v1.10.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

‎documentation/assets/css/material-dashboard.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Material Dashboard React- v1.9.0
4+
* Material Dashboard React- v1.10.0
55
=========================================================
66
77
* Product Page: http://www.creative-tim.com/product/material-dashboard-react
8-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1010
1111
=========================================================

‎documentation/tutorial-components.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*!
33
44
=========================================================
5-
* Material Dashboard React - v1.9.0
5+
* Material Dashboard React - v1.10.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
9-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/material-dashboard-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -48,8 +48,8 @@
4848
/>
4949
<!-- CSS Files -->
5050
<link href="assets/css/bootstrap.min.css" rel="stylesheet" />
51-
<link href="assets/css/material-dashboard.css?v=1.9.0" rel="stylesheet" />
52-
<link href="assets/css/demo-documentation.css?v=1.9.0" rel="stylesheet" />
51+
<link href="assets/css/material-dashboard.css?v=1.10.0" rel="stylesheet" />
52+
<link href="assets/css/demo-documentation.css?v=1.10.0" rel="stylesheet" />
5353
<style media="screen">
5454
.page-header {
5555
height: 100vh;
@@ -117,7 +117,7 @@
117117
<div class="col-md-8 col-md-offset-2 text-center">
118118
<h1 class="title ">Material Dashboard React</h1>
119119
<h4 class="title">Tutorial and Components</h4>
120-
<h5 class="description">v1.9.0</h5>
120+
<h5 class="description">v1.10.0</h5>
121121
<a
122122
href="https://demos.creative-tim.com/material-dashboard-react/#/documentation/tutorial"
123123
class="btn btn-rose btn-fill btn-round"

‎gulpfile.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const gulp = require("gulp");
22
const gap = require("gulp-append-prepend");
33

4-
gulp.task("licenses", async function() {
4+
gulp.task("licenses", async function () {
55
// this is to add Creative Tim licenses in the production mode for the minified js
66
gulp
77
.src("build/static/js/*chunk.js", { base: "./" })
88
.pipe(
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Material Dashboard React - v1.9.0
12+
* Material Dashboard React - v1.10.0
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
16-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
16+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
1717
1818
* Coded by Creative Tim
1919
@@ -32,11 +32,11 @@ gulp.task("licenses", async function() {
3232
gap.prependText(`<!--
3333
3434
=========================================================
35-
* Material Dashboard React - v1.9.0
35+
* Material Dashboard React - v1.10.0
3636
=========================================================
3737
3838
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
39-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
39+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
4040
4141
* Coded by Creative Tim
4242
@@ -55,11 +55,11 @@ gulp.task("licenses", async function() {
5555
gap.prependText(`/*!
5656
5757
=========================================================
58-
* Material Dashboard React - v1.9.0
58+
* Material Dashboard React - v1.10.0
5959
=========================================================
6060
6161
* Product Page: https://www.creative-tim.com/product/material-dashboard-react
62-
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
62+
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
6363
6464
* Coded by Creative Tim
6565

0 commit comments

Comments
 (0)