Skip to content

Commit 01d3f1b

Browse files
authored
Merge pull request #10 from creativetimofficial/dev-main
Feature: update to v1.1.0
2 parents ae6ea60 + fc7fd28 commit 01d3f1b

Some content is hidden

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

68 files changed

+2008
-1419
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ yarn-error.log*
2424

2525
.next/
2626
out/
27+
28+
commit.sh

CHANGELOG.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
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+
- Since we've dropped the usage of custom CSS, and reverted to `Built-In CSS Support` from `NextJS`, we had to move our images inside the `public` folder, and our styles inside the `styles` folder
22+
- All the `require` images have been replaced by simple `/img/` strings
23+
- https://github.com/creativetimofficial/notus-angular/issues/4
24+
- https://github.com/creativetimofficial/notus-js/issues/4
25+
- https://github.com/creativetimofficial/notus-js/pull/5
26+
- https://github.com/creativetimofficial/notus-js/pull/6
27+
- https://github.com/creativetimofficial/notus-nextjs/issues/6
28+
- https://github.com/creativetimofficial/notus-nextjs/issues/7
29+
- https://github.com/creativetimofficial/notus-nextjs/issues/8
30+
- https://github.com/creativetimofficial/notus-react/issues/3
31+
- https://github.com/creativetimofficial/notus-svelte/issues/3
32+
- https://github.com/creativetimofficial/notus-svelte/issues/6
33+
- https://github.com/creativetimofficial/vue-notus/pull/4/
34+
### Major style changes
35+
- 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:
36+
- https://blog.tailwindcss.com/tailwindcss-v2
37+
- https://tailwindcss.com/
38+
- https://tailwindcss.com/docs/upgrading-to-v2
39+
### Deleted components
40+
- `next.config.js` (we do not need it anymore since we now use `Built-In CSS Support` from `NextJS`)
41+
- for the absolute imports, we've used the `jsconfig.json` file
42+
### Added components
43+
- `jsconfig.json` (to keep our absolute imports)
44+
### Deleted dependencies
45+
- `@tailwindcss/custom-forms`
46+
- `react-google-maps` (replaced by simple Google Maps API)
47+
- `@types/googlemaps` (dependencies of `react-google-maps`)
48+
- `@types/markerclustererplus` (dependencies of `react-google-maps`)
49+
- `@types/react` (dependencies of `react-google-maps`)
50+
- `@zeit/next-css` (we'll use the default `Built-In CSS Support` from `NextJS`)
51+
- `@zeit/next-sass` (we'll use the default `Built-In CSS Support` from `NextJS`)
52+
- `node-sass` (we'll use the default `Built-In CSS Support` from `NextJS`)
53+
- `next-images` (we'll use the default `Built-In CSS Support` from `NextJS`)
54+
- `next-fonts` (we'll use the default `Built-In CSS Support` from `NextJS`)
55+
- `next-compose-plugins` (we'll use the default `Built-In CSS Support` from `NextJS`)
56+
- `path` (we'll use the default `Built-In CSS Support` from `NextJS`)
57+
- `webpack` (we'll use the default `Built-In CSS Support` from `NextJS`)
58+
### Added dependencies
59+
- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`)
60+
- `autoprefixer`
61+
- `postcss`
62+
### Updated dependencies
63+
```
64+
@fortawesome/fontawesome-free 5.14.0 → 5.15.3
65+
@popperjs/core 2.5.1 → 2.9.1
66+
chart.js 2.9.3 → 2.9.4
67+
next 9.5.3 → 10.0.9
68+
react 16.13.1 → 17.0.1
69+
@types/react 16.9.49 → 17.0.3
70+
react-dom 16.13.1 → 17.0.1
71+
react-scripts 3.4.3 → 4.0.3
72+
tailwindcss 1.8.10 → 2.0.4
73+
typescript 4.0.3 → 4.2.3
74+
```
75+
### Warning
76+
_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._
77+
378
## [1.0.0] 2020-09-29
479
### Original Release
580
- Started project from [Tailwind Starter Kit by Creative Tim](https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation?ref=nnjs-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=nnjs-license)
3+
Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=nnjs-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 NextJS <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fdemos.creative-tim.com%2Fnotus-nextjs%2F&text=Start%20your%20development%20with%20a%20Free%20Tailwind%20CSS%20and%20NextJS%20UI%20Kit%20and%20Admin.%20Let%20Notus%20NextJS%20amaze%20you%20with%20its%20cool%20features%20and%20build%20tools%20and%20get%20your%20project%20to%20a%20whole%20new%20level." 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-nextjs/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-nextjs.svg)</a> <a href="https://github.com/creativetimofficial/notus-nextjs/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-nextjs.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-nextjs/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-nextjs.svg)</a> <a href="https://github.com/creativetimofficial/notus-nextjs/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-nextjs.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 NextJS](https://github.com/creativetimofficial/public-assets/blob/master/notus-nextjs/notus-nextjs.jpg?raw=true)
66

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

202202
## Licensing
203203

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

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

208208
## Useful Links
209209

components/Cards/CardBarChart.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ export default function CardBarChart() {
104104
<div className="rounded-t mb-0 px-4 py-3 bg-transparent">
105105
<div className="flex flex-wrap items-center">
106106
<div className="relative w-full max-w-full flex-grow flex-1">
107-
<h6 className="uppercase text-gray-500 mb-1 text-xs font-semibold">
107+
<h6 className="uppercase text-blueGray-400 mb-1 text-xs font-semibold">
108108
Performance
109109
</h6>
110-
<h2 className="text-gray-800 text-xl font-semibold">
110+
<h2 className="text-blueGray-700 text-xl font-semibold">
111111
Total orders
112112
</h2>
113113
</div>

components/Cards/CardLineChart.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ export default function CardLineChart() {
108108
}, []);
109109
return (
110110
<>
111-
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded bg-gray-800">
111+
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded bg-blueGray-700">
112112
<div className="rounded-t mb-0 px-4 py-3 bg-transparent">
113113
<div className="flex flex-wrap items-center">
114114
<div className="relative w-full max-w-full flex-grow flex-1">
115-
<h6 className="uppercase text-gray-200 mb-1 text-xs font-semibold">
115+
<h6 className="uppercase text-blueGray-100 mb-1 text-xs font-semibold">
116116
Overview
117117
</h6>
118118
<h2 className="text-white text-xl font-semibold">Sales value</h2>

components/Cards/CardPageVisits.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default function CardPageVisits() {
99
<div className="rounded-t mb-0 px-4 py-3 border-0">
1010
<div className="flex flex-wrap items-center">
1111
<div className="relative w-full px-4 max-w-full flex-grow flex-1">
12-
<h3 className="font-semibold text-base text-gray-800">
12+
<h3 className="font-semibold text-base text-blueGray-700">
1313
Page visits
1414
</h3>
1515
</div>
@@ -28,92 +28,92 @@ export default function CardPageVisits() {
2828
<table className="items-center w-full bg-transparent border-collapse">
2929
<thead>
3030
<tr>
31-
<th className="px-6 bg-gray-100 text-gray-600 align-middle border border-solid border-gray-200 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-no-wrap font-semibold text-left">
31+
<th className="px-6 bg-blueGray-50 text-blueGray-500 align-middle border border-solid border-blueGray-100 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-nowrap font-semibold text-left">
3232
Page name
3333
</th>
34-
<th className="px-6 bg-gray-100 text-gray-600 align-middle border border-solid border-gray-200 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-no-wrap font-semibold text-left">
34+
<th className="px-6 bg-blueGray-50 text-blueGray-500 align-middle border border-solid border-blueGray-100 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-nowrap font-semibold text-left">
3535
Visitors
3636
</th>
37-
<th className="px-6 bg-gray-100 text-gray-600 align-middle border border-solid border-gray-200 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-no-wrap font-semibold text-left">
37+
<th className="px-6 bg-blueGray-50 text-blueGray-500 align-middle border border-solid border-blueGray-100 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-nowrap font-semibold text-left">
3838
Unique users
3939
</th>
40-
<th className="px-6 bg-gray-100 text-gray-600 align-middle border border-solid border-gray-200 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-no-wrap font-semibold text-left">
40+
<th className="px-6 bg-blueGray-50 text-blueGray-500 align-middle border border-solid border-blueGray-100 py-3 text-xs uppercase border-l-0 border-r-0 whitespace-nowrap font-semibold text-left">
4141
Bounce rate
4242
</th>
4343
</tr>
4444
</thead>
4545
<tbody>
4646
<tr>
47-
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4 text-left">
47+
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">
4848
/argon/
4949
</th>
50-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
50+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
5151
4,569
5252
</td>
53-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
53+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
5454
340
5555
</td>
56-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
57-
<i className="fas fa-arrow-up text-green-500 mr-4"></i>
56+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
57+
<i className="fas fa-arrow-up text-emerald-500 mr-4"></i>
5858
46,53%
5959
</td>
6060
</tr>
6161
<tr>
62-
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4 text-left">
62+
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">
6363
/argon/index.html
6464
</th>
65-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
65+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
6666
3,985
6767
</td>
68-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
68+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
6969
319
7070
</td>
71-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
71+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
7272
<i className="fas fa-arrow-down text-orange-500 mr-4"></i>
7373
46,53%
7474
</td>
7575
</tr>
7676
<tr>
77-
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4 text-left">
77+
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">
7878
/argon/charts.html
7979
</th>
80-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
80+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
8181
3,513
8282
</td>
83-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
83+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
8484
294
8585
</td>
86-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
86+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
8787
<i className="fas fa-arrow-down text-orange-500 mr-4"></i>
8888
36,49%
8989
</td>
9090
</tr>
9191
<tr>
92-
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4 text-left">
92+
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">
9393
/argon/tables.html
9494
</th>
95-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
95+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
9696
2,050
9797
</td>
98-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
98+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
9999
147
100100
</td>
101-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
102-
<i className="fas fa-arrow-up text-green-500 mr-4"></i>
101+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
102+
<i className="fas fa-arrow-up text-emerald-500 mr-4"></i>
103103
50,87%
104104
</td>
105105
</tr>
106106
<tr>
107-
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4 text-left">
107+
<th className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">
108108
/argon/profile.html
109109
</th>
110-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
110+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
111111
1,795
112112
</td>
113-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
113+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
114114
190
115115
</td>
116-
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-no-wrap p-4">
116+
<td className="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4">
117117
<i className="fas fa-arrow-down text-red-500 mr-4"></i>
118118
46,53%
119119
</td>

0 commit comments

Comments
 (0)