From e63720ebe946397286ecbb87b02f8f2cab6d8bab Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 27 Sep 2017 21:17:53 -0500 Subject: [PATCH] chore(Example): Add login info to example app. Fix sidenav issue with IE (#436) --- example-app/README.md | 10 ++++------ example-app/app/core/components/nav-item.ts | 4 ++-- example-app/app/core/containers/app.ts | 8 ++++---- package.json | 7 ++++++- yarn.lock | 6 +++--- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/example-app/README.md b/example-app/README.md index 4ed3f3e448..cf58422679 100644 --- a/example-app/README.md +++ b/example-app/README.md @@ -26,20 +26,18 @@ Built with [@angular/cli](https://github.com/angular/angular-cli) # clone the repo git clone https://github.com/ngrx/platform.git -# Use npm or yarn to install the dependencies: -npm install - -# OR +# Install the dependencies: yarn # start the server -npm run build && npm run cli -- serve +yarn run build && yarn run cli -- serve # OR yarn run example:start ``` -Navigate to [http://localhost:4200/](http://localhost:4200/) in your browser +Navigate to [http://localhost:4200/](http://localhost:4200/) in your browser. To login, the username and password is `test`. + _NOTE:_ The above setup instructions assume you have added local npm bin folders to your path. If this is not the case you will need to install the Angular CLI globally. diff --git a/example-app/app/core/components/nav-item.ts b/example-app/app/core/components/nav-item.ts index 148c910c11..61d1c247e1 100644 --- a/example-app/app/core/components/nav-item.ts +++ b/example-app/app/core/components/nav-item.ts @@ -3,7 +3,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; @Component({ selector: 'bc-nav-item', template: ` - + {{ icon }} {{ hint }} @@ -21,5 +21,5 @@ export class NavItemComponent { @Input() icon = ''; @Input() hint = ''; @Input() routerLink: string | any[] = '/'; - @Output() activate = new EventEmitter(); + @Output() navigate = new EventEmitter(); } diff --git a/example-app/app/core/containers/app.ts b/example-app/app/core/containers/app.ts index ca7722adcf..36e7f1df79 100644 --- a/example-app/app/core/containers/app.ts +++ b/example-app/app/core/containers/app.ts @@ -14,16 +14,16 @@ import * as Auth from '../../auth/actions/auth'; template: ` - + My Collection - + Browse Books - + Sign In - + Sign Out diff --git a/package.json b/package.json index 0e3040040a..d21ff5939a 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,11 @@ "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", "release": "lerna publish --skip-npm --conventional-commits && npm run build" }, + "engines": { + "node": ">=6.9.5", + "npm": ">=4.0.0", + "yarn": ">=0.27.5 <2.0.0" + }, "lint-staged": { "*.ts": [ "yarn prettier", @@ -100,7 +105,7 @@ "lerna": "^2.0.0", "lint-staged": "^4.0.3", "module-alias": "^2.0.0", - "ngrx-store-freeze": "^0.1.9", + "ngrx-store-freeze": "^0.2.0", "nyc": "^10.1.2", "ora": "^1.2.0", "prettier": "^1.5.2", diff --git a/yarn.lock b/yarn.lock index cce51a858d..1280316362 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4753,9 +4753,9 @@ nested-error-stacks@^1.0.0, nested-error-stacks@^1.0.1: dependencies: inherits "~2.0.1" -ngrx-store-freeze@^0.1.9: - version "0.1.9" - resolved "https://registry.yarnpkg.com/ngrx-store-freeze/-/ngrx-store-freeze-0.1.9.tgz#b20f18f21fd5efc4e1b1e05f6f279674d0f70c81" +ngrx-store-freeze@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ngrx-store-freeze/-/ngrx-store-freeze-0.2.0.tgz#74c231947bbe1938af722f6a72624dc69788d39f" dependencies: deep-freeze-strict "^1.1.1"