Skip to content

Commit

Permalink
Merge pull request #7 from creativetimofficial/dev-main
Browse files Browse the repository at this point in the history
Feature: Update dependencies
  • Loading branch information
einazare authored Feb 4, 2021
2 parents 1c35813 + 7d77f7b commit 801c7c4
Show file tree
Hide file tree
Showing 114 changed files with 8,094 additions and 13,341 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.next
out
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
## [1.1.0] 2021-02-04
### Bug fixing
- Changed all class components to functional ones (the `pages/_app.js` and `pages/_document.js` were kept as class components, read more here: https://nextjs.org/docs/advanced-features/custom-document)
### Major style changes
- Delete the `src/assets/scss/bootstrap` folder and changed all the bootstrap imports from `src/assets/scss` files to ones from `node_modules`
### Deleted components
### Added components
### Deleted dependencies
- @types/react
- @types/markerclustererplus
- @types/googlemaps
- react-google-maps (We've replace this plugin with Google Maps API Vanilla JS)
### Added dependencies
+ bootstrap@4.6.0 (and deleted the downloaded version of Bootstrap)
+ node-sass-package-importer@5.3.2 (so we can import bootstrap from node_modules)
### Updated dependencies
```
@fortawesome/fontawesome-free 5.14.0 → 5.15.2
chart.js 2.9.3 → 2.9.4
moment 2.27.0 → 2.29.1
next 9.5.2 → 10.0.6
next-compose-plugins 2.2.0 → 2.2.1
nouislider 14.6.1 → 14.6.3
react 16.13.1 → 17.0.1
react-chartjs-2 2.10.0 → 2.11.1
react-copy-to-clipboard 5.0.2 → 5.0.3
react-datetime 2.16.3 → 3.0.4
react-dom 16.13.1 → 17.0.1
reactstrap 8.5.1 → 8.9.0
```
### Warning
_The following warnings will appear when running the installation command, but they do not affect the UI or the functionality of the product (they will be solved in our next update):_
```
npm WARN react-datetime@3.0.4 requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself.
npm WARN react-popper@1.3.7 requires a peer of react@0.14.x || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
npm WARN create-react-context@0.3.0 requires a peer of react@^0.14.0 || ^15.0.0 || ^16.0.0 but none is installed. You must install peer dependencies yourself.
```
_If they will persist in our 2.*.* version, we will drop their usages and replace them with other plugins._
_In development mode, some of the above plugins will throw a warning because they still use React v16 syntax. If the error will persist in our 2.*.* version, we will drop their usage and replace them with other plugins._

## [1.0.0] 2020-09-14
### Original Release
- Started project with NextJS
Expand Down
8 changes: 4 additions & 4 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* NextJS Argon Dashboard - v1.0.0
* NextJS Argon Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/nextjs-argon-dashboard
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/nextjs-argon-dashboard/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -47,7 +47,7 @@
<!-- Argon CSS -->
<link
type="text/css"
href="../assets/css/nextjs-argon-dashboard.css?v=1.0.0"
href="../assets/css/nextjs-argon-dashboard.css?v=1.1.0"
rel="stylesheet"
/>
</head>
Expand Down Expand Up @@ -143,7 +143,7 @@ <h6 class="text-overflow m-0">Welcome!</h6>
<div class="row justify-content-center">
<div class="col-lg-6 col-md-10 text-center">
<h1 class="display-2 text-white">
Documentation <small>v1.0.0</small>
Documentation <small>v1.1.0</small>
</h1>
<p class="text-white mt-0 mb-5">
We are constatly doing updates on the product and documentation,
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
Copyright (c) 2021 Creative Tim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [NextJS Argon Dashboard](https://demos.creative-tim.com/nextjs-argon-dashboard?ref=njsad-github-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=NextJS%20Argon%20Dashboard%20is%20a%20Free%20NextJS%204,%20Bootstrap%204,%20React%20and%20Reactstrap%20Dashboard%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//demos.creative-tim.com/nextjs-argon-dashboard-%20%23react%20%23reactstrap%20%23nextjs%20%23argon%20%23argondesign%20%23reactdashboard%20%23argonreact%20%23reactdesign%20%23bootstrap%20%23uikit%20%23freebie%20%20via%20%40CreativeTim)


![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/nextjs-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/nextjs-argon-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-nextjs-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-nextjs-argon-dashboard/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
![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/nextjs-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/nextjs-argon-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-nextjs-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-nextjs-argon-dashboard/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)


![Product Image](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/nextjs-argon-dashboard/nextjs-argon-dashboard.jpg)
Expand Down Expand Up @@ -247,7 +247,7 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are

## Licensing

- Copyright 2020 Creative Tim (https://www.creative-tim.com/?ref=njsad-github-readme)
- Copyright 2021 Creative Tim (https://www.creative-tim.com/?ref=njsad-github-readme)

- Licensed under MIT (https://github.com/creativetimofficial/nextjs-argon-dashboard/blob/master/LICENSE.md?ref=creativetim)

Expand Down
Loading

0 comments on commit 801c7c4

Please sign in to comment.