Skip to content

Commit

Permalink
Merge pull request #38 from creativetimofficial/feature/v1.5.0
Browse files Browse the repository at this point in the history
Feature/v1.5.0
  • Loading branch information
rarestoma committed Dec 8, 2022
2 parents 9277f29 + 39dc4b6 commit 2e14802
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 103 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ testem.log
# System Files
.DS_Store
Thumbs.db
package-lock.json
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [1.5.0] - 2022-12-08
### Updates
- update to Angular 14
- update all dependencies to match Angular 14 version

## [1.4.0] - 2022-04-1
### Updates
- update to Angular 13
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.4.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-angular.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-angular/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-angular.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-angular/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.5.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-angular.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-angular/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-angular.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-angular/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 Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-dashboard-angular/argon-dashboard-angular.gif)
Expand Down
2 changes: 1 addition & 1 deletion docs/argon.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
=========================================================
* Argon Dashboard - v1.4.0
* Argon Dashboard - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard
Expand Down
2 changes: 1 addition & 1 deletion docs/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<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.4.0</small>
Documentation <small>v1.5.0</small>
</h1>
<p class="text-white mt-0 mb-5">
We are constatly doing updates on the product and documentation,
Expand Down
61 changes: 31 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "argon-dashboard-angular",
"version": "1.4.0",
"version": "1.5.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand All @@ -12,49 +12,50 @@
},
"private": true,
"dependencies": {
"@angular/animations": "13.3.1",
"@angular/cdk": "^13.3.1",
"@angular/common": "^13.3.1",
"@angular/compiler": "^13.3.1",
"@angular/core": "^13.3.1",
"@angular/elements": "^13.3.1",
"@angular/forms": "^13.3.1",
"@angular/localize": "13.3.1",
"@angular/platform-browser": "^13.3.1",
"@angular/platform-browser-dynamic": "^13.3.1",
"@angular/router": "^13.3.1",
"@angular/animations": "^14.2.0",
"@angular/cdk": "^14.2.0",
"@angular/common": "^14.2.0",
"@angular/compiler": "^14.2.0",
"@angular/core": "^14.2.0",
"@angular/elements": "^14.2.0",
"@angular/forms": "^14.2.0",
"@angular/google-maps": "^14.2.0",
"@angular/localize": "^14.2.0",
"@angular/material": "^14.2.0",
"@angular/platform-browser": "^14.2.0",
"@angular/platform-browser-dynamic": "^14.2.0",
"@angular/router": "^14.2.0",
"@ng-bootstrap/ng-bootstrap": "12.0.1",
"@popperjs/core": "^2.11.4",
"bootstrap": "4.6.1",
"chart.js": "2.9.4",
"clipboard": "2.0.10",
"core-js": "3.21.1",
"ngx-clipboard": "15.0.1",
"ngx-toastr": "14.2.2",
"nouislider": "15.5.1",
"rxjs": "^7.5.5",
"zone.js": "~0.11.5"
"rxjs": "~7.5.0",
"zone.js": "~0.11.4",
"web-animations-js": "2.3.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^13.3.1",
"@angular/cli": "^13.3.1",
"@angular/compiler-cli": "^13.3.1",
"@angular/language-service": "13.3.1",
"@types/jasmine": "~3.10.3",
"@angular-devkit/build-angular": "^14.2.7",
"@angular/cli": "~14.2.7",
"@angular/compiler-cli": "^14.2.0",
"@angular/language-service": "14.2.0",
"@types/jasmine": "~4.0.0",
"@types/jasminewd2": "~2.0.10",
"@types/node": "16.3.2",
"@types/node": "^17.0.21",
"codelyzer": "6.0.2",
"jasmine-core": "~4.0.1",
"jasmine-core": "~4.4.0",
"jasmine-spec-reporter": "~7.0.0",
"karma": "^6.3.17",
"karma-chrome-launcher": "~3.1.1",
"karma-coverage": "^2.2.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.2.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"protractor": "7.0.0",
"ts-node": "~10.7.0",
"tslint": "6.1.3",
"typescript": "~4.4.2"
"ts-node": "~10.9.1",
"typescript": "~4.7.2"
}
}
66 changes: 33 additions & 33 deletions src/assets/scss/argon.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
=========================================================
* Argon Dashboard Angular - v1.4.0
* Argon Dashboard Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-angular
Expand All @@ -25,38 +25,38 @@
// Bootstrap (4.3.0) components

