Skip to content

v2.4.0 #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
## [angular](./README.md) version `changelog`

###### `v2.4.0`
- fix(sidebar): navItems reassignment bug #126, #42
- refactor(default-layout): use `cui-breadcrumb` instead of deprecated `app-breadcrumb` (migrate when ready)
- fix(polyfills.ts): ie issues add `core-js/es7/array` and `core-js/es7/object`
- update: `@angular/animations` to `^7.2.5`
- update: `@angular/common` to `^7.2.5`
- update: `@angular/compiler` to `^7.2.5`
- update: `@angular/core` to `^7.2.5`
- update: `@angular/forms` to `^7.2.5`
- update: `@angular/http` to `^7.2.5`
- update: `@angular/platform-browser` to `^7.2.5`
- update: `@angular/platform-browser-dynamic` to `^7.2.5`
- update: `@angular/router` to `^7.2.5`
- update: `@coreui/angular` to `^2.4.1`
- update: `bootstrap` to `^4.3.1`
- update: `core-js` to `^2.6.5`
- update: `moment` to `^2.24.0`
- update: `ngx-bootstrap` to `^3.2.0`
- update: `rxjs` to `^6.4.0`
- update: `tsickle` to `^0.34.3`
- update: `zone.js` to `^0.8.29`
- update: `@angular-devkit/build-angular` to `^0.13.2`
- update: `@angular/cli` to `^7.3.2`
- update: `@angular/compiler-cli` to `^7.2.5`
- update: `@angular/language-service` to `^7.2.5`
- update: `@types/jasmine` to `^3.3.9`
- update: `@types/node` to `^10.12.26`
- update: `karma` to `^4.0.0`
- update: `karma-coverage-istanbul-reporter` to `^2.0.5`

###### `v2.2.4`
- refactor(colors): use 'DOCUMENT' of '@angular/common'
- refactor(default-layout): use 'DOCUMENT' of '@angular/common' #133 - thanks @damingerdai
Expand Down
2 changes: 1 addition & 1 deletion e2e/app.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export class CoreUIPage {
}

getParagraphText() {
return element(by.tagName('footer')).getText();
return element(by.className('app-footer')).getText();
}
}
54 changes: 27 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-angular-admin-template",
"version": "2.2.4",
"version": "2.4.0",
"description": "CoreUI Free Angular 2+ Admin Template",
"author": {
"name": "Łukasz Holeczek",
Expand All @@ -27,54 +27,54 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^7.2.1",
"@angular/common": "^7.2.1",
"@angular/compiler": "^7.2.1",
"@angular/core": "^7.2.1",
"@angular/forms": "^7.2.1",
"@angular/http": "^7.2.1",
"@angular/platform-browser": "^7.2.1",
"@angular/platform-browser-dynamic": "^7.2.1",
"@angular/router": "^7.2.1",
"@coreui/angular": "^2.2.4",
"@angular/animations": "^7.2.5",
"@angular/common": "^7.2.5",
"@angular/compiler": "^7.2.5",
"@angular/core": "^7.2.5",
"@angular/forms": "^7.2.5",
"@angular/http": "^7.2.5",
"@angular/platform-browser": "^7.2.5",
"@angular/platform-browser-dynamic": "^7.2.5",
"@angular/router": "^7.2.5",
"@coreui/angular": "^2.4.1",
"@coreui/coreui": "^2.1.6",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
"@coreui/icons": "0.3.0",
"bootstrap": "^4.2.1",
"bootstrap": "^4.3.1",
"chart.js": "^2.7.3",
"core-js": "^2.6.2",
"core-js": "^2.6.5",
"flag-icon-css": "^3.2.1",
"font-awesome": "^4.7.0",
"moment": "^2.23.0",
"moment": "^2.24.0",
"mutationobserver-shim": "^0.3.3",
"ng2-charts": "^1.6.0",
"ngx-bootstrap": "^3.1.4",
"ngx-bootstrap": "^3.2.0",
"ngx-perfect-scrollbar": "^7.2.0",
"rxjs": "^6.3.3",
"rxjs": "^6.4.0",
"simple-line-icons": "^2.4.1",
"ts-helpers": "^1.1.2",
"tsickle": "^0.34.0",
"tsickle": "^0.34.3",
"tslib": "^1.9.0",
"zone.js": "^0.8.28"
"zone.js": "^0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.12.2",
"@angular/cli": "^7.2.2",
"@angular/compiler-cli": "^7.2.1",
"@angular/language-service": "^7.2.1",
"@types/jasmine": "^3.3.7",
"@angular-devkit/build-angular": "^0.13.2",
"@angular/cli": "^7.3.2",
"@angular/compiler-cli": "^7.2.5",
"@angular/language-service": "^7.2.5",
"@types/jasmine": "^3.3.9",
"@types/jasminewd2": "^2.0.6",
"@types/node": "^10.12.18",
"@types/node": "^11.9.4",
"codelyzer": "^4.5.0",
"jasmine-core": "^3.3.0",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^3.1.4",
"karma": "^4.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-coverage-istanbul-reporter": "^2.0.5",
"karma-jasmine": "^2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "^5.4.2",
"ts-node": "^7.0.1",
"ts-node": "^8.0.2",
"tslint": "^5.12.1",
"typescript": "~3.2.4"
},
Expand Down
2 changes: 2 additions & 0 deletions src/app/_nav.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export interface NavData {
attributes?: object;
divider?: boolean;
class?: string;
label?: any;
wrapper?: any;
}

