Skip to content

Commit

Permalink
Merge pull request #8 from creativetimofficial/feature/v1.1.0
Browse files Browse the repository at this point in the history
Feature: update to v1.1.0
  • Loading branch information
einazare authored Mar 19, 2021
2 parents 923b9de + fa65abb commit 508d5bd
Show file tree
Hide file tree
Showing 41 changed files with 1,902 additions and 1,357 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ yarn-error.log*
*.sw?

package-lock.json
commit.sh
71 changes: 71 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,76 @@
# Change Log

## [1.1.0] 2021-03-19
### Bug fixing
- Rename `master` branch to `main`
- 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
- 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}`
- After that, we've changed `{type}-blueGray-{number}` to `{type}-blueGray-{lower-number}`, i.e. (`100` became `50`, `200` became `100`, ..., `900` became `800`)
- You can achieve this, by search in your whole project for `blueGray-100` and replace it with `blueGray-50`
- Then, you search in your whole project for `blueGray-200` and replace it with `blueGray-100`
- Then, you search in your whole project for `blueGray-300` and replace it with `blueGray-200`
- Then, you search in your whole project for `blueGray-400` and replace it with `blueGray-300`
- Then, you search in your whole project for `blueGray-500` and replace it with `blueGray-400`
- Then, you search in your whole project for `blueGray-600` and replace it with `blueGray-500`
- Then, you search in your whole project for `blueGray-700` and replace it with `blueGray-600`
- Then, you search in your whole project for `blueGray-800` and replace it with `blueGray-700`
- Then, you search in your whole project for `blueGray-900` and replace it with `blueGray-800`
- 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}`
- 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}`
- `lg:bg-transparent` is not working anymore, so we've changed it with `lg:bg-opacity-0`
- https://github.com/creativetimofficial/notus-angular/issues/4
- https://github.com/creativetimofficial/notus-js/issues/4
- https://github.com/creativetimofficial/notus-js/pull/5
- https://github.com/creativetimofficial/notus-js/pull/6
- https://github.com/creativetimofficial/notus-nextjs/issues/6
- https://github.com/creativetimofficial/notus-nextjs/issues/7
- https://github.com/creativetimofficial/notus-nextjs/issues/8
- https://github.com/creativetimofficial/notus-react/issues/3
- https://github.com/creativetimofficial/notus-svelte/issues/3
- https://github.com/creativetimofficial/notus-svelte/issues/6
- https://github.com/creativetimofficial/vue-notus/pull/4/
### Major style changes
- 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:
- https://blog.tailwindcss.com/tailwindcss-v2
- https://tailwindcss.com/
- https://tailwindcss.com/docs/upgrading-to-v2
### Deleted components
### Added components
### Deleted dependencies
- `@tailwindcss/custom-forms`
### Added dependencies
- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`)
### Updated dependencies
```
@angular/animations 10.1.2 → 11.2.5
@angular/common 10.1.2 → 11.2.5
@angular/compiler 10.1.2 → 11.2.5
@angular/core 10.1.2 → 11.2.5
@angular/forms 10.1.2 → 11.2.5
@angular/platform-browser 10.1.2 → 11.2.5
@angular/platform-browser-dynamic 10.1.2 → 11.2.5
@angular/router 10.1.2 → 11.2.5
@fortawesome/fontawesome-free 5.14.0 → 5.15.3
@popperjs/core 2.5.1 → 2.9.1
chart.js 2.9.3 → 2.9.4
rxjs 6.6.3 → 6.6.6
tailwindcss 1.8.10 → 2.0.4
tslib 2.0.1 → 2.1.0
zone.js 0.10.3 → 0.11.4
@angular-devkit/build-angular 0.1001.2 → 0.1102.4
@angular/cli 10.1.2 → 11.2.4
@angular/compiler-cli 10.1.2 → 11.2.5
@angular/language-service 10.1.2 → 11.2.5
@types/jasmine 3.5.14 → 3.6.6
@types/node 14.11.2 → 14.14.35
codelyzer 6.0.0 → 6.0.1
karma 5.2.2 → 6.2.0
ts-node 9.0.0 → 9.1.1
typescript 4.0.3 → 4.1.5
```
### Warning
_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._

## [1.0.0] 2020-09-29
### Original Release
- Started project from [Tailwind Starter Kit by Creative Tim](https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation?ref=na-changelog)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Creative Tim (https://www.creative-tim.com?ref=na-license)
Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=na-license)

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:

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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>

