Skip to content

Commit

Permalink
Merge pull request #6 from creativetimofficial/dev-main
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 e0247ed + f6e3cc2 commit d250c46
Show file tree
Hide file tree
Showing 38 changed files with 1,823 additions and 1,255 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ yarn-error.log*
*.njsproj
*.sln
*.sw?

commit.sh
65 changes: 65 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,70 @@
# 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`
- `babel-eslint` (updated to `@babel/eslint-parser` and `@babel/core`)
### Added dependencies
- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`)
- `autoprefixer`
- `postcss`
- `@babel/core` (instead of `babel-eslint`)
- `@babel/eslint-parser` (instead of `babel-eslint`)
- `@vue/compiler-sfc`
### Updated dependencies
```
@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
core-js 3.6.5 → 3.9.1
tailwindcss 1.8.10 → 2.0.4
vue 2.6.12 → 3.0.7
vue-router 3.4.3 → 4.0.5
@vue/cli-plugin-babel 4.5.6 → 5.0.0-alpha.7
@vue/cli-plugin-eslint 4.5.6 → 5.0.0-alpha.7
@vue/cli-service 4.5.6 → 5.0.0-alpha.7
eslint 6.8.0 → 7.22.0
eslint-plugin-vue 6.2.2 → 7.7.0
```
### 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._
_The following warning will show when doing a clean install `npm WARN [email protected] requires a peer of webpack@^4.0.0 but none is installed. You must install peer dependencies yourself.`, however it does not affect in any way the product._

## [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=vn-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=vn-license)
Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=vn-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 @@
# Vue Notus <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fdemos.creative-tim.com%2Fvue-notus%2F%23%2F&text=Start%20your%20development%20with%20a%20Free%20Tailwind%20CSS%20and%20VueJS%20UI%20Kit%20and%20Admin.%20Let%20Vue%20Notus%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>

![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/vue-notus/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-notus.svg)</a> <a href="https://github.com/creativetimofficial/vue-notus/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-notus.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/vue-notus/issues?q=is%3Aopen+is%3Aissue" target="_blank">![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-notus.svg)</a> <a href="https://github.com/creativetimofficial/vue-notus/issues?q=is%3Aissue+is%3Aclosed" target="_blank">![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-notus.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>

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

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

## Licensing

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

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

## Useful Links

Expand Down
18 changes: 9 additions & 9 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ gulp.task("licenses", async function () {
gap.prependText(`/*!
=========================================================
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
=========================================================
* Product Page: https://www.creative-tim.com/product/vue-notus
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
Expand All @@ -35,12 +35,12 @@ gulp.task("licenses", async function () {
gap.prependText(`<!--
=========================================================
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
=========================================================
* Product Page: https://www.creative-tim.com/product/vue-notus
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
Expand All @@ -61,12 +61,12 @@ gulp.task("licenses", async function () {
gap.prependText(`/*!
=========================================================
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
=========================================================
* Product Page: https://www.creative-tim.com/product/vue-notus
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
Expand Down
36 changes: 20 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vue-notus",
"homepage": "https://demos.creative-tim.com/vue-notus/",
"version": "1.0.0",
"version": "1.1.0",
"description": "Vue Notus - A free Tailwind CSS and VueJS UI Kit and Admin by Creative Tim.",
"repository": "https://github.com/creativetimofficial/vue-notus",
"license": "MIT",
Expand All @@ -13,24 +13,28 @@
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm run build:tailwind && npm run serve"
},
"dependencies": {
"@fortawesome/fontawesome-free": "5.14.0",
"@popperjs/core": "2.5.1",
"@tailwindcss/custom-forms": "0.2.1",
"chart.js": "2.9.3",
"core-js": "3.6.5",
"@fortawesome/fontawesome-free": "5.15.3",
"@popperjs/core": "2.9.1",
"@tailwindcss/forms": "0.2.1",
"@vue/compiler-sfc": "3.0.7",
"chart.js": "2.9.4",
"core-js": "3.9.1",
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8",
"tailwindcss": "1.8.10",
"vue": "2.6.12",
"vue-router": "3.4.3"
"tailwindcss": "2.0.4",
"vue": "3.0.7",
"vue-router": "4.0.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.5.6",
"@vue/cli-plugin-eslint": "4.5.6",
"@vue/cli-service": "4.5.6",
"babel-eslint": "10.1.0",
"eslint": "6.8.0",
"eslint-plugin-vue": "6.2.2",
"@babel/core": "7.13.10",
"@babel/eslint-parser": "7.13.10",
"@vue/cli-plugin-babel": "5.0.0-alpha.7",
"@vue/cli-plugin-eslint": "5.0.0-alpha.7",
"@vue/cli-service": "5.0.0-alpha.7",
"autoprefixer": "10.2.5",
"eslint": "7.22.0",
"eslint-plugin-vue": "7.7.0",
"postcss": "8.2.8",
"vue-template-compiler": "2.6.12"
},
"eslintConfig": {
Expand All @@ -44,7 +48,7 @@
],
"rules": {},
"parserOptions": {
"parser": "babel-eslint"
"parser": "@babel/eslint-parser"
}
},
"postcss": {
Expand Down
10 changes: 5 additions & 5 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!--
=========================================================
* Vue Notus - v1.0.0 based on Tailwind Starter Kit by Creative Tim
* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim
=========================================================
* Product Page: https://www.creative-tim.com/product/vue-notus
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/vue-notus/blob/main/LICENSE.md)
* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
Expand All @@ -29,10 +29,10 @@
/>
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY"></script>
<title>
Tailwind Starter Kit by Creative Tim | Free and Open Source UI Kit
Vue Notus by Creative Tim | Free and Open Source UI Kit
</title>
</head>
<body class="text-gray-800 antialiased">
<body class="text-blueGray-700 antialiased">
<noscript>
<strong
>We're sorry but vue-notus doesn't work properly without JavaScript
Expand Down
Loading

0 comments on commit d250c46

Please sign in to comment.