Skip to content

Commit 303a2eb

Browse files
authored
Merge pull request #7 from creativetimofficial/dev-main
Feature: update to v1.1.0
2 parents ba98619 + a0d3073 commit 303a2eb

38 files changed

+1597
-1305
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@
2121
npm-debug.log*
2222
yarn-debug.log*
2323
yarn-error.log*
24+
25+
commit.sh

CHANGELOG.md

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

3+
## [1.1.0] 2021-03-19
4+
### Bug fixing
5+
- Rename `master` branch to `main`
6+
- To make a lot of our changes, we've followed the instructions from here (minus the `colors` and `font-sizes`): https://tailwindcss.com/docs/upgrading-to-v2
7+
- For the colors, the only change that we made, is the fact that we've added all Tailwind CSS colors to our `tailwind.config.js` files, and inside our product, all `{type}-gray-{number}` classes were renamed to `{type}-blueGray-{number}`
8+
- After that, we've changed `{type}-blueGray-{number}` to `{type}-blueGray-{lower-number}`, i.e. (`100` became `50`, `200` became `100`, ..., `900` became `800`)
9+
- You can achieve this, by search in your whole project for `blueGray-100` and replace it with `blueGray-50`
10+
- Then, you search in your whole project for `blueGray-200` and replace it with `blueGray-100`
11+
- Then, you search in your whole project for `blueGray-300` and replace it with `blueGray-200`
12+
- Then, you search in your whole project for `blueGray-400` and replace it with `blueGray-300`
13+
- Then, you search in your whole project for `blueGray-500` and replace it with `blueGray-400`
14+
- Then, you search in your whole project for `blueGray-600` and replace it with `blueGray-500`
15+
- Then, you search in your whole project for `blueGray-700` and replace it with `blueGray-600`
16+
- Then, you search in your whole project for `blueGray-800` and replace it with `blueGray-700`
17+
- Then, you search in your whole project for `blueGray-900` and replace it with `blueGray-800`
18+
- For the colors, the only change that we made, is the fact that we've added all Tailwind CSS colors to our `tailwind.config.js` files, and inside our product, all `{type}-blue-{number}` classes were renamed to `{type}-lightBlue-{number}`
19+
- For the colors, the only change that we made, is the fact that we've added all Tailwind CSS colors to our `tailwind.config.js` files, and inside our product, all `{type}-green-{number}` classes were renamed to `{type}-emerald-{number}`
20+
- `lg:bg-transparent` is not working anymore, so we've changed it with `lg:bg-opacity-0`
21+
- https://github.com/creativetimofficial/notus-angular/issues/4
22+
- https://github.com/creativetimofficial/notus-js/issues/4
23+
- https://github.com/creativetimofficial/notus-js/pull/5
24+
- https://github.com/creativetimofficial/notus-js/pull/6
25+
- https://github.com/creativetimofficial/notus-nextjs/issues/6
26+
- https://github.com/creativetimofficial/notus-nextjs/issues/7
27+
- https://github.com/creativetimofficial/notus-nextjs/issues/8
28+
- https://github.com/creativetimofficial/notus-react/issues/3
29+
- https://github.com/creativetimofficial/notus-svelte/issues/3
30+
- https://github.com/creativetimofficial/notus-svelte/issues/6
31+
- https://github.com/creativetimofficial/vue-notus/pull/4/
32+
### Major style changes
33+
- The upgrade of Tailwind CSS from version 1 to version 2, will cause multiple style changes, check them out on the official Tailwind CSS websites:
34+
- https://blog.tailwindcss.com/tailwindcss-v2
35+
- https://tailwindcss.com/
36+
- https://tailwindcss.com/docs/upgrading-to-v2
37+
### Deleted components
38+
### Added components
39+
### Deleted dependencies
40+
- `@tailwindcss/custom-forms`
41+
- `react-google-maps` (replaced by simple Google Maps API)
42+
- `@types/googlemaps` (dependencies of `react-google-maps`)
43+
- `@types/markerclustererplus` (dependencies of `react-google-maps`)
44+
- `@types/react` (dependencies of `react-google-maps`)
45+
### Added dependencies
46+
- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`)
47+
- `autoprefixer`
48+
- `postcss`
49+
### Updated dependencies
50+
```
51+
@fortawesome/fontawesome-free 5.14.0 → 5.15.3
52+
@popperjs/core 2.5.1 → 2.9.1
53+
chart.js 2.9.3 → 2.9.4
54+
react 16.13.1 → 17.0.1
55+
react-dom 16.13.1 → 17.0.1
56+
react-scripts 3.4.3 → 4.0.3
57+
tailwindcss 1.8.10 → 2.0.4
58+
typescript 4.0.3 → 4.2.3
59+
```
60+
### Warning
61+
_On a clean install there may be some warnings from request, chokidar, fsevents - they come from node_modules, and they do not affect the product at all._
62+
363
## [1.0.0] 2020-09-29
464
### Original Release
565
- Started project from [Tailwind Starter Kit by Creative Tim](https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation?ref=nr-changelog)

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 (https://www.creative-tim.com?ref=nr-license)
3+
Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=nr-license)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Notus React <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fdemos.creative-tim.com%2Fnotus-react%2F%23%2F&text=Start%20your%20development%20with%20a%20Free%20Tailwind%20CSS%20and%20React%20UI%20Kit%20and%20Admin.%20Let%20Notus%20React%20amaze%20you%20with%20its%20cool%20features%20and%20build%20tools%20and%20get%20your%20project%20to%20a%20whole%20new%20level.%20" target="_blank">![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)</a>
22

3-
![version](https://img.shields.io/badge/version-1.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) <a href="https://github.com/creativetimofficial/notus-react/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-react.svg)</a> <a href="https://github.com/creativetimofficial/notus-react/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-react.svg)</a> <a href="https://gitter.im/creative-tim-general/Lobby" target="_blank">![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)</a> <a href="https://discord.gg/E4aHAQy" target="_blank">![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)</a>
3+
![version](https://img.shields.io/badge/version-1.1.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) <a href="https://github.com/creativetimofficial/notus-react/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-react.svg)</a> <a href="https://github.com/creativetimofficial/notus-react/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-react.svg)</a> <a href="https://gitter.im/creative-tim-general/Lobby" target="_blank">![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)</a> <a href="https://discord.gg/E4aHAQy" target="_blank">![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)</a>
44

55
![Notus React](https://github.com/creativetimofficial/public-assets/blob/master/notus-react/notus-react.jpg?raw=true)
66

@@ -201,9 +201,9 @@ We use GitHub Issues as the official bug tracker for the Notus React. Here are s
201201

202202
## Licensing
203203

204-
- Copyright 2020 <a href="https://www.creative-tim.com/?ref=nr-readme" target="_blank">Creative Tim</a>
204+
- Copyright 2021 <a href="https://www.creative-tim.com/?ref=nr-readme" target="_blank">Creative Tim</a>
205205

206-
- Licensed under <a href="https://github.com/creativetimofficial/notus-react/blob/master/LICENSE.md" target="_blank">MIT</a>
206+
- Licensed under <a href="https://github.com/creativetimofficial/notus-react/blob/main/LICENSE.md" target="_blank">MIT</a>
207207

208208
## Useful Links
209209

gulpfile.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ gulp.task("licenses", async function () {
99
gap.prependText(`/*!
1010
1111
=========================================================
12-
* Notus React - v1.0.0 based on Tailwind Starter Kit by Creative Tim
12+
* Notus React - v1.1.0 based on Tailwind Starter Kit by Creative Tim
1313
=========================================================
1414
1515
* Product Page: https://www.creative-tim.com/product/notus-react
16-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
17-
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/master/LICENSE.md)
16+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
17+
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/main/LICENSE.md)
1818
1919
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
2020
@@ -35,12 +35,12 @@ gulp.task("licenses", async function () {
3535
gap.prependText(`<!--
3636
3737
=========================================================
38-
* Notus React - v1.0.0 based on Tailwind Starter Kit by Creative Tim
38+
* Notus React - v1.1.0 based on Tailwind Starter Kit by Creative Tim
3939
=========================================================
4040
4141
* Product Page: https://www.creative-tim.com/product/notus-react
42-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
43-
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/master/LICENSE.md)
42+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
43+
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/main/LICENSE.md)
4444
4545
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
4646
@@ -61,12 +61,12 @@ gulp.task("licenses", async function () {
6161
gap.prependText(`/*!
6262
6363
=========================================================
64-
* Notus React - v1.0.0 based on Tailwind Starter Kit by Creative Tim
64+
* Notus React - v1.1.0 based on Tailwind Starter Kit by Creative Tim
6565
=========================================================
6666
6767
* Product Page: https://www.creative-tim.com/product/notus-react
68-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
69-
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/master/LICENSE.md)
68+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
69+
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/main/LICENSE.md)
7070
7171
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
7272

package.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
{
22
"name": "notus-react",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "Notus React - A free Tailwind CSS and React UI Kit and Admin by Creative Tim.",
55
"repository": "https://github.com/creativetimofficial/notus-react",
66
"license": "MIT",
77
"dependencies": {
8-
"@fortawesome/fontawesome-free": "5.14.0",
9-
"@popperjs/core": "2.5.1",
10-
"@tailwindcss/custom-forms": "0.2.1",
11-
"chart.js": "2.9.3",
8+
"@fortawesome/fontawesome-free": "5.15.3",
9+
"@popperjs/core": "2.9.1",
10+
"@tailwindcss/forms": "0.2.1",
11+
"autoprefixer": "10.2.5",
12+
"chart.js": "2.9.4",
1213
"gulp": "4.0.2",
1314
"gulp-append-prepend": "1.0.8",
14-
"react": "16.13.1",
15-
"react-dom": "16.13.1",
16-
"react-google-maps": "9.4.5",
15+
"postcss": "8.2.8",
16+
"react": "17.0.1",
17+
"react-dom": "17.0.1",
1718
"react-router": "5.2.0",
1819
"react-router-dom": "5.2.0",
19-
"react-scripts": "3.4.3",
20-
"tailwindcss": "1.8.10"
20+
"react-scripts": "4.0.3",
21+
"tailwindcss": "2.0.4"
2122
},
2223
"scripts": {
2324
"start": "react-scripts start",
@@ -43,9 +44,6 @@
4344
]
4445
},
4546
"optionalDependencies": {
46-
"@types/googlemaps": "3.39.13",
47-
"@types/markerclustererplus": "2.1.33",
48-
"@types/react": "16.9.49",
49-
"typescript": "4.0.3"
47+
"typescript": "4.2.3"
5048
}
5149
}

public/index.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!--
22
=========================================================
3-
* Notus React - v1.0.0 based on Tailwind Starter Kit by Creative Tim
3+
* Notus React - v1.1.0 based on Tailwind Starter Kit by Creative Tim
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/notus-react
7-
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
8-
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/master/LICENSE.md)
7+
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
8+
* Licensed under MIT (https://github.com/creativetimofficial/notus-react/blob/main/LICENSE.md)
99
1010
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
1111
@@ -45,11 +45,10 @@
4545
work correctly both with client-side routing and a non-root public URL.
4646
Learn how to configure a non-root public URL by running `npm run build`.
4747
-->
48-
<title>
49-
Notus React by Creative Tim | Free and Open Source UI Kit
50-
</title>
48+
<title>Notus React by Creative Tim | Free and Open Source UI Kit</title>
49+
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
5150
</head>
52-
<body class="text-gray-800 antialiased">
51+
<body class="text-blueGray-700 antialiased">
5352
<noscript>You need to enable JavaScript to run this app.</noscript>
5453
<div id="root"></div>
5554
<!--

0 commit comments

Comments
 (0)