![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>
![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>

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

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

## Licensing

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

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

## Useful Links

Expand Down
6 changes: 3 additions & 3 deletions e2e/src/app.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ export class AppPage {
}

getTitleText() {
return element(by.css("app-root .content span")).getText() as Promise<
string
>;
return element(
by.css("app-root .content span")
).getText() as Promise<string>;
}
}
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notus-angular",
"version": "1.0.0",
"version": "1.1.0",
"description": "Notus Angular - Free Tailwind CSS UI Kit and Admin by Creative Tim.",
"repository": "https://github.com/creativetimofficial/notus-angular",
"license": "MIT",
Expand All @@ -15,42 +15,42 @@
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm run build:tailwind && npm start"
},
"dependencies": {
"@angular/animations": "10.1.2",
"@angular/common": "10.1.2",
"@angular/compiler": "10.1.2",
"@angular/core": "10.1.2",
"@angular/forms": "10.1.2",
"@angular/platform-browser": "10.1.2",
"@angular/platform-browser-dynamic": "10.1.2",
"@angular/router": "10.1.2",
"@fortawesome/fontawesome-free": "5.14.0",
"@popperjs/core": "2.5.1",
"@tailwindcss/custom-forms": "0.2.1",
"chart.js": "2.9.3",
"rxjs": "6.6.3",
"tailwindcss": "1.8.10",
"tslib": "2.0.1",
"zone.js": "0.10.3"
"@angular/animations": "11.2.5",
"@angular/common": "11.2.5",
"@angular/compiler": "11.2.5",
"@angular/core": "11.2.5",
"@angular/forms": "11.2.5",
"@angular/platform-browser": "11.2.5",
"@angular/platform-browser-dynamic": "11.2.5",
"@angular/router": "11.2.5",
"@fortawesome/fontawesome-free": "5.15.3",
"@popperjs/core": "2.9.1",
"@tailwindcss/forms": "0.2.1",
"chart.js": "2.9.4",
"rxjs": "6.6.6",
"tailwindcss": "2.0.4",
"tslib": "2.1.0",
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1001.2",
"@angular/cli": "10.1.2",
"@angular/compiler-cli": "10.1.2",
"@angular/language-service": "10.1.2",
"@types/jasmine": "3.5.14",
"@angular-devkit/build-angular": "0.1102.4",
"@angular/cli": "11.2.4",
"@angular/compiler-cli": "11.2.5",
"@angular/language-service": "11.2.5",
"@types/jasmine": "3.6.6",
"@types/jasminewd2": "2.0.8",
"@types/node": "14.11.2",
"codelyzer": "6.0.0",
"@types/node": "14.14.35",
"codelyzer": "6.0.1",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "6.0.0",
"karma": "5.2.2",
"karma": "6.2.0",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.5.4",
"protractor": "7.0.0",
"ts-node": "9.0.0",
"ts-node": "9.1.1",
"tslint": "6.1.3",
"typescript": "4.0.3"
"typescript": "4.1.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@
<div class="rounded-t mb-0 px-4 py-3 bg-transparent">
<div class="flex flex-wrap items-center">
<div class="relative w-full max-w-full flex-grow flex-1">
<h6 class="uppercase text-gray-500 mb-1 text-xs font-semibold">
<h6 class="uppercase text-blueGray-400 mb-1 text-xs font-semibold">
Performance
</h6>
<h2 class="text-gray-800 text-xl font-semibold">
Total orders
</h2>
<h2 class="text-blueGray-700 text-xl font-semibold">Total orders</h2>
</div>
</div>
</div>
<div class="p-4 flex-auto">
<!-- Chart -->
<div class="relative" style="height: 350px;">
<div class="relative" style="height: 350px">
<canvas id="bar-chart"></canvas>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
<div
class="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded bg-gray-800"
class="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded bg-blueGray-700"
>
<div class="rounded-t mb-0 px-4 py-3 bg-transparent">
<div class="flex flex-wrap items-center">
<div class="relative w-full max-w-full flex-grow flex-1">
<h6 class="uppercase text-gray-200 mb-1 text-xs font-semibold">
<h6 class="uppercase text-blueGray-100 mb-1 text-xs font-semibold">
Overview
</h6>
<h2 class="text-white text-xl font-semibold">
Sales value
</h2>
<h2 class="text-white text-xl font-semibold">Sales value</h2>
</div>
</div>
</div>
<div class="p-4 flex-auto">
<!-- Chart -->
<div class="relative" style="height: 350px;">
<div class="relative" style="height: 350px">
<canvas id="line-chart"></canvas>
</div>
</div>
Expand Down
Loading

0 comments on commit 508d5bd

Please sign in to comment.