Skip to content

Commit

Permalink
Merge pull request #35 from creativetimofficial/feature/v1.1.1
Browse files Browse the repository at this point in the history
update to v1.1.1
  • Loading branch information
sajadevo authored Aug 25, 2022
2 parents e694853 + 0c597c8 commit 68f8853
Show file tree
Hide file tree
Showing 40 changed files with 34,036 additions and 7,790 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GENERATE_SOURCEMAP=false
34 changes: 30 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
# Change Log

## [1.1.1] 2022-08-25

- Update dependencies
- Migrate to React 18
- Migrate from node-sass to sass

## [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/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.`)

- [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
Expand All @@ -30,14 +49,19 @@ reactstrap 8.0.0 → 8.4.1
@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.
Expand All @@ -49,6 +73,8 @@ Please update the following components: DateTime
```

## [1.0.0] 2019-05-13

### Original Release

- Added Reactstrap as base framework
- Added design from Argon Design System by Creative Tim
6 changes: 3 additions & 3 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.1.0
* Argon Design System React - v1.1.1
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 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 @@ -284,7 +284,7 @@ <h5 class="heading text-warning mb-md-1">Components</h5>
<div class="col-lg-6 text-center">
<img
src="../src/assets/img/brand/argon-react-white.png"
style="width: 200px;"
style="width: 200px"
class="img-fluid"
/>
<p class="lead text-white">
Expand Down
65 changes: 27 additions & 38 deletions README.md

Large diffs are not rendered by default.

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

gulp.task("licenses", async function() {
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
* Argon Design System React - v1.1.1
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 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 All @@ -33,11 +33,11 @@ gulp.task("licenses", async function() {
gap.prependText(`<!--
=========================================================
* Argon Design System React - v1.1.0
* Argon Design System React - v1.1.1
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 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 All @@ -57,11 +57,11 @@ gulp.task("licenses", async function() {
gap.prependText(`/*!
=========================================================
* Argon Design System React - v1.1.0
* Argon Design System React - v1.1.1
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 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
40 changes: 21 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "argon-design-system-react",
"version": "1.1.0",
"version": "1.1.1",
"description": "React version of Argon Design System by Creative Tim",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -34,9 +34,8 @@
"test": "react-scripts test",
"eject": "react-scripts eject",
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
"compile-sass": "node-sass src/assets/scss/argon-design-system-react.scss src/assets/css/argon-design-system-react.css",
"minify-sass": "node-sass src/assets/scss/argon-design-system-react.scss src/assets/css/argon-design-system-react.min.css --output-style compressed",
"map-sass": "node-sass src/assets/scss/argon-design-system-react.scss src/assets/css/argon-design-system-react.css --source-map true"
"compile-sass": "sass src/assets/scss/argon-design-system-react.scss src/assets/css/argon-design-system-react.css",
"minify-sass": "sass src/assets/scss/argon-design-system-react.scss src/assets/css/argon-design-system-react.min.css --style compressed"
},
"eslintConfig": {
"extends": "react-app"
Expand All @@ -49,27 +48,30 @@
],
"dependencies": {
"bootstrap": "4.3.1",
"classnames": "2.2.6",
"headroom.js": "0.11.0",
"moment": "2.24.0",
"node-sass": "4.13.1",
"classnames": "2.3.1",
"headroom.js": "0.12.0",
"moment": "2.29.4",
"nouislider": "14.1.1",
"react": "16.12.0",
"react-datetime": "2.16.3",
"react-dom": "16.12.0",
"react-router": "5.1.2",
"react": "18.2.0",
"react-datetime": "3.1.1",
"react-dom": "18.2.0",
"react-router-dom": "5.1.2",
"react-scripts": "3.3.1",
"reactstrap": "8.4.1"
"react-scripts": "5.0.1",
"reactstrap": "8.4.1",
"sass": "1.53.0"
},
"peerDependencies": {
"react": ">=16.0.0",
"react-dom": ">=16.0.0"
},
"devDependencies": {
"@types/googlemaps": "3.39.2",
"@types/markerclustererplus": "2.1.33",
"@types/react": "16.9.19",
"eslint-plugin-flowtype": "3.13.0",
"@types/react": "18.0.17",
"eslint-plugin-flowtype": "8.0.3",
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8",
"jquery": "3.4.1",
"typescript": "3.7.5"
"gulp-append-prepend": "1.0.9",
"jquery": "3.6.0",
"typescript": "4.7.4"
}
}
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.1.0
* Argon Design System React - v1.1.1
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2022 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 68f8853

Please sign in to comment.