Skip to content

Commit

Permalink
Merge pull request #172 from coreui/dev-v2.7.5
Browse files Browse the repository at this point in the history
v2.7.5
  • Loading branch information
xidedix authored Jan 31, 2020
2 parents c448050 + 9fb4373 commit 38f63ea
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 32 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
## [CoreUI for Angular](./README.md) version `changelog`

###### `v2.7.5`
- fix(carousels): move to picsum.photos

###### dependencies update
- update `@coreui/angular` to `^2.7.5`
- update `@angular/animations` to `^9.0.0-rc.12`
- update `@angular/common` to `^9.0.0-rc.12`
- update `@angular/compiler` to `^9.0.0-rc.12`
- update `@angular/core` to `^9.0.0-rc.12`
- update `@angular/forms` to `^9.0.0-rc.12`
- update `@angular/platform-browser` to `^9.0.0-rc.12`
- update `@angular/platform-browser-dynamic` to `^9.0.0-rc.12`
- update `@angular/router` to `^9.0.0-rc.12`
- update `@angular-devkit/build-angular` to `^0.900.0-rc.12`
- update `@angular/cli` to `^9.0.0-rc.12`
- update `@angular/compiler-cli` to `^9.0.0-rc.12`
- update `@angular/language-service` to `^9.0.0-rc.12`

