Skip to content

Commit

Permalink
Merge pull request #25 from creativetimofficial/feature/v2.3.0
Browse files Browse the repository at this point in the history 
Feature/v2.3.0
  • Loading branch information
@rarestoma
rarestoma authored May 6, 2022
2 parents 5ae88d2 + 00d9f08 commit da9604b
Show file tree
Hide file tree
Showing 11 changed files with 85 additions and 55 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
npm-debug.log
testem.log
/typings
/.angular

# e2e
/e2e/*.js
Expand All @@ -40,3 +41,4 @@ testem.log
# System Files
.DS_Store
Thumbs.db
package-lock.json
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [2.3.0] 2022-05-06
### Updates
- update to Angular 13
- update all dependencies to match Angular 13 version
- fixed cosmetic issue

## [2.2.0] 2020-10-08
### Updates
- update to Angular 10
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [Paper Dashboard Angular](https://www.creative-tim.com/product/paper-dashboard-angular)
![version](https://img.shields.io/badge/version-2.2.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/paper-dashboard-angular.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-dashboard-angular.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
![version](https://img.shields.io/badge/version-2.3.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/paper-dashboard-angular.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-dashboard-angular.svg?maxAge=2592000)]() [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)

![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/paper-dashboard-angular/paper-dashboard-angular.gif)

Expand Down
30 changes: 25 additions & 5 deletions angular.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"styles": [
"node_modules/bootstrap/scss/bootstrap.scss",
"src/assets/scss/paper-dashboard.scss",
"node_modules/ngx-toastr/toastr.css"
"node_modules/ngx-toastr/toastr.css",
"src/assets/css/demo.css"
],
"scripts": []
},
Expand All @@ -35,9 +36,7 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
Expand All @@ -47,6 +46,22 @@
"with": "src/environments/environment.prod.ts"
}
]
},
"development": {
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true,
"buildOptimizer": false,
"optimization": {
"scripts": true,
"styles": {
"minify": false,
"inlineCritical": true
},
"fonts": true
},
"outputHashing": "all"
}
}
},
Expand All @@ -58,7 +73,11 @@
"configurations": {
"production": {
"browserTarget": "pd-free-angularcli:build:production"
}
},
"development": {
"browserTarget": "pd-free-angularcli:build:development"
},
"defaultConfiguration": "development"
}
},
"extract-i18n": {
Expand All @@ -84,7 +103,8 @@
],
"styles": [
"src/styles.css",
"src/assets/sass/paper-dashboard.scss"
"src/assets/sass/paper-dashboard.scss",
"src/assets/css/demo.css"
],
"assets": [
"src/assets",
Expand Down
8 changes: 4 additions & 4 deletions documentation/css/paper-dashboard.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion documentation/tutorial-components.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<h1 class="title">
Paper Dashboard Angular
</h1>
<h3 class="description">Documentation v2.2.0</h3>
<h3 class="description">Documentation v2.3.0</h3>
<br/>
<a href="https://demos.creative-tim.com/paper-dashboard-angular/#/documentation/tutorial" class="btn btn-primary btn-round btn-lg">View documentation</a>
</div>
Expand Down
77 changes: 40 additions & 37 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paper-dashboard-angular",
"version": "2.2.0",
"version": "2.3.0",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand All @@ -13,53 +13,56 @@
},
"private": true,
"dependencies": {
"@angular/animations": "10.1.5",
"@angular/common": "10.1.5",
"@angular/compiler": "10.1.5",
"@angular/core": "10.1.5",
"@angular/forms": "10.1.5",
"@angular/localize": "^10.1.5",
"@angular/platform-browser": "10.1.5",
"@angular/platform-browser-dynamic": "10.1.5",
"@angular/router": "10.1.5",
"@ng-bootstrap/ng-bootstrap": "7.0.0",
"@angular/animations": "^13.2.6",
"@angular/cdk": "^13.2.6",
"@angular/common": "^13.2.6",
"@angular/compiler": "^13.2.6",
"@angular/core": "^13.2.6",
"@angular/elements": "^13.2.6",
"@angular/forms": "^13.2.6",
"@angular/localize": "^13.2.6",
"@angular/material": "^13.2.6",
"@angular/platform-browser": "^13.2.6",
"@angular/platform-browser-dynamic": "^13.2.6",
"@angular/router": "^13.2.6",
"@ng-bootstrap/ng-bootstrap": "12.0.1",
"@popperjs/core": "^2.11.4",
"@ngui/map": "0.30.3",
"@types/googlemaps": "3.39.14",
"arrive": "2.4.1",
"bootstrap": "4.5.2",
"bootstrap-notify": "3.1.3",
"chart.js": "2.9.3",
"chart.js": "2.9.4",
"chartist": "0.11.4",
"core-js": "3.6.5",
"express": "4.17.1",
"core-js": "3.21.1",
"express": "4.18.0",
"jquery": "3.5.1",
"moment": "2.29.1",
"ngx-toastr": "13.1.0",
"rxjs": "6.6.3",
"tslib": "2.0.2",
"zone.js": "0.11.1"
"ngx-toastr": "14.3.0",
"rxjs": "^7.5.5",
"zone.js": "~0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1001.5",
"@angular/cli": "10.1.5",
"@angular/compiler-cli": "10.1.5",
"@types/bootstrap": "5.0.0",
"@angular-devkit/build-angular": "^13.2.6",
"@angular/cli": "^13.2.6",
"@angular/compiler-cli": "^13.2.6",
"@angular/language-service": "13.2.6",
"@types/jasmine": "~3.10.3",
"@types/jasminewd2": "~2.0.10",
"@types/chartist": "0.11.0",
"@types/jasmine": "3.5.14",
"@types/jquery": "3.5.2",
"@types/node": "14.11.5",
"codelyzer": "6.0.1",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "6.0.0",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-cli": "2.0.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.5.4",
"@types/jquery": "3.5.1",
"@types/node": "16.3.2",
"codelyzer": "6.0.2",
"jasmine-core": "~4.0.1",
"jasmine-spec-reporter": "~7.0.0",
"karma": "^6.3.17",
"karma-chrome-launcher": "~3.1.1",
"karma-coverage": "^2.2.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"protractor": "7.0.0",
"ts-node": "9.0.0",
"tslint": "6.1.3",
"typescript": "4.0.3"
"ts-node": "~10.7.0",
"typescript": "~4.4.2"
}
}
2 changes: 1 addition & 1 deletion src/app/app.routing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const AppRoutes: Routes = [
children: [
{
path: '',
loadChildren: './layouts/admin-layout/admin-layout.module#AdminLayoutModule'
loadChildren: () => import('./layouts/admin-layout/admin-layout.module').then(x => x.AdminLayoutModule)
}]},
{
path: '**',
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/paper-dashboard.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
=========================================================
* Paper Dashboard Angular - v2.2.0
* Paper Dashboard Angular - v2.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-dashboard-angular
Expand Down
3 changes: 3 additions & 0 deletions src/assets/scss/paper-dashboard/_misc.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,6 @@ a[data-toggle="collapse"][aria-expanded="true"] .caret,
}
}
}
.fixed-plugin .dropdown-menu {
right: 70px !important;
}
6 changes: 1 addition & 5 deletions src/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
=========================================================
* Paper Dashboard Angular - v2.2.0
* Paper Dashboard Angular - v2.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-dashboard-angular
Expand Down Expand Up @@ -29,10 +29,6 @@
<title>Paper Dashboard Angular by Creative Tim</title>

<base href="/">

<!-- CSS for Demo Purpose, don't include it in your project -->
<link href="./assets/css/demo.css" rel="stylesheet" />

<!-- Fonts and icons -->
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" />
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet">
Expand Down

0 comments on commit da9604b

Please sign in to comment.