Skip to content

Commit

Permalink
CHANGES VERSION 1.9.0
Browse files Browse the repository at this point in the history
UPDATE: [BREAKING] Update to Angular 6 and rxjs 6, these are breaking
changes. [how to update](https://update.angular.io/)
  • Loading branch information
wickeym committed May 15, 2018
1 parent 64ab71e commit 2d98da3
Show file tree
Hide file tree
Showing 13 changed files with 1,107 additions and 909 deletions.
68 changes: 0 additions & 68 deletions .angular-cli.json

This file was deleted.

8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/wickeyware/was-tutorial/compare/1.2.0...HEAD)
## [Unreleased](https://github.com/wickeyware/was-tutorial/compare/1.9.0...HEAD)

This shows all commits since last release.

## [1.9.0](https://github.com/wickeyware/was-tutorial/compare/1.6.1...1.9.0) - 2018-05-15

### Changed

* **packages** [BREAKING] Update to Angular 6 and rxjs 6, these are breaking changes. [how to update](https://update.angular.io/)

## [1.6.1](https://github.com/wickeyware/was-tutorial/compare/1.6.1...1.2.0) - 2018-04-19

### Added
Expand Down
147 changes: 147 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"was-tutorial": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/favicon.ico",
"src/service-worker.js",
"src/OneSignalSDKUpdaterWorker.js",
"src/OneSignalSDKWorker.js"
],
"styles": [
"src/styles.css"
],
"scripts": [
{
"input": "node_modules/hammerjs/hammer.min.js"
}
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"serviceWorker": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "was-tutorial:build"
},
"configurations": {
"production": {
"browserTarget": "was-tutorial:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "was-tutorial:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [
{
"input": "node_modules/hammerjs/hammer.min.js"
}
],
"styles": [
"src/styles.css"
],
"assets": [
"src/assets",
"src/favicon.ico",
"src/service-worker.js",
"src/OneSignalSDKUpdaterWorker.js",
"src/OneSignalSDKWorker.js"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"was-tutorial-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "was-tutorial:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "was-tutorial",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
6 changes: 3 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
require('@angular-devkit/build-angular/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
Expand Down
11 changes: 9 additions & 2 deletions src/ngsw-config.json → ngsw-config.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
{
"index": "/index.html",
"appData": {"title": "Update Available", "description": "Updated libraries & organized push notifications. Add configurations.", "version": "1.8.0", "askToUpdate": true},
"appData": {
"title": "Update Available",
"description": "Updated to Angular 6.",
"version": "1.9.0",
"askToUpdate": true
},
"assetGroups": [{
"name": "app",
"installMode": "prefetch",
"resources": {
"files": [
"/assets/favicon.ico",
"/index.html"
"/index.html",
"/*.css",
"/*.js"
],
"versionedFiles": [
"/*.bundle.css",
Expand Down
49 changes: 27 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "was-tutorial",
"version": "1.8.0",
"version": "1.9.0",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand All @@ -21,35 +21,38 @@
},
"private": true,
"dependencies": {
"@angular/animations": "5.2.9",
"@angular/cdk": "^5.2.4",
"@angular/common": "5.2.9",
"@angular/compiler": "5.2.9",
"@angular/core": "5.2.9",
"@angular/forms": "5.2.9",
"@angular/material": "^5.2.4",
"@angular/platform-browser": "5.2.9",
"@angular/platform-browser-dynamic": "5.2.9",
"@angular/router": "5.2.9",
"@angular/service-worker": "5.2.9",
"@angular/animations": "6.0.1",
"@angular/cdk": "^6.0.2",
"@angular/common": "6.0.1",
"@angular/compiler": "6.0.1",
"@angular/core": "6.0.1",
"@angular/forms": "6.0.1",
"@angular/material": "^6.0.2",
"@angular/platform-browser": "6.0.1",
"@angular/platform-browser-dynamic": "6.0.1",
"@angular/pwa": "^0.6.1",
"@angular/router": "6.0.1",
"@angular/service-worker": "6.0.1",
"@types/howler": "^2.0.5",
"core-js": "^2.4.1",
"core-js": "^2.5.4",
"hammerjs": "^2.0.8",
"howler": "^2.0.9",
"howler": "^2.0.12",
"idb-keyval": "^3.0.2",
"rxjs": "^5.5.9",
"rxjs": "^6.1.0",
"rxjs-compat": "^6.0.0-rc.0",
"swiper": "3.4.2",
"web-animations-js": "^2.3.1",
"wickeyappstore": "^2.8.1",
"wickeyappstore": "^2.10.2",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/cli": "1.7.4",
"@angular/compiler-cli": "5.2.9",
"@angular/language-service": "5.2.9",
"@angular-devkit/build-angular": "~0.6.1",
"@angular/cli": "^6.0.1",
"@angular/compiler-cli": "6.0.1",
"@angular/language-service": "6.0.1",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~9.6.4",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"http-server": "^0.11.1",
"jasmine-core": "~2.6.2",
Expand All @@ -61,8 +64,10 @@
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2",
"ts-node": "~3.3.0",
"ts-node": "~5.0.1",
"tsickle": ">=0.25.5",
"tslib": "^1.7.1",
"tslint": "~5.9.1",
"typescript": "2.6.2"
"typescript": "~2.7.2"
}
}
9 changes: 5 additions & 4 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component } from '@angular/core';
import { MatDialog } from '@angular/material';
import { map } from 'rxjs/operators';
import { OneSignalController } from '../OneSignalController';
import { UserService, User, UserParams, WasUp, WasAlert, WasPay, PromptUpdateService } from 'wickeyappstore';
import { Howl } from 'howler';
Expand All @@ -12,8 +13,8 @@ import { Howl } from 'howler';
export class AppComponent {
// (1) SET THESE VALUES FOR YOUR APP ****************************
public title = 'Air Horn';
public version = '1.8.0';
public whats_new = 'Updated libraries & organized push notifications. Add configurations.';
public version = '1.9.0';
public whats_new = 'Updated to Angular 6.';
// (2) UPDATE the version to match in package.json ****************************
// UPDATE the version & whats_new in ngsw-config.json
//
Expand Down Expand Up @@ -99,15 +100,15 @@ export class AppComponent {

// Return the login message
get displayMessage() {
return this.userService.user.map((usr: User) => {
return this.userService.user.pipe(map((usr: User) => {
let _displayMsg = '';
if (usr.email) {
_displayMsg = 'Welcome Back!';
} else {
_displayMsg = 'Sign in with the WickeyAppStore button';
}
return _displayMsg;
});
}));
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Binary file added src/favicon.ico
Binary file not shown.
Loading

0 comments on commit 2d98da3

Please sign in to comment.