Merge branch 'master' into travis/github

jenkins.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+npm --version
+node --version
+npm install
+npm run build
+rm -f web.zip
+zip -r web.zip web-dist/*

package.json

@@ -20,19 +20,19 @@
   "author": "Travis Ralston",
   "dependencies": {
     "body-parser": "^1.17.2",
-    "chalk": "^1.1.3",
-    "config": "^1.26.1",
-    "db-migrate": "^0.10.0-beta.20",
+    "chalk": "^2.1.0",
+    "config": "^1.26.2",
+    "db-migrate": "^0.10.0-beta.23",
     "db-migrate-sqlite3": "^0.2.1",
-    "express": "^4.15.3",
-    "js-yaml": "^3.8.4",
+    "express": "^4.15.4",
+    "js-yaml": "^3.9.1",
     "lodash": "^4.17.4",
-    "matrix-js-sdk": "^0.7.13",
+    "matrix-js-sdk": "^0.8.2",
     "moment": "^2.18.1",
     "random-string": "^0.2.0",
     "request": "^2.81.0",
-    "sequelize": "^4.2.0",
-    "sqlite3": "^3.1.8",
+    "sequelize": "^4.7.5",
+    "sqlite3": "^3.1.9",
     "winston": "^2.3.1"
   },
   "devDependencies": {
@@ -45,11 +45,10 @@
     "@angular/platform-browser": "^4.2.1",
     "@angular/platform-browser-dynamic": "^4.2.1",
     "@angular/router": "^4.2.1",
-    "@angularclass/hmr": "^1.2.2",
+    "@angularclass/hmr": "^2.1.0",
     "@angularclass/hmr-loader": "^3.0.2",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.26",
-    "@types/node": "^6.11.0",
-    "angular2-modal": "^2.0.3",
+    "@types/node": "^6.0.78",
     "angular2-template-loader": "^0.6.2",
     "angular2-toaster": "^4.0.0",
     "angular2-ui-switch": "^1.2.0",
@@ -59,14 +58,15 @@
     "core-js": "^2.4.1",
     "css-loader": "^0.28.4",
     "cssnano": "^3.10.0",
-    "extract-text-webpack-plugin": "^2.1.2",
-    "file-loader": "^0.11.2",
-    "html-loader": "^0.4.5",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^1.0.0",
+    "html-loader": "^0.5.1",
     "html-webpack-plugin": "^2.28.0",
     "jquery": "^3.2.1",
     "json-loader": "^0.5.4",
+    "ngx-modialog": "^3.0.3",
     "node-sass": "^4.5.2",
-    "postcss-cssnext": "^2.11.0",
+    "postcss-cssnext": "^3.0.0",
     "postcss-import": "^10.0.0",
     "postcss-loader": "^2.0.5",
     "postcss-scss": "^1.0.0",

web/app/app.component.ts

@@ -2,9 +2,9 @@ import { Component } from "@angular/core";
 import "../style/app.scss";
 
 @Component({
-    selector: 'my-app', // <my-app></my-app>
-    templateUrl: './app.component.html',
-    styleUrls: ['./app.component.scss'],
+    selector: "my-app", // <my-app></my-app>
+    templateUrl: "./app.component.html",
+    styleUrls: ["./app.component.scss"],
 })
 export class AppComponent {
 

web/app/app.module.ts

@@ -16,8 +16,8 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { IntegrationComponent } from "./integration/integration.component";
 import { ScalarCloseComponent } from "./riot/scalar-close/scalar-close.component";
 import { IntegrationService } from "./shared/integration.service";
-import { BootstrapModalModule } from "angular2-modal/plugins/bootstrap";
-import { ModalModule } from "angular2-modal";
+import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap";
+import { ModalModule } from "ngx-modialog";
 import { RssConfigComponent } from "./configs/rss/rss-config.component";
 import { IrcConfigComponent } from "./configs/irc/irc-config.component";
 import { IrcApiService } from "./shared/irc-api.service";
@@ -65,7 +65,7 @@ export class AppModule {
     }
 
     hmrOnInit(store) {
-        console.log('HMR store', store);
+        console.log("HMR store", store);
     }
 
     hmrOnDestroy(store) {

web/app/app.routing.ts

@@ -3,8 +3,8 @@ import { HomeComponent } from "./home/home.component";
 import { RiotComponent } from "./riot/riot.component";
 
 const routes: Routes = [
-    {path: '', component: HomeComponent},
-    {path: 'riot', component: RiotComponent},
+    {path: "", component: HomeComponent},
+    {path: "riot", component: RiotComponent},
 ];
 
 export const routing = RouterModule.forRoot(routes);

web/app/configs/irc/irc-config.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from "@angular/core";
 import { IRCIntegration } from "../../shared/models/integration";
-import { ModalComponent, DialogRef } from "angular2-modal";
+import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { IrcApiService } from "../../shared/irc-api.service";
 import { ToasterService } from "angular2-toaster";
@@ -9,9 +9,9 @@ import { ApiService } from "../../shared/api.service";
 import { Subscription } from "rxjs";
 
 @Component({
-    selector: 'my-irc-config',
-    templateUrl: './irc-config.component.html',
-    styleUrls: ['./irc-config.component.scss', './../config.component.scss'],
+    selector: "my-irc-config",
+    templateUrl: "./irc-config.component.html",
+    styleUrls: ["./irc-config.component.scss", "./../config.component.scss"],
 })
 export class IrcConfigComponent implements ModalComponent<ConfigModalContext>, OnDestroy {
 

web/app/configs/rss/rss-config.component.ts

@@ -1,14 +1,14 @@
 import { Component } from "@angular/core";
 import { RSSIntegration } from "../../shared/models/integration";
-import { ModalComponent, DialogRef } from "angular2-modal";
+import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { ApiService } from "../../shared/api.service";
 
 @Component({
-    selector: 'my-rss-config',
-    templateUrl: './rss-config.component.html',
-    styleUrls: ['./rss-config.component.scss', './../config.component.scss'],
+    selector: "my-rss-config",
+    templateUrl: "./rss-config.component.html",
+    styleUrls: ["./rss-config.component.scss", "./../config.component.scss"],
 })
 export class RssConfigComponent implements ModalComponent<ConfigModalContext> {
 

web/app/home/home.component.ts

@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
 
 @Component({
-    selector: 'my-home',
-    templateUrl: './home.component.html',
-    styleUrls: ['./home.component.scss'],
+    selector: "my-home",
+    templateUrl: "./home.component.html",
+    styleUrls: ["./home.component.scss"],
 })
 export class HomeComponent {
 

web/app/integration/integration.component.ts

@@ -1,7 +1,7 @@
-import { Component, Input, Output, EventEmitter, ViewContainerRef } from "@angular/core";
+import { Component, Input, Output, EventEmitter } from "@angular/core";
 import { Integration } from "../shared/models/integration";
-import { Overlay, overlayConfigFactory } from "angular2-modal";
-import { Modal, BSModalContext } from "angular2-modal/plugins/bootstrap";
+import { overlayConfigFactory } from "ngx-modialog";
+import { Modal, BSModalContext } from "ngx-modialog/plugins/bootstrap";
 import { IntegrationService } from "../shared/integration.service";
 
 export class ConfigModalContext extends BSModalContext {
@@ -11,9 +11,9 @@ export class ConfigModalContext extends BSModalContext {
 }
 
 @Component({
-    selector: 'my-integration',
-    templateUrl: './integration.component.html',
-    styleUrls: ['./integration.component.scss'],
+    selector: "my-integration",
+    templateUrl: "./integration.component.html",
+    styleUrls: ["./integration.component.scss"],
 })
 export class IntegrationComponent {
 
@@ -22,8 +22,8 @@ export class IntegrationComponent {
     @Input() scalarToken: string;
     @Output() updated: EventEmitter<any> = new EventEmitter();
 
-    constructor(overlay: Overlay, vcRef: ViewContainerRef, public modal: Modal) {
-        overlay.defaultViewContainer = vcRef;
+    constructor(/*overlay: Overlay, vcRef: ViewContainerRef, */public modal: Modal) {
+        // overlay.defaultViewContainer = vcRef;
     }
 
     public update(): void {
@@ -37,7 +37,7 @@ export class IntegrationComponent {
             roomId: this.roomId,
             scalarToken: this.scalarToken,
             isBlocking: false,
-            size: 'lg'
+            size: "lg"
         }, BSModalContext));
     }
 }

