From 325ca0afc73071fffab00eaf06c11d7f6139c94a Mon Sep 17 00:00:00 2001 From: Maisam Afshar Date: Fri, 16 Dec 2022 10:51:41 +0430 Subject: [PATCH 1/9] add .eslintrc --- .eslintrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..b94e9b0 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,12 @@ +{ + "root": true, + "extends": [ + "plugin:vue/essential" + ], + "env": { + "amd": true + }, + "rules": { + "vue/multi-word-component-names": "off" + } +} From 869615fe16d9ee8e4266b5e136d50be3545e2c69 Mon Sep 17 00:00:00 2001 From: Maisam Afshar Date: Fri, 16 Dec 2022 10:51:55 +0430 Subject: [PATCH 2/9] package-lock.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 42738dd..297f1e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store node_modules +package-lock.json /dist # local env files From 039fd2e58630a5d34e51414c52035b3f7e031cd1 Mon Sep 17 00:00:00 2001 From: Maisam Afshar Date: Fri, 16 Dec 2022 10:52:04 +0430 Subject: [PATCH 3/9] legacy-peer-deps=true --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..e9ee3cb --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +legacy-peer-deps=true \ No newline at end of file From 9faaaf1497d5efc491c9ce1fa08f58eea1af0b2b Mon Sep 17 00:00:00 2001 From: Maisam Afshar Date: Fri, 16 Dec 2022 10:52:16 +0430 Subject: [PATCH 4/9] add v1.2.0 changes --- CHANGELOG.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e455e..c874837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ # Change Log +## [1.2.0] 2021-03-19 + +- Update dependencies and devDependencies +- Fix installation issue when running `npm i` + ## [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}` @@ -29,24 +36,34 @@ - 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 @@ -61,11 +78,15 @@ vue-router 3.4.3 → 4.0.5 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 cache-loader@4.1.0 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) - Added design from Tailwind Starter Kit by Creative Tim From 5af0adb8cca8f0080d2cde62adc5a22d95bcb94b Mon Sep 17 00:00:00 2001 From: Maisam Afshar Date: Fri, 16 Dec 2022 10:52:24 +0430 Subject: [PATCH 5/9] update dependencies --- package.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index d70abe2..755c33e 100644 --- a/package.json +++ b/package.json @@ -13,29 +13,29 @@ "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.15.3", - "@popperjs/core": "2.9.1", - "@tailwindcss/forms": "0.2.1", - "@vue/compiler-sfc": "3.0.7", + "@fortawesome/fontawesome-free": "5.15.4", + "@popperjs/core": "2.11.6", + "@tailwindcss/forms": "0.5.3", "chart.js": "2.9.4", - "core-js": "3.9.1", + "core-js": "3.26.1", "gulp": "4.0.2", - "gulp-append-prepend": "1.0.8", - "tailwindcss": "2.0.4", - "vue": "3.0.7", - "vue-router": "4.0.5" + "gulp-append-prepend": "1.0.9", + "@vue/compiler-sfc": "3.2.45", + "tailwindcss": "2.2.19", + "vue": "3.2.45", + "vue-router": "4.1.6" }, "devDependencies": { - "@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" + "@babel/core": "7.20.5", + "@babel/eslint-parser": "7.19.1", + "@vue/cli-plugin-babel": "5.0.8", + "@vue/cli-plugin-eslint": "5.0.8", + "@vue/cli-service": "5.0.8", + "autoprefixer": "10.4.13", + "eslint": "7.32.0", + "eslint-plugin-vue": "7.20.0", + "postcss": "8.4.20", + "vue-template-compiler": "2.7.14" }, "eslintConfig": { "root": true, From af937ddfba4f17cb8990da2afd3c81007868e089 Mon Sep 17 00:00:00 2001 From: Maisam Afshar Date: Fri, 16 Dec 2022 10:53:01 +0430 Subject: [PATCH 6/9] update version & date --- LICENSE.md | 2 +- gulpfile.js | 12 +- public/index.html | 8 +- src/assets/styles/tailwind.css | 682 ++++++++++++++++++--------------- 4 files changed, 393 insertions(+), 311 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index df9ca2d..7ca322e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=vn-license) +Copyright (c) 2022 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: diff --git a/gulpfile.js b/gulpfile.js index 395d4f0..b0397a4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -9,11 +9,11 @@ gulp.task("licenses", async function () { gap.prependText(`/*! ========================================================= -* Vue Notus - v1.1.0 based on Tailwind Starter Kit by Creative Tim +* Vue Notus - v1.2.0 based on Tailwind Starter Kit by Creative Tim ========================================================= * Product Page: https://www.creative-tim.com/product/vue-notus -* Copyright 2021 Creative Tim (https://www.creative-tim.com) +* Copyright 2022 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 @@ -35,11 +35,11 @@ gulp.task("licenses", async function () { gap.prependText(`