Merge pull request #16 from okgreece/cutting-edge

Cutting edge

angular-cli.json → .angular-cli.json

@@ -1,24 +1,27 @@
 {
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "version": "1.0.0-beta.17",
     "name": "indigo"
   },
   "apps": [
     {
       "root": "src",
       "outDir": "dist",
-      "assets": ["assets"],
+      "assets": [
+        "assets",
+        "favicon.ico",
+        "USERGUIDE.md"
+      ],
       "index": "index.html",
       "main": "main.ts",
+      "polyfills": "polyfills.ts",
       "test": "test.ts",
-      "tsconfig": "tsconfig.json",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
-      "mobile": false,
       "styles": [
         "styles.css",
-        "obeu-theme.scss",
-        "../node_modules/prismjs/themes/prism-okaidia.css"
-
+        "obeu-theme.scss"
       ],
       "scripts": [],
       "environmentSource": "environments/environment.ts",
@@ -28,20 +31,29 @@
       }
     }
   ],
-  "addons": [],
-  "packages": [],
   "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",
-    "prefixInterfaces": false
+    "component": {}
   }
 }

.editorconfig

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

.gitignore

@@ -1,58 +1,42 @@
-# Logs
-logs
-*.log
+# See http://help.github.com/ignore-files/ for more about ignoring files.
 
-# 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
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+# compiled output
+/dist
+/tmp
+/out-tsc
 
-# Users Environment Variables
-.lock-wscript
+# dependencies
+/node_modules
 
-# OS generated files #
+# 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
-ehthumbs.db
-Icon?
 Thumbs.db
-
-# Node Files #
-/node_modules
-/bower_components
-
-# Typing TSD #
-/src/typings/tsd/
-/typings/
-/tsd_typings/
-
-# Dist #
-/dist
-/public/__build__/
-/src/*/__build__/
-__build__/**
-.webpack.json
-
-#doc
-/doc
-
-# IDE #
-.idea/
-*.swp
-!/typings/custom.d.ts
-
-# Build Artifacts #
-release
-distout
-*.ngfactory.ts

README.md

@@ -41,4 +41,4 @@ Indigo lets you set the following configuration options, by editing the `src/env
   5. `baseHref`: The path of the application. Defaults to "indigo/"
 
 ### Usage
-Currently, Indigo offers two analysis functions: descriptive statistics and time series analysis. You can start [here](USERGUIDE.md) .  
+Currently, Indigo offers two analysis functions: descriptive statistics and time series analysis. You can start [here](USERGUIDE.md) .  

e2e/app.e2e-spec.ts

@@ -0,0 +1,14 @@
+import { IndigoPage } from './app.po';
+
+describe('indigo App', () => {
+  let page: IndigoPage;
+
+  beforeEach(() => {
+    page = new IndigoPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('Welcome to app!!');
+  });
+});

e2e/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class IndigoPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}

e2e/tsconfig.e2e.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  }
+}

karma.conf.js

@@ -4,30 +4,25 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', 'angular-cli'],
+    frameworks: ['jasmine', '@angular/cli'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
-      require('karma-remap-istanbul'),
-      require('angular-cli/plugins/karma')
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular/cli/plugins/karma')
     ],
-    files: [
-      { pattern: './src/test.ts', watched: false }
-    ],
-    preprocessors: {
-      './src/test.ts': ['angular-cli']
+    client:{
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
-    remapIstanbulReporter: {
-      reports: {
-        html: 'coverage',
-        lcovonly: './coverage/coverage.lcov'
-      }
+    coverageIstanbulReporter: {
+      reports: [ 'html', 'lcovonly' ],
+      fixWebpackSourcePaths: true
     },
     angularCli: {
-      config: './angular-cli.json',
       environment: 'dev'
     },
-    reporters: ['progress', 'karma-remap-istanbul'],
+    reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,