// @import "~bootstrap/scss/bootstrap";
@import "~bootstrap/scss/root";
@import "~bootstrap/scss/reboot";
@import "~bootstrap/scss/type";
@import "~bootstrap/scss/images";
@import "~bootstrap/scss/code";
@import "~bootstrap/scss/grid";
@import "~bootstrap/scss/tables";
@import "~bootstrap/scss/forms";
@import "~bootstrap/scss/buttons";
@import "~bootstrap/scss/transitions";
@import "~bootstrap/scss/dropdown";
@import "~bootstrap/scss/button-group";
@import "~bootstrap/scss/input-group";
@import "~bootstrap/scss/custom-forms";
@import "~bootstrap/scss/nav";
@import "~bootstrap/scss/navbar";
@import "~bootstrap/scss/card";
@import "~bootstrap/scss/breadcrumb";
@import "~bootstrap/scss/pagination";
@import "~bootstrap/scss/badge";
@import "~bootstrap/scss/jumbotron";
@import "~bootstrap/scss/alert";
@import "~bootstrap/scss/progress";
@import "~bootstrap/scss/media";
@import "~bootstrap/scss/list-group";
@import "~bootstrap/scss/close";
@import "~bootstrap/scss/modal";
@import "~bootstrap/scss/tooltip";
@import "~bootstrap/scss/popover";
@import "~bootstrap/scss/carousel";
@import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/print";
@import "bootstrap/scss/root";
@import "bootstrap/scss/reboot";
@import "bootstrap/scss/type";
@import "bootstrap/scss/images";
@import "bootstrap/scss/code";
@import "bootstrap/scss/grid";
@import "bootstrap/scss/tables";
@import "bootstrap/scss/forms";
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/transitions";
@import "bootstrap/scss/dropdown";
@import "bootstrap/scss/button-group";
@import "bootstrap/scss/input-group";
@import "bootstrap/scss/custom-forms";
@import "bootstrap/scss/nav";
@import "bootstrap/scss/navbar";
@import "bootstrap/scss/card";
@import "bootstrap/scss/breadcrumb";
@import "bootstrap/scss/pagination";
@import "bootstrap/scss/badge";
@import "bootstrap/scss/jumbotron";
@import "bootstrap/scss/alert";
@import "bootstrap/scss/progress";
@import "bootstrap/scss/media";
@import "bootstrap/scss/list-group";
@import "bootstrap/scss/close";
@import "bootstrap/scss/modal";
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/popover";
@import "bootstrap/scss/carousel";
@import "bootstrap/scss/utilities";
@import "bootstrap/scss/print";

// Argon utilities and components

Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/custom/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// Bootstrap default functions

@import "~bootstrap/scss/functions";
@import "bootstrap/scss/functions";


// Retrieve color Sass maps
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/custom/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// Bootstrap default mixins

@import "~bootstrap/scss/mixins";
@import "bootstrap/scss/mixins";


// Custom mixins
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/custom/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -980,4 +980,4 @@ $footer-heading-font-size: $font-size-sm !default;

// Import Bootstrap variable defaults

@import "~bootstrap/scss/variables";
@import "bootstrap/scss/variables";
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
=========================================================
* Argon Dashboard Angular - v1.4.0
* Argon Dashboard Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-angular
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
=========================================================
* Argon Dashboard Angular - v1.4.0
* Argon Dashboard Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-angular
Expand Down
29 changes: 0 additions & 29 deletions src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,6 @@ import '@angular/localize/init';

/***************************************************************************************************
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
// import 'core-js/es6/symbol';
// import 'core-js/es6/object';
// import 'core-js/es6/function';
// import 'core-js/es6/parse-int';
// import 'core-js/es6/parse-float';
// import 'core-js/es6/number';
// import 'core-js/es6/math';
// import 'core-js/es6/string';
// import 'core-js/es6/date';
// import 'core-js/es6/array';
// import 'core-js/es6/regexp';
// import 'core-js/es6/map';
// import 'core-js/es6/weak-map';
// import 'core-js/es6/set';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/** IE10 and IE11 requires the following for the Reflect API. */
// import 'core-js/es6/reflect';


/** Evergreen browsers require these. **/
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
import 'core-js/es/reflect';

/**
* Web Animations `@angular/platform-browser/animations`
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
"target": "es2020",
"module": "es2020",
"lib": [
"es2017",
"es2020",
"dom"
]
}
Expand Down

0 comments on commit 2e14802

Please sign in to comment.