Skip to content

Commit

Permalink
Merge pull request #8 from creativetimofficial/feature/v1.3.0
Browse files Browse the repository at this point in the history
Feature/v1.3.0
  • Loading branch information
rarestoma authored Jul 15, 2021
2 parents 42973ed + 19c9357 commit 24b6bce
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 47 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.3.0] - 2021-07-15
### Updates
- update to Angular 12
- update all dependencies to match Angular 12 version

When you build and serve your app it is possible that some warnings to appear on your terminal. Those will NOT affect your product.

## [1.2.0] - 2020-12-18
### Updates
- update to Angular 11
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@



![version](https://img.shields.io/badge/version-1.2.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/black-dashboard-angular.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/black-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-1.3.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/black-dashboard-angular.svg?maxAge=2592000)]() [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/black-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/black-dashboard-angular/bd_angular.gif)

Expand Down
13 changes: 10 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,16 @@
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"optimization": {
"scripts": true,
"styles": {
"minify": false,
"inlineCritical": false
},
"fonts": true
},
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -71,7 +77,8 @@
"production": {
"browserTarget": "black-dashboard-angular:build:production"
}
}
},
"defaultConfiguration": "production"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
Expand Down
2 changes: 1 addition & 1 deletion documentation/black-dashboard.css

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

6 changes: 3 additions & 3 deletions documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
=========================================================
* Black Dashboard Angular v1.2.0
* Black Dashboard Angular v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-angular
Expand Down Expand Up @@ -36,7 +36,7 @@
<!-- Nucleo Icons -->
<link href="../src/assets/css/nucleo-icons.css" rel="stylesheet" />
<!-- CSS Files -->
<link href="./black-dashboard.css?v=1.1.0" rel="stylesheet" />
<link href="./black-dashboard.css?v=1.3.0" rel="stylesheet" />
<!-- CSS Just for demo purpose, don't include it in your project -->
<link href="../src/assets/demo/demo.css" rel="stylesheet" />
<style media="screen">
Expand Down Expand Up @@ -97,7 +97,7 @@
<h1 class="title">
Black Dashboard Angular
</h1>
<h3 class="description">Documentation v1.1.0</h3>
<h3 class="description">Documentation v1.3.0</h3>
<br/>
<a href="https://demos.creative-tim.com/black-dashboard-angular/#/documentation/tutorial" class="btn btn-primary btn-round btn-lg">View documentation</a>
</div>
Expand Down
58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,42 +61,42 @@
"homepage": "https://demos.creative-tim.com/black-dashboard-angular/#/dashboard",
"private": false,
"dependencies": {
"@angular/animations": "11.0.5",
"@angular/common": "11.0.5",
"@angular/compiler": "11.0.5",
"@angular/core": "11.0.5",
"@angular/forms": "11.0.5",
"@angular/localize": "^11.0.5",
"@angular/platform-browser": "11.0.5",
"@angular/platform-browser-dynamic": "11.0.5",
"@angular/router": "11.0.5",
"@ng-bootstrap/ng-bootstrap": "6.0.0",
"@angular/animations": "12.1.2",
"@angular/common": "12.1.2",
"@angular/compiler": "12.1.2",
"@angular/core": "12.1.2",
"@angular/forms": "12.1.2",
"@angular/localize": "^12.1.2",
"@angular/platform-browser": "12.1.2",
"@angular/platform-browser-dynamic": "12.1.2",
"@angular/router": "12.1.2",
"@ng-bootstrap/ng-bootstrap": "10.0.0",
"chart.js": "2.9.4",
"core-js": "3.8.1",
"ngx-toastr": "13.2.0",
"rxjs": "6.6.3",
"tslib": "2.0.3",
"zone.js": "0.11.3"
"core-js": "3.15.2",
"ngx-toastr": "14.0.0",
"rxjs": "7.2.0",
"tslib": "2.3.0",
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1100.5",
"@angular/cli": "11.0.5",
"@angular/compiler-cli": "11.0.5",
"@angular/language-service": "11.0.5",
"@types/node": "14.14.14",
"@types/jasmine": "3.6.2",
"@types/jasminewd2": "2.0.8",
"codelyzer": "6.0.1",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "6.0.0",
"karma": "5.2.3",
"@angular-devkit/build-angular": "12.1.2",
"@angular/cli": "12.1.2",
"@angular/compiler-cli": "12.1.2",
"@angular/language-service": "12.1.2",
"@types/node": "16.3.2",
"@types/jasmine": "3.8.1",
"@types/jasminewd2": "2.0.10",
"codelyzer": "6.0.2",
"jasmine-core": "3.8.0",
"jasmine-spec-reporter": "7.0.0",
"karma": "6.3.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.5.4",
"karma-jasmine-html-reporter": "1.7.0",
"protractor": "7.0.0",
"ts-node": "9.1.1",
"ts-node": "10.1.0",
"tslint": "6.1.3",
"typescript": "4.0.3"
"typescript": "4.3.5"
}
}
9 changes: 4 additions & 5 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@ const routes: Routes = [
children: [
{
path: "",
loadChildren:
"./layouts/admin-layout/admin-layout.module#AdminLayoutModule"
loadChildren: () => import ("./layouts/admin-layout/admin-layout.module").then(m => m.AdminLayoutModule)
}
]
}, {
path: '',
path: "",
component: AuthLayoutComponent,
children: [
{
path: '',
loadChildren: './layouts/auth-layout/auth-layout.module#AuthLayoutModule'
path: "",
loadChildren: () => import ("./layouts/auth-layout/auth-layout.module").then(m => m.AuthLayoutModule)
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/black-dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/*
=========================================================
* Black Dashboard Angular - v1.2.0
* Black Dashboard Angular - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-angular
Expand Down
3 changes: 2 additions & 1 deletion src/assets/scss/black-dashboard/custom/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:math";

// Global settings

Expand Down Expand Up @@ -404,7 +405,7 @@ $font-paragraph: 1rem !default;
$font-weight-base: $font-weight-normal !default;
$shape-height-base: 1.428571 !default;

$headings-margin-bottom: ($spacer / 2);
$headings-margin-bottom: math.div($spacer, 2);
$headings-font-family: inherit !default;
$headings-font-weight: $font-weight-normal !default;
$headings-line-height: 1.2 !default;
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
=========================================================
* Black Dashboard Angular - v1.2.0
* Black Dashboard Angular - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-angular
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
=========================================================
* Black Dashboard Angular - v1.2.0
* Black Dashboard Angular - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard-angular
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
Expand Down

0 comments on commit 24b6bce

Please sign in to comment.