###### `v2.7.2`
- feat: add missing Navbars example - thanks @EliasDerHai

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![@coreui coreui](https://img.shields.io/badge/@coreui%20-coreui-lightgrey.svg?style=flat-square)](https://github.com/coreui/coreui)
[![npm package][npm-coreui-badge]][npm-coreui]
[![NPM downloads][npm-coreui-download]][npm-coreui]
![angular](https://img.shields.io/badge/angular-^9.0.0--rc.7-lightgrey.svg?style=flat-square&logo=angular)
![angular](https://img.shields.io/badge/angular-^9.0.0--rc.12-lightgrey.svg?style=flat-square&logo=angular)

[npm-coreui-angular]: https://www.npmjs.com/package/@coreui/angular
[npm-coreui-angular-badge]: https://img.shields.io/npm/v/@coreui/angular.png?style=flat-square
Expand Down Expand Up @@ -95,8 +95,8 @@ Install the Angular CLI globally using a terminal/console window.
npm install -g @angular/cli
```

##### Update to Angular 8
Angular 8 requires `Node.js` version 12.x
##### Update to Angular 9
Angular 9 requires `Node.js` version 10.x or newer
Update guide - see: [https://update.angular.io](https://update.angular.io)

## Installation
Expand Down
32 changes: 16 additions & 16 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.7.2",
"version": "2.7.5",
"description": "CoreUI Free Angular 2+ Admin Template",
"author": {
"name": "Łukasz Holeczek",
Expand All @@ -15,7 +15,7 @@
}
],
"homepage": "https://coreui.io/angular",
"copyright": "Copyright 2019 creativeLabs Łukasz Holeczek",
"copyright": "Copyright 2020 creativeLabs Łukasz Holeczek",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand All @@ -28,15 +28,15 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^9.0.0-rc.7",
"@angular/common": "^9.0.0-rc.7",
"@angular/compiler": "^9.0.0-rc.7",
"@angular/core": "^9.0.0-rc.7",
"@angular/forms": "^9.0.0-rc.7",
"@angular/platform-browser": "^9.0.0-rc.7",
"@angular/platform-browser-dynamic": "^9.0.0-rc.7",
"@angular/router": "^9.0.0-rc.7",
"@coreui/angular": "^2.7.2",
"@angular/animations": "^9.0.0-rc.12",
"@angular/common": "^9.0.0-rc.12",
"@angular/compiler": "^9.0.0-rc.12",
"@angular/core": "^9.0.0-rc.12",
"@angular/forms": "^9.0.0-rc.12",
"@angular/platform-browser": "^9.0.0-rc.12",
"@angular/platform-browser-dynamic": "^9.0.0-rc.12",
"@angular/router": "^9.0.0-rc.12",
"@coreui/angular": "^2.7.5",
"@coreui/coreui": "^2.1.16",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1",
"@coreui/icons": "0.3.0",
Expand All @@ -58,10 +58,10 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.0-rc.7",
"@angular/cli": "^9.0.0-rc.7",
"@angular/compiler-cli": "^9.0.0-rc.7",
"@angular/language-service": "^9.0.0-rc.7",
"@angular-devkit/build-angular": "^0.900.0-rc.12",
"@angular/cli": "^9.0.0-rc.12",
"@angular/compiler-cli": "^9.0.0-rc.12",
"@angular/language-service": "^9.0.0-rc.12",
"@types/jasmine": "^3.4.5",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^12.11.1",
Expand All @@ -79,7 +79,7 @@
"typescript": "~3.6.4"
},
"engines": {
"node": ">= 12",
"node": ">= 10",
"npm": ">= 6"
}
}
18 changes: 9 additions & 9 deletions src/app/views/base/carousels.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<div class="card-body">
<carousel [interval]="false">
<slide>
<img src="https://lorempixel.com/900/500/nature/1" alt="First slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1/900/500" alt="First slide" style="display: block; width: 100%;">
</slide>
<slide>
<img src="https://lorempixel.com/900/500/nature/2" alt="Second slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1026/900/500" alt="Second slide" style="display: block; width: 100%;">
</slide>
<slide>
<img src="https://lorempixel.com/900/500/nature/3" alt="Third slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1031/900/500" alt="Third slide" style="display: block; width: 100%;">
</slide>
</carousel>
</div>
Expand All @@ -34,21 +34,21 @@
<div class="card-body">
<carousel [interval]="false">
<slide>
<img src="https://lorempixel.com/900/500/technics/1" alt="First slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1032/900/500" alt="First slide" style="display: block; width: 100%;">
<div class="carousel-caption d-none d-md-block">
<h3>First slide label</h3>
<p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</div>
</slide>
<slide>
<img src="https://lorempixel.com/900/500/technics/2" alt="Second slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1036/900/500" alt="Second slide" style="display: block; width: 100%;">
<div class="carousel-caption d-none d-md-block">
<h3>Second slide label</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</slide>
<slide>
<img src="https://lorempixel.com/900/500/technics/3" alt="Third slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1043/900/500" alt="Third slide" style="display: block; width: 100%;">
<div class="carousel-caption d-none d-md-block">
<h3>Third slide label</h3>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
Expand All @@ -69,21 +69,21 @@ <h3>Third slide label</h3>
<div class="card-body">
<carousel [interval]="false">
<slide>
<img src="https://lorempixel.com/900/500/city/1" alt="First slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1054/900/500" alt="First slide" style="display: block; width: 100%;">
<div class="carousel-caption d-none d-md-block">
<h3>First slide label</h3>
<p>Nulla vitae elit libero, a pharetra augue mollis interdum.</p>
</div>
</slide>
<slide>
<img src="https://lorempixel.com/900/500/city/2" alt="Second slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1059/900/500" alt="Second slide" style="display: block; width: 100%;">
<div class="carousel-caption d-none d-md-block">
<h3>Second slide label</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
</div>
</slide>
<slide>
<img src="https://lorempixel.com/900/500/city/3" alt="Third slide" style="display: block; width: 100%;">
<img src="https://picsum.photos/id/1065/900/500" alt="Third slide" style="display: block; width: 100%;">
<div class="carousel-caption d-none d-md-block">
<h3>Third slide label</h3>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur.</p>
Expand Down
9 changes: 6 additions & 3 deletions src/app/views/base/carousels.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ export class CarouselsComponent implements OnDestroy {
}

addSlide(): void {
this.slides.push({
image: `https://lorempixel.com/900/500/abstract/${this.slides.length % 8 + 1}/`
});
setTimeout( () => {
const seed = Math.random().toString(36).slice(-6);
this.slides.push({
image: `https://picsum.photos/seed/${seed}/900/500`
});
}, 500);
}

removeSlide(index?: number): void {
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.7.0
* @version v2.7.5
* @link https://coreui.io/angular/
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* Licensed under MIT (https://coreui.io/license)
Expand Down

0 comments on commit 38f63ea

Please sign in to comment.