Skip to content

Commit

Permalink
Merge pull request #20 from creativetimofficial/feature/v1.5.0
Browse files Browse the repository at this point in the history
Feature/1.5.0
  • Loading branch information
rarestoma authored Dec 22, 2022
2 parents 9f26e15 + dedd5ad commit ef3cabf
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ package-lock.json
npm-debug.log
testem.log
/typings
/.angular

# e2e
/e2e/*.js
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [1.5.0] - 2022-12-22
### Updates
- update to Angular 14
- update all dependencies to match Angular 14 version


## [1.4.0] - 2020-12-14
### 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
@@ -1,6 +1,6 @@
# [Paper Kit 2 Angular - Free Bootstrap 4 UI Kit](https://demos.creative-tim.com/paper-kit-2-angular/)

![version](https://img.shields.io/badge/version-1.4.0-blue.svg) [![license][license-badge]][LICENSE] [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/paper-kit-2-angular.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-2-angular/issues?q=is%3Aopen+is%3Aissue) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-kit-2-angular.svg?maxAge=259200)](https://github.com/creativetimofficial/paper-kit-2-angular/issues?q=is%3Aissue+is%3Aclosed) [![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][license-badge]][LICENSE] [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/paper-kit-2-angular.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-2-angular/issues?q=is%3Aopen+is%3Aissue) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-kit-2-angular.svg?maxAge=259200)](https://github.com/creativetimofficial/paper-kit-2-angular/issues?q=is%3Aissue+is%3Aclosed) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
![Paper Kit 2 Angular](https://s3.amazonaws.com/creativetim_bucket/products/65/original/opt_pk2_angular_thumbnail.jpg "Paper Kit 2 Angular Free")

Paper Kit 2 Angular is a free Bootstrap 4 UI Kit with pale colors, beautiful typography built for Angular 7.
Expand Down
2 changes: 1 addition & 1 deletion documentation/tutorial-components.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<div class="content">
<div class="motto text-center">
<h2 class="title-uppercase text-center">Tutorial and Components</h2>
<h3 class="text-center">Documentation v1.4.0</h3>
<h3 class="text-center">Documentation v1.5.0</h3>
<br/>
<a href="https://pk2-angular.creative-tim.com/documentation/tutorial?ref=pk2-angular-free-doc" class="btn btn-danger btn-round">View documentation</a>
</div>
Expand Down
65 changes: 33 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paper-kit-2-angular",
"version": "1.4.0",
"version": "1.5.0",
"license": "MIT",
"repository": {
"type": "git",
Expand All @@ -16,16 +16,15 @@
"install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start"
},
"dependencies": {
"@angular/animations": "11.0.4",
"@angular/common": "11.0.4",
"@angular/compiler": "11.0.4",
"@angular/core": "11.0.4",
"@angular/forms": "11.0.4",
"@angular/http": "7.2.16",
"@angular/localize": "^11.0.4",
"@angular/platform-browser": "11.0.4",
"@angular/platform-browser-dynamic": "11.0.4",
"@angular/router": "11.0.4",
"@angular/animations": "^14.2.0",
"@angular/common": "^14.2.0",
"@angular/compiler": "^14.2.0",
"@angular/core": "^14.2.0",
"@angular/forms": "^14.2.0",
"@angular/platform-browser": "^14.2.0",
"@angular/platform-browser-dynamic": "^14.2.0",
"@angular/router": "^14.2.0",
"@angular/localize": "^14.2.0",
"@ng-bootstrap/ng-bootstrap": "6.0.0",
"bootstrap": "4.5.3",
"core-js": "3.8.1",
Expand All @@ -34,29 +33,31 @@
"ng2-nouislider": "1.8.2",
"nouislider": "14.6.3",
"popper.js": "1.16.1",
"rxjs": "6.6.3",
"rxjs-compat": "6.6.3",
"zone.js": "0.11.3"
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1100.4",
"@angular/cli": "11.0.4",
"@angular/compiler-cli": "11.0.4",
"@angular/language-service": "11.0.4",
"@types/jasmine": "3.6.2",
"@types/node": "14.14.12",
"codelyzer": "6.0.1",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "6.0.0",
"karma": "5.2.3",
"karma-chrome-launcher": "3.1.0",
"karma-cli": "2.0.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.5.4",
"@angular-devkit/build-angular": "^14.2.7",
"@angular/cli": "~14.2.7",
"@angular/compiler-cli": "^14.2.0",
"@types/bootstrap": "5.0.1",
"@types/chartist": "0.11.0",
"@angular/language-service": "14.2.0",
"@types/jasmine": "~4.0.0",
"@types/jasminewd2": "~2.0.10",
"@types/node": "^17.0.21",
"codelyzer": "6.0.2",
"jasmine-core": "~4.4.0",
"jasmine-spec-reporter": "~7.0.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": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"protractor": "7.0.0",
"ts-node": "9.1.1",
"tslint": "6.1.3",
"typescript": "4.0.3"
"ts-node": "~10.9.1",
"typescript": "~4.7.2"
}
}
5 changes: 2 additions & 3 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { Component, OnInit, Inject, Renderer2, ElementRef, ViewChild } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
import { Subscription } from 'rxjs/Subscription';
import 'rxjs/add/operator/filter';
import { DOCUMENT } from '@angular/common';
import { LocationStrategy, PlatformLocation, Location } from '@angular/common';
import { NavbarComponent } from './shared/navbar/navbar.component';
import { filter, Subscription } from 'rxjs';

@Component({
selector: 'app-root',
Expand All @@ -18,7 +17,7 @@ export class AppComponent implements OnInit {
constructor( private renderer : Renderer2, private router: Router, @Inject(DOCUMENT,) private document: any, private element : ElementRef, public location: Location) {}
ngOnInit() {
var navbar : HTMLElement = this.element.nativeElement.children[0].children[0];
this._router = this.router.events.filter(event => event instanceof NavigationEnd).subscribe((event: NavigationEnd) => {
this._router = this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
if (window.outerWidth > 991) {
window.document.children[0].scrollTop = 0;
}else{
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/demo.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
=========================================================
* Paper Kit 2 Angular - v1.4.0
* Paper Kit 2 Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-2-angular
Expand Down
2 changes: 1 addition & 1 deletion src/assets/sass/paper-kit.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
=========================================================
* Paper Kit 2 Angular - v1.4.0
* Paper Kit 2 Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-2-angular
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
=========================================================
* Paper Kit 2 Angular - v1.4.0
* Paper Kit 2 Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-2-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 @@
/*!
=========================================================
* Paper Kit 2 Angular - v1.4.0
* Paper Kit 2 Angular - v1.5.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-2-angular
Expand Down

0 comments on commit ef3cabf

Please sign in to comment.