Skip to content

Commit 697ef7f

Browse files
authored
Merge pull request #10 from creativetimofficial/dev-main
Dev main
2 parents 8df9910 + 79ea212 commit 697ef7f

25 files changed

+12306
-3094
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
GENERATE_SOURCEMAP=false

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
npm-debug.log*
2222
yarn-debug.log*
2323
yarn-error.log*
24+
package-lock.json

CHANGELOG.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
# Change Log
22

3+
## [1.5.1] 2021-07-31
4+
5+
- Update the dependencies
6+
- Migration to React 18
7+
- Migration to sass from node-sass
8+
39
## [1.5.0] 2021-05-19
10+
411
### Bug fixing
12+
513
### Major style changes
14+
615
### Deleted components
16+
717
### Added components
18+
819
### Deleted dependencies
20+
921
### Added dependencies
22+
1023
- `@babel/core@7.14.3` (to stop warnings on install)
24+
1125
### Updated dependencies
26+
1227
```
1328
gulp-append-prepend 1.0.8 → 1.0.9
1429
moment 2.26.0 → 2.29.1
@@ -21,35 +36,50 @@ react-scripts 3.4.1 → 4.0.3
2136
reactstrap 8.4.1 → 8.9.0
2237
typescript 3.9.5 → 4.2.4
2338
```
39+
2440
### Warning
41+
2542
_While in development some of the plugins that were used for this product will throw some warnings - note, this only happens in development, the UI or the functionality of the product is not affected, also, if the issues will persist in React 17, we'll drop usage of those plugins, and replace them with other ones._
2643
_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._
44+
2745
```
2846
npm WARN react-datetime@3.0.4 requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself.
2947
```
48+
3049
_In our next update we'll replace this plugin with something else to stop these._
3150
_You will also have the following message: found 80 vulnerabilities (1 low, 79 moderate). This comes from react-scripts, and will be fixed in the next version. NOTE: the product works as expected with these vulnerabilities._
3251

3352
## [1.4.0] 2020-06-15
53+
3454
### Bug fixing
55+
3556
- Other Now UI React products
3657
- https://github.com/creativetimofficial/ct-now-ui-dashboard-pro-react/issues/10 (added `window.scrollTo(0, 0)` and `document.body.scrollTop = 0` to all pages so when you navigate to new page you are sent to the first line of the page)
3758
- https://github.com/creativetimofficial/ct-now-ui-dashboard-pro-react/issues/31 (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
3859
- https://github.com/creativetimofficial/ct-now-ui-kit-pro-react/issues/2 (added warnings on the documentation about this issue - unfortunately, we need to keep our own homepage prop inside the package.json for copyright issues)
3960
- https://github.com/creativetimofficial/now-ui-dashboard-react/issues/10
61+
4062
### Major style changes
63+
4164
- `src/assets/scss/now-ui-kit/_nucleo-outline.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
4265
- `src/assets/scss/now-ui-kit/_variables.scss` (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
4366
- `src/assets/scss/react/now-ui-kit/_popovers.scss` (because of new bootstrap and reactstrap versions)
4467
- `src/assets/scss/react/now-ui-kit/_tooltips.scss` (because of new bootstrap and reactstrap versions)
4568
- `src/assets/scss/react/react-differences.scss` (to add the new tootlips styles)
69+
4670
### Deleted components
71+
4772
### Added components
73+
4874
### Deleted dependencies
75+
4976
### Added dependencies
50-
+ gulp@4.0.2 (for Creative Tim copyrights)
51-
+ gulp-append-prepend@1.0.8 (for Creative Tim copyrights)
77+
78+
- gulp@4.0.2 (for Creative Tim copyrights)
79+
- gulp-append-prepend@1.0.8 (for Creative Tim copyrights)
80+
5281
### Updated dependencies
82+
5383
```
5484
moment 2.24.0 → 2.26.0
5585
node-sass 4.12.0 → 4.14.1
@@ -62,13 +92,17 @@ react-scripts 3.0.1 → 3.4.1
6292
reactstrap 8.0.1 → 8.4.1
6393
typescript 3.5.3 → 3.9.5
6494
```
95+
6596
### Warning
97+
6698
_All the following products: Now UI Kit React, Now UI Dashboard React, Now UI Kit PRO React and Now UI Dashboard PRO React have been updated together, and thus, we've added to all of them the same version of 1.4.0 - we may have skipped some versions for some of the above products, we've done so, since we want all Now UI & React products to share the same versions._
6799
_While in development some of the plugins that were used for this product will throw some warnings - note, this only happens in development, the UI or the functionality of the product is not affected, also, if the issues will persist in React 17, we'll drop usage of those plugins, and replace them with other ones._
68100
_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._
69101

70102
## [1.0.0] 2019-07-23
103+
71104
### Original Release
105+
72106
- Started project with create-react-app
73107
- Added Reactstrap as base framework
74108
- Added design from Now UI Kit by Creative Tim

Documentation/documentation.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
22
33
=========================================================
4-
* Now UI Kit React - v1.5.0
4+
* Now UI Kit React - v1.5.1
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/now-ui-kit-react
8-
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2022 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/now-ui-kit-react/blob/main/LICENSE.md)
1010
1111
* Designed by www.invisionapp.com Coded by www.creative-tim.com
@@ -26,9 +26,7 @@
2626
/>
2727
<link rel="icon" type="image/png" href="../public/favicon.png" />
2828
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
29-
<title>
30-
Components Documentation - Now UI Kit by Creative Tim
31-
</title>
29+
<title>Components Documentation - Now UI Kit by Creative Tim</title>
3230
<meta
3331
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no"
3432
name="viewport"
@@ -136,14 +134,12 @@
136134
<div class="page-header clear-filter" filter-color="info">
137135
<div
138136
class="page-header-image"
139-
style="background-image: url('../src/assets/img/header.jpg');"
137+
style="background-image: url('../src/assets/img/header.jpg')"
140138
></div>
141139
<div class="container text-center">
142140
<div class="col-md-8 ml-auto mr-auto">
143141
<div class="brand">
144-
<h1 class="title">
145-
Now UI Kit React
146-
</h1>
142+
<h1 class="title">Now UI Kit React</h1>
147143
<h3 class="description">Documentation v1.5.0</h3>
148144
<br />
149145
<a

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) 2021 Creative Tim
3+
Copyright (c) 2022 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

0 commit comments

Comments
 (0)