diff --git a/.gitignore b/.gitignore index e5be06e5..7692eaab 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ yarn-error.log* .next/ out/ + +commit.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b63b24e..61262a0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,80 @@ # 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` +- 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 + - All the `require` images have been replaced by simple `/img/` strings +- 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 +- `next.config.js` (we do not need it anymore since we now use `Built-In CSS Support` from `NextJS`) + - for the absolute imports, we've used the `jsconfig.json` file +### Added components +- `jsconfig.json` (to keep our absolute imports) +### Deleted dependencies +- `@tailwindcss/custom-forms` +- `react-google-maps` (replaced by simple Google Maps API) +- `@types/googlemaps` (dependencies of `react-google-maps`) +- `@types/markerclustererplus` (dependencies of `react-google-maps`) +- `@types/react` (dependencies of `react-google-maps`) +- `@zeit/next-css` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `@zeit/next-sass` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `node-sass` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `next-images` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `next-fonts` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `next-compose-plugins` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `path` (we'll use the default `Built-In CSS Support` from `NextJS`) +- `webpack` (we'll use the default `Built-In CSS Support` from `NextJS`) +### Added dependencies +- `@tailwindcss/forms` (replaces `@tailwindcss/custom-forms`) +- `autoprefixer` +- `postcss` +### 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 +next 9.5.3 → 10.0.9 +react 16.13.1 → 17.0.1 +@types/react 16.9.49 → 17.0.3 +react-dom 16.13.1 → 17.0.1 +react-scripts 3.4.3 → 4.0.3 +tailwindcss 1.8.10 → 2.0.4 +typescript 4.0.3 → 4.2.3 +``` +### 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=nnjs-changelog) diff --git a/LICENSE.md b/LICENSE.md index e054faf2..574c7270 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Creative Tim (https://www.creative-tim.com?ref=nnjs-license) +Copyright (c) 2021 Creative Tim (https://www.creative-tim.com?ref=nnjs-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/README.md b/README.md index 51b2cf1d..9bc8167d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Notus NextJS ![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter) -![version](https://img.shields.io/badge/version-1.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) ![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-nextjs.svg) ![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-nextjs.svg) ![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg) ![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg) +![version](https://img.shields.io/badge/version-1.1.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) ![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/notus-nextjs.svg) ![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/notus-nextjs.svg) ![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg) ![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg) ![Notus NextJS](https://github.com/creativetimofficial/public-assets/blob/master/notus-nextjs/notus-nextjs.jpg?raw=true) @@ -201,9 +201,9 @@ We use GitHub Issues as the official bug tracker for the Notus NextJS. Here are ## Licensing -- Copyright 2020 Creative Tim +- Copyright 2021 Creative Tim -- Licensed under MIT +- Licensed under MIT ## Useful Links diff --git a/components/Cards/CardBarChart.js b/components/Cards/CardBarChart.js index 6fe93dd3..378a03c1 100644 --- a/components/Cards/CardBarChart.js +++ b/components/Cards/CardBarChart.js @@ -104,10 +104,10 @@ export default function CardBarChart() {
+ | Page name | -+ | Visitors | -+ | Unique users | -+ | Bounce rate |
---|---|---|---|---|---|---|---|
+ | /argon/ | -+ | 4,569 | -+ | 340 | -- + | + 46,53% |
+ | /argon/index.html | -+ | 3,985 | -+ | 319 | -+ | 46,53% |
+ | /argon/charts.html | -+ | 3,513 | -+ | 294 | -+ | 36,49% |
+ | /argon/tables.html | -+ | 2,050 | -+ | 147 | -- + | + 50,87% |
+ | /argon/profile.html | -+ | 1,795 | -+ | 190 | -+ | 46,53% | diff --git a/components/Cards/CardProfile.js b/components/Cards/CardProfile.js index ecbc5a49..f9d63927 100644 --- a/components/Cards/CardProfile.js +++ b/components/Cards/CardProfile.js @@ -12,7 +12,7 @@ export default function CardProfile() {