Skip to content

Commit

Permalink
Merge pull request #8 from creativetimofficial/dev-master
Browse files Browse the repository at this point in the history
Feature: update dependencies for v1.1.0
  • Loading branch information
einazare authored Feb 14, 2020
2 parents 953e9c6 + ec72c90 commit 0a4ea7e
Show file tree
Hide file tree
Showing 193 changed files with 10,958 additions and 9,490 deletions.
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
## [1.1.0] 2020-02-14
### Bug fixing
- Changed all 1.0.0 versioning to v1.1.0
- Solved https://github.com/creativetimofficial/argon-design-system-react/issues/2
- Changes to match [Argon Design System](https://www.creative-tim.com/product/argon-design-system?ref=adsr-changelog) by Creative Tim
- - `src/components/Footers/CardsFooter.js`
- - `src/views/IndexSections/Datepicker.js`
- Solved build issue
### Major style changes
- 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
### Deleted components
### Added components
### Deleted dependencies
### Added dependencies
+ [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.`)
+ [email protected] (To match the new files and folders of scss)
+ [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.`)
### Updated dependencies
```
headroom.js 0.9.4 → 0.11.0
node-sass 4.12.0 → 4.13.1
nouislider 13.1.5 → 14.1.1
react 16.8.6 → 16.12.0
react-dom 16.8.6 → 16.12.0
react-router 5.0.0 → 5.1.2
react-router-dom 5.0.0 → 5.1.2
react-scripts 3.0.0 → 3.3.1
reactstrap 8.0.0 → 8.4.1
@types/googlemaps 3.30.19 → 3.39.2
@types/react 16.8.16 → 16.9.19
typescript 3.4.5 → 3.7.5
```
### Warning
**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:**
```
npm WARN deprecated [email protected]: request has been deprecated, see https://github.com/request/request/issues/3142
npm WARN deprecated [email protected]: Popper changed home, find its new releases at @popperjs/core
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.
```
**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):**
```
Warning: componentWillReceiveProps has been renamed, and is not recommended for use. See https://fb.me/react-unsafe-component-lifecycles for details.
* Move data fetching code or side effects to componentDidUpdate.
* 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
* 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.
Please update the following components: DateTime
```

## [1.0.0] 2019-05-13
### Original Release
- Added Reactstrap as base framework
Expand Down
14 changes: 7 additions & 7 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Argon Design System React - v1.0.0
* Argon Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -53,7 +53,7 @@
<!-- Argon CSS -->
<link
type="text/css"
href="../src/assets/css/argon-design-system-react.css?v=1.0.1"
href="../src/assets/css/argon-design-system-react.css?v=1.1.0"
rel="stylesheet"
/>
</head>
Expand Down Expand Up @@ -117,7 +117,7 @@
<div class="dropdown-menu dropdown-menu-xl">
<div class="dropdown-menu-inner">
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/overview?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/overview?ref=adsr-static-docs"
class="media d-flex align-items-center"
>
<div
Expand All @@ -136,7 +136,7 @@ <h6 class="heading text-primary mb-md-1">
</div>
</a>
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/colors?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/colors?ref=adsr-static-docs"
class="media d-flex align-items-center"
>
<div
Expand All @@ -153,7 +153,7 @@ <h6 class="heading text-primary mb-md-1">Foundation</h6>
</div>
</a>
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/alerts?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/alerts?ref=adsr-static-docs"
class="media d-flex align-items-center"
>
<div
Expand Down Expand Up @@ -293,7 +293,7 @@ <h5 class="heading text-warning mb-md-1">Components</h5>
</p>
<div class="btn-wrapper mt-5">
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/overview?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/overview?ref=adsr-static-docs"
class="btn btn-lg btn-white btn-icon mb-3 mb-sm-0"
>
<span class="btn-inner--icon"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Creative Tim
Copyright (c) 2020 Creative Tim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
60 changes: 30 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [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)


![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)
![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)


