Skip to content

Commit 5c002e4

Browse files
authored
Merge pull request #6 from creativetimofficial/feature/update-to-v1.1.0
Feature: update to v1.1.0
2 parents 953e9c6 + 485f52a commit 5c002e4

File tree

192 files changed

+10920
-9453
lines changed

Some content is hidden

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

192 files changed

+10920
-9453
lines changed

CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
## [1.1.0] 2020-02-14
2+
### Bug fixing
3+
- Changed all 1.0.0 versioning to v1.1.0
4+
- Solved https://github.com/creativetimofficial/argon-design-system-react/issues/2
5+
- Changes to match [Argon Design System](https://www.creative-tim.com/product/argon-design-system?ref=adsr-changelog) by Creative Tim
6+
- - `src/components/Footers/CardsFooter.js`
7+
- - `src/views/IndexSections/Datepicker.js`
8+
### Major style changes
9+
- Changed the whole scss/css files and folders to match those of [Argon Design System](https://www.creative-tim.com/product/argon-design-system?ref=adsr-changelog) by Creative Tim
10+
### Deleted components
11+
### Added components
12+
### Deleted dependencies
13+
### Added dependencies
14+
+ [email protected] (To stop warning: `npm WARN [email protected] requires a peer of [email protected] but none is installed. You must install peer dependencies yourself.`)
15+
+ [email protected] (To match the new files and folders of scss)
16+
+ [email protected] (To stop warning: `npm WARN [email protected] requires a peer of [email protected] - 3 but none is installed. You must install peer dependencies yourself.`)
17+
### Updated dependencies
18+
```
19+
headroom.js 0.9.4 → 0.11.0
20+
node-sass 4.12.0 → 4.13.1
21+
nouislider 13.1.5 → 14.1.1
22+
react 16.8.6 → 16.12.0
23+
react-dom 16.8.6 → 16.12.0
24+
react-router 5.0.0 → 5.1.2
25+
react-router-dom 5.0.0 → 5.1.2
26+
react-scripts 3.0.0 → 3.3.1
27+
reactstrap 8.0.0 → 8.4.1
28+
@types/googlemaps 3.30.19 → 3.39.2
29+
@types/react 16.8.16 → 16.9.19
30+
typescript 3.4.5 → 3.7.5
31+
```
32+
### Warning
33+
**The following warnings could not be solved, due to some of our dependencies, however, they do not affect the functionality or the UI of the product:**
34+
```
35+
npm WARN deprecated [email protected]: request has been deprecated, see https://github.com/request/request/issues/3142
36+
npm WARN deprecated [email protected]: Popper changed home, find its new releases at @popperjs/core
37+
npm WARN deprecated [email protected]: core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.
38+
```
39+
**The following warning could not be solved due to the usage of react-datetime (Note: if the warning will persist after React changes version to 17, we'll drop the support for react-datetime and replace them with other react library for dates input):**
40+
```
41+
Warning: componentWillReceiveProps has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
42+
43+
* Move data fetching code or side effects to componentDidUpdate.
44+
* If you're updating state whenever props change, refactor your code to use memoization techniques or move it to static getDerivedStateFromProps. Learn more at: https://fb.me/react-derived-state
45+
* Rename componentWillReceiveProps to UNSAFE_componentWillReceiveProps to suppress this warning in non-strict mode. In React 17.x, only the UNSAFE_ name will work. To rename all deprecated lifecycles to their new names, you can run `npx react-codemod rename-unsafe-lifecycles` in your project source folder.
46+
47+
Please update the following components: DateTime
48+
```
49+
150
## [1.0.0] 2019-05-13
251
### Original Release
352
- Added Reactstrap as base framework

Documentation/documentation.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*!
33
44
=========================================================
5-
* Argon Design System React - v1.0.0
5+
* Argon Design System React - v1.1.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
@@ -117,7 +117,7 @@
117117
<div class="dropdown-menu dropdown-menu-xl">
118118
<div class="dropdown-menu-inner">
119119
<a
120-
href="https://demos.creative-tim.com/argon-design-system-react/documentation/overview?ref=adsr-static-docs"
120+
href="https://demos.creative-tim.com/argon-design-system-react/documentation/#/overview?ref=adsr-static-docs"
121121
class="media d-flex align-items-center"
122122
>
123123
<div
@@ -293,7 +293,7 @@ <h5 class="heading text-warning mb-md-1">Components</h5>
293293
</p>
294294
<div class="btn-wrapper mt-5">
295295
<a
296-
href="https://demos.creative-tim.com/argon-design-system-react/documentation/overview?ref=adsr-static-docs"
296+
href="https://demos.creative-tim.com/argon-design-system-react/documentation/#/overview?ref=adsr-static-docs"
297297
class="btn btn-lg btn-white btn-icon mb-3 mb-sm-0"
298298
>
299299
<span class="btn-inner--icon"

README.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# [Argon Design System React](https://demos.creative-tim.com/argon-design-system-react?ref=adsr-github-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Argon%20Design%20System%20is%20a%20Free%20Bootstrap%204,%20React%20and%20Reactstrap%20Dashboard%20made%20using%20create-react-app%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//demos.creative-tim.com/argon-design-system-react%20%23react%20%23reactstrap%20%23createreactapp%20%23argon%20%23argondesign%20%23reactkit%20%23argonreact%20%23reactdesign%20%23bootstrap%20%23design%20%23uikit%20%23freebie%20%20via%20%40CreativeTim)
22

33

4-
![version](https://img.shields.io/badge/version-1.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-design-system-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-design-system-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
4+
![version](https://img.shields.io/badge/version-1.1.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-design-system-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-design-system-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-design-system-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
55

66

77
![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-design-system-react/argon-design-system-react.gif)
@@ -133,39 +133,39 @@ Argon Design System React
133133
│   └── fonts
134134
├── components
135135
│   ├── Footers
136-
│   │   ├── CardsFooter.jsx
137-
│   │   └── SimpleFooter.jsx
136+
│   │   ├── CardsFooter.js
137+
│   │   └── SimpleFooter.js
138138
│   └── Navbars
139-
│   └── DemoNavbar.jsx
139+
│   └── DemoNavbar.js
140140
├── index.js
141141
└── views
142-
├── Index.jsx
142+
├── Index.js
143143
├── IndexSections
144-
│   ├── Alerts.jsx
145-
│   ├── Buttons.jsx
146-
│   ├── Carousel.jsx
147-
│   ├── CustomControls.jsx
148-
│   ├── Datepicker.jsx
149-
│   ├── Download.jsx
150-
│   ├── Hero.jsx
151-
│   ├── Icons.jsx
152-
│   ├── Inputs.jsx
153-
│   ├── Labels.jsx
154-
│   ├── Login.jsx
155-
│   ├── Menus.jsx
156-
│   ├── Modals.jsx
157-
│   ├── Navbars.jsx
158-
│   ├── Pagination.jsx
159-
│   ├── Pills.jsx
160-
│   ├── Progress.jsx
161-
│   ├── Tabs.jsx
162-
│   ├── TooltipPopover.jsx
163-
│   └── Typography.jsx
144+
│   ├── Alerts.js
145+
│   ├── Buttons.js
146+
│   ├── Carousel.js
147+
│   ├── CustomControls.js
148+
│   ├── Datepicker.js
149+
│   ├── Download.js
150+
│   ├── Hero.js
151+
│   ├── Icons.js
152+
│   ├── Inputs.js
153+
│   ├── Labels.js
154+
│   ├── Login.js
155+
│   ├── Menus.js
156+
│   ├── Modals.js
157+
│   ├── Navbars.js
158+
│   ├── Pagination.js
159+
│   ├── Pills.js
160+
│   ├── Progress.js
161+
│   ├── Tabs.js
162+
│   ├── TooltipPopover.js
163+
│   └── Typography.js
164164
└── examples
165-
├── Landing.jsx
166-
├── Login.jsx
167-
├── Profile.jsx
168-
└── Register.jsx
165+
├── Landing.js
166+
├── Login.js
167+
├── Profile.js
168+
└── Register.js
169169
```
170170

171171

gulpfile.js

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
const gulp = require("gulp");
2+
const gap = require("gulp-append-prepend");
3+
4+
gulp.task("licenses", async function() {
5+
// this is to add Creative Tim licenses in the production mode for the minified js
6+
await gulp
7+
.src("build/static/js/*chunk.js", { base: "./" })
8+
.pipe(
9+
gap.prependText(`/*!
10+
11+
=========================================================
12+
* Argon Design System React - v1.1.0
13+
=========================================================
14+
15+
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
16+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
17+
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
18+
19+
* Coded by Creative Tim
20+
21+
=========================================================
22+
23+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
24+
25+
*/`)
26+
)
27+
.pipe(gulp.dest("./", { overwrite: true }));
28+
29+
// this is to add Creative Tim licenses in the production mode for the minified html
30+
await gulp
31+
.src("build/index.html", { base: "./" })
32+
.pipe(
33+
gap.prependText(`<!--
34+
35+
=========================================================
36+
* Argon Design System React - v1.1.0
37+
=========================================================
38+
39+
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
40+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
41+
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
42+
43+
* Coded by Creative Tim
44+
45+
=========================================================
46+
47+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
48+
49+
-->`)
50+
)
51+
.pipe(gulp.dest("./", { overwrite: true }));
52+
53+
// this is to add Creative Tim licenses in the production mode for the minified css
54+
await gulp
55+
.src("build/static/css/*chunk.css", { base: "./" })
56+
.pipe(
57+
gap.prependText(`/*!
58+
59+
=========================================================
60+
* Argon Design System React - v1.1.0
61+
=========================================================
62+
63+
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
64+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
65+
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
66+
67+
* Coded by Creative Tim
68+
69+
=========================================================
70+
71+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
72+
73+
*/`)
74+
)
75+
.pipe(gulp.dest("./", { overwrite: true }));
76+
return;
77+
});

package.json

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "argon-design-system-react",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "React version of Argon Design System by Creative Tim",
55
"main": "index.js",
66
"repository": {
@@ -30,7 +30,7 @@
3030
"homepage": "https://demos.creative-tim.com/argon-design-system-react/",
3131
"scripts": {
3232
"start": "react-scripts start",
33-
"build": "react-scripts build",
33+
"build": "react-scripts build && gulp licenses",
3434
"test": "react-scripts test",
3535
"eject": "react-scripts eject",
3636
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
@@ -48,23 +48,28 @@
4848
"not op_mini all"
4949
],
5050
"dependencies": {
51+
"bootstrap": "4.3.1",
5152
"classnames": "2.2.6",
52-
"headroom.js": "0.9.4",
53+
"headroom.js": "0.11.0",
5354
"moment": "2.24.0",
54-
"node-sass": "4.12.0",
55-
"nouislider": "13.1.5",
56-
"react": "16.8.6",
55+
"node-sass": "4.13.1",
56+
"nouislider": "14.1.1",
57+
"react": "16.12.0",
5758
"react-datetime": "2.16.3",
58-
"react-dom": "16.8.6",
59-
"react-router": "5.0.0",
60-
"react-router-dom": "5.0.0",
61-
"react-scripts": "3.0.0",
62-
"reactstrap": "8.0.0"
59+
"react-dom": "16.12.0",
60+
"react-router": "5.1.2",
61+
"react-router-dom": "5.1.2",
62+
"react-scripts": "3.3.1",
63+
"reactstrap": "8.4.1"
6364
},
6465
"devDependencies": {
65-
"@types/googlemaps": "3.30.19",
66+
"@types/googlemaps": "3.39.2",
6667
"@types/markerclustererplus": "2.1.33",
67-
"@types/react": "16.8.16",
68-
"typescript": "3.4.5"
68+
"@types/react": "16.9.19",
69+
"eslint-plugin-flowtype": "3.13.0",
70+
"gulp": "4.0.2",
71+
"gulp-append-prepend": "1.0.8",
72+
"jquery": "3.4.1",
73+
"typescript": "3.7.5"
6974
}
7075
}

public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*!
33
44
=========================================================
5-
* Argon Design System React - v1.0.0
5+
* Argon Design System React - v1.1.0
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-design-system-react

0 commit comments

Comments
 (0)