web/app/riot/riot.component.ts

@@ -8,9 +8,9 @@ import { IntegrationService } from "../shared/integration.service";
 import * as _ from "lodash";
 
 @Component({
-    selector: 'my-riot',
-    templateUrl: './riot.component.html',
-    styleUrls: ['./riot.component.scss'],
+    selector: "my-riot",
+    templateUrl: "./riot.component.html",
+    styleUrls: ["./riot.component.scss"],
 })
 export class RiotComponent {
 
@@ -82,7 +82,7 @@ export class RiotComponent {
                 return;
             }
 
-            integration.isEnabled = (payload.response.membership === 'join' || payload.response.membership === 'invite');
+            integration.isEnabled = (payload.response.membership === "join" || payload.response.membership === "invite");
         }, (error) => {
             console.error(error);
             integration.isEnabled = false;
@@ -117,8 +117,8 @@ export class RiotComponent {
 
         promise.then(() => {
             if (integration.isEnabled)
-                this.toaster.pop('success', integration.name + " was invited to the room");
-            else this.toaster.pop('success', integration.name + " was removed from the room");
+                this.toaster.pop("success", integration.name + " was invited to the room");
+            else this.toaster.pop("success", integration.name + " was removed from the room");
         }).catch(err => {
             let errorMessage = "Could not update integration status";
 

web/app/riot/scalar-close/scalar-close.component.ts

@@ -2,9 +2,9 @@ import { Component } from "@angular/core";
 import { ScalarService } from "../../shared/scalar.service";
 
 @Component({
-    selector: 'my-scalar-close',
-    templateUrl: './scalar-close.component.html',
-    styleUrls: ['./scalar-close.component.scss'],
+    selector: "my-scalar-close",
+    templateUrl: "./scalar-close.component.html",
+    styleUrls: ["./scalar-close.component.scss"],
 })
 export class ScalarCloseComponent {
 

web/app/shared/integration.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Integration } from "./models/integration";
 import { RssConfigComponent } from "../configs/rss/rss-config.component";
-import { ContainerContent } from "angular2-modal";
+import { ContainerContent } from "ngx-modialog";
 import { IrcConfigComponent } from "../configs/irc/irc-config.component";
 
 @Injectable()

web/main.ts

@@ -4,7 +4,7 @@ import { AppModule } from "./app/app.module";
 
 // depending on the env mode, enable prod mode or add debugging modules
 //noinspection TypeScriptUnresolvedVariable
-if (process.env.ENV === 'build') {
+if (process.env.ENV === "build") {
     enableProdMode();
 }
 
@@ -12,10 +12,10 @@ export function main() {
     return platformBrowserDynamic().bootstrapModule(AppModule);
 }
 
-if (document.readyState === 'complete') {
+if (document.readyState === "complete") {
     main();
 } else {
-    document.addEventListener('DOMContentLoaded', main);
+    document.addEventListener("DOMContentLoaded", main);
 }
 
 (<any>String.prototype).hashCode = function () {

web/polyfills.ts

@@ -1,17 +1,17 @@
 import "core-js/client/shim";
 import "reflect-metadata";
 import "ts-helpers";
-require('zone.js/dist/zone');
+require("zone.js/dist/zone");
 
 //noinspection TypeScriptUnresolvedVariable
-if (process.env.ENV === 'build') {
+if (process.env.ENV === "build") {
     // Production
 
 } else {
     // Development
 
-    Error['stackTraceLimit'] = Infinity;
+    Error["stackTraceLimit"] = Infinity;
 
     //noinspection TypeScriptUnresolvedFunction
-    require('zone.js/dist/long-stack-trace-zone');
+    require("zone.js/dist/long-stack-trace-zone");
 }