From ac1f154b51390d3411b7922d4ee2959c00428369 Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 20 Dec 2019 16:20:22 +0100 Subject: [PATCH 01/44] feat: add missing Navbars example - thanks @EliasDerHai --- src/app/_nav.ts | 6 +++ src/app/views/base/base-routing.module.ts | 14 ++++-- src/app/views/base/base.module.ts | 5 +- .../views/base/navbars/navbars.component.css | 0 .../views/base/navbars/navbars.component.html | 48 +++++++++++++++++++ .../base/navbars/navbars.component.spec.ts | 25 ++++++++++ .../views/base/navbars/navbars.component.ts | 38 +++++++++++++++ 7 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 src/app/views/base/navbars/navbars.component.css create mode 100644 src/app/views/base/navbars/navbars.component.html create mode 100644 src/app/views/base/navbars/navbars.component.spec.ts create mode 100644 src/app/views/base/navbars/navbars.component.ts diff --git a/src/app/_nav.ts b/src/app/_nav.ts index ae594c487..264c3c292 100644 --- a/src/app/_nav.ts +++ b/src/app/_nav.ts @@ -53,6 +53,12 @@ export const navItems: INavData[] = [ url: '/base/forms', icon: 'icon-puzzle' }, + { + name: 'Navbars', + url: '/base/navbars', + icon: 'icon-puzzle' + + }, { name: 'Pagination', url: '/base/paginations', diff --git a/src/app/views/base/base-routing.module.ts b/src/app/views/base/base-routing.module.ts index 3289b51e7..1ade8b037 100644 --- a/src/app/views/base/base-routing.module.ts +++ b/src/app/views/base/base-routing.module.ts @@ -9,9 +9,10 @@ import { TabsComponent } from './tabs.component'; import { CarouselsComponent } from './carousels.component'; import { CollapsesComponent } from './collapses.component'; import { PaginationsComponent } from './paginations.component'; -import {PopoversComponent} from './popovers.component'; -import {ProgressComponent} from './progress.component'; -import {TooltipsComponent} from './tooltips.component'; +import { PopoversComponent } from './popovers.component'; +import { ProgressComponent } from './progress.component'; +import { TooltipsComponent } from './tooltips.component'; +import { NavbarsComponent } from './navbars/navbars.component'; const routes: Routes = [ { @@ -100,6 +101,13 @@ const routes: Routes = [ data: { title: 'Tooltips' } + }, + { + path: 'navbars', + component: NavbarsComponent, + data: { + title: 'Navbars' + } } ] } diff --git a/src/app/views/base/base.module.ts b/src/app/views/base/base.module.ts index e2d700b21..5f046e6de 100644 --- a/src/app/views/base/base.module.ts +++ b/src/app/views/base/base.module.ts @@ -42,6 +42,8 @@ import { ProgressComponent } from './progress.component'; import { TooltipModule } from 'ngx-bootstrap/tooltip'; import { TooltipsComponent } from './tooltips.component'; +// navbars +import { NavbarsComponent } from './navbars/navbars.component'; // Components Routing import { BaseRoutingModule } from './base-routing.module'; @@ -71,7 +73,8 @@ import { BaseRoutingModule } from './base-routing.module'; PaginationsComponent, PopoversComponent, ProgressComponent, - TooltipsComponent + TooltipsComponent, + NavbarsComponent ] }) export class BaseModule { } diff --git a/src/app/views/base/navbars/navbars.component.css b/src/app/views/base/navbars/navbars.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/views/base/navbars/navbars.component.html b/src/app/views/base/navbars/navbars.component.html new file mode 100644 index 000000000..55c1dacbc --- /dev/null +++ b/src/app/views/base/navbars/navbars.component.html @@ -0,0 +1,48 @@ +
+
+
+
+
+ Bootstrap Navbar +
+
+ +
+
+
+
+
diff --git a/src/app/views/base/navbars/navbars.component.spec.ts b/src/app/views/base/navbars/navbars.component.spec.ts new file mode 100644 index 000000000..0166f2609 --- /dev/null +++ b/src/app/views/base/navbars/navbars.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NavbarsComponent } from './navbars.component'; + +describe('NavbarsComponent', () => { + let component: NavbarsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NavbarsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NavbarsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/base/navbars/navbars.component.ts b/src/app/views/base/navbars/navbars.component.ts new file mode 100644 index 000000000..7b92610e4 --- /dev/null +++ b/src/app/views/base/navbars/navbars.component.ts @@ -0,0 +1,38 @@ +import {AfterViewChecked, Component, ElementRef, OnInit, Renderer2, ViewChild} from '@angular/core'; +import {CollapseDirective} from 'ngx-bootstrap'; + +@Component({ + selector: 'app-navbars', + templateUrl: './navbars.component.html', + styleUrls: ['./navbars.component.css'] +}) +export class NavbarsComponent implements OnInit, AfterViewChecked { + + private _isCollapsed: boolean = true; + set isCollapsed(value) { + this._isCollapsed = value; + } + get isCollapsed() { + if (this.collapseRef) { + // temp fix for "overflow: hidden" + if (getComputedStyle(this.collapseRef.nativeElement).getPropertyValue('display') === 'flex') { + this.renderer.removeStyle(this.collapseRef.nativeElement, 'overflow'); + } + } + return this._isCollapsed; + } + + @ViewChild(CollapseDirective, { read: ElementRef, static: false }) collapse !: CollapseDirective; + + collapseRef; + + constructor( + private renderer: Renderer2, + ) { } + + ngOnInit() {} + + ngAfterViewChecked (): void { + this.collapseRef = this.collapse; + } +} From 5a17d79770b10a40f5b417f8d9060fba97e01ab0 Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 20 Dec 2019 16:21:14 +0100 Subject: [PATCH 02/44] chore: dependencies update - update `@angular/animations` to `^9.0.0-rc.7` - update `@angular/common` to `^9.0.0-rc.7` - update `@angular/compiler` to `^9.0.0-rc.7` - update `@angular/core` to `^9.0.0-rc.7` - update `@angular/forms` to `^9.0.0-rc.7` - update `@angular/platform-browser` to `^9.0.0-rc.7` - update `@angular/platform-browser-dynamic` to `^9.0.0-rc.7` - update `@angular/router` to `^9.0.0-rc.7` - update `@coreui/angular` to `^2.7.2` - update `core-js` to `^2.6.11` - update `@angular-devkit/build-angular` to `^0.900.0-rc.7` - update `@angular/cli` to `^9.0.0-rc.7` - update `@angular/compiler-cli` to `^9.0.0-rc.7` - update `@angular/language-service` to `^9.0.0-rc.7` - update `codelyzer` to `^5.2.1` --- package.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index a4a9f1ddc..38feea744 100644 --- a/package.json +++ b/package.json @@ -28,21 +28,21 @@ }, "private": true, "dependencies": { - "@angular/animations": "^9.0.0-rc.0", - "@angular/common": "^9.0.0-rc.0", - "@angular/compiler": "^9.0.0-rc.0", - "@angular/core": "^9.0.0-rc.0", - "@angular/forms": "^9.0.0-rc.0", - "@angular/platform-browser": "^9.0.0-rc.0", - "@angular/platform-browser-dynamic": "^9.0.0-rc.0", - "@angular/router": "^9.0.0-rc.0", - "@coreui/angular": "^2.7.0", + "@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", "@coreui/coreui": "^2.1.16", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1", "@coreui/icons": "0.3.0", "bootstrap": "^4.3.1", "chart.js": "^2.9.2", - "core-js": "^2.6.10", + "core-js": "^2.6.11", "flag-icon-css": "^3.4.5", "font-awesome": "^4.7.0", "moment": "^2.24.0", @@ -58,14 +58,14 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.900.0-rc.0", - "@angular/cli": "^9.0.0-rc.0", - "@angular/compiler-cli": "^9.0.0-rc.0", - "@angular/language-service": "^9.0.0-rc.0", + "@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", "@types/jasmine": "^3.4.5", "@types/jasminewd2": "^2.0.8", "@types/node": "^12.11.1", - "codelyzer": "^5.1.2", + "codelyzer": "^5.2.1", "jasmine-core": "^3.5.0", "jasmine-spec-reporter": "^4.2.1", "karma": "^4.4.1", From 61059cce7257c243eaf7104b826a1ceb40c5bd93 Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 20 Dec 2019 16:21:45 +0100 Subject: [PATCH 03/44] Ship: v2.7.2 --- CHANGELOG.md | 20 ++++++++++++++++++++ README.md | 2 +- package.json | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d051f63..da8fd4b1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ ## [CoreUI for Angular](./README.md) version `changelog` +###### `v2.7.2` +- feat: add missing Navbars example - thanks @EliasDerHai + +###### dependencies update +- update `@angular/animations` to `^9.0.0-rc.7` +- update `@angular/common` to `^9.0.0-rc.7` +- update `@angular/compiler` to `^9.0.0-rc.7` +- update `@angular/core` to `^9.0.0-rc.7` +- update `@angular/forms` to `^9.0.0-rc.7` +- update `@angular/platform-browser` to `^9.0.0-rc.7` +- update `@angular/platform-browser-dynamic` to `^9.0.0-rc.7` +- update `@angular/router` to `^9.0.0-rc.7` +- update `@coreui/angular` to `^2.7.2` +- update `core-js` to `^2.6.11` +- update `@angular-devkit/build-angular` to `^0.900.0-rc.7` +- update `@angular/cli` to `^9.0.0-rc.7` +- update `@angular/compiler-cli` to `^9.0.0-rc.7` +- update `@angular/language-service` to `^9.0.0-rc.7` +- update `codelyzer` to `^5.2.1` + ###### `v2.7.0` for Angular 9 - chore: upgrade to Angular 9 - see also: - `https://next.angular.io/guide/updating-to-version-9` diff --git a/README.md b/README.md index 5ff324d6a..700c1a0a6 100644 --- a/README.md +++ b/README.md @@ -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%20rc.0-lightgrey.svg?style=flat-square) +![angular](https://img.shields.io/badge/angular-^9.0.0--rc.7-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 diff --git a/package.json b/package.json index 38feea744..84cb3cb38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-angular-admin-template", - "version": "2.7.0", + "version": "2.7.2", "description": "CoreUI Free Angular 2+ Admin Template", "author": { "name": "Łukasz Holeczek", From 8667ffc367cb73219ada73da896e07b6ed659557 Mon Sep 17 00:00:00 2001 From: xidedix Date: Fri, 31 Jan 2020 19:04:42 +0100 Subject: [PATCH 04/44] fix(carousels): move to picsum.photos --- src/app/views/base/carousels.component.html | 18 +++++++++--------- src/app/views/base/carousels.component.ts | 9 ++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/app/views/base/carousels.component.html b/src/app/views/base/carousels.component.html index 7d9e07cc3..9765b5731 100644 --- a/src/app/views/base/carousels.component.html +++ b/src/app/views/base/carousels.component.html @@ -13,13 +13,13 @@
- First slide + First slide - Second slide + Second slide - Third slide + Third slide
@@ -34,21 +34,21 @@
- First slide + First slide - Second slide + Second slide - Third slide + Third slide