export const navItems: NavData[] = [
Expand Down
18 changes: 15 additions & 3 deletions src/app/containers/default-layout/default-layout.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<!-- Main content -->
<main class="main">
<!-- Breadcrumb -->
<ol class="breadcrumb">
<app-breadcrumb></app-breadcrumb>
<!-- breaking change 'cui-breadcrumb' -->
<cui-breadcrumb>
<!-- Breadcrumb Menu-->
<li class="breadcrumb-menu d-md-down-none">
<div class="btn-group" role="group" aria-label="Button group with nested dropdown">
Expand All @@ -65,7 +65,19 @@
<a class="btn" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
</div>
</li>
</ol>
</cui-breadcrumb>
<!-- deprecation warning for 'app-breadcrumb' -->
<!--<ol class="breadcrumb">-->
<!--<app-breadcrumb></app-breadcrumb>-->
<!--&lt;!&ndash; Breadcrumb Menu&ndash;&gt;-->
<!--<li class="breadcrumb-menu d-md-down-none">-->
<!--<div class="btn-group" role="group" aria-label="Button group with nested dropdown">-->
<!--<a class="btn" href="#"><i class="icon-speech"></i></a>-->
<!--<a class="btn" [routerLink]="['/dashboard']"><i class="icon-graph"></i> &nbsp;Dashboard</a>-->
<!--<a class="btn" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>-->
<!--</div>-->
<!--</li>-->
<!--</ol>-->
<div class="container-fluid">
<router-outlet></router-outlet>
</div><!-- /.container-fluid -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, OnDestroy, Inject } from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { navItems } from './../../_nav';
import { navItems } from '../../_nav';


@Component({
Expand Down
52 changes: 26 additions & 26 deletions src/app/views/dashboard/dashboard.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
<div class="animated fadeIn">
<div class="row">
<div class="col-sm-6 col-lg-3">
<div class="card text-white bg-info">
<div class="card-body pb-0">
<button type="button" class="btn btn-transparent p-0 float-right">
<i class="icon-location-pin"></i>
</button>
<div class="text-value">9.823</div>
<div>Members online</div>
</div>
<div class="chart-wrapper mt-3 mx-3" style="height:70px;">
<canvas baseChart class="chart"
[datasets]="lineChart2Data"
[labels]="lineChart2Labels"
[options]="lineChart2Options"
[colors]="lineChart2Colours"
[legend]="lineChart2Legend"
[chartType]="lineChart2Type"></canvas>
</div>
</div>
</div><!--/.col-->
<div class="col-sm-6 col-lg-3">
<div class="card text-white bg-primary">
<div class="card-body pb-0">
Expand All @@ -19,32 +39,12 @@
</div>
<div class="chart-wrapper mt-3 mx-3" style="height:70px;">
<canvas baseChart class="chart"
[datasets]="lineChart1Data"
[labels]="lineChart1Labels"
[options]="lineChart1Options"
[colors]="lineChart1Colours"
[legend]="lineChart1Legend"
[chartType]="lineChart1Type"></canvas>
</div>
</div>
</div><!--/.col-->
<div class="col-sm-6 col-lg-3">
<div class="card text-white bg-info">
<div class="card-body pb-0">
<button type="button" class="btn btn-transparent p-0 float-right">
<i class="icon-location-pin"></i>
</button>
<div class="text-value">9.823</div>
<div>Members online</div>
</div>
<div class="chart-wrapper mt-3 mx-3" style="height:70px;">
<canvas baseChart class="chart"
[datasets]="lineChart2Data"
[labels]="lineChart2Labels"
[options]="lineChart2Options"
[colors]="lineChart2Colours"
[legend]="lineChart2Legend"
[chartType]="lineChart2Type"></canvas>
[datasets]="lineChart1Data"
[labels]="lineChart1Labels"
[options]="lineChart1Options"
[colors]="lineChart1Colours"
[legend]="lineChart1Legend"
[chartType]="lineChart1Type"></canvas>
</div>
</div>
</div><!--/.col-->
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 @@
<!--
* CoreUI - Free Angular Admin Template
* @version v2.2.1
* @version v2.4.0
* @link https://coreui.io/angular/
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down
2 changes: 2 additions & 0 deletions src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import 'core-js/es6/regexp';
import 'core-js/es6/map';
import 'core-js/es6/weak-map';
import 'core-js/es6/set';
import "core-js/es7/array";
import "core-js/es7/object";

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