initial angular-cli version

Author: jashmenn

.angular-cli.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "project": {
+    "name": "angular-redux-chat"
+  },
+  "apps": [
+    {
+      "root": "src",
+      "outDir": "dist",
+      "assets": [
+        "assets",
+        "favicon.ico"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "polyfills": "polyfills.ts",
+      "test": "test.ts",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
+      "prefix": "app",
+      "styles": [
+        "styles.css"
+      ],
+      "scripts": [],
+      "environmentSource": "environments/environment.ts",
+      "environments": {
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json"
+    },
+    {
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
+    }
+  ],
+  "test": {
+    "karma": {
+      "config": "./karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "component": {}
+  }
+}

.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.gitignore

@@ -1,51 +1,41 @@
-build/
-\.\#*
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
-
-.webpack.json
-
-
-app/ts/ChatExampleData.js
-app/ts/app.js
-app/ts/components/ChatNavBar.js
-app/ts/components/ChatThreads.js
-app/ts/components/ChatWindow.js
-app/ts/models.js
-app/ts/services/MessagesService.js
-app/ts/services/ThreadsService.js
-app/ts/services/UserService.js
-app/ts/services/services.js
-app/ts/util/FromNowPipe.js
-app/ts/util/RxPipe.js
-app/ts/util/util.js
-app/ts/util/uuid.js
-.tern-port
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+#System Files
+.DS_Store
+Thumbs.db

.test.bats

@@ -5,23 +5,38 @@ load "${NGBOOK_ROOT}/scripts/bats/fullstack.bats"
 load "${NGBOOK_ROOT}/scripts/bats-support/load.bash"
 load "${NGBOOK_ROOT}/scripts/bats-assert/load.bash"
 
-@test "angular2-rxjs-chat e2e tests pass" {
+@test "angular-rxjs-chat unit tests pass" {
+ cd $DIR
+ run npm run test
+ assert_output --partial 'SUCCESS'
+}
+
+@test "angular-rxjs-chat e2e tests pass" {
   cd $DIR
-  run ./node_modules/.bin/protractor
+  run_ng_e2e $TEST_TMP_DIR
+  run cat ${TEST_TMP_DIR}/log.txt
   assert_output --partial 'SUCCESS'
 }
 
+@test "angular-rxjs-chat linting passes" {
+  cd $DIR
+  run npm run lint
+  assert_output --partial 'All files pass linting'
+}
+
 setup() {
+  echo "travis_fold:start:angular-rxjs-chat"
   cd $DIR
-  kill_by_port 8080
-  kill_by_grep "webpack-dev-server"
-  npm run go 3>- &
+  TEST_TMP_DIR="$(mktemp -d -t fullstackXXX)"
+  kill_ng_cli || :
+  kill_by_port 4200
   true
 }
 
 teardown() {
   cd $DIR
-  kill_by_port 8080
-  kill_by_grep "webpack-dev-server"
+  kill_ng_cli || :
+  kill_by_port 4200
+  echo "travis_fold:end:angular-rxjs-chat"
   true
 }

.webpack.json

@@ -23,19 +23,19 @@ This repo shows an example chat application using RxJS and Angular 2. The goal i
 
 ```bash
 # clone the repo
-git clone https://github.com/ng-book/angular2-rxjs-chat.git 
+git clone https://github.com/ng-book/angular2-rxjs-chat.git
 
 # change into the repo directory
 cd angular2-rxjs-chat
 
-# install 
+# install
 npm install
 
 # run
 npm run go
 ```
 
-Then visit [http://localhost:8080](http://localhost:8080) in your browser. 
+Then visit [http://localhost:8080](http://localhost:8080) in your browser.
 
 ## Architecture
 
@@ -58,7 +58,7 @@ And there are three services, one for each model:
 There are also three top-level components:
 
 * [`ChatNavBar`](app/ts/components/ChatNavBar.ts) - for the top navigation bar and unread messages count
-* [`ChatThreads`](app/ts/components/ChatThreads.ts) - for our clickable list of threads 
+* [`ChatThreads`](app/ts/components/ChatThreads.ts) - for our clickable list of threads
 * [`ChatWindow`](app/ts/components/ChatWindow.ts) - where we hold our current conversation
 
 <p align="center">
@@ -67,7 +67,7 @@ There are also three top-level components:
 
 ## Services Manage Observables
 
-Each service publishes data as RxJS streams. The service clients subscribe to these streams to be notified of changes. 
+Each service publishes data as RxJS streams. The service clients subscribe to these streams to be notified of changes.
 
 The `MessagesService` is the backbone of the application. All new messages are added to the `newMessages` stream and, more or less, all streams are derived from listening to `newMessages`. Even the `Thread`s exposed by the `ThreadsService` are created by listening to the stream of `Message`s.
 
@@ -101,11 +101,11 @@ angular2-rxjs-chat/
 ├── README.md                       * This file
 ├── app/                            * Where our application code is stored
 │   ├── css/                        * Contains our CSS and SCSS files
-|   | 
+|   |
 │   ├── images/                     * Stores app images
-|   | 
+|   |
 │   ├── index.html                  * HTML entry point
-|   | 
+|   |
 │   ├── ts/                         * All of our TypeScript is here
 |   |   |
 │   │   ├── ChatExampleData.ts      * Contains our bots and sample data
@@ -128,18 +128,18 @@ angular2-rxjs-chat/
 │   │   │   └── services.ts         * Exports all services
 |   |   |
 │   │   └── util/                   * Pipes and various utilities
-|   | 
+|   |
 │   ├── typings/                    * Self-managed type definitions here
-|   | 
+|   |
 │   └── vendor.js                   * Vendor js requires for webpack
-|   | 
+|   |
 ├── karma.conf.js                   * Our unit testing configuration
 ├── package.json                    * Our javascript dependencies
 ├── test/                           * Our tests go here
 ├── test.bundle.js                  * Some hacks to get TypeScript tests
 ├── tsconfig.json                   * Configures the TypeScript compiler
 ├── tsd.json                        * Configures tsd (type definitions packages)
-├── tslint.json                     * Configures our TypeScript linter 
+├── tslint.json                     * Configures our TypeScript linter
 ├── typings/                        * tsd managed typings
 ├── vendor/                         * Various vendored code
 └── webpack.config.js               * Our Webpack configuration
@@ -168,7 +168,7 @@ npm install
 npm run go
 ```
 
-Then visit [http://localhost:8080](http://localhost:8080) in your browser. 
+Then visit [http://localhost:8080](http://localhost:8080) in your browser.
 
 ## Running the Tests
 
@@ -184,7 +184,7 @@ There are two big changes we plan to make to this repo:
 
 ### 1. Add HTTP Requests
 
-Currently the bots are all client-side and there are no HTTP requests involved in the chats. 
+Currently the bots are all client-side and there are no HTTP requests involved in the chats.
 
 We will move the chat bots to a server and integrate API requests into this project once the Angular 2 HTTP client development has settled down.
 
@@ -222,5 +222,3 @@ This app is only one of several apps we have in the book. If you're looking to l
 
 ## License
  [MIT](/LICENSE.md)
-
-