Skip to content

Commit

Permalink
Merge pull request #21 from jeroenouw/angular-8-beta
Browse files Browse the repository at this point in the history
Upgrade to Angular 8 beta
  • Loading branch information
jeroenouw authored Mar 6, 2019
2 parents b200fc2 + 33663f8 commit d47c59e
Show file tree
Hide file tree
Showing 10 changed files with 1,386 additions and 1,321 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

![logo](https://jerouw.nl/wp-content/uploads/2017/05/ngfbmd.png "Logo")

# Angular 7 | Material Design | Firebase - Starter kit
# Angular 8 beta | Material Design | Firebase - Starter kit

A full stack starter app containing [Angular 7](https://angular.io), [Material](https://material.io/) and [Firebase](https://firebase.google.com/). See also: [AngularMaterialGo](https://github.com/jeroenouw/AngularMaterialGo)
A full stack starter app containing [Angular 8 beta](https://angular.io), [Material](https://material.io/) and [Firebase](https://firebase.google.com/). See also: [AngularMaterialGo](https://github.com/jeroenouw/AngularMaterialGo)

## [Live demo](http://ngxmatfire.jerouw.nl)

Expand Down
2 changes: 1 addition & 1 deletion docs/FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Features in this project

* Angular 7 front-end
* Angular 8 beta front-end
* Material Design
* Firebase back-end (OAuth authentication and NoSQL database)
* Automated documentation (compodoc)
Expand Down
2,637 changes: 1,351 additions & 1,286 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "ngxmatfire",
"version": "1.3.3",
"version": "1.4.0",
"author": "Jeroen Ouwehand",
"description": "Full stack starter app with Angular 7, Material Design and Firebase.",
"description": "Full stack starter app with Angular 8 beta, Material Design and Firebase.",
"keywords": [
"angular",
"angular 7",
Expand Down Expand Up @@ -37,51 +37,51 @@
"sync": "git fetch && git checkout master && git merge upstream/master && git push"
},
"dependencies": {
"@angular/animations": "^7.1.0",
"@angular/cdk": "^7.1.0",
"@angular/common": "^7.1.0",
"@angular/compiler": "^7.1.0",
"@angular/core": "^7.1.0",
"@angular/animations": "^8.0.0-beta.6",
"@angular/cdk": "^7.0.0-rc.2",
"@angular/common": "^8.0.0-beta.6",
"@angular/compiler": "^8.0.0-beta.6",
"@angular/core": "^8.0.0-beta.6",
"@angular/fire": "^5.1.1",
"@angular/flex-layout": "^7.0.0-beta.23",
"@angular/forms": "^7.1.0",
"@angular/material": "^7.1.0",
"@angular/platform-browser": "^7.1.0",
"@angular/platform-browser-dynamic": "^7.1.0",
"@angular/platform-server": "^7.1.0",
"@angular/router": "^7.1.0",
"core-js": "^2.5.7",
"@angular/forms": "^8.0.0-beta.6",
"@angular/material": "^7.0.0-rc.2",
"@angular/platform-browser": "^8.0.0-beta.6",
"@angular/platform-browser-dynamic": "^8.0.0-beta.6",
"@angular/platform-server": "^8.0.0-beta.6",
"@angular/router": "^8.0.0-beta.6",
"core-js": "^2.6.5",
"firebase": "^5.7.3",
"hammerjs": "^2.0.8",
"ngx-auth-firebaseui": "^2.2.1",
"rxjs": "^6.3.3",
"rxjs": "^6.4.0",
"rxjs-compat": "^6.3.3",
"ts-helpers": "*",
"zone.js": "^0.8.26"
"zone.js": "^0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.11.4",
"@angular/cli": "^7.1.0",
"@angular/compiler-cli": "^7.1.0",
"@angular/language-service": "^7.1.0",
"@compodoc/compodoc": "^1.1.7",
"@types/jasmine": "^2.8.11",
"@types/node": "^10.12.18",
"@types/jasmine": "^3.3.9",
"@types/node": "^11.10.4",
"codelyzer": "^4.5.0",
"jasmine-core": "^3.3.0",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^3.1.1",
"karma": "^4.0.1",
"karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1",
"karma-cli": "^2.0.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-jasmine": "^1.1.2",
"karma-jasmine": "^2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "^5.4.1",
"rxjs-tslint": "^0.1.5",
"protractor": "^5.4.2",
"rxjs-tslint": "^0.1.7",
"ts-node": "^7.0.1",
"tscov": "^1.3.3",
"tslint": "^5.12.0",
"typescript": "^3.1.6",
"webpack": "^4.28.2"
"tslint": "^5.13.1",
"typescript": "^3.3.3333",
"webpack": "^4.29.6"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component } from '@angular/core';
})
export class CardBlockComponent {
titleCard = 'Angular';
numberCard = 7;
numberCard = 8;
subTitleCard = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi nisl ligula.';
contentCard = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi nisl ligula.';
angularImage: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ import { Component } from '@angular/core';
})
export class FirstBlockComponent {
titleOne = 'Starter kit';
contentOne = 'Angular 7 | Material Design | Firebase (OAuth authentication and NoSQL database)';
contentOne = 'Angular 8 beta | Material Design | Firebase (OAuth authentication and NoSQL database)';

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component } from '@angular/core';
styleUrls: ['./third-block.component.scss']
})
export class ThirdBlockComponent {
titleThree = 'Angular 7';
titleThree = 'Angular 8 beta';
contentThree = 'Angular is a framework for building client applications in HTML and TypeScript that compiles to JavaScript.';

titleFour = 'Material 2';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class ChangeDetectionComponent implements OnInit {

OnMutate() {
console.log('OnMutate');
this.change1.title = 'Learning Angular 7';
this.change1.title = 'Learning Angular 8 beta';
this.change1.author = 'Person A';
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/pipes/currency-pipe.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component } from '@angular/core';
<h3>Currency Pipe :</h3>
<div>
<p>Angular: {{angularPrice | currency:'EUR':false}}</p>
<p>Angular 7: {{angular7Price | currency:'EUR':true:'4.2-2'}}</p>
<p>Angular 8 beta: {{angular7Price | currency:'EUR':true:'4.2-2'}}</p>
</div>
</fieldset>`,
styles: []
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Angular 7 | Material Design | Firebase</title>
<title>Angular 8 beta | Material Design | Firebase</title>
<base href="/">

<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down

0 comments on commit d47c59e

Please sign in to comment.