Skip to content

Commit 2057723

Browse files
authored
Merge pull request #9 from creativetimofficial/dev-main
Feature: update to v1.1.0
2 parents 923b9de + 508d5bd commit 2057723

Some content is hidden

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

41 files changed

+1902
-1357
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ yarn-error.log*
2121
*.sw?
2222

2323
package-lock.json
24+
commit.sh

CHANGELOG.md

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,76 @@
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+
### Added dependencies
42+
- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`)
43+
### Updated dependencies
44+
```
45+
@angular/animations 10.1.2 → 11.2.5
46+
@angular/common 10.1.2 → 11.2.5
47+
@angular/compiler 10.1.2 → 11.2.5
48+
@angular/core 10.1.2 → 11.2.5
49+
@angular/forms 10.1.2 → 11.2.5
50+
@angular/platform-browser 10.1.2 → 11.2.5
51+
@angular/platform-browser-dynamic 10.1.2 → 11.2.5
52+
@angular/router 10.1.2 → 11.2.5
53+
@fortawesome/fontawesome-free 5.14.0 → 5.15.3
54+
@popperjs/core 2.5.1 → 2.9.1
55+
chart.js 2.9.3 → 2.9.4
56+
rxjs 6.6.3 → 6.6.6
57+
tailwindcss 1.8.10 → 2.0.4
58+
tslib 2.0.1 → 2.1.0
59+
zone.js 0.10.3 → 0.11.4
60+
@angular-devkit/build-angular 0.1001.2 → 0.1102.4
61+
@angular/cli 10.1.2 → 11.2.4
62+
@angular/compiler-cli 10.1.2 → 11.2.5
63+
@angular/language-service 10.1.2 → 11.2.5
64+
@types/jasmine 3.5.14 → 3.6.6
65+
@types/node 14.11.2 → 14.14.35
66+
codelyzer 6.0.0 → 6.0.1
67+
karma 5.2.2 → 6.2.0
68+
ts-node 9.0.0 → 9.1.1
69+
typescript 4.0.3 → 4.1.5
70+
```
71+
### Warning
72+
_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._
73+
374
## [1.0.0] 2020-09-29
475
### Original Release
576
- Started project from [Tailwind Starter Kit by Creative Tim](https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation?ref=na-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=na-license)
3+
Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=na-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 Angular <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fdemos.creative-tim.com%2Fnotus-angular%2F&text=Start%20your%20development%20with%20a%20Free%20Tailwind%20CSS%20and%20Angular%20UI%20Kit%20and%20Admin.%20Let%20Notus%20Angular%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-angular/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-angular.svg)</a> <a href="https://github.com/creativetimofficial/notus-angular/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-angular.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-angular/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-angular.svg)</a> <a href="https://github.com/creativetimofficial/notus-angular/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-angular.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 Angular](https://github.com/creativetimofficial/public-assets/blob/master/notus-angular/notus-angular.jpg?raw=true)
66

@@ -285,9 +285,9 @@ We use GitHub Issues as the official bug tracker for the Notus Angular. Here are
285285

286286
## Licensing
287287

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

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

292292
## Useful Links
293293

e2e/src/app.po.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ export class AppPage {
66
}
77

88
getTitleText() {
9-
return element(by.css("app-root .content span")).getText() as Promise<
10-
string
11-
>;
9+
return element(
10+
by.css("app-root .content span")
11+
).getText() as Promise<string>;
1212
}
1313
}

package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notus-angular",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "Notus Angular - Free Tailwind CSS UI Kit and Admin by Creative Tim.",
55
"repository": "https://github.com/creativetimofficial/notus-angular",
66
"license": "MIT",
@@ -15,42 +15,42 @@
1515
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm run build:tailwind && npm start"
1616
},
1717
"dependencies": {
18-
"@angular/animations": "10.1.2",
19-
"@angular/common": "10.1.2",
20-
"@angular/compiler": "10.1.2",
21-
"@angular/core": "10.1.2",
22-
"@angular/forms": "10.1.2",
23-
"@angular/platform-browser": "10.1.2",
24-
"@angular/platform-browser-dynamic": "10.1.2",
25-
"@angular/router": "10.1.2",
26-
"@fortawesome/fontawesome-free": "5.14.0",
27-
"@popperjs/core": "2.5.1",
28-
"@tailwindcss/custom-forms": "0.2.1",
29-
"chart.js": "2.9.3",
30-
"rxjs": "6.6.3",
31-
"tailwindcss": "1.8.10",
32-
"tslib": "2.0.1",
33-
"zone.js": "0.10.3"
18+
"@angular/animations": "11.2.5",
19+
"@angular/common": "11.2.5",
20+
"@angular/compiler": "11.2.5",
21+
"@angular/core": "11.2.5",
22+
"@angular/forms": "11.2.5",
23+
"@angular/platform-browser": "11.2.5",
24+
"@angular/platform-browser-dynamic": "11.2.5",
25+
"@angular/router": "11.2.5",
26+
"@fortawesome/fontawesome-free": "5.15.3",
27+
"@popperjs/core": "2.9.1",
28+
"@tailwindcss/forms": "0.2.1",
29+
"chart.js": "2.9.4",
30+
"rxjs": "6.6.6",
31+
"tailwindcss": "2.0.4",
32+
"tslib": "2.1.0",
33+
"zone.js": "0.11.4"
3434
},
3535
"devDependencies": {
36-
"@angular-devkit/build-angular": "0.1001.2",
37-
"@angular/cli": "10.1.2",
38-
"@angular/compiler-cli": "10.1.2",
39-
"@angular/language-service": "10.1.2",
40-
"@types/jasmine": "3.5.14",
36+
"@angular-devkit/build-angular": "0.1102.4",
37+
"@angular/cli": "11.2.4",
38+
"@angular/compiler-cli": "11.2.5",
39+
"@angular/language-service": "11.2.5",
40+
"@types/jasmine": "3.6.6",
4141
"@types/jasminewd2": "2.0.8",
42-
"@types/node": "14.11.2",
43-
"codelyzer": "6.0.0",
42+
"@types/node": "14.14.35",
43+
"codelyzer": "6.0.1",
4444
"jasmine-core": "3.6.0",
4545
"jasmine-spec-reporter": "6.0.0",
46-
"karma": "5.2.2",
46+
"karma": "6.2.0",
4747
"karma-chrome-launcher": "3.1.0",
4848
"karma-coverage-istanbul-reporter": "3.0.3",
4949
"karma-jasmine": "4.0.1",
5050
"karma-jasmine-html-reporter": "1.5.4",
5151
"protractor": "7.0.0",
52-
"ts-node": "9.0.0",
52+
"ts-node": "9.1.1",
5353
"tslint": "6.1.3",
54-
"typescript": "4.0.3"
54+
"typescript": "4.1.5"
5555
}
5656
}

src/app/components/cards/card-bar-chart/card-bar-chart.component.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
<div class="rounded-t mb-0 px-4 py-3 bg-transparent">
55
<div class="flex flex-wrap items-center">
66
<div class="relative w-full max-w-full flex-grow flex-1">
7-
<h6 class="uppercase text-gray-500 mb-1 text-xs font-semibold">
7+
<h6 class="uppercase text-blueGray-400 mb-1 text-xs font-semibold">
88
Performance
99
</h6>
10-
<h2 class="text-gray-800 text-xl font-semibold">
11-
Total orders
12-
</h2>
10+
<h2 class="text-blueGray-700 text-xl font-semibold">Total orders</h2>
1311
</div>
1412
</div>
1513
</div>
1614
<div class="p-4 flex-auto">
1715
<!-- Chart -->
18-
<div class="relative" style="height: 350px;">
16+
<div class="relative" style="height: 350px">
1917
<canvas id="bar-chart"></canvas>
2018
</div>
2119
</div>

src/app/components/cards/card-line-chart/card-line-chart.component.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<div
2-
class="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded bg-gray-800"
2+
class="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded bg-blueGray-700"
33
>
44
<div class="rounded-t mb-0 px-4 py-3 bg-transparent">
55
<div class="flex flex-wrap items-center">
66
<div class="relative w-full max-w-full flex-grow flex-1">
7-
<h6 class="uppercase text-gray-200 mb-1 text-xs font-semibold">
7+
<h6 class="uppercase text-blueGray-100 mb-1 text-xs font-semibold">
88
Overview
99
</h6>
10-
<h2 class="text-white text-xl font-semibold">
11-
Sales value
12-
</h2>
10+
<h2 class="text-white text-xl font-semibold">Sales value</h2>
1311
</div>
1412
</div>
1513
</div>
1614
<div class="p-4 flex-auto">
1715
<!-- Chart -->
18-
<div class="relative" style="height: 350px;">
16+
<div class="relative" style="height: 350px">
1917
<canvas id="line-chart"></canvas>
2018
</div>
2119
</div>

0 commit comments

Comments
 (0)