![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-design-system-react/argon-design-system-react.gif)
Expand Down Expand Up @@ -133,39 +133,39 @@ Argon Design System React
│   └── fonts
├── components
│   ├── Footers
│   │   ├── CardsFooter.jsx
│   │   └── SimpleFooter.jsx
│   │   ├── CardsFooter.js
│   │   └── SimpleFooter.js
│   └── Navbars
│   └── DemoNavbar.jsx
│   └── DemoNavbar.js
├── index.js
└── views
├── Index.jsx
├── Index.js
├── IndexSections
│   ├── Alerts.jsx
│   ├── Buttons.jsx
│   ├── Carousel.jsx
│   ├── CustomControls.jsx
│   ├── Datepicker.jsx
│   ├── Download.jsx
│   ├── Hero.jsx
│   ├── Icons.jsx
│   ├── Inputs.jsx
│   ├── Labels.jsx
│   ├── Login.jsx
│   ├── Menus.jsx
│   ├── Modals.jsx
│   ├── Navbars.jsx
│   ├── Pagination.jsx
│   ├── Pills.jsx
│   ├── Progress.jsx
│   ├── Tabs.jsx
│   ├── TooltipPopover.jsx
│   └── Typography.jsx
│   ├── Alerts.js
│   ├── Buttons.js
│   ├── Carousel.js
│   ├── CustomControls.js
│   ├── Datepicker.js
│   ├── Download.js
│   ├── Hero.js
│   ├── Icons.js
│   ├── Inputs.js
│   ├── Labels.js
│   ├── Login.js
│   ├── Menus.js
│   ├── Modals.js
│   ├── Navbars.js
│   ├── Pagination.js
│   ├── Pills.js
│   ├── Progress.js
│   ├── Tabs.js
│   ├── TooltipPopover.js
│   └── Typography.js
└── examples
├── Landing.jsx
├── Login.jsx
├── Profile.jsx
└── Register.jsx
├── Landing.js
├── Login.js
├── Profile.js
└── Register.js
```


Expand Down Expand Up @@ -200,7 +200,7 @@ We use GitHub Issues as the official bug tracker for the Argon Design System Rea

## Licensing

- Copyright 2018 Creative Tim (https://www.creative-tim.com/?ref=adsr-github-readme)
- Copyright 2020 Creative Tim (https://www.creative-tim.com/?ref=adsr-github-readme)

- Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md?ref=creativetim)

Expand Down
77 changes: 77 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
const gulp = require("gulp");
const gap = require("gulp-append-prepend");

gulp.task("licenses", async function() {
// this is to add Creative Tim licenses in the production mode for the minified js
await gulp
.src("build/static/js/*chunk.js", { base: "./" })
.pipe(
gap.prependText(`/*!
=========================================================
* Argon Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
=========================================================
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/`)
)
.pipe(gulp.dest("./", { overwrite: true }));

// this is to add Creative Tim licenses in the production mode for the minified html
await gulp
.src("build/index.html", { base: "./" })
.pipe(
gap.prependText(`<!--
=========================================================
* Argon Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
=========================================================
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-->`)
)
.pipe(gulp.dest("./", { overwrite: true }));

// this is to add Creative Tim licenses in the production mode for the minified css
await gulp
.src("build/static/css/*chunk.css", { base: "./" })
.pipe(
gap.prependText(`/*!
=========================================================
* Argon Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
=========================================================
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/`)
)
.pipe(gulp.dest("./", { overwrite: true }));
return;
});
33 changes: 19 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "argon-design-system-react",
"version": "1.0.0",
"version": "1.1.0",
"description": "React version of Argon Design System by Creative Tim",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"homepage": "https://demos.creative-tim.com/argon-design-system-react/",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build": "react-scripts build && gulp licenses",
"test": "react-scripts test",
"eject": "react-scripts eject",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
Expand All @@ -48,23 +48,28 @@
"not op_mini all"
],
"dependencies": {
"bootstrap": "4.3.1",
"classnames": "2.2.6",
"headroom.js": "0.9.4",
"headroom.js": "0.11.0",
"moment": "2.24.0",
"node-sass": "4.12.0",
"nouislider": "13.1.5",
"react": "16.8.6",
"node-sass": "4.13.1",
"nouislider": "14.1.1",
"react": "16.12.0",
"react-datetime": "2.16.3",
"react-dom": "16.8.6",
"react-router": "5.0.0",
"react-router-dom": "5.0.0",
"react-scripts": "3.0.0",
"reactstrap": "8.0.0"
"react-dom": "16.12.0",
"react-router": "5.1.2",
"react-router-dom": "5.1.2",
"react-scripts": "3.3.1",
"reactstrap": "8.4.1"
},
"devDependencies": {
"@types/googlemaps": "3.30.19",
"@types/googlemaps": "3.39.2",
"@types/markerclustererplus": "2.1.33",
"@types/react": "16.8.16",
"typescript": "3.4.5"
"@types/react": "16.9.19",
"eslint-plugin-flowtype": "3.13.0",
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8",
"jquery": "3.4.1",
"typescript": "3.7.5"
}
}
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Argon Design System React - v1.0.0
* Argon Design System React - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
Loading

0 comments on commit 0a4ea7e

Please sign in to comment.