From 6657d5dbf5677af04ab79c8a81b203cd2e309dc0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Dec 2017 21:25:15 -0700
Subject: [PATCH 001/111] Start of a new UI for Dimension

Integrations need styling and the breadcrumbs don't work. Further, you can't actually add/edit anything.
---
 package-lock.json                             |  12 ++
 package.json                                  |   2 +
 src/DimensionApi.js                           |  22 +-
 src/storage/DimensionStore.js                 |  12 ++
 web/app/app.component.html                    |   2 +
 web/app/app.module.ts                         |   6 +
 web/app/app.routing.ts                        |   5 +-
 .../page-header/page-header.component.html    |   9 +
 .../page-header/page-header.component.scss    |  28 +++
 web/app/page-header/page-header.component.ts  |  10 +
 web/app/riot/riot.component.html              | 115 +++++-----
 web/app/riot/riot.component.scss              |  16 +-
 web/app/riot/riot.component.ts                | 201 ++++++++++++------
 web/app/shared/api.service.ts                 |   5 +
 web/app/shared/models/integration.ts          |  14 +-
 web/app/spinner/spinner.component.html        |   6 +
 web/app/spinner/spinner.component.scss        |   2 +
 web/app/spinner/spinner.component.ts          |   9 +
 web/style/app.scss                            |   6 +-
 19 files changed, 322 insertions(+), 160 deletions(-)
 create mode 100644 web/app/page-header/page-header.component.html
 create mode 100644 web/app/page-header/page-header.component.scss
 create mode 100644 web/app/page-header/page-header.component.ts
 create mode 100644 web/app/spinner/spinner.component.html
 create mode 100644 web/app/spinner/spinner.component.scss
 create mode 100644 web/app/spinner/spinner.component.ts

diff --git a/package-lock.json b/package-lock.json
index 9ec711f..e0cdec6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4550,6 +4550,12 @@
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
       "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU="
     },
+    "ng2-breadcrumbs": {
+      "version": "0.1.281",
+      "resolved": "https://registry.npmjs.org/ng2-breadcrumbs/-/ng2-breadcrumbs-0.1.281.tgz",
+      "integrity": "sha1-OKZsYoD7BgwacyQ7ezP3zZ88waY=",
+      "dev": true
+    },
     "ngx-modialog": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/ngx-modialog/-/ngx-modialog-3.0.4.tgz",
@@ -8052,6 +8058,12 @@
         "wbuf": "1.7.2"
       }
     },
+    "spinkit": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/spinkit/-/spinkit-1.2.5.tgz",
+      "integrity": "sha1-kPn0ZqIOjjnvJNqVnB5hHCow3VQ=",
+      "dev": true
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
diff --git a/package.json b/package.json
index d2479eb..fe4885b 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "html-webpack-plugin": "^2.28.0",
     "jquery": "^3.2.1",
     "json-loader": "^0.5.4",
+    "ng2-breadcrumbs": "^0.1.281",
     "ngx-modialog": "^3.0.4",
     "node-sass": "^4.7.2",
     "postcss-cssnext": "^3.0.0",
@@ -84,6 +85,7 @@
     "rxjs": "^5.5.5",
     "sass-loader": "^6.0.3",
     "shelljs": "^0.7.8",
+    "spinkit": "^1.2.5",
     "style-loader": "^0.18.2",
     "ts-helpers": "^1.1.2",
     "tslint": "^5.8.0",
diff --git a/src/DimensionApi.js b/src/DimensionApi.js
index c8b4728..28f3061 100644
--- a/src/DimensionApi.js
+++ b/src/DimensionApi.js
@@ -33,6 +33,25 @@ class DimensionApi {
         app.get("/api/v1/dimension/integrations/:roomId/:type/:integrationType/state", this._getIntegrationState.bind(this));
         app.get("/api/v1/dimension/widgets/embeddable", this._checkEmbeddable.bind(this));
         app.get("/api/v1/dimension/integration/:type/:integrationType", this._getIntegration.bind(this));
+        app.get("/api/v1/dimension/whoami", this._getTokenOwner.bind(this));
+    }
+
+    _getTokenOwner(req, res) {
+        res.setHeader("Content-Type", "application/json");
+
+        var scalarToken = req.query.scalar_token;
+        if (!scalarToken) {
+            res.status(400).send({error: 'Missing scalar token'});
+            return;
+        }
+
+        this._db.getTokenOwner(scalarToken).then(userId => {
+            res.status(200).send({userId: userId});
+        }).catch(err => {
+            log.error("DimensionApi", err);
+            console.error(err);
+            res.status(401).send({error: 'Invalid token or other error'});
+        });
     }
 
     _checkEmbeddable(req, res) {
@@ -113,7 +132,8 @@ class DimensionApi {
         }
     }
 
-    _getIntegration(req, res) {res.setHeader("Content-Type", "application/json");
+    _getIntegration(req, res) {
+        res.setHeader("Content-Type", "application/json");
         // Unauthed endpoint.
 
         var type = req.params.type;
diff --git a/src/storage/DimensionStore.js b/src/storage/DimensionStore.js
index a8f0172..d013f7e 100644
--- a/src/storage/DimensionStore.js
+++ b/src/storage/DimensionStore.js
@@ -92,6 +92,18 @@ class DimensionStore {
         });
     }
 
+    /**
+     * Gets the user ID that owns a given token, returning a falsey value if no one owns the token.
+     * @param {string} scalarToken the scalar token to check
+     * @returns {Promise<String>} resolves to the user ID, or a falsey value if no user ID was found
+     */
+    getTokenOwner(scalarToken) {
+        return this.__Tokens.find({where:{scalarToken: scalarToken}}).then(token => {
+            if (!token) return Promise.reject(new Error("Token not found"));
+            return Promise.resolve(token.matrixUserId);
+        })
+    }
+
     /**
      * Gets the upstream token for a given scalar token
      * @param {string} scalarToken the scalar token to lookup
diff --git a/web/app/app.component.html b/web/app/app.component.html
index 27c14e7..80510b9 100644
--- a/web/app/app.component.html
+++ b/web/app/app.component.html
@@ -2,6 +2,8 @@
 </header>
 <main>
     <toaster-container></toaster-container>
+    <!-- The breadcrumb needs to be defined here otherwise it doesn't work -->
+    <breadcrumb [allowBootstrap]="false" [hidden]="true"></breadcrumb>
     <router-outlet></router-outlet>
 </main>
 <footer>
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index e60008d..dcd56e7 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -26,6 +26,9 @@ import { FullscreenButtonComponent } from "./fullscreen-button/fullscreen-button
 import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component";
 import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
 import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
+import { PageHeaderComponent } from "./page-header/page-header.component";
+import { SpinnerComponent } from "./spinner/spinner.component";
+import { BreadcrumbsModule } from "ng2-breadcrumbs";
 
 const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigComponents();
 
@@ -41,6 +44,7 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo
         BrowserAnimationsModule,
         ModalModule.forRoot(),
         BootstrapModalModule,
+        BreadcrumbsModule,
     ],
     declarations: [
         ...WIDGET_CONFIGURATION_COMPONENTS,
@@ -48,6 +52,8 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo
         HomeComponent,
         RiotComponent,
         IntegrationComponent,
+        PageHeaderComponent,
+        SpinnerComponent,
         ScalarCloseComponent,
         MyFilterPipe,
         GenericWidgetWrapperComponent,
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 87d41fe..d3c3ae7 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -8,7 +8,10 @@ import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.componen
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
-    {path: "riot", component: RiotComponent},
+    {
+        path: "riot", component: RiotComponent, data: {breadcrumb: "Home"},
+        children: [{path: "test", component: RiotComponent, data: {breadcrumb: "Testing"}}]
+    },
     {path: "widgets/generic", component: GenericWidgetWrapperComponent},
     {path: "widgets/video", component: VideoWidgetWrapperComponent},
     {path: "widgets/jitsi", component: JitsiWidgetWrapperComponent},
diff --git a/web/app/page-header/page-header.component.html b/web/app/page-header/page-header.component.html
new file mode 100644
index 0000000..f183bbf
--- /dev/null
+++ b/web/app/page-header/page-header.component.html
@@ -0,0 +1,9 @@
+<div class="header">
+    <div class="title">
+        <h2 class="pageName">{{ pageName }}</h2>
+        <breadcrumb [allowBootstrap]="false"></breadcrumb>
+    </div>
+    <div class="quickAction">
+        <ng-content></ng-content>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/page-header/page-header.component.scss b/web/app/page-header/page-header.component.scss
new file mode 100644
index 0000000..cbed3ae
--- /dev/null
+++ b/web/app/page-header/page-header.component.scss
@@ -0,0 +1,28 @@
+// component styles are encapsulated and only applied to their components
+.header {
+  width: 100%;
+  margin-top: 30px;
+  border-top: 1px solid #e7eaec;
+  border-bottom: 1px solid #e7eaec;
+  background-color: #fff;
+}
+
+.header .title {
+  margin: 0;
+  width: 83.333333%; // col-sm-10
+  padding: 15px;
+}
+
+.header .title .pageName {
+  font-weight: 100;
+  padding: 0;
+  margin: 0;
+}
+
+.header .quickAction {
+  padding: 0;
+  margin: 0;
+  float: right;
+  text-align: right;
+  width: 16.666667%; // col-sm-2
+}
\ No newline at end of file
diff --git a/web/app/page-header/page-header.component.ts b/web/app/page-header/page-header.component.ts
new file mode 100644
index 0000000..63ad6ea
--- /dev/null
+++ b/web/app/page-header/page-header.component.ts
@@ -0,0 +1,10 @@
+import { Component, Input } from "@angular/core";
+
+@Component({
+    selector: "my-page-header",
+    templateUrl: "./page-header.component.html",
+    styleUrls: ["./page-header.component.scss"],
+})
+export class PageHeaderComponent {
+    @Input() pageName: string;
+}
diff --git a/web/app/riot/riot.component.html b/web/app/riot/riot.component.html
index ef187cd..3b962ee 100644
--- a/web/app/riot/riot.component.html
+++ b/web/app/riot/riot.component.html
@@ -1,76 +1,57 @@
 <div id="wrapper">
     <my-scalar-close></my-scalar-close>
-    <div *ngIf="error">
-        <p class="text-danger">{{ error }}</p>
-    </div>
-    <div *ngIf="loading && !error">
-        <p><i class="fa fa-circle-o-notch fa-spin"></i> Loading...</p>
-    </div>
-    <div *ngIf="!error && !loading">
-        <!-- ------------------------ -->
-        <!-- EMPTY/ENCRYPTED STATES   -->
-        <!-- ------------------------ -->
-        <div class="alert alert-warning" *ngIf="integrations.length > 0 && isEncryptedRoom">
-            <h4>This room is encrypted</h4>
-            <strong>Integrations are not encrypted!</strong> This means that some information about yourself and the room may be leaked to the bot, bridge, or widget. This information includes the room ID, your display name, your username, your avatar, information about Riot, and other similar details. Add integrations with caution.
+
+    <my-page-header pageName="Dimension"></my-page-header>
+
+    <div class="page-content">
+        <div *ngIf="isError">
+            <div class="alert alert-danger">{{ errorMessage }}</div>
         </div>
-        <div class="alert alert-warning" *ngIf="integrations.length === 0 && isEncryptedRoom">
-            <h4>This room is encrypted</h4>
-            There are currently no integrations which support encrypted rooms. Sorry about that!
-        </div>
-        <div class="alert alert-warning" *ngIf="integrations.length === 0 && !isEncryptedRoom">
-            <h4>No integrations available</h4>
-            This room does not have any compatible integrations. Please contact the server owner if you're seeing this message.
+        <div *ngIf="isLoading">
+            <my-spinner></my-spinner>
         </div>
 
-        <!-- ------------------------ -->
-        <!-- WIDGETS                  -->
-        <!-- ------------------------ -->
-        <h4 *ngIf="hasAnyOf('widget')">
-            Widgets <i class="fa fa-question-circle text-info" style="font-size: 15px;" placement="bottom"
-                       ngbTooltip="Widgets add small apps to Riot, like Google Docs, Jitsi conferences, and YouTube videos"></i>
-        </h4>
-        <div class="integration-container">
-            <my-integration *ngFor="let integration of integrations | myFilter:'type':'widget'"
-                            [integration]="integration"
-                            [roomId]="roomId"
-                            [scalarToken]="scalarToken"
-                            (updated)="updateIntegration(integration)"></my-integration>
-        </div>
+        <div *ngIf="!isLoading && !isError">
+            <!-- ------------------------ -->
+            <!-- EMPTY/ENCRYPTED STATES   -->
+            <!-- ------------------------ -->
+            <div class="alert alert-warning" *ngIf="hasIntegrations() && isRoomEncrypted">
+                <h4>This room is encrypted</h4>
+                <strong>Integrations are not encrypted!</strong>
+                This means that some information about yourself and the
+                room may be leaked to the bot, bridge, or widget. This information includes the room ID, your display
+                name,
+                your username, your avatar, information about Riot, and other similar details. Add integrations with
+                caution.
+            </div>
+            <div class="alert alert-warning" *ngIf="!hasIntegrations() && isRoomEncrypted">
+                <h4>This room is encrypted</h4>
+                There are currently no integrations which support encrypted rooms. Sorry about that!
+            </div>
+            <div class="alert alert-warning" *ngIf="!hasIntegrations() && !isRoomEncrypted">
+                <h4>No integrations available</h4>
+                This room does not have any compatible integrations. Please contact the server owner if you're seeing
+                this
+                message.
+            </div>
 
-        <!-- ------------------------ -->
-        <!-- BOTS                     -->
-        <!-- ------------------------ -->
-        <h4 *ngIf="hasAnyOf('bot', 'complex-bot')">
-            Bots <i class="fa fa-question-circle text-info" style="font-size: 15px;" placement="bottom"
-                    ngbTooltip="Bots can provide entertainment or some utility to your room"></i>
-        </h4>
-        <div class="integration-container">
-            <my-integration *ngFor="let integration of integrations | myFilter:'type':'bot'"
-                            [integration]="integration"
-                            [roomId]="roomId"
-                            [scalarToken]="scalarToken"
-                            (updated)="updateIntegration(integration)"></my-integration>
-            <my-integration *ngFor="let integration of integrations | myFilter:'type':'complex-bot'"
-                            [integration]="integration"
-                            [roomId]="roomId"
-                            [scalarToken]="scalarToken"
-                            (updated)="updateIntegration(integration)"></my-integration>
-        </div>
-
-        <!-- ------------------------ -->
-        <!-- BRIDGES                  -->
-        <!-- ------------------------ -->
-        <h4 *ngIf="hasAnyOf('bridge')">
-            Bridges <i class="fa fa-question-circle text-info" style="font-size: 15px;" placement="bottom"
-                       ngbTooltip="Bridges allow people on other platforms to talk in the room"></i>
-        </h4>
-        <div class="integration-container">
-            <my-integration *ngFor="let integration of integrations | myFilter:'type':'bridge'"
-                            [integration]="integration"
-                            [roomId]="roomId"
-                            [scalarToken]="scalarToken"
-                            (updated)="updateIntegration(integration)"></my-integration>
+            <!-- ------------------------ -->
+            <!-- CATEGORIES               -->
+            <!-- ------------------------ -->
+            <div *ngFor="let category of getCategories()">
+                <div class="ibox" *ngIf="getIntegrationsIn(category).length > 0">
+                    <div class="ibox-title">
+                        <h4>{{ category }}</h4>
+                    </div>
+                    <div class="ibox-content">
+                        <div class="integration" *ngFor="let integration of getIntegrationsIn(category)">
+                            <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
+                            <div class="integration-name">{{ integration.name }}</div>
+                            <div class="integration-description">{{ integration.about }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/riot/riot.component.scss b/web/app/riot/riot.component.scss
index e99f9aa..7f3fd9d 100644
--- a/web/app/riot/riot.component.scss
+++ b/web/app/riot/riot.component.scss
@@ -1,20 +1,10 @@
 // component styles are encapsulated and only applied to their components
-.integration-container {
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 20px;
-}
-
-#wrapper {
-  padding: 30px;
-}
-
 my-scalar-close {
   position: fixed;
-  top: 15px;
+  top: 10px;
   right: 15px;
 }
 
-h4 {
-  margin-left: 5px;
+.page-content {
+  padding: 30px;
 }
\ No newline at end of file
diff --git a/web/app/riot/riot.component.ts b/web/app/riot/riot.component.ts
index 251139c..9ff4246 100644
--- a/web/app/riot/riot.component.ts
+++ b/web/app/riot/riot.component.ts
@@ -8,6 +8,12 @@ import { IntegrationService } from "../shared/integration.service";
 import * as _ from "lodash";
 import { IntegrationComponent } from "../integration/integration.component";
 
+const CATEGORY_MAP = {
+    "Widgets": ["widget"],
+    "Bots": ["complex-bot", "bot"],
+    "Bridges": ["bridge"],
+};
+
 @Component({
     selector: "my-riot",
     templateUrl: "./riot.component.html",
@@ -16,15 +22,18 @@ import { IntegrationComponent } from "../integration/integration.component";
 export class RiotComponent {
     @ViewChildren(IntegrationComponent) integrationComponents: Array<IntegrationComponent>;
 
-    public error: string;
-    public integrations: Integration[] = [];
-    public loading = true;
-    public roomId: string;
-    public scalarToken: string;
-    public isEncryptedRoom = false;
+    public isLoading = true;
+    public isError = false;
+    public errorMessage: string;
+    public isRoomEncrypted: boolean;
 
+    private scalarToken: string;
+    private roomId: string;
+    private userId: string;
     private requestedScreen: string = null;
     private requestedIntegration: string = null;
+    private integrationsForCategory: { [category: string]: Integration[] } = {};
+    private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
 
     constructor(private activatedRoute: ActivatedRoute,
                 private api: ApiService,
@@ -35,27 +44,94 @@ export class RiotComponent {
         this.requestedScreen = params.screen;
         this.requestedIntegration = params.integ_id;
 
-        if (!params.scalar_token || !params.room_id) this.error = "Missing scalar token or room ID";
-        else {
+        if (!params.scalar_token || !params.room_id) {
+            console.error("Unable to load Dimension. Missing room ID or scalar token.");
+            this.isError = true;
+            this.isLoading = false;
+            this.errorMessage = "Unable to load Dimension - missing room ID or token.";
+        } else {
             this.roomId = params.room_id;
             this.scalarToken = params.scalar_token;
 
-            this.api.checkScalarToken(params.scalar_token).then(isValid => {
-                if (isValid) this.init();
-                else this.error = "Invalid scalar token";
+            this.api.getTokenOwner(params.scalar_token).then(userId => {
+                if (!userId) {
+                    console.error("No user returned for token. Is the token registered in Dimension?");
+                    this.isError = true;
+                    this.isLoading = false;
+                    this.errorMessage = "Could not verify your token. Please try logging out of Riot and back in. Be sure to back up your encryption keys!";
+                } else {
+                    this.userId = userId;
+                    console.log("Scalar token belongs to " + userId);
+                    this.prepareIntegrations();
+                }
             }).catch(err => {
-                this.error = "Unable to communicate with Dimension";
                 console.error(err);
+                this.isError = true;
+                this.isLoading = false;
+                this.errorMessage = "Unable to communicate with Dimension due to an unknown error.";
             });
         }
     }
 
-    private init() {
+    public hasIntegrations(): boolean {
+        for (const category of this.getCategories()) {
+            if (this.getIntegrationsIn(category).length > 0) return true;
+        }
+
+        return false;
+    }
+
+    public getCategories(): string[] {
+        return Object.keys(this.categoryMap);
+    }
+
+    public getIntegrationsIn(category: string): Integration[] {
+        return this.integrationsForCategory[category];
+    }
+
+    public modifyIntegration(integration: Integration) {
+        console.log(this.userId + " is trying to modify " + integration.name);
+
+        if (integration.hasAdditionalConfig) {
+            // TODO: Navigate to edit screen
+            console.log("EDIT SCREEN FOR " + integration.name);
+        } else {
+            // It's a flip-a-bit (simple bot)
+            // TODO: "Are you sure?" dialog
+
+            let promise = null;
+            if (!integration.isEnabled) {
+                promise = this.scalar.inviteUser(this.roomId, integration.userId);
+            } else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
+
+            // We set this ahead of the promise for debouncing
+            integration.isEnabled = !integration.isEnabled;
+            integration.isUpdating = true;
+            promise.then(() => {
+                integration.isUpdating = false;
+                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");
+            }).catch(err => {
+                integration.isEnabled = !integration.isEnabled; // revert the status change
+                integration.isUpdating = false;
+                console.error(err);
+
+                let errorMessage = null;
+                if (err.json) errorMessage = err.json().error;
+                if (err.response && err.response.error) errorMessage = err.response.error.message;
+                if (!errorMessage) errorMessage = "Could not update integration status";
+
+                this.toaster.pop("error", errorMessage);
+            })
+        }
+    }
+
+    private prepareIntegrations() {
         this.scalar.isRoomEncrypted(this.roomId).then(payload => {
-            this.isEncryptedRoom = payload.response;
+            this.isRoomEncrypted = payload.response;
             return this.api.getIntegrations(this.roomId, this.scalarToken);
         }).then(integrations => {
-            const supportedIntegrations = _.filter(integrations, i => IntegrationService.isSupported(i));
+            const supportedIntegrations: Integration[] = _.filter(integrations, i => IntegrationService.isSupported(i));
 
             for (const integration of supportedIntegrations) {
                 // Widgets technically support encrypted rooms, so unless they explicitly declare that
@@ -65,20 +141,34 @@ export class RiotComponent {
                     integration.supportsEncryptedRooms = true;
             }
 
-            if (this.isEncryptedRoom)
-                this.integrations = _.filter(supportedIntegrations, i => i.supportsEncryptedRooms);
-            else this.integrations = supportedIntegrations;
+            // Flag integrations that aren't supported in encrypted rooms
+            if (this.isRoomEncrypted) {
+                for (const integration of supportedIntegrations) {
+                    if (!integration.supportsEncryptedRooms) {
+                        integration.isSupported = false;
+                        integration.notSupportedReason = "This integration is not supported in encrypted rooms";
+                    }
+                }
+            }
 
-            let promises = this.integrations.map(b => this.updateIntegrationState(b));
+            // Set up the categories
+            for (const category of Object.keys(this.categoryMap)) {
+                const supportedTypes = this.categoryMap[category];
+                this.integrationsForCategory[category] = _.filter(supportedIntegrations, i => supportedTypes.indexOf(i.type) !== -1);
+            }
+
+            let promises = supportedIntegrations.map(i => this.updateIntegrationState(i));
             return Promise.all(promises);
         }).then(() => {
-            this.loading = false;
+            this.isLoading = false;
 
             // HACK: We wait for the digest cycle so we actually have components to look at
             setTimeout(() => this.tryOpenConfigScreen(), 20);
         }).catch(err => {
-            this.error = "Unable to communicate with Dimension";
             console.error(err);
+            this.isError = true;
+            this.isLoading = false;
+            this.errorMessage = "Unable to set up Dimension. This version of Riot may not supported or there may be a problem with the server.";
         });
     }
 
@@ -109,13 +199,14 @@ export class RiotComponent {
     }
 
     private updateIntegrationState(integration: Integration) {
-        integration.hasConfig = IntegrationService.hasConfig(integration);
+        integration.hasAdditionalConfig = IntegrationService.hasConfig(integration);
 
         if (integration.type === "widget") {
             if (!integration.requirements) integration.requirements = {};
             integration.requirements["canSetWidget"] = true;
         }
 
+        // If the integration has requirements, then we'll check those instead of anything else
         if (integration.requirements) {
             let keys = _.keys(integration.requirements);
             let promises = [];
@@ -126,29 +217,30 @@ export class RiotComponent {
             }
 
             return Promise.all(promises).then(() => {
-                integration.isEnabled = true;
-                integration.isBroken = false;
+                integration.isSupported = true;
+                integration.notSupportedReason = null;
             }, error => {
                 console.error(error);
-                integration.bridgeError = error.message || error;
-                integration.isEnabled = false;
-                integration.isBroken = false;
+                integration.isSupported = false;
+                integration.notSupportedReason = error;
             });
         }
 
+        // The integration doesn't have requirements, so we'll just make sure the bot user can be retrieved.
         return this.scalar.getMembershipState(this.roomId, integration.userId).then(payload => {
-            integration.isBroken = false;
-
-            if (!payload.response) {
-                integration.isEnabled = false;
-                return;
+            if (payload.response) {
+                integration.isSupported = true;
+                integration.notSupportedReason = null;
+                integration.isEnabled = (payload.response.membership === "join" || payload.response.membership === "invite");
+            } else {
+                console.error("No response received to membership query of " + integration.userId);
+                integration.isSupported = false;
+                integration.notSupportedReason = "Unable to query membership state for this bot";
             }
-
-            integration.isEnabled = (payload.response.membership === "join" || payload.response.membership === "invite");
         }, (error) => {
             console.error(error);
-            integration.isEnabled = false;
-            integration.isBroken = true;
+            integration.isSupported = false;
+            integration.notSupportedReason = "Unable to query membership state for this bot";
         });
     }
 
@@ -163,50 +255,19 @@ export class RiotComponent {
                     }
                     return payload.response.join_rule === requirement
                         ? Promise.resolve()
-                        : Promise.reject(new Error("The room must be " + requirement + " to use this integration."));
+                        : Promise.reject("The room must be " + requirement + " to use this integration.");
                 });
             case "canSetWidget":
                 const processPayload = payload => {
                     const response = <any>payload.response;
                     if (response === true) return Promise.resolve();
                     if (response.error || response.error.message)
-                        return Promise.reject(new Error("You cannot modify widgets in this room"));
+                        return Promise.reject("You cannot modify widgets in this room");
                     return Promise.reject("Error communicating with Riot");
                 };
                 return this.scalar.canSendEvent(this.roomId, "im.vector.modular.widgets", true).then(processPayload).catch(processPayload);
             default:
-                return Promise.reject(new Error("Requirement '" + key + "' not found"));
+                return Promise.reject("Requirement '" + key + "' not found");
         }
     }
-
-    public updateIntegration(integration: Integration) {
-        let promise = null;
-
-        if (!integration.isEnabled) {
-            promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
-        } else promise = this.scalar.inviteUser(this.roomId, integration.userId);
-
-        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");
-        }).catch(err => {
-            let errorMessage = "Could not update integration status";
-
-            if (err.json) {
-                errorMessage = err.json().error;
-            } else errorMessage = err.response.error.message;
-
-            integration.isEnabled = !integration.isEnabled;
-            this.toaster.pop("error", errorMessage);
-        });
-    }
-
-    public hasAnyOf(...types: string[]): boolean {
-        for (const integration of this.integrations) {
-            if (types.indexOf(integration.type) !== -1) return true;
-        }
-
-        return false;
-    }
 }
diff --git a/web/app/shared/api.service.ts b/web/app/shared/api.service.ts
index d78dc38..f080545 100644
--- a/web/app/shared/api.service.ts
+++ b/web/app/shared/api.service.ts
@@ -12,6 +12,11 @@ export class ApiService {
             .map(res => res.status === 200).toPromise();
     }
 
+    getTokenOwner(scalarToken: String): Promise<string> {
+        return this.http.get("/api/v1/dimension/whoami", {params:{scalar_token:scalarToken}})
+            .map(res => res.status === 200 ? res.json()["userId"] : null).toPromise();
+    }
+
     getIntegrations(roomId: string, scalarToken: string): Promise<Integration[]> {
         return this.http.get("/api/v1/dimension/integrations/" + roomId, {params: {scalar_token: scalarToken}})
             .map(res => res.json()).toPromise();
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index 8f02e8c..9f5b5c6 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -1,4 +1,5 @@
 export interface Integration {
+    // These are from the server
     type: string;
     integrationType: string;
     userId: string;
@@ -6,13 +7,14 @@ export interface Integration {
     avatar: string;
     about: string; // nullable
     supportsEncryptedRooms: boolean;
+    requirements: any; // nullable
 
-    // Set by us
-    isEnabled: boolean;
-    isBroken: boolean;
-    hasConfig: boolean;
-    requirements?: any; // nullable
-    bridgeError: string; // nullable
+    // These are set in the UI
+    isSupported: boolean;
+    notSupportedReason: string;
+    hasAdditionalConfig: boolean;
+    isEnabled: boolean; // for the flip-a-bit integrations
+    isUpdating: boolean;
 }
 
 export interface RSSIntegration extends Integration {
diff --git a/web/app/spinner/spinner.component.html b/web/app/spinner/spinner.component.html
new file mode 100644
index 0000000..86c0ae5
--- /dev/null
+++ b/web/app/spinner/spinner.component.html
@@ -0,0 +1,6 @@
+<div class="sk-folding-cube">
+    <div class="sk-cube1 sk-cube"></div>
+    <div class="sk-cube2 sk-cube"></div>
+    <div class="sk-cube4 sk-cube"></div>
+    <div class="sk-cube3 sk-cube"></div>
+</div>
\ No newline at end of file
diff --git a/web/app/spinner/spinner.component.scss b/web/app/spinner/spinner.component.scss
new file mode 100644
index 0000000..6150188
--- /dev/null
+++ b/web/app/spinner/spinner.component.scss
@@ -0,0 +1,2 @@
+// component styles are encapsulated and only applied to their components
+@import "../../../node_modules/spinkit/scss/spinners/11-folding-cube.scss";
\ No newline at end of file
diff --git a/web/app/spinner/spinner.component.ts b/web/app/spinner/spinner.component.ts
new file mode 100644
index 0000000..98bac06
--- /dev/null
+++ b/web/app/spinner/spinner.component.ts
@@ -0,0 +1,9 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "my-spinner",
+    templateUrl: "./spinner.component.html",
+    styleUrls: ["./spinner.component.scss"],
+})
+export class SpinnerComponent {
+}
diff --git a/web/style/app.scss b/web/style/app.scss
index 2c4be9a..2264990 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -1,11 +1,13 @@
 // styles in src/style directory are applied to the whole page
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
 @import '../../node_modules/angular2-toaster/toaster';
 
 body {
-  background: #ddd !important;
+  background: rgb(238, 238, 238) !important;
   margin: 0;
   padding: 0;
-  color: #222;
+  color: #333;
+  font-family: 'Open Sans', sans-serif;
 }
 
 // HACK: Work around dialog not showing up

From b5a8231a7a5447c51b3082d99eea20ce88ab2b89 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Dec 2017 23:32:23 -0700
Subject: [PATCH 002/111] Update style and layout of header

---
 src/storage/DimensionStore.js                 |  2 +-
 .../page-header/page-header.component.html    |  2 +-
 .../page-header/page-header.component.scss    |  5 ++-
 web/app/riot/riot.component.html              |  6 ++--
 web/app/riot/riot.component.scss              |  6 ----
 .../scalar-close/scalar-close.component.html  |  2 +-
 web/style/_riot.scss                          | 31 +++++++++++++++++++
 web/style/app.scss                            |  1 +
 8 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 web/style/_riot.scss

diff --git a/src/storage/DimensionStore.js b/src/storage/DimensionStore.js
index d013f7e..249bc55 100644
--- a/src/storage/DimensionStore.js
+++ b/src/storage/DimensionStore.js
@@ -101,7 +101,7 @@ class DimensionStore {
         return this.__Tokens.find({where:{scalarToken: scalarToken}}).then(token => {
             if (!token) return Promise.reject(new Error("Token not found"));
             return Promise.resolve(token.matrixUserId);
-        })
+        });
     }
 
     /**
diff --git a/web/app/page-header/page-header.component.html b/web/app/page-header/page-header.component.html
index f183bbf..a88a348 100644
--- a/web/app/page-header/page-header.component.html
+++ b/web/app/page-header/page-header.component.html
@@ -1,7 +1,7 @@
 <div class="header">
     <div class="title">
         <h2 class="pageName">{{ pageName }}</h2>
-        <breadcrumb [allowBootstrap]="false"></breadcrumb>
+        <breadcrumb [allowBootstrap]="true" class="dimension-breadcrumb"></breadcrumb>
     </div>
     <div class="quickAction">
         <ng-content></ng-content>
diff --git a/web/app/page-header/page-header.component.scss b/web/app/page-header/page-header.component.scss
index cbed3ae..d5fdf50 100644
--- a/web/app/page-header/page-header.component.scss
+++ b/web/app/page-header/page-header.component.scss
@@ -11,6 +11,7 @@
   margin: 0;
   width: 83.333333%; // col-sm-10
   padding: 15px;
+  display: inline-block;
 }
 
 .header .title .pageName {
@@ -24,5 +25,7 @@
   margin: 0;
   float: right;
   text-align: right;
-  width: 16.666667%; // col-sm-2
+  display: inline-block;
+  width: 15.666667%; // col-sm-2
+  position: relative;
 }
\ No newline at end of file
diff --git a/web/app/riot/riot.component.html b/web/app/riot/riot.component.html
index 3b962ee..b59e2c3 100644
--- a/web/app/riot/riot.component.html
+++ b/web/app/riot/riot.component.html
@@ -1,7 +1,7 @@
 <div id="wrapper">
-    <my-scalar-close></my-scalar-close>
-
-    <my-page-header pageName="Dimension"></my-page-header>
+    <my-page-header pageName="Dimension">
+        <my-scalar-close class="closeButton"></my-scalar-close>
+    </my-page-header>
 
     <div class="page-content">
         <div *ngIf="isError">
diff --git a/web/app/riot/riot.component.scss b/web/app/riot/riot.component.scss
index 7f3fd9d..dbc8212 100644
--- a/web/app/riot/riot.component.scss
+++ b/web/app/riot/riot.component.scss
@@ -1,10 +1,4 @@
 // component styles are encapsulated and only applied to their components
-my-scalar-close {
-  position: fixed;
-  top: 10px;
-  right: 15px;
-}
-
 .page-content {
   padding: 30px;
 }
\ No newline at end of file
diff --git a/web/app/riot/scalar-close/scalar-close.component.html b/web/app/riot/scalar-close/scalar-close.component.html
index 095359e..34fa9ab 100644
--- a/web/app/riot/scalar-close/scalar-close.component.html
+++ b/web/app/riot/scalar-close/scalar-close.component.html
@@ -1 +1 @@
-<img src="/img/close.svg" (click)="closeScalar()">
\ No newline at end of file
+<img src="/img/close.svg" (click)="closeScalar()" alt="close" title="close" />
\ No newline at end of file
diff --git a/web/style/_riot.scss b/web/style/_riot.scss
new file mode 100644
index 0000000..80fe0b2
--- /dev/null
+++ b/web/style/_riot.scss
@@ -0,0 +1,31 @@
+// The CSS for the Riot breadcrumb is specified here to ensure that it's style can be overridden.
+// In it's current position (as a component), the component-level stylesheet cannot access the
+// elements, so we specify it in a more generic location.
+
+.dimension-breadcrumb {
+  .fluid-bread {
+    padding: 0;
+  }
+
+  .fluid-bread .container {
+    padding: 0;
+  }
+
+  .fluid-bread .container .breadcrumb {
+    padding: 0;
+  }
+
+  .fluid-bread .breadcrumb-item a:hover {
+    text-decoration: none;
+  }
+
+  font-size: 13px;
+  display: block;
+  padding-top: 4px;
+}
+
+.header .quickAction .closeButton img {
+  position: absolute;
+  top: 25px;
+  right: 15px;
+}
\ No newline at end of file
diff --git a/web/style/app.scss b/web/style/app.scss
index 2264990..7a3ccb0 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -1,6 +1,7 @@
 // styles in src/style directory are applied to the whole page
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
 @import '../../node_modules/angular2-toaster/toaster';
+@import "riot";
 
 body {
   background: rgb(238, 238, 238) !important;

From 86a4d8dac27d409de47afe71fff34b488e168f1d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Dec 2017 23:41:56 -0700
Subject: [PATCH 003/111] Set up the correct routing and preparations for the
 "Riot" version of Dimension

---
 web/app/app.module.ts                      |   2 +
 web/app/app.routing.ts                     |  13 +-
 web/app/riot/riot-home/home.component.html |  49 ++++
 web/app/riot/riot-home/home.component.scss |   1 +
 web/app/riot/riot-home/home.component.ts   | 279 +++++++++++++++++++++
 web/app/riot/riot.component.html           |  50 +---
 web/app/riot/riot.component.ts             | 265 +------------------
 7 files changed, 344 insertions(+), 315 deletions(-)
 create mode 100644 web/app/riot/riot-home/home.component.html
 create mode 100644 web/app/riot/riot-home/home.component.scss
 create mode 100644 web/app/riot/riot-home/home.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index dcd56e7..bb8bff0 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -29,6 +29,7 @@ import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.componen
 import { PageHeaderComponent } from "./page-header/page-header.component";
 import { SpinnerComponent } from "./spinner/spinner.component";
 import { BreadcrumbsModule } from "ng2-breadcrumbs";
+import { RiotHomeComponent } from "./riot/riot-home/home.component";
 
 const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigComponents();
 
@@ -62,6 +63,7 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo
         VideoWidgetWrapperComponent,
         JitsiWidgetWrapperComponent,
         GCalWidgetWrapperComponent,
+        RiotHomeComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index d3c3ae7..29afa5e 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -5,12 +5,21 @@ import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic
 import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component";
 import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
 import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
+import { RiotHomeComponent } from "./riot/riot-home/home.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
+    {path: "riot", pathMatch: "full", redirectTo: "riot-app/home"},
     {
-        path: "riot", component: RiotComponent, data: {breadcrumb: "Home"},
-        children: [{path: "test", component: RiotComponent, data: {breadcrumb: "Testing"}}]
+        path: "riot-app",
+        component: RiotComponent,
+        children: [
+            {
+                path: "home",
+                component: RiotHomeComponent,
+                data: {breadcrumb: "Home"},
+            },
+        ],
     },
     {path: "widgets/generic", component: GenericWidgetWrapperComponent},
     {path: "widgets/video", component: VideoWidgetWrapperComponent},
diff --git a/web/app/riot/riot-home/home.component.html b/web/app/riot/riot-home/home.component.html
new file mode 100644
index 0000000..06dbc19
--- /dev/null
+++ b/web/app/riot/riot-home/home.component.html
@@ -0,0 +1,49 @@
+<div *ngIf="isError">
+    <div class="alert alert-danger">{{ errorMessage }}</div>
+</div>
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+
+<div *ngIf="!isLoading && !isError">
+    <!-- ------------------------ -->
+    <!-- EMPTY/ENCRYPTED STATES   -->
+    <!-- ------------------------ -->
+    <div class="alert alert-warning" *ngIf="hasIntegrations() && isRoomEncrypted">
+        <h4>This room is encrypted</h4>
+        <strong>Integrations are not encrypted!</strong>
+        This means that some information about yourself and the
+        room may be leaked to the bot, bridge, or widget. This information includes the room ID, your display
+        name,
+        your username, your avatar, information about Riot, and other similar details. Add integrations with
+        caution.
+    </div>
+    <div class="alert alert-warning" *ngIf="!hasIntegrations() && isRoomEncrypted">
+        <h4>This room is encrypted</h4>
+        There are currently no integrations which support encrypted rooms. Sorry about that!
+    </div>
+    <div class="alert alert-warning" *ngIf="!hasIntegrations() && !isRoomEncrypted">
+        <h4>No integrations available</h4>
+        This room does not have any compatible integrations. Please contact the server owner if you're seeing
+        this
+        message.
+    </div>
+
+    <!-- ------------------------ -->
+    <!-- CATEGORIES               -->
+    <!-- ------------------------ -->
+    <div *ngFor="let category of getCategories()">
+        <div class="ibox" *ngIf="getIntegrationsIn(category).length > 0">
+            <div class="ibox-title">
+                <h4>{{ category }}</h4>
+            </div>
+            <div class="ibox-content">
+                <div class="integration" *ngFor="let integration of getIntegrationsIn(category)">
+                    <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
+                    <div class="integration-name">{{ integration.name }}</div>
+                    <div class="integration-description">{{ integration.about }}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.scss b/web/app/riot/riot-home/home.component.scss
new file mode 100644
index 0000000..12e299a
--- /dev/null
+++ b/web/app/riot/riot-home/home.component.scss
@@ -0,0 +1 @@
+// component styles are encapsulated and only applied to their components
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
new file mode 100644
index 0000000..8f7bfee
--- /dev/null
+++ b/web/app/riot/riot-home/home.component.ts
@@ -0,0 +1,279 @@
+import { Component, ViewChildren } from "@angular/core";
+import { IntegrationService } from "../../shared/integration.service";
+import { IntegrationComponent } from "../../integration/integration.component";
+import { ToasterService } from "angular2-toaster";
+import { Integration } from "../../shared/models/integration";
+import { ActivatedRoute } from "@angular/router";
+import { ApiService } from "../../shared/api.service";
+import { ScalarService } from "../../shared/scalar.service";
+import * as _ from "lodash";
+import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
+
+const CATEGORY_MAP = {
+    "Widgets": ["widget"],
+    "Bots": ["complex-bot", "bot"],
+    "Bridges": ["bridge"],
+};
+
+@Component({
+    selector: "my-riot-home",
+    templateUrl: "./home.component.html",
+    styleUrls: ["./home.component.scss"],
+})
+export class RiotHomeComponent {
+    @ViewChildren(IntegrationComponent) integrationComponents: Array<IntegrationComponent>;
+
+    public isLoading = true;
+    public isError = false;
+    public errorMessage: string;
+    public isRoomEncrypted: boolean;
+
+    private scalarToken: string;
+    private roomId: string;
+    private userId: string;
+    private requestedScreen: string = null;
+    private requestedIntegration: string = null;
+    private integrationsForCategory: { [category: string]: Integration[] } = {};
+    private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
+
+    constructor(private activatedRoute: ActivatedRoute,
+                private api: ApiService,
+                private scalar: ScalarService,
+                private toaster: ToasterService,
+                private sanitizer: DomSanitizer) {
+        let params: any = this.activatedRoute.snapshot.queryParams;
+
+        this.requestedScreen = params.screen;
+        this.requestedIntegration = params.integ_id;
+
+        if (!params.scalar_token || !params.room_id) {
+            console.error("Unable to load Dimension. Missing room ID or scalar token.");
+            this.isError = true;
+            this.isLoading = false;
+            this.errorMessage = "Unable to load Dimension - missing room ID or token.";
+        } else {
+            this.roomId = params.room_id;
+            this.scalarToken = params.scalar_token;
+
+            this.api.getTokenOwner(params.scalar_token).then(userId => {
+                if (!userId) {
+                    console.error("No user returned for token. Is the token registered in Dimension?");
+                    this.isError = true;
+                    this.isLoading = false;
+                    this.errorMessage = "Could not verify your token. Please try logging out of Riot and back in. Be sure to back up your encryption keys!";
+                } else {
+                    this.userId = userId;
+                    console.log("Scalar token belongs to " + userId);
+                    this.prepareIntegrations();
+                }
+            }).catch(err => {
+                console.error(err);
+                this.isError = true;
+                this.isLoading = false;
+                this.errorMessage = "Unable to communicate with Dimension due to an unknown error.";
+            });
+        }
+    }
+
+    public getSafeUrl(url: string): SafeResourceUrl {
+        return this.sanitizer.bypassSecurityTrustResourceUrl(url);
+    }
+
+    public hasIntegrations(): boolean {
+        for (const category of this.getCategories()) {
+            if (this.getIntegrationsIn(category).length > 0) return true;
+        }
+
+        return false;
+    }
+
+    public getCategories(): string[] {
+        return Object.keys(this.categoryMap);
+    }
+
+    public getIntegrationsIn(category: string): Integration[] {
+        return this.integrationsForCategory[category];
+    }
+
+    public modifyIntegration(integration: Integration) {
+        console.log(this.userId + " is trying to modify " + integration.name);
+
+        if (integration.hasAdditionalConfig) {
+            // TODO: Navigate to edit screen
+            console.log("EDIT SCREEN FOR " + integration.name);
+        } else {
+            // It's a flip-a-bit (simple bot)
+            // TODO: "Are you sure?" dialog
+
+            let promise = null;
+            if (!integration.isEnabled) {
+                promise = this.scalar.inviteUser(this.roomId, integration.userId);
+            } else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
+
+            // We set this ahead of the promise for debouncing
+            integration.isEnabled = !integration.isEnabled;
+            integration.isUpdating = true;
+            promise.then(() => {
+                integration.isUpdating = false;
+                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");
+            }).catch(err => {
+                integration.isEnabled = !integration.isEnabled; // revert the status change
+                integration.isUpdating = false;
+                console.error(err);
+
+                let errorMessage = null;
+                if (err.json) errorMessage = err.json().error;
+                if (err.response && err.response.error) errorMessage = err.response.error.message;
+                if (!errorMessage) errorMessage = "Could not update integration status";
+
+                this.toaster.pop("error", errorMessage);
+            })
+        }
+    }
+
+    private prepareIntegrations() {
+        this.scalar.isRoomEncrypted(this.roomId).then(payload => {
+            this.isRoomEncrypted = payload.response;
+            return this.api.getIntegrations(this.roomId, this.scalarToken);
+        }).then(integrations => {
+            const supportedIntegrations: Integration[] = _.filter(integrations, i => IntegrationService.isSupported(i));
+
+            for (const integration of supportedIntegrations) {
+                // Widgets technically support encrypted rooms, so unless they explicitly declare that
+                // they don't, we'll assume they do. A warning about adding widgets in encrypted rooms
+                // is displayed to users elsewhere.
+                if (integration.type === "widget" && integration.supportsEncryptedRooms !== false)
+                    integration.supportsEncryptedRooms = true;
+            }
+
+            // Flag integrations that aren't supported in encrypted rooms
+            if (this.isRoomEncrypted) {
+                for (const integration of supportedIntegrations) {
+                    if (!integration.supportsEncryptedRooms) {
+                        integration.isSupported = false;
+                        integration.notSupportedReason = "This integration is not supported in encrypted rooms";
+                    }
+                }
+            }
+
+            // Set up the categories
+            for (const category of Object.keys(this.categoryMap)) {
+                const supportedTypes = this.categoryMap[category];
+                this.integrationsForCategory[category] = _.filter(supportedIntegrations, i => supportedTypes.indexOf(i.type) !== -1);
+            }
+
+            let promises = supportedIntegrations.map(i => this.updateIntegrationState(i));
+            return Promise.all(promises);
+        }).then(() => {
+            this.isLoading = false;
+
+            // HACK: We wait for the digest cycle so we actually have components to look at
+            setTimeout(() => this.tryOpenConfigScreen(), 20);
+        }).catch(err => {
+            console.error(err);
+            this.isError = true;
+            this.isLoading = false;
+            this.errorMessage = "Unable to set up Dimension. This version of Riot may not supported or there may be a problem with the server.";
+        });
+    }
+
+    private tryOpenConfigScreen() {
+        let type = null;
+        let integrationType = null;
+        if (!this.requestedScreen) return;
+
+        const targetIntegration = IntegrationService.getIntegrationForScreen(this.requestedScreen);
+        if (targetIntegration) {
+            type = targetIntegration.type;
+            integrationType = targetIntegration.integrationType;
+        } else {
+            console.log("Unknown screen requested: " + this.requestedScreen);
+        }
+
+        let opened = false;
+        this.integrationComponents.forEach(component => {
+            if (opened) return;
+            if (component.integration.type !== type || component.integration.integrationType !== integrationType) return;
+            console.log("Configuring integration " + this.requestedIntegration + " type=" + type + " integrationType=" + integrationType);
+            component.configureIntegration(this.requestedIntegration);
+            opened = true;
+        });
+        if (!opened) {
+            console.log("Failed to find integration component for type=" + type + " integrationType=" + integrationType);
+        }
+    }
+
+    private updateIntegrationState(integration: Integration) {
+        integration.hasAdditionalConfig = IntegrationService.hasConfig(integration);
+
+        if (integration.type === "widget") {
+            if (!integration.requirements) integration.requirements = {};
+            integration.requirements["canSetWidget"] = true;
+        }
+
+        // If the integration has requirements, then we'll check those instead of anything else
+        if (integration.requirements) {
+            let keys = _.keys(integration.requirements);
+            let promises = [];
+
+            for (let key of keys) {
+                let requirement = this.checkRequirement(integration, key);
+                promises.push(requirement);
+            }
+
+            return Promise.all(promises).then(() => {
+                integration.isSupported = true;
+                integration.notSupportedReason = null;
+            }, error => {
+                console.error(error);
+                integration.isSupported = false;
+                integration.notSupportedReason = error;
+            });
+        }
+
+        // The integration doesn't have requirements, so we'll just make sure the bot user can be retrieved.
+        return this.scalar.getMembershipState(this.roomId, integration.userId).then(payload => {
+            if (payload.response) {
+                integration.isSupported = true;
+                integration.notSupportedReason = null;
+                integration.isEnabled = (payload.response.membership === "join" || payload.response.membership === "invite");
+            } else {
+                console.error("No response received to membership query of " + integration.userId);
+                integration.isSupported = false;
+                integration.notSupportedReason = "Unable to query membership state for this bot";
+            }
+        }, (error) => {
+            console.error(error);
+            integration.isSupported = false;
+            integration.notSupportedReason = "Unable to query membership state for this bot";
+        });
+    }
+
+    private checkRequirement(integration: Integration, key: string) {
+        let requirement = integration.requirements[key];
+
+        switch (key) {
+            case "joinRule":
+                return this.scalar.getJoinRule(this.roomId).then(payload => {
+                    if (!payload.response) {
+                        return Promise.reject("Could not communicate with Riot");
+                    }
+                    return payload.response.join_rule === requirement
+                        ? Promise.resolve()
+                        : Promise.reject("The room must be " + requirement + " to use this integration.");
+                });
+            case "canSetWidget":
+                const processPayload = payload => {
+                    const response = <any>payload.response;
+                    if (response === true) return Promise.resolve();
+                    if (response.error || response.error.message)
+                        return Promise.reject("You cannot modify widgets in this room");
+                    return Promise.reject("Error communicating with Riot");
+                };
+                return this.scalar.canSendEvent(this.roomId, "im.vector.modular.widgets", true).then(processPayload).catch(processPayload);
+            default:
+                return Promise.reject("Requirement '" + key + "' not found");
+        }
+    }
+}
diff --git a/web/app/riot/riot.component.html b/web/app/riot/riot.component.html
index b59e2c3..a2be092 100644
--- a/web/app/riot/riot.component.html
+++ b/web/app/riot/riot.component.html
@@ -4,54 +4,6 @@
     </my-page-header>
 
     <div class="page-content">
-        <div *ngIf="isError">
-            <div class="alert alert-danger">{{ errorMessage }}</div>
-        </div>
-        <div *ngIf="isLoading">
-            <my-spinner></my-spinner>
-        </div>
-
-        <div *ngIf="!isLoading && !isError">
-            <!-- ------------------------ -->
-            <!-- EMPTY/ENCRYPTED STATES   -->
-            <!-- ------------------------ -->
-            <div class="alert alert-warning" *ngIf="hasIntegrations() && isRoomEncrypted">
-                <h4>This room is encrypted</h4>
-                <strong>Integrations are not encrypted!</strong>
-                This means that some information about yourself and the
-                room may be leaked to the bot, bridge, or widget. This information includes the room ID, your display
-                name,
-                your username, your avatar, information about Riot, and other similar details. Add integrations with
-                caution.
-            </div>
-            <div class="alert alert-warning" *ngIf="!hasIntegrations() && isRoomEncrypted">
-                <h4>This room is encrypted</h4>
-                There are currently no integrations which support encrypted rooms. Sorry about that!
-            </div>
-            <div class="alert alert-warning" *ngIf="!hasIntegrations() && !isRoomEncrypted">
-                <h4>No integrations available</h4>
-                This room does not have any compatible integrations. Please contact the server owner if you're seeing
-                this
-                message.
-            </div>
-
-            <!-- ------------------------ -->
-            <!-- CATEGORIES               -->
-            <!-- ------------------------ -->
-            <div *ngFor="let category of getCategories()">
-                <div class="ibox" *ngIf="getIntegrationsIn(category).length > 0">
-                    <div class="ibox-title">
-                        <h4>{{ category }}</h4>
-                    </div>
-                    <div class="ibox-content">
-                        <div class="integration" *ngFor="let integration of getIntegrationsIn(category)">
-                            <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
-                            <div class="integration-name">{{ integration.name }}</div>
-                            <div class="integration-description">{{ integration.about }}</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
+        <router-outlet></router-outlet>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/riot/riot.component.ts b/web/app/riot/riot.component.ts
index 9ff4246..de6e3db 100644
--- a/web/app/riot/riot.component.ts
+++ b/web/app/riot/riot.component.ts
@@ -1,18 +1,4 @@
-import { Component, ViewChildren } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
-import { ApiService } from "../shared/api.service";
-import { ScalarService } from "../shared/scalar.service";
-import { ToasterService } from "angular2-toaster";
-import { Integration } from "../shared/models/integration";
-import { IntegrationService } from "../shared/integration.service";
-import * as _ from "lodash";
-import { IntegrationComponent } from "../integration/integration.component";
-
-const CATEGORY_MAP = {
-    "Widgets": ["widget"],
-    "Bots": ["complex-bot", "bot"],
-    "Bridges": ["bridge"],
-};
+import { Component } from "@angular/core";
 
 @Component({
     selector: "my-riot",
@@ -20,254 +6,5 @@ const CATEGORY_MAP = {
     styleUrls: ["./riot.component.scss"],
 })
 export class RiotComponent {
-    @ViewChildren(IntegrationComponent) integrationComponents: Array<IntegrationComponent>;
 
-    public isLoading = true;
-    public isError = false;
-    public errorMessage: string;
-    public isRoomEncrypted: boolean;
-
-    private scalarToken: string;
-    private roomId: string;
-    private userId: string;
-    private requestedScreen: string = null;
-    private requestedIntegration: string = null;
-    private integrationsForCategory: { [category: string]: Integration[] } = {};
-    private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
-
-    constructor(private activatedRoute: ActivatedRoute,
-                private api: ApiService,
-                private scalar: ScalarService,
-                private toaster: ToasterService) {
-        let params: any = this.activatedRoute.snapshot.queryParams;
-
-        this.requestedScreen = params.screen;
-        this.requestedIntegration = params.integ_id;
-
-        if (!params.scalar_token || !params.room_id) {
-            console.error("Unable to load Dimension. Missing room ID or scalar token.");
-            this.isError = true;
-            this.isLoading = false;
-            this.errorMessage = "Unable to load Dimension - missing room ID or token.";
-        } else {
-            this.roomId = params.room_id;
-            this.scalarToken = params.scalar_token;
-
-            this.api.getTokenOwner(params.scalar_token).then(userId => {
-                if (!userId) {
-                    console.error("No user returned for token. Is the token registered in Dimension?");
-                    this.isError = true;
-                    this.isLoading = false;
-                    this.errorMessage = "Could not verify your token. Please try logging out of Riot and back in. Be sure to back up your encryption keys!";
-                } else {
-                    this.userId = userId;
-                    console.log("Scalar token belongs to " + userId);
-                    this.prepareIntegrations();
-                }
-            }).catch(err => {
-                console.error(err);
-                this.isError = true;
-                this.isLoading = false;
-                this.errorMessage = "Unable to communicate with Dimension due to an unknown error.";
-            });
-        }
-    }
-
-    public hasIntegrations(): boolean {
-        for (const category of this.getCategories()) {
-            if (this.getIntegrationsIn(category).length > 0) return true;
-        }
-
-        return false;
-    }
-
-    public getCategories(): string[] {
-        return Object.keys(this.categoryMap);
-    }
-
-    public getIntegrationsIn(category: string): Integration[] {
-        return this.integrationsForCategory[category];
-    }
-
-    public modifyIntegration(integration: Integration) {
-        console.log(this.userId + " is trying to modify " + integration.name);
-
-        if (integration.hasAdditionalConfig) {
-            // TODO: Navigate to edit screen
-            console.log("EDIT SCREEN FOR " + integration.name);
-        } else {
-            // It's a flip-a-bit (simple bot)
-            // TODO: "Are you sure?" dialog
-
-            let promise = null;
-            if (!integration.isEnabled) {
-                promise = this.scalar.inviteUser(this.roomId, integration.userId);
-            } else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
-
-            // We set this ahead of the promise for debouncing
-            integration.isEnabled = !integration.isEnabled;
-            integration.isUpdating = true;
-            promise.then(() => {
-                integration.isUpdating = false;
-                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");
-            }).catch(err => {
-                integration.isEnabled = !integration.isEnabled; // revert the status change
-                integration.isUpdating = false;
-                console.error(err);
-
-                let errorMessage = null;
-                if (err.json) errorMessage = err.json().error;
-                if (err.response && err.response.error) errorMessage = err.response.error.message;
-                if (!errorMessage) errorMessage = "Could not update integration status";
-
-                this.toaster.pop("error", errorMessage);
-            })
-        }
-    }
-
-    private prepareIntegrations() {
-        this.scalar.isRoomEncrypted(this.roomId).then(payload => {
-            this.isRoomEncrypted = payload.response;
-            return this.api.getIntegrations(this.roomId, this.scalarToken);
-        }).then(integrations => {
-            const supportedIntegrations: Integration[] = _.filter(integrations, i => IntegrationService.isSupported(i));
-
-            for (const integration of supportedIntegrations) {
-                // Widgets technically support encrypted rooms, so unless they explicitly declare that
-                // they don't, we'll assume they do. A warning about adding widgets in encrypted rooms
-                // is displayed to users elsewhere.
-                if (integration.type === "widget" && integration.supportsEncryptedRooms !== false)
-                    integration.supportsEncryptedRooms = true;
-            }
-
-            // Flag integrations that aren't supported in encrypted rooms
-            if (this.isRoomEncrypted) {
-                for (const integration of supportedIntegrations) {
-                    if (!integration.supportsEncryptedRooms) {
-                        integration.isSupported = false;
-                        integration.notSupportedReason = "This integration is not supported in encrypted rooms";
-                    }
-                }
-            }
-
-            // Set up the categories
-            for (const category of Object.keys(this.categoryMap)) {
-                const supportedTypes = this.categoryMap[category];
-                this.integrationsForCategory[category] = _.filter(supportedIntegrations, i => supportedTypes.indexOf(i.type) !== -1);
-            }
-
-            let promises = supportedIntegrations.map(i => this.updateIntegrationState(i));
-            return Promise.all(promises);
-        }).then(() => {
-            this.isLoading = false;
-
-            // HACK: We wait for the digest cycle so we actually have components to look at
-            setTimeout(() => this.tryOpenConfigScreen(), 20);
-        }).catch(err => {
-            console.error(err);
-            this.isError = true;
-            this.isLoading = false;
-            this.errorMessage = "Unable to set up Dimension. This version of Riot may not supported or there may be a problem with the server.";
-        });
-    }
-
-    private tryOpenConfigScreen() {
-        let type = null;
-        let integrationType = null;
-        if (!this.requestedScreen) return;
-
-        const targetIntegration = IntegrationService.getIntegrationForScreen(this.requestedScreen);
-        if (targetIntegration) {
-            type = targetIntegration.type;
-            integrationType = targetIntegration.integrationType;
-        } else {
-            console.log("Unknown screen requested: " + this.requestedScreen);
-        }
-
-        let opened = false;
-        this.integrationComponents.forEach(component => {
-            if (opened) return;
-            if (component.integration.type !== type || component.integration.integrationType !== integrationType) return;
-            console.log("Configuring integration " + this.requestedIntegration + " type=" + type + " integrationType=" + integrationType);
-            component.configureIntegration(this.requestedIntegration);
-            opened = true;
-        });
-        if (!opened) {
-            console.log("Failed to find integration component for type=" + type + " integrationType=" + integrationType);
-        }
-    }
-
-    private updateIntegrationState(integration: Integration) {
-        integration.hasAdditionalConfig = IntegrationService.hasConfig(integration);
-
-        if (integration.type === "widget") {
-            if (!integration.requirements) integration.requirements = {};
-            integration.requirements["canSetWidget"] = true;
-        }
-
-        // If the integration has requirements, then we'll check those instead of anything else
-        if (integration.requirements) {
-            let keys = _.keys(integration.requirements);
-            let promises = [];
-
-            for (let key of keys) {
-                let requirement = this.checkRequirement(integration, key);
-                promises.push(requirement);
-            }
-
-            return Promise.all(promises).then(() => {
-                integration.isSupported = true;
-                integration.notSupportedReason = null;
-            }, error => {
-                console.error(error);
-                integration.isSupported = false;
-                integration.notSupportedReason = error;
-            });
-        }
-
-        // The integration doesn't have requirements, so we'll just make sure the bot user can be retrieved.
-        return this.scalar.getMembershipState(this.roomId, integration.userId).then(payload => {
-            if (payload.response) {
-                integration.isSupported = true;
-                integration.notSupportedReason = null;
-                integration.isEnabled = (payload.response.membership === "join" || payload.response.membership === "invite");
-            } else {
-                console.error("No response received to membership query of " + integration.userId);
-                integration.isSupported = false;
-                integration.notSupportedReason = "Unable to query membership state for this bot";
-            }
-        }, (error) => {
-            console.error(error);
-            integration.isSupported = false;
-            integration.notSupportedReason = "Unable to query membership state for this bot";
-        });
-    }
-
-    private checkRequirement(integration: Integration, key: string) {
-        let requirement = integration.requirements[key];
-
-        switch (key) {
-            case "joinRule":
-                return this.scalar.getJoinRule(this.roomId).then(payload => {
-                    if (!payload.response) {
-                        return Promise.reject("Could not communicate with Riot");
-                    }
-                    return payload.response.join_rule === requirement
-                        ? Promise.resolve()
-                        : Promise.reject("The room must be " + requirement + " to use this integration.");
-                });
-            case "canSetWidget":
-                const processPayload = payload => {
-                    const response = <any>payload.response;
-                    if (response === true) return Promise.resolve();
-                    if (response.error || response.error.message)
-                        return Promise.reject("You cannot modify widgets in this room");
-                    return Promise.reject("Error communicating with Riot");
-                };
-                return this.scalar.canSendEvent(this.roomId, "im.vector.modular.widgets", true).then(processPayload).catch(processPayload);
-            default:
-                return Promise.reject("Requirement '" + key + "' not found");
-        }
-    }
 }

From e8f1167ec23546c5f159123a2b8c099bc435669a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Dec 2017 23:46:17 -0700
Subject: [PATCH 004/111] Organize the shared folder a bit

---
 web/app/app.module.ts                         | 12 ++++------
 web/app/configs/irc/irc-config.component.ts   |  4 ++--
 web/app/configs/rss/rss-config.component.ts   |  2 +-
 .../travisci/travisci-config.component.ts     |  2 +-
 .../custom_widget-config.component.ts         |  2 +-
 .../etherpad/etherpad-config.component.ts     |  2 +-
 .../googlecalendar-config.component.ts        |  2 +-
 .../googledocs/googledocs-config.component.ts |  2 +-
 .../widget/jitsi/jitsi-config.component.ts    |  2 +-
 .../widget/twitch/twitch-config.component.ts  |  2 +-
 web/app/configs/widget/widget.component.ts    |  2 +-
 .../youtube/youtube-config.component.ts       |  2 +-
 web/app/integration/integration.component.ts  |  2 +-
 web/app/riot/riot-home/home.component.ts      |  6 ++---
 .../scalar-close/scalar-close.component.ts    |  2 +-
 .../toggle-fullscreen.directive.ts            |  0
 web/app/shared/my-filter.pipe.ts              | 13 ----------
 web/app/shared/{ => services}/api.service.ts  |  2 +-
 .../{ => services}/integration.service.ts     | 24 +++++++++----------
 .../shared/{ => services}/irc-api.service.ts  |  0
 .../shared/{ => services}/scalar.service.ts   |  4 ++--
 .../generic/generic.component.ts              |  2 +-
 .../widget_wrappers/jitsi/jitsi.component.ts  |  2 +-
 23 files changed, 39 insertions(+), 54 deletions(-)
 rename web/app/shared/{ => directives}/toggle-fullscreen.directive.ts (100%)
 delete mode 100644 web/app/shared/my-filter.pipe.ts
 rename web/app/shared/{ => services}/api.service.ts (97%)
 rename web/app/shared/{ => services}/integration.service.ts (76%)
 rename web/app/shared/{ => services}/irc-api.service.ts (100%)
 rename web/app/shared/{ => services}/scalar.service.ts (97%)

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index bb8bff0..8b5a035 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -8,20 +8,19 @@ import { routing } from "./app.routing";
 import { createNewHosts, removeNgStyles } from "@angularclass/hmr";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import { RiotComponent } from "./riot/riot.component";
-import { ApiService } from "./shared/api.service";
+import { ApiService } from "./shared/services/api.service";
 import { UiSwitchModule } from "angular2-ui-switch";
-import { ScalarService } from "./shared/scalar.service";
+import { ScalarService } from "./shared/services/scalar.service";
 import { ToasterModule } from "angular2-toaster";
 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 { IntegrationService } from "./shared/services/integration.service";
 import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap";
 import { ModalModule } from "ngx-modialog";
-import { IrcApiService } from "./shared/irc-api.service";
-import { MyFilterPipe } from "./shared/my-filter.pipe";
+import { IrcApiService } from "./shared/services/irc-api.service";
 import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic.component";
-import { ToggleFullscreenDirective } from "./shared/toggle-fullscreen.directive";
+import { ToggleFullscreenDirective } from "./shared/directives/toggle-fullscreen.directive";
 import { FullscreenButtonComponent } from "./fullscreen-button/fullscreen-button.component";
 import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component";
 import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
@@ -56,7 +55,6 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo
         PageHeaderComponent,
         SpinnerComponent,
         ScalarCloseComponent,
-        MyFilterPipe,
         GenericWidgetWrapperComponent,
         ToggleFullscreenDirective,
         FullscreenButtonComponent,
diff --git a/web/app/configs/irc/irc-config.component.ts b/web/app/configs/irc/irc-config.component.ts
index c6e1e05..4bf0d67 100644
--- a/web/app/configs/irc/irc-config.component.ts
+++ b/web/app/configs/irc/irc-config.component.ts
@@ -2,10 +2,10 @@ import { Component, OnDestroy } from "@angular/core";
 import { IRCIntegration } from "../../shared/models/integration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
-import { IrcApiService } from "../../shared/irc-api.service";
+import { IrcApiService } from "../../shared/services/irc-api.service";
 import { ToasterService } from "angular2-toaster";
 import { IntervalObservable } from "rxjs/observable/IntervalObservable";
-import { ApiService } from "../../shared/api.service";
+import { ApiService } from "../../shared/services/api.service";
 import { Subscription } from "rxjs";
 
 @Component({
diff --git a/web/app/configs/rss/rss-config.component.ts b/web/app/configs/rss/rss-config.component.ts
index 5a4f642..fdc342b 100644
--- a/web/app/configs/rss/rss-config.component.ts
+++ b/web/app/configs/rss/rss-config.component.ts
@@ -3,7 +3,7 @@ import { RSSIntegration } from "../../shared/models/integration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/api.service";
+import { ApiService } from "../../shared/services/api.service";
 
 @Component({
     selector: "my-rss-config",
diff --git a/web/app/configs/travisci/travisci-config.component.ts b/web/app/configs/travisci/travisci-config.component.ts
index 6433f59..f755946 100644
--- a/web/app/configs/travisci/travisci-config.component.ts
+++ b/web/app/configs/travisci/travisci-config.component.ts
@@ -3,7 +3,7 @@ import { TravisCiIntegration } from "../../shared/models/integration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/api.service";
+import { ApiService } from "../../shared/services/api.service";
 
 @Component({
     selector: "my-travisci-config",
diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts b/web/app/configs/widget/custom_widget/custom_widget-config.component.ts
index 98dc0dd..27c15e6 100644
--- a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts
+++ b/web/app/configs/widget/custom_widget/custom_widget-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { WIDGET_CUSTOM } from "../../../shared/models/widget";
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.ts b/web/app/configs/widget/etherpad/etherpad-config.component.ts
index 691c3c1..1afc303 100644
--- a/web/app/configs/widget/etherpad/etherpad-config.component.ts
+++ b/web/app/configs/widget/etherpad/etherpad-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { WIDGET_ETHERPAD } from "../../../shared/models/widget";
diff --git a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts b/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
index 9eae321..6fefa91 100644
--- a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
+++ b/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_GOOGLE_CALENDAR } from "../../../shared/models/widget";
diff --git a/web/app/configs/widget/googledocs/googledocs-config.component.ts b/web/app/configs/widget/googledocs/googledocs-config.component.ts
index 6f69e73..74f25e4 100644
--- a/web/app/configs/widget/googledocs/googledocs-config.component.ts
+++ b/web/app/configs/widget/googledocs/googledocs-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { WIDGET_GOOGLE_DOCS } from "../../../shared/models/widget";
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.ts b/web/app/configs/widget/jitsi/jitsi-config.component.ts
index 85296c6..fc5a3f1 100644
--- a/web/app/configs/widget/jitsi/jitsi-config.component.ts
+++ b/web/app/configs/widget/jitsi/jitsi-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_JITSI } from "../../../shared/models/widget";
diff --git a/web/app/configs/widget/twitch/twitch-config.component.ts b/web/app/configs/widget/twitch/twitch-config.component.ts
index fd94740..e15e2b5 100644
--- a/web/app/configs/widget/twitch/twitch-config.component.ts
+++ b/web/app/configs/widget/twitch/twitch-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_TWITCH } from "../../../shared/models/widget";
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index fb19d5a..1821178 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,4 +1,4 @@
-import { ScalarService } from "../../shared/scalar.service";
+import { ScalarService } from "../../shared/services/scalar.service";
 import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
 import { Integration } from "../../shared/models/integration";
diff --git a/web/app/configs/widget/youtube/youtube-config.component.ts b/web/app/configs/widget/youtube/youtube-config.component.ts
index 6c46820..938f667 100644
--- a/web/app/configs/widget/youtube/youtube-config.component.ts
+++ b/web/app/configs/widget/youtube/youtube-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/scalar.service";
+import { ScalarService } from "../../../shared/services/scalar.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_YOUTUBE } from "../../../shared/models/widget";
diff --git a/web/app/integration/integration.component.ts b/web/app/integration/integration.component.ts
index 60de92c..ba4467a 100644
--- a/web/app/integration/integration.component.ts
+++ b/web/app/integration/integration.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { Integration } from "../shared/models/integration";
 import { overlayConfigFactory } from "ngx-modialog";
 import { BSModalContext, Modal } from "ngx-modialog/plugins/bootstrap";
-import { IntegrationService } from "../shared/integration.service";
+import { IntegrationService } from "../shared/services/integration.service";
 
 export class ConfigModalContext extends BSModalContext {
     public integration: Integration;
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 8f7bfee..3b89dca 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -1,11 +1,11 @@
 import { Component, ViewChildren } from "@angular/core";
-import { IntegrationService } from "../../shared/integration.service";
+import { IntegrationService } from "../../shared/services/integration.service";
 import { IntegrationComponent } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { Integration } from "../../shared/models/integration";
 import { ActivatedRoute } from "@angular/router";
-import { ApiService } from "../../shared/api.service";
-import { ScalarService } from "../../shared/scalar.service";
+import { ApiService } from "../../shared/services/api.service";
+import { ScalarService } from "../../shared/services/scalar.service";
 import * as _ from "lodash";
 import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 
diff --git a/web/app/riot/scalar-close/scalar-close.component.ts b/web/app/riot/scalar-close/scalar-close.component.ts
index 707e01d..2c073bc 100644
--- a/web/app/riot/scalar-close/scalar-close.component.ts
+++ b/web/app/riot/scalar-close/scalar-close.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ScalarService } from "../../shared/scalar.service";
+import { ScalarService } from "../../shared/services/scalar.service";
 
 @Component({
     selector: "my-scalar-close",
diff --git a/web/app/shared/toggle-fullscreen.directive.ts b/web/app/shared/directives/toggle-fullscreen.directive.ts
similarity index 100%
rename from web/app/shared/toggle-fullscreen.directive.ts
rename to web/app/shared/directives/toggle-fullscreen.directive.ts
diff --git a/web/app/shared/my-filter.pipe.ts b/web/app/shared/my-filter.pipe.ts
deleted file mode 100644
index 01dfc4d..0000000
--- a/web/app/shared/my-filter.pipe.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Pipe, PipeTransform } from "@angular/core";
-
-@Pipe({
-    name: "myFilter",
-    pure: false
-})
-export class MyFilterPipe implements PipeTransform {
-    transform(items: any[], field: string, value: string): any[] {
-        if (!items) return [];
-        if (!value || value.length === 0) return items;
-        return items.filter(it => it[field].toLowerCase() === value.toLowerCase());
-    }
-}
diff --git a/web/app/shared/api.service.ts b/web/app/shared/services/api.service.ts
similarity index 97%
rename from web/app/shared/api.service.ts
rename to web/app/shared/services/api.service.ts
index f080545..b5d3b16 100644
--- a/web/app/shared/api.service.ts
+++ b/web/app/shared/services/api.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { Integration } from "./models/integration";
+import { Integration } from "../models/integration";
 
 @Injectable()
 export class ApiService {
diff --git a/web/app/shared/integration.service.ts b/web/app/shared/services/integration.service.ts
similarity index 76%
rename from web/app/shared/integration.service.ts
rename to web/app/shared/services/integration.service.ts
index c4fe7d2..158a1c6 100644
--- a/web/app/shared/integration.service.ts
+++ b/web/app/shared/services/integration.service.ts
@@ -1,20 +1,20 @@
 import { Injectable } from "@angular/core";
-import { Integration } from "./models/integration";
-import { RssConfigComponent } from "../configs/rss/rss-config.component";
+import { Integration } from "../models/integration";
+import { RssConfigComponent } from "../../configs/rss/rss-config.component";
 import { ContainerContent } from "ngx-modialog";
-import { IrcConfigComponent } from "../configs/irc/irc-config.component";
-import { TravisCiConfigComponent } from "../configs/travisci/travisci-config.component";
-import { CustomWidgetConfigComponent } from "../configs/widget/custom_widget/custom_widget-config.component";
-import { YoutubeWidgetConfigComponent } from "../configs/widget/youtube/youtube-config.component";
-import { TwitchWidgetConfigComponent } from "../configs/widget/twitch/twitch-config.component";
-import { EtherpadWidgetConfigComponent } from "../configs/widget/etherpad/etherpad-config.component";
-import { JitsiWidgetConfigComponent } from "../configs/widget/jitsi/jitsi-config.component";
+import { IrcConfigComponent } from "../../configs/irc/irc-config.component";
+import { TravisCiConfigComponent } from "../../configs/travisci/travisci-config.component";
+import { CustomWidgetConfigComponent } from "../../configs/widget/custom_widget/custom_widget-config.component";
+import { YoutubeWidgetConfigComponent } from "../../configs/widget/youtube/youtube-config.component";
+import { TwitchWidgetConfigComponent } from "../../configs/widget/twitch/twitch-config.component";
+import { EtherpadWidgetConfigComponent } from "../../configs/widget/etherpad/etherpad-config.component";
+import { JitsiWidgetConfigComponent } from "../../configs/widget/jitsi/jitsi-config.component";
 import {
     WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
     WIDGET_YOUTUBE
-} from "./models/widget";
-import { GoogleDocsWidgetConfigComponent } from "../configs/widget/googledocs/googledocs-config.component";
-import { GoogleCalendarWidgetConfigComponent } from "../configs/widget/googlecalendar/googlecalendar-config.component";
+} from "../models/widget";
+import { GoogleDocsWidgetConfigComponent } from "../../configs/widget/googledocs/googledocs-config.component";
+import { GoogleCalendarWidgetConfigComponent } from "../../configs/widget/googlecalendar/googlecalendar-config.component";
 
 @Injectable()
 export class IntegrationService {
diff --git a/web/app/shared/irc-api.service.ts b/web/app/shared/services/irc-api.service.ts
similarity index 100%
rename from web/app/shared/irc-api.service.ts
rename to web/app/shared/services/irc-api.service.ts
diff --git a/web/app/shared/scalar.service.ts b/web/app/shared/services/scalar.service.ts
similarity index 97%
rename from web/app/shared/scalar.service.ts
rename to web/app/shared/services/scalar.service.ts
index fd0dd69..0a86582 100644
--- a/web/app/shared/scalar.service.ts
+++ b/web/app/shared/services/scalar.service.ts
@@ -6,8 +6,8 @@ import {
     MembershipStateResponse, RoomEncryptionStatusResponse,
     ScalarSuccessResponse,
     WidgetsResponse
-} from "./models/scalar_responses";
-import { EditableWidget } from "./models/widget";
+} from "../models/scalar_responses";
+import { EditableWidget } from "../models/widget";
 
 @Injectable()
 export class ScalarService {
diff --git a/web/app/widget_wrappers/generic/generic.component.ts b/web/app/widget_wrappers/generic/generic.component.ts
index 1239ed1..3957941 100644
--- a/web/app/widget_wrappers/generic/generic.component.ts
+++ b/web/app/widget_wrappers/generic/generic.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ApiService } from "../../shared/api.service";
+import { ApiService } from "../../shared/services/api.service";
 import { ActivatedRoute } from "@angular/router";
 import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
 
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.ts b/web/app/widget_wrappers/jitsi/jitsi.component.ts
index 9ed696b..b1500e2 100644
--- a/web/app/widget_wrappers/jitsi/jitsi.component.ts
+++ b/web/app/widget_wrappers/jitsi/jitsi.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import * as $ from "jquery";
-import { ApiService } from "../../shared/api.service";
+import { ApiService } from "../../shared/services/api.service";
 import { JitsiWidgetIntegration } from "../../shared/models/integration";
 
 declare var JitsiMeetExternalAPI: any;

From d02830e1701193b7131e702d8ca101452df8096a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Dec 2017 23:52:36 -0700
Subject: [PATCH 005/111] Generify some widget wrappers

---
 web/app/app.routing.ts                              | 13 +++++++++----
 .../fullpage-iframe.component.html}                 |  0
 .../fullpage-iframe.component.scss}                 |  0
 web/app/widget_wrappers/gcal/gcal.component.ts      |  4 ++--
 .../widget_wrappers/generic/generic.component.html  |  3 +--
 .../widget_wrappers/generic/generic.component.scss  |  4 ++--
 web/app/widget_wrappers/video/video.component.html  |  1 -
 web/app/widget_wrappers/video/video.component.scss  | 10 ----------
 web/app/widget_wrappers/video/video.component.ts    |  4 ++--
 9 files changed, 16 insertions(+), 23 deletions(-)
 rename web/app/widget_wrappers/{gcal/gcal.component.html => fullpage-iframe/fullpage-iframe.component.html} (100%)
 rename web/app/widget_wrappers/{gcal/gcal.component.scss => fullpage-iframe/fullpage-iframe.component.scss} (100%)
 delete mode 100644 web/app/widget_wrappers/video/video.component.html
 delete mode 100644 web/app/widget_wrappers/video/video.component.scss

diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 29afa5e..5e8ad8f 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -21,10 +21,15 @@ const routes: Routes = [
             },
         ],
     },
-    {path: "widgets/generic", component: GenericWidgetWrapperComponent},
-    {path: "widgets/video", component: VideoWidgetWrapperComponent},
-    {path: "widgets/jitsi", component: JitsiWidgetWrapperComponent},
-    {path: "widgets/gcal", component: GCalWidgetWrapperComponent},
+    {
+        path: "widgets",
+        children: [
+            {path: "generic", component: GenericWidgetWrapperComponent},
+            {path: "video", component: VideoWidgetWrapperComponent},
+            {path: "jitsi", component: JitsiWidgetWrapperComponent},
+            {path: "gcal", component: GCalWidgetWrapperComponent},
+        ]
+    },
 ];
 
 export const routing = RouterModule.forRoot(routes);
diff --git a/web/app/widget_wrappers/gcal/gcal.component.html b/web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.html
similarity index 100%
rename from web/app/widget_wrappers/gcal/gcal.component.html
rename to web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.html
diff --git a/web/app/widget_wrappers/gcal/gcal.component.scss b/web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.scss
similarity index 100%
rename from web/app/widget_wrappers/gcal/gcal.component.scss
rename to web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.scss
diff --git a/web/app/widget_wrappers/gcal/gcal.component.ts b/web/app/widget_wrappers/gcal/gcal.component.ts
index 9cb6ece..8900426 100644
--- a/web/app/widget_wrappers/gcal/gcal.component.ts
+++ b/web/app/widget_wrappers/gcal/gcal.component.ts
@@ -4,8 +4,8 @@ import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
 
 @Component({
     selector: "my-gcal-widget-wrapper",
-    templateUrl: "gcal.component.html",
-    styleUrls: ["gcal.component.scss"],
+    templateUrl: "../fullpage-iframe/fullpage-iframe.component.html",
+    styleUrls: ["../fullpage-iframe/fullpage-iframe.component.scss"],
 })
 export class GCalWidgetWrapperComponent {
 
diff --git a/web/app/widget_wrappers/generic/generic.component.html b/web/app/widget_wrappers/generic/generic.component.html
index 92baf94..a78bcef 100644
--- a/web/app/widget_wrappers/generic/generic.component.html
+++ b/web/app/widget_wrappers/generic/generic.component.html
@@ -1,8 +1,7 @@
 <div class="wrapper">
     <div class="control-page" *ngIf="isLoading || !canEmbed">
         <div class="loading-badge" *ngIf="isLoading">
-            <i class="fa fa-circle-o-notch fa-spin"></i>
-            Loading...
+            <my-spinner></my-spinner>
         </div>
         <div class="embed-failed" *ngIf="!isLoading && !canEmbed">
             <p class="ban"><i class="fa fa-ban"></i></p>
diff --git a/web/app/widget_wrappers/generic/generic.component.scss b/web/app/widget_wrappers/generic/generic.component.scss
index 1e42721..c89693f 100644
--- a/web/app/widget_wrappers/generic/generic.component.scss
+++ b/web/app/widget_wrappers/generic/generic.component.scss
@@ -7,8 +7,8 @@
   right: 0;
   margin: 0;
   padding: 0;
-  background-color: #222;
-  color: #eee;
+  background-color: #eee;
+  color: #222;
 }
 
 .loading-badge {
diff --git a/web/app/widget_wrappers/video/video.component.html b/web/app/widget_wrappers/video/video.component.html
deleted file mode 100644
index 246cda2..0000000
--- a/web/app/widget_wrappers/video/video.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<iframe [src]="embedUrl" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/web/app/widget_wrappers/video/video.component.scss b/web/app/widget_wrappers/video/video.component.scss
deleted file mode 100644
index 10e3be2..0000000
--- a/web/app/widget_wrappers/video/video.component.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// component styles are encapsulated and only applied to their components
-iframe {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  width: 100%;
-  height: 100%;
-}
\ No newline at end of file
diff --git a/web/app/widget_wrappers/video/video.component.ts b/web/app/widget_wrappers/video/video.component.ts
index b26a990..c543f97 100644
--- a/web/app/widget_wrappers/video/video.component.ts
+++ b/web/app/widget_wrappers/video/video.component.ts
@@ -4,8 +4,8 @@ import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
 
 @Component({
     selector: "my-video-widget-wrapper",
-    templateUrl: "video.component.html",
-    styleUrls: ["video.component.scss"],
+    templateUrl: "../fullpage-iframe/fullpage-iframe.component.html",
+    styleUrls: ["../fullpage-iframe/fullpage-iframe.component.scss"],
 })
 export class VideoWidgetWrapperComponent {
 

From b7002ea4d63859bf766906b7adb1a75a517a0ee5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Dec 2017 00:33:32 -0700
Subject: [PATCH 006/111] Dynamic page titles

---
 web/app/app.routing.ts                       |  2 +-
 web/app/page-header/page-header.component.ts | 26 ++++++++++++++++++--
 web/app/riot/riot.component.html             |  2 +-
 web/public/service-worker.js                 |  1 -
 4 files changed, 26 insertions(+), 5 deletions(-)
 delete mode 100644 web/public/service-worker.js

diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 5e8ad8f..960c7f4 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -17,7 +17,7 @@ const routes: Routes = [
             {
                 path: "home",
                 component: RiotHomeComponent,
-                data: {breadcrumb: "Home"},
+                data: {breadcrumb: "Home", name: "Dimension"},
             },
         ],
     },
diff --git a/web/app/page-header/page-header.component.ts b/web/app/page-header/page-header.component.ts
index 63ad6ea..a6adea3 100644
--- a/web/app/page-header/page-header.component.ts
+++ b/web/app/page-header/page-header.component.ts
@@ -1,4 +1,5 @@
-import { Component, Input } from "@angular/core";
+import { Component } from "@angular/core";
+import { ActivatedRoute, NavigationEnd, PRIMARY_OUTLET, Router } from "@angular/router";
 
 @Component({
     selector: "my-page-header",
@@ -6,5 +7,26 @@ import { Component, Input } from "@angular/core";
     styleUrls: ["./page-header.component.scss"],
 })
 export class PageHeaderComponent {
-    @Input() pageName: string;
+
+    public pageName: string;
+
+    constructor(private router: Router, private activatedRoute: ActivatedRoute) {
+        this.router.events.filter(ev => ev instanceof NavigationEnd).subscribe((ev: NavigationEnd) => {
+            console.log(ev);
+            let currentRoute = this.activatedRoute.root;
+            let url = "";
+
+            while (currentRoute.children.length > 0) {
+                let children = currentRoute.children;
+                children.forEach(route => {
+                    currentRoute = route;
+                    url += "/" + route.snapshot.url.map(s => s.path).join("/");
+                    if (route.outlet !== PRIMARY_OUTLET) return;
+                    if (!route.routeConfig || !route.routeConfig.data) return;
+                    if (url === ev.url) this.pageName = route.snapshot.data.name;
+                    console.log(url);
+                });
+            }
+        });
+    }
 }
diff --git a/web/app/riot/riot.component.html b/web/app/riot/riot.component.html
index a2be092..3e70586 100644
--- a/web/app/riot/riot.component.html
+++ b/web/app/riot/riot.component.html
@@ -1,5 +1,5 @@
 <div id="wrapper">
-    <my-page-header pageName="Dimension">
+    <my-page-header>
         <my-scalar-close class="closeButton"></my-scalar-close>
     </my-page-header>
 
diff --git a/web/public/service-worker.js b/web/public/service-worker.js
deleted file mode 100644
index 630bdbd..0000000
--- a/web/public/service-worker.js
+++ /dev/null
@@ -1 +0,0 @@
-// This file is intentionally without code.
\ No newline at end of file

From ebe00487108cd9126130768348ac49c4d1b6c778 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Dec 2017 00:38:27 -0700
Subject: [PATCH 007/111] Use the correct title when we're also handling
 redirects and scalar tokens

---
 web/app/page-header/page-header.component.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/app/page-header/page-header.component.ts b/web/app/page-header/page-header.component.ts
index a6adea3..2bbe7cb 100644
--- a/web/app/page-header/page-header.component.ts
+++ b/web/app/page-header/page-header.component.ts
@@ -12,7 +12,6 @@ export class PageHeaderComponent {
 
     constructor(private router: Router, private activatedRoute: ActivatedRoute) {
         this.router.events.filter(ev => ev instanceof NavigationEnd).subscribe((ev: NavigationEnd) => {
-            console.log(ev);
             let currentRoute = this.activatedRoute.root;
             let url = "";
 
@@ -23,8 +22,7 @@ export class PageHeaderComponent {
                     url += "/" + route.snapshot.url.map(s => s.path).join("/");
                     if (route.outlet !== PRIMARY_OUTLET) return;
                     if (!route.routeConfig || !route.routeConfig.data) return;
-                    if (url === ev.url) this.pageName = route.snapshot.data.name;
-                    console.log(url);
+                    if (url === ev.urlAfterRedirects.split("?")[0]) this.pageName = route.snapshot.data.name;
                 });
             }
         });

From a09a4d6b5136b20b0075ceccde8bf7ea281caf38 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Dec 2017 21:22:34 -0700
Subject: [PATCH 008/111] Styling for widgets (mostly)

---
 web/app/app.module.ts                         |  4 +-
 .../integration-bag.component.html            |  9 ++++
 .../integration-bag.component.scss            | 37 +++++++++++++++
 .../integration-bag.component.ts              | 25 +++++++++++
 .../integration/integration.component.html    | 23 ++--------
 .../integration/integration.component.scss    | 45 ++++++++-----------
 web/app/integration/integration.component.ts  | 31 +++----------
 web/app/riot/riot-home/home.component.html    |  8 +---
 web/app/riot/riot-home/home.component.ts      | 13 ++----
 web/app/riot/riot.component.ts                |  1 -
 web/style/app.scss                            |  1 +
 web/style/components/ibox.scss                | 22 +++++++++
 12 files changed, 131 insertions(+), 88 deletions(-)
 create mode 100644 web/app/integration-bag/integration-bag.component.html
 create mode 100644 web/app/integration-bag/integration-bag.component.scss
 create mode 100644 web/app/integration-bag/integration-bag.component.ts
 create mode 100644 web/style/components/ibox.scss

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 8b5a035..440c96c 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -13,7 +13,6 @@ import { UiSwitchModule } from "angular2-ui-switch";
 import { ScalarService } from "./shared/services/scalar.service";
 import { ToasterModule } from "angular2-toaster";
 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/services/integration.service";
 import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap";
@@ -29,6 +28,8 @@ import { PageHeaderComponent } from "./page-header/page-header.component";
 import { SpinnerComponent } from "./spinner/spinner.component";
 import { BreadcrumbsModule } from "ng2-breadcrumbs";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
+import { IntegrationBagComponent } from "./integration-bag/integration-bag.component";
+import { IntegrationComponent } from "./integration/integration.component";
 
 const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigComponents();
 
@@ -52,6 +53,7 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo
         HomeComponent,
         RiotComponent,
         IntegrationComponent,
+        IntegrationBagComponent,
         PageHeaderComponent,
         SpinnerComponent,
         ScalarCloseComponent,
diff --git a/web/app/integration-bag/integration-bag.component.html b/web/app/integration-bag/integration-bag.component.html
new file mode 100644
index 0000000..7d5a396
--- /dev/null
+++ b/web/app/integration-bag/integration-bag.component.html
@@ -0,0 +1,9 @@
+<div class="integration-bag">
+    <!--<my-integration *ngFor="let integration of integrations"-->
+                    <!--[integration]="integration" (selected)="onClick(integration)"></my-integration>-->
+    <div class="integration" *ngFor="let integration of integrations">
+        <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
+        <div class="integration-name">{{ integration.name }}</div>
+        <div class="integration-description">{{ integration.about }}</div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/integration-bag/integration-bag.component.scss b/web/app/integration-bag/integration-bag.component.scss
new file mode 100644
index 0000000..bc10af3
--- /dev/null
+++ b/web/app/integration-bag/integration-bag.component.scss
@@ -0,0 +1,37 @@
+// component styles are encapsulated and only applied to their components
+.integration-bag {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+
+.integration {
+  border: 1px solid #eee;
+  border-radius: 5px;
+  margin: 7px;
+  padding: 5px;
+  width: calc(325px - 14px);
+  position: relative;
+}
+
+.integration .integration-avatar {
+  width: 50px;
+  height: 50px;
+  float: left;
+}
+
+.integration .integration-name {
+  display: inline-block;
+  font-size: 1.1em;
+  font-weight: 100;
+  padding-left: 5px;
+}
+
+.integration .integration-description {
+  display: block;
+  font-size: 0.8em;
+  margin-left: 55px;
+  color: #999;
+}
\ No newline at end of file
diff --git a/web/app/integration-bag/integration-bag.component.ts b/web/app/integration-bag/integration-bag.component.ts
new file mode 100644
index 0000000..dfd1874
--- /dev/null
+++ b/web/app/integration-bag/integration-bag.component.ts
@@ -0,0 +1,25 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { Integration } from "../shared/models/integration";
+import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
+
+@Component({
+    selector: "my-integration-bag",
+    templateUrl: "./integration-bag.component.html",
+    styleUrls: ["./integration-bag.component.scss"],
+})
+export class IntegrationBagComponent {
+
+    @Input() integrations: Integration[];
+    @Output() integrationClicked: EventEmitter<Integration> = new EventEmitter<Integration>();
+
+    constructor(private sanitizer: DomSanitizer) {
+    }
+
+    public getSafeUrl(url: string): SafeResourceUrl {
+        return this.sanitizer.bypassSecurityTrustResourceUrl(url);
+    }
+
+    public onClick(integration: Integration) {
+        this.integrationClicked.emit(integration);
+    }
+}
diff --git a/web/app/integration/integration.component.html b/web/app/integration/integration.component.html
index dd7f0b0..19bdddb 100644
--- a/web/app/integration/integration.component.html
+++ b/web/app/integration/integration.component.html
@@ -1,22 +1,5 @@
 <div class="integration">
-    <img [src]="integration.avatar" class="avatar">
-    <div class="title">
-        <b>{{ integration.name }}</b>
-        <div style="display: flex;">
-            <div class="switch" *ngIf="integration.type !== 'bridge' && integration.type !== 'widget'">
-                <ui-switch [checked]="integration.isEnabled" size="small" [disabled]="integration.isBroken"
-                           (change)="update()"></ui-switch>
-            </div>
-            <div class="switch" *ngIf="canHaveErrors(integration) && !integration.isEnabled">
-                <i class="fa fa-warning text-warning" ngbTooltip="{{ integration.bridgeError }}"></i>
-            </div>
-            <div class="toolbar">
-                <i class="fa fa-question-circle text-info" ngbTooltip="{{integration.about}}"
-                   *ngIf="integration.about"></i>
-                <i class="fa fa-cog text-info config-icon" (click)="configureIntegration()"
-                   *ngIf="integration.isEnabled && integration.hasConfig"></i>
-            </div>
-        </div>
-    </div>
-    <div style="clear: both;"></div>
+    <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
+    <div class="integration-name">{{ integration.name }}</div>
+    <div class="integration-description">{{ integration.about }}</div>
 </div>
\ No newline at end of file
diff --git a/web/app/integration/integration.component.scss b/web/app/integration/integration.component.scss
index 0b55b7a..b7b4af4 100644
--- a/web/app/integration/integration.component.scss
+++ b/web/app/integration/integration.component.scss
@@ -1,38 +1,31 @@
 // component styles are encapsulated and only applied to their components
 .integration {
-  flex: auto;
-  margin: 5px;
-  padding: 10px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  min-width: 150px;
-  background-color: white;
+  border: 1px solid #eee;
+  border-radius: 3px;
+  margin-left: 7px;
+  margin-right: 7px;
+  padding: 5px;
+  width: calc(325px - 14px);
+  position: relative;
+  flex: 1;
 }
 
-.avatar {
-  float: left;
-  margin-right: 7px;
+.integration .integration-avatar {
   width: 50px;
   height: 50px;
-  border-radius: 50px;
+  float: left;
 }
 
-.title {
-  float: right;
-  width: calc(100% - 57px);
-}
-
-.switch {
+.integration .integration-name {
   display: inline-block;
-  text-align: left;
+  font-size: 1.1em;
+  font-weight: 100;
+  padding-left: 5px;
 }
 
-.toolbar {
-  display: inline-block;
-  vertical-align: top;
-  margin-left: 5px;
+.integration .integration-description {
+  display: block;
+  font-size: 0.8em;
+  margin-left: 55px;
+  color: #999;
 }
-
-.config-icon {
-  cursor: pointer;
-}
\ No newline at end of file
diff --git a/web/app/integration/integration.component.ts b/web/app/integration/integration.component.ts
index ba4467a..5416c8b 100644
--- a/web/app/integration/integration.component.ts
+++ b/web/app/integration/integration.component.ts
@@ -1,8 +1,7 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { Integration } from "../shared/models/integration";
-import { overlayConfigFactory } from "ngx-modialog";
-import { BSModalContext, Modal } from "ngx-modialog/plugins/bootstrap";
-import { IntegrationService } from "../shared/services/integration.service";
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 
 export class ConfigModalContext extends BSModalContext {
     public integration: Integration;
@@ -20,30 +19,12 @@ export class ConfigModalContext extends BSModalContext {
 export class IntegrationComponent {
 
     @Input() integration: Integration;
-    @Input() roomId: string;
-    @Input() scalarToken: string;
-    @Output() updated: EventEmitter<any> = new EventEmitter();
+    @Output() selected: EventEmitter<any> = new EventEmitter<any>();
 
-    constructor(public modal: Modal) {
+    constructor(private sanitizer: DomSanitizer) {
     }
 
-    public update(): void {
-        this.integration.isEnabled = !this.integration.isEnabled;
-        this.updated.emit();
-    }
-
-    public configureIntegration(integrationId: string = null): void {
-        this.modal.open(IntegrationService.getConfigComponent(this.integration), overlayConfigFactory({
-            integration: this.integration,
-            roomId: this.roomId,
-            scalarToken: this.scalarToken,
-            isBlocking: false,
-            integrationId: integrationId,
-            size: "lg"
-        }, BSModalContext));
-    }
-
-    public canHaveErrors(integration: Integration): boolean {
-        return integration.type === "bridge" || integration.type === "widget";
+    public getSafeUrl(url: string): SafeResourceUrl {
+        return this.sanitizer.bypassSecurityTrustResourceUrl(url);
     }
 }
diff --git a/web/app/riot/riot-home/home.component.html b/web/app/riot/riot-home/home.component.html
index 06dbc19..2cba7ec 100644
--- a/web/app/riot/riot-home/home.component.html
+++ b/web/app/riot/riot-home/home.component.html
@@ -35,14 +35,10 @@
     <div *ngFor="let category of getCategories()">
         <div class="ibox" *ngIf="getIntegrationsIn(category).length > 0">
             <div class="ibox-title">
-                <h4>{{ category }}</h4>
+                <h5>{{ category }}</h5>
             </div>
             <div class="ibox-content">
-                <div class="integration" *ngFor="let integration of getIntegrationsIn(category)">
-                    <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
-                    <div class="integration-name">{{ integration.name }}</div>
-                    <div class="integration-description">{{ integration.about }}</div>
-                </div>
+                <my-integration-bag [integrations]="getIntegrationsIn(category)"></my-integration-bag>
             </div>
         </div>
     </div>
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 3b89dca..fcb10f0 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -7,7 +7,6 @@ import { ActivatedRoute } from "@angular/router";
 import { ApiService } from "../../shared/services/api.service";
 import { ScalarService } from "../../shared/services/scalar.service";
 import * as _ from "lodash";
-import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -33,14 +32,13 @@ export class RiotHomeComponent {
     private userId: string;
     private requestedScreen: string = null;
     private requestedIntegration: string = null;
-    private integrationsForCategory: { [category: string]: Integration[] } = {};
+    public integrationsForCategory: { [category: string]: Integration[] } = {};
     private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
 
     constructor(private activatedRoute: ActivatedRoute,
                 private api: ApiService,
                 private scalar: ScalarService,
-                private toaster: ToasterService,
-                private sanitizer: DomSanitizer) {
+                private toaster: ToasterService) {
         let params: any = this.activatedRoute.snapshot.queryParams;
 
         this.requestedScreen = params.screen;
@@ -75,10 +73,6 @@ export class RiotHomeComponent {
         }
     }
 
-    public getSafeUrl(url: string): SafeResourceUrl {
-        return this.sanitizer.bypassSecurityTrustResourceUrl(url);
-    }
-
     public hasIntegrations(): boolean {
         for (const category of this.getCategories()) {
             if (this.getIntegrationsIn(category).length > 0) return true;
@@ -196,7 +190,8 @@ export class RiotHomeComponent {
             if (opened) return;
             if (component.integration.type !== type || component.integration.integrationType !== integrationType) return;
             console.log("Configuring integration " + this.requestedIntegration + " type=" + type + " integrationType=" + integrationType);
-            component.configureIntegration(this.requestedIntegration);
+            //component.configureIntegration(this.requestedIntegration);
+            // TODO: Support editing integrations
             opened = true;
         });
         if (!opened) {
diff --git a/web/app/riot/riot.component.ts b/web/app/riot/riot.component.ts
index de6e3db..52219a9 100644
--- a/web/app/riot/riot.component.ts
+++ b/web/app/riot/riot.component.ts
@@ -6,5 +6,4 @@ import { Component } from "@angular/core";
     styleUrls: ["./riot.component.scss"],
 })
 export class RiotComponent {
-
 }
diff --git a/web/style/app.scss b/web/style/app.scss
index 7a3ccb0..b981442 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -1,6 +1,7 @@
 // styles in src/style directory are applied to the whole page
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
 @import '../../node_modules/angular2-toaster/toaster';
+@import "components/ibox.scss";
 @import "riot";
 
 body {
diff --git a/web/style/components/ibox.scss b/web/style/components/ibox.scss
new file mode 100644
index 0000000..71bd302
--- /dev/null
+++ b/web/style/components/ibox.scss
@@ -0,0 +1,22 @@
+.ibox {
+  background-color: #fff;
+  padding: 0;
+  margin-bottom: 30px;
+}
+
+.ibox .ibox-title {
+  padding: 5px;
+  border-bottom: 1px solid #e7eaec;
+  border-top: 2px solid #e7eaec;
+}
+
+.ibox .ibox-title h5 {
+  display: inline-block;
+  font-size: 1.1em;
+  padding: 5px;
+  margin: 0;
+}
+
+.ibox .ibox-content {
+  padding: 15px;
+}
\ No newline at end of file

From e3a32679c9ca03d17825002a1f14b6a5b32d8977 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Dec 2017 21:23:57 -0700
Subject: [PATCH 009/111] Fix circle ci for new project layout

---
 web/app/configs/circleci/circleci-config.component.ts | 2 +-
 web/app/shared/services/integration.service.ts        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/app/configs/circleci/circleci-config.component.ts b/web/app/configs/circleci/circleci-config.component.ts
index c524063..384065e 100644
--- a/web/app/configs/circleci/circleci-config.component.ts
+++ b/web/app/configs/circleci/circleci-config.component.ts
@@ -3,7 +3,7 @@ import { CircleCiIntegration } from "../../shared/models/integration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/api.service";
+import { ApiService } from "../../shared/services/api.service";
 
 @Component({
     selector: "my-circleci-config",
diff --git a/web/app/shared/services/integration.service.ts b/web/app/shared/services/integration.service.ts
index 158a1c6..841e7fe 100644
--- a/web/app/shared/services/integration.service.ts
+++ b/web/app/shared/services/integration.service.ts
@@ -15,6 +15,7 @@ import {
 } from "../models/widget";
 import { GoogleDocsWidgetConfigComponent } from "../../configs/widget/googledocs/googledocs-config.component";
 import { GoogleCalendarWidgetConfigComponent } from "../../configs/widget/googlecalendar/googlecalendar-config.component";
+import { CircleCiConfigComponent } from "../../configs/circleci/circleci-config.component";
 
 @Injectable()
 export class IntegrationService {
@@ -28,6 +29,9 @@ export class IntegrationService {
             "travisci": {
                 component: TravisCiConfigComponent,
             },
+            "circleci": {
+                component: CircleCiConfigComponent,
+            },
         },
         "bridge": {
             "irc": {

From 3a517be0c10705587cfecb8e7f3c3a3bee1b7829 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Dec 2017 22:27:20 -0700
Subject: [PATCH 010/111] Styling for integration hover

---
 config/integrations/etherpad_widget.yaml      |  2 +-
 .../integration-bag.component.html            |  1 +
 .../integration-bag.component.scss            | 22 +++++++++++++++++--
 web/style/_riot.scss                          |  2 ++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/config/integrations/etherpad_widget.yaml b/config/integrations/etherpad_widget.yaml
index 1b69147..065fc64 100644
--- a/config/integrations/etherpad_widget.yaml
+++ b/config/integrations/etherpad_widget.yaml
@@ -3,7 +3,7 @@ type: "widget"
 integrationType: "etherpad"
 enabled: true
 name: "Etherpad"
-about: "Etherpad is a collaborative text editor. With this widget you can embed Etherpad directly in to your Matrix chat rooms so that you can securely collaborate on documents."
+about: "Collaborate on documents with members of your room."
 avatar: "img/avatars/etherpad.png"
 
 # This is the URL people will be provided when adding a new Etherpad widget. The supported variables
diff --git a/web/app/integration-bag/integration-bag.component.html b/web/app/integration-bag/integration-bag.component.html
index 7d5a396..29e2b3c 100644
--- a/web/app/integration-bag/integration-bag.component.html
+++ b/web/app/integration-bag/integration-bag.component.html
@@ -5,5 +5,6 @@
         <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
         <div class="integration-name">{{ integration.name }}</div>
         <div class="integration-description">{{ integration.about }}</div>
+        <div class="integration-arrow"><i class="fa fa-chevron-right"></i></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/integration-bag/integration-bag.component.scss b/web/app/integration-bag/integration-bag.component.scss
index bc10af3..757f71e 100644
--- a/web/app/integration-bag/integration-bag.component.scss
+++ b/web/app/integration-bag/integration-bag.component.scss
@@ -14,6 +14,23 @@
   padding: 5px;
   width: calc(325px - 14px);
   position: relative;
+  cursor: pointer;
+}
+
+.integration .integration-arrow {
+  display: none;
+  position: absolute;
+  top: calc(50% - 12px); // icon happens to be 24px tall
+  right: 0;
+  color: #bbb;
+}
+
+.integration:hover {
+  box-shadow: 0 0 9px #888;
+}
+
+.integration:hover .integration-arrow {
+  display: block;
 }
 
 .integration .integration-avatar {
@@ -26,12 +43,13 @@
   display: inline-block;
   font-size: 1.1em;
   font-weight: 100;
-  padding-left: 5px;
+  padding-left: 10px;
 }
 
 .integration .integration-description {
   display: block;
   font-size: 0.8em;
-  margin-left: 55px;
+  margin-left: 60px;
+  margin-right: 5px;
   color: #999;
 }
\ No newline at end of file
diff --git a/web/style/_riot.scss b/web/style/_riot.scss
index 80fe0b2..51ef99a 100644
--- a/web/style/_riot.scss
+++ b/web/style/_riot.scss
@@ -9,10 +9,12 @@
 
   .fluid-bread .container {
     padding: 0;
+    margin: 0;
   }
 
   .fluid-bread .container .breadcrumb {
     padding: 0;
+    margin: 0;
   }
 
   .fluid-bread .breadcrumb-item a:hover {

From 7a8b27fa2254aafaabe2f222da10dceb81553e07 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 15 Dec 2017 22:35:57 -0700
Subject: [PATCH 011/111] Update icons

The new custom widget icon is safe to use in a commercial setting. Licensed under the repo's license.
---
 web/public/img/avatars/circleci.png     | Bin 4381 -> 4485 bytes
 web/public/img/avatars/customwidget.png | Bin 49760 -> 11242 bytes
 web/public/img/avatars/demobot.png      | Bin 8996 -> 3578 bytes
 web/public/img/avatars/imgur.png        | Bin 1686 -> 3522 bytes
 web/public/img/avatars/irc.png          | Bin 1564 -> 3647 bytes
 web/public/img/avatars/rssbot.png       | Bin 4030 -> 5765 bytes
 web/public/img/avatars/twitch.png       | Bin 1873 -> 3850 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/web/public/img/avatars/circleci.png b/web/public/img/avatars/circleci.png
index 1e9ba51a4c024cc125969d4adc3d7f4122c2e04f..d207f7a37919f99892cb768fbb574219264cd113 100644
GIT binary patch
delta 4470
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
IM6N<$f?u7A!~g&Q

literal 4381
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
XM3bLSXtKnm00000NkvXXu0mjf8N6^3

diff --git a/web/public/img/avatars/customwidget.png b/web/public/img/avatars/customwidget.png
index 3f0613a97d5602b089488afbba354a4fa2658ef4..4c4ad35067496d4fd94dfae4ac09b8451e08ef09 100644
GIT binary patch
literal 11242
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
U>2am@p#T5?07*qoM6N<$g4X2VbN~PV

literal 49760
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

diff --git a/web/public/img/avatars/demobot.png b/web/public/img/avatars/demobot.png
index 71650045962c161bb2afb51f72d529718c4a98cb..9f9e2e2ec23f7c083d1a576bcddae40a70346514 100644
GIT binary patch
literal 3578
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
A;{X5v

literal 8996
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

diff --git a/web/public/img/avatars/imgur.png b/web/public/img/avatars/imgur.png
index 332a0ccd80013d05c838fa81af5d261f85bcc515..231338b5ea4b2f3dc15d3cbb68b16e5f36010bba 100644
GIT binary patch
delta 3473
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

delta 1622
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

diff --git a/web/public/img/avatars/irc.png b/web/public/img/avatars/irc.png
index 2412069fe6429b5469495d4fff486a0e3924c8f8..6df8dda952af060c4b8782bf599116b1ab3b278c 100644
GIT binary patch
delta 3599
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
Vqj$+lQvd(}00>D%PDHLkV1j@>{y+c#

delta 1499
zcmZ8hdpOez7#5>Na-Rt^>CAnk!U@UTl6#bq*`^$~le;mOewotgrW`f7ABW`{4vlb}
zo#{xq7FNw=x)_dJ4r9Z#ovHKm$NBGlzUO_u?|Z)YdtaJH(cZg0fDFV+*+#G+CMG6X
z?c!kPn>@By?CN#y477&^0`H+X>OHE`e1?)?tC-3w!rpsZjk&94t0x^pj;g69hNx!C
zB(;BH<<EDiVdlovRCjgp&zPPD4a@iPnPf5wcDJ37!w(r`yDhbS7Pjbe-20YG__W!H
z_(AH+wx&Fg+f6_P5C==i?}bB8m|n(-(ZxvG-_S0Q1UTzUZ3l@+!#d-)gw<BqbdM>3
zm)OhovP7xWtD~r{NXUp&m@mhIy^eYO<S_|mbQ4+X+&rlTRj5zzY(CSRP7E0^jdRzx
z?2Dk7dzQ~cr-(oOK(Y!rG7hBfcFLifg~u^oF`GBX6t}ulV_Jv$0<CrAjn=sn^~N{?
z(&3y{s%VHwr%OnlYd&l*U2R|rrrF8EAb>pBqv7Gz{h-<c+N5R>W%W%0scqXGkvlqW
zg3K7065zpu7X$(hu7q1+tx|*W7MNpFKFLyGjs3dlU_so+DWLng*`vCPCmQ`ZenZ_7
z^vb(5U0q#e=>CydK2PtcwOKI^2~=h_uO$fEycXN%rQ4Is&~4jC^KjQU#|PXzj|T?+
zO1*6i9t;!A6aNebsZ)6cPNsRZ>kcIG%;3#PYCu&v)&IqAqY?1TYEoQE*1jMOX$FDu
z<}@Ck!IgjjAj2YB{{kZ|EXTZs07o-cme)O~EMb9%sL4ulk(4vyYD8#gh<8V;%h=cb
z&ga@4v%VqCh>EJK+}=LiJ7c1d^PQ5j8X1eETpO_g{bVG`o)ZbV3uOPFq!}-I=#}(R
zV4}Rx;+Rj1aDx-Q#$1fP5-}wJJ}9;GpSJ3c&qBI<*_Y&O(2#I<?fD1z4?#iDbb&vS
z9+j6{j2b=cybzffDPz8|R<TNIQ^}5(!H-R_RB9IMsw+5-R|{x=+sl!S-o81o$enmm
zS5hQrERD66FOvG6$sC=Jb?LB)kFNBc?>r^VZCBSb8KPgPcycA%yfqwvHQrP1H^vv|
z7grW{_MoVdwFXriX$mPZKXCk5ke>$$i;Uc|m@BU>TD8%THgk32q^z4@9x80ww0al-
zc)7;Z_BawcY(i4a@+<zZn{H?lJ%H?B|ErI>d=$0Tu%VHEXA6#IZ!=)RES)=HiRntD
zket~@pZIbg)<#}F0GvGp+*h2Kxp=T}fZT*x7GR@<Io>?s7ZrWz{$l_E?#mxzm>Cd1
zi>EZ^a9aI>1y1C%VZ=m?3w;>7L7R|Mf*Z6A8>Mxz3^~fOJ5Ks)7dZ3*PNVLVR_Jdp
zqb`tcNMl_$3wgF14+N`nV1{s=h1r^W3Y^m)2e#NrTWft*bM&ULs@maug(nY&;gV5L
zj`K)UTF@@z0K~-F^hWv$$D+odm$@0LQ;G}SM_07Pk8}rGm&N?mIO|z}YGg!cV{dW=
zI{BqND}}%C_6NkAw>MT%E^=ko&u$wYxFkt=HAFidWZG)u=qY#|*io~vIrLBg=-1TN
zi%*@)1XROPljKCVDZbxbVq3k;v0O#Mz#bAyU^?2!$-ewKHbgR>5A+~16O?c7Vbs^Y
zW&!uy5cdP$)su0hzppg(cXLE~w-jj*gbgJtCOo3XVRnPIWa^~sbj(}IbVGMA-p^}`
zp9M!R{d1D96j!bU_#A-%syi<<nnsLGOLNO8iv^PlX{%hVSmtq+B1-6x92^bd2C5Sa
z<|%9wUc%C{I-(h`N59BI^bQQTGhw%#!jpeIWeKDkN6jpW(bY7C*|$7>jF4p7vSsa2
z8lZfqC(#&o`JK;mEM^(Vubf@s+oi-NgXm3`xwG)rK7HRq0JeB@R_K^pQ#l~+c+F+U
rH~))0IP^>HTS|hTm40POslB%q-;zKe2%s2IfQz{}dN|ahaHM|$K7-%W

diff --git a/web/public/img/avatars/rssbot.png b/web/public/img/avatars/rssbot.png
index ea7144c4a96e2603e96ea505849e9e8bdecf62bc..7ffdfd0f2ecad22133cf3d660db63db8f6a43e37 100644
GIT binary patch
delta 5733
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
Xi*j9w=o4Pj00000NkvXXu0mjf;#Ny<

delta 3985
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

diff --git a/web/public/img/avatars/twitch.png b/web/public/img/avatars/twitch.png
index 7f5301651219f9ae965c945c4397ca4a5859b6a6..9a61b7b756c2a69610374ea9106e7b43cdc8ebba 100644
GIT binary patch
delta 3844
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
GLSTaLyhmpM

delta 1852
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


From 826364e8037523e17fd4e5331a18182a7bb143f4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 17 Dec 2017 19:22:09 -0700
Subject: [PATCH 012/111] Re-implement the Scalar API in typescript

This is part of a rewrite for Dimension to better support integrations. Only the bare minimum scalar APIs are implemented at this point - dimension is non-functional.
---
 .gitignore                                    |   2 +
 .travis.yml                                   |   1 +
 config/database.json                          |  13 -
 config/default.yaml                           |  49 +-
 db/.gitkeep                                   |   0
 migrations/20170527035704-add-tokens-table.js |  34 -
 ...910-add-upstream-scalar-token-to-tokens.js |  27 -
 package-lock.json                             | 866 ++++++++++--------
 package.json                                  |  46 +-
 src-ts/MemoryCache.ts                         |  25 +
 src-ts/api/ApiError.ts                        |  14 +
 src-ts/api/Webserver.ts                       |  76 ++
 src-ts/api/scalar/ScalarService.ts            | 106 +++
 src-ts/api/scalar/ScalarWidgetService.ts      |  81 ++
 src-ts/config.ts                              |  21 +
 src-ts/db/DimensionStore.ts                   |  75 ++
 src-ts/db/models/Upstream.ts                  |  25 +
 src-ts/db/models/User.ts                      |  14 +
 src-ts/db/models/UserScalarToken.ts           |  39 +
 src-ts/index.ts                               |  15 +
 src-ts/matrix/MatrixLiteClient.ts             |  24 +
 src-ts/matrix/MatrixOpenIdClient.ts           |  20 +
 src-ts/matrix/helpers.ts                      |  61 ++
 src-ts/models/OpenId.ts                       |   6 +
 src-ts/models/ScalarResponses.ts              |   8 +
 src-ts/scalar/ScalarClient.ts                 |  32 +
 src-ts/temp_todo.txt                          |   5 +
 tsconfig-app.json                             |  18 +
 tslint.json                                   |   7 +-
 .../integration-bag.component.scss            |   4 +-
 webpack.config.js                             |   4 +-
 31 files changed, 1225 insertions(+), 493 deletions(-)
 delete mode 100644 config/database.json
 delete mode 100644 db/.gitkeep
 delete mode 100644 migrations/20170527035704-add-tokens-table.js
 delete mode 100644 migrations/20170527221910-add-upstream-scalar-token-to-tokens.js
 create mode 100644 src-ts/MemoryCache.ts
 create mode 100644 src-ts/api/ApiError.ts
 create mode 100644 src-ts/api/Webserver.ts
 create mode 100644 src-ts/api/scalar/ScalarService.ts
 create mode 100644 src-ts/api/scalar/ScalarWidgetService.ts
 create mode 100644 src-ts/config.ts
 create mode 100644 src-ts/db/DimensionStore.ts
 create mode 100644 src-ts/db/models/Upstream.ts
 create mode 100644 src-ts/db/models/User.ts
 create mode 100644 src-ts/db/models/UserScalarToken.ts
 create mode 100644 src-ts/index.ts
 create mode 100644 src-ts/matrix/MatrixLiteClient.ts
 create mode 100644 src-ts/matrix/MatrixOpenIdClient.ts
 create mode 100644 src-ts/matrix/helpers.ts
 create mode 100644 src-ts/models/OpenId.ts
 create mode 100644 src-ts/models/ScalarResponses.ts
 create mode 100644 src-ts/scalar/ScalarClient.ts
 create mode 100644 src-ts/temp_todo.txt
 create mode 100644 tsconfig-app.json

diff --git a/.gitignore b/.gitignore
index 07545ca..6d832e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ db/*.db
 start.sh
 config/integrations/*_development.yaml
 config/integrations/*_production.yaml
+build/
+dimension.db
 
 # Logs
 logs
diff --git a/.travis.yml b/.travis.yml
index 49b9257..297b85c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,3 +9,4 @@ install:
   - npm install
 script:
   - npm run build
+  - npm run lint:app
diff --git a/config/database.json b/config/database.json
deleted file mode 100644
index f2abade..0000000
--- a/config/database.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "defaultEnv": {
-    "ENV": "NODE_ENV"
-  },
-  "development": {
-    "driver": "sqlite",
-    "filename": "db/development.db"
-  },
-  "production": {
-    "driver": "sqlite",
-    "filename": "db/production.db"
-  }
-}
\ No newline at end of file
diff --git a/config/default.yaml b/config/default.yaml
index 7824d86..200af3d 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -3,6 +3,28 @@ web:
   port: 8184
   address: '0.0.0.0'
 
+# Homeserver configuration (used to proxy some requests to the homeserver for processing)
+homeserver:
+  name: "t2bot.io"
+  accessToken: "something"
+
+# These users can modify the integrations this Dimension supports.
+# To access the admin interface, open Dimension in Riot and click the settings icon.
+admins:
+  - "@someone:domain.com"
+
+# IPs and CIDR ranges listed here will be blocked from being widgets.
+# Note: Widgets may still be embedded with restricted content, although not through Dimension directly.
+widgetBlacklist:
+- 10.0.0.0/8
+- 172.16.0.0/12
+- 192.168.0.0/16
+- 127.0.0.0/8
+
+# Where the database for Dimension is
+database:
+  file: "dimension.db"
+
 # Settings for controlling how logging works
 logging:
   file: logs/dimension.log
@@ -11,29 +33,4 @@ logging:
   fileLevel: verbose
   rotate:
     size: 52428800 # bytes, default is 50mb
-    count: 5
-
-# Demo bot configuration. Used purely to show how to configure a self-hosted bot in Dimension
-demobot:
-  enabled: false
-  userId: "@dimension:t2bot.io"
-  homeserverUrl: "https://t2bot.io"
-  accessToken: "something"
-
-# Upstream configuration. This should almost never change.
-upstreams:
-- name: vector
-  url: "https://scalar.vector.im/api"
-
-# Homeserver configuration (used to proxy some requests to the homeserver for processing)
-homeserver:
-  name: "t2bot.io"
-  accessToken: "something"
-
-# IPs and CIDR ranges listed here will be blocked from being widgets.
-# Note: Widgets may still be embedded with restricted content, although not through Dimension directly.
-widgetBlacklist:
-- 10.0.0.0/8
-- 172.16.0.0/12
-- 192.168.0.0/16
-- 127.0.0.0/8
\ No newline at end of file
+    count: 5
\ No newline at end of file
diff --git a/db/.gitkeep b/db/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/migrations/20170527035704-add-tokens-table.js b/migrations/20170527035704-add-tokens-table.js
deleted file mode 100644
index 34ad73e..0000000
--- a/migrations/20170527035704-add-tokens-table.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-
-var dbm;
-var type;
-var seed;
-
-/**
- * We receive the dbmigrate dependency from dbmigrate initially.
- * This enables us to not have to rely on NODE_PATH.
- */
-exports.setup = function (options, seedLink) {
-    dbm = options.dbmigrate;
-    type = dbm.dataType;
-    seed = seedLink;
-};
-
-exports.up = function (db) {
-    return db.createTable("tokens", {
-        id: {type: 'int', primaryKey: true, autoIncrement: true, notNull: true},
-        matrixUserId: {type: 'string', notNull: true},
-        matrixServerName: {type: 'string', notNull: true},
-        matrixAccessToken: {type: 'string', notNull: true},
-        scalarToken: {type: 'string', notNull: true},
-        expires: {type: 'timestamp', notNull: true}
-    });
-};
-
-exports.down = function (db) {
-    return db.dropTable("tokens");
-};
-
-exports._meta = {
-    "version": 1
-};
diff --git a/migrations/20170527221910-add-upstream-scalar-token-to-tokens.js b/migrations/20170527221910-add-upstream-scalar-token-to-tokens.js
deleted file mode 100644
index 7d025aa..0000000
--- a/migrations/20170527221910-add-upstream-scalar-token-to-tokens.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-var dbm;
-var type;
-var seed;
-
-/**
- * We receive the dbmigrate dependency from dbmigrate initially.
- * This enables us to not have to rely on NODE_PATH.
- */
-exports.setup = function (options, seedLink) {
-    dbm = options.dbmigrate;
-    type = dbm.dataType;
-    seed = seedLink;
-};
-
-exports.up = function (db) {
-    return db.addColumn('tokens', 'upstreamToken', {type: 'string', notNull: false}); // has to be nullable, despite our best intentions
-};
-
-exports.down = function (db) {
-    return db.removeColumn('tokens', 'upstreamToken');
-};
-
-exports._meta = {
-    "version": 1
-};
diff --git a/package-lock.json b/package-lock.json
index e0cdec6..494863d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -106,6 +106,54 @@
       "integrity": "sha1-WLyB9hACj0BSZSnOQEg6lQKBY7A=",
       "dev": true
     },
+    "@types/bluebird": {
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.18.tgz",
+      "integrity": "sha512-OTPWHmsyW18BhrnG5x8F7PzeZ2nFxmHGb42bZn79P9hl+GI5cMzyPgQTwNjbem0lJhoru/8vtjAFCUOu3+gE2w=="
+    },
+    "@types/body-parser": {
+      "version": "1.16.8",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz",
+      "integrity": "sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA==",
+      "requires": {
+        "@types/express": "4.0.39",
+        "@types/node": "8.5.1"
+      }
+    },
+    "@types/continuation-local-storage": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@types/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz",
+      "integrity": "sha1-oz4N+dzptCTRyY/E/evYV43O7H4=",
+      "requires": {
+        "@types/node": "8.5.1"
+      }
+    },
+    "@types/cookie-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.1.tgz",
+      "integrity": "sha512-iJY6B3ZGufLiDf2OCAgiAAQuj1sMKC/wz/7XCEjZ+/MDuultfFJuSwrBKcLSmJ5iYApLzCCYBYJZs0Ws8GPmwA==",
+      "requires": {
+        "@types/express": "4.0.39"
+      }
+    },
+    "@types/express": {
+      "version": "4.0.39",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.0.39.tgz",
+      "integrity": "sha512-dBUam7jEjyuEofigUXCtublUHknRZvcRgITlGsTbFgPvnTwtQUt2NgLakbsf+PsGo/Nupqr3IXCYsOpBpofyrA==",
+      "requires": {
+        "@types/body-parser": "1.16.8",
+        "@types/express-serve-static-core": "4.0.57",
+        "@types/serve-static": "1.13.1"
+      }
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.0.57",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.57.tgz",
+      "integrity": "sha512-QLAHjdLwEICm3thVbXSKRoisjfgMVI4xJH/HU8F385BR2HI7PmM6ax4ELXf8Du6sLmSpySXMYaI+xc//oQ/IFw==",
+      "requires": {
+        "@types/node": "8.5.1"
+      }
+    },
     "@types/geojson": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
@@ -117,10 +165,58 @@
       "integrity": "sha512-q2WC02YxQoX2nY1HRKlYGHpGP1saPmD7GN0pwCDlTz35a4eOtJG+aHRlXyjCuXokUukSrR2aXyBhSW3j+jPc0A==",
       "dev": true
     },
+    "@types/lodash": {
+      "version": "4.14.91",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.91.tgz",
+      "integrity": "sha512-k+nc3moSlAaXacyvz4/c6D9lnUeI6AKsLvkXFuNzUEEqMw7sjDnLW2GqlJ4nyFgMX/p+QzvVG6zRoDo4lJIV5g=="
+    },
+    "@types/mime": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz",
+      "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="
+    },
+    "@types/multer": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/multer/-/multer-0.0.32.tgz",
+      "integrity": "sha1-+Jx1EifcILfJM8MJo+dGfEmfzew=",
+      "requires": {
+        "@types/express": "4.0.39"
+      }
+    },
     "@types/node": {
-      "version": "6.0.92",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.92.tgz",
-      "integrity": "sha512-awEYSSTn7dauwVCYSx2CJaPTu0Z1Ht2oR1b2AD3CYao6ZRb+opb6EL43fzmD7eMFgMHzTBWSUzlWSD+S8xN0Nw=="
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.1.tgz",
+      "integrity": "sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw=="
+    },
+    "@types/reflect-metadata": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@types/reflect-metadata/-/reflect-metadata-0.0.4.tgz",
+      "integrity": "sha1-tkd8qal+UmXyrGf56nBOrl4Or00="
+    },
+    "@types/sequelize": {
+      "version": "4.0.79",
+      "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.0.79.tgz",
+      "integrity": "sha512-rtBBoxXNrSyEaBJm1duQy8C6AeZ4EoSI2MzI/twAVZShKa9y4tAhMiFWwACkrp1VInbJ1aSB+IaCtL+B9btpNA==",
+      "requires": {
+        "@types/bluebird": "3.5.18",
+        "@types/continuation-local-storage": "3.2.1",
+        "@types/lodash": "4.14.91",
+        "@types/validator": "6.3.0"
+      }
+    },
+    "@types/serve-static": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz",
+      "integrity": "sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q==",
+      "requires": {
+        "@types/express-serve-static-core": "4.0.57",
+        "@types/mime": "2.0.0"
+      }
+    },
+    "@types/validator": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-6.3.0.tgz",
+      "integrity": "sha512-fUc+9BEr1WWW8wVRl5I/pyRDGZNe9nH06kOzlGH3eN7N8VVPW/zSrE0Vdca6G2sRCVmIN/XuOenbmldAAyTYaw=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -384,6 +480,11 @@
       "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
       "dev": true
     },
+    "append-field": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz",
+      "integrity": "sha1-bdxY+gg8e8VF08WZWygwzCNm1Eo="
+    },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
@@ -451,7 +552,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
       "requires": {
         "array-uniq": "1.0.3"
       }
@@ -459,8 +559,7 @@
     "array-uniq": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
     },
     "array-unique": {
       "version": "0.3.2",
@@ -504,11 +603,6 @@
       "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
       "dev": true
     },
-    "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
-    },
     "async-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
@@ -614,7 +708,6 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "2.5.2",
         "regenerator-runtime": "0.11.0"
@@ -623,7 +716,8 @@
     "balanced-match": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
     },
     "base": {
       "version": "0.11.2",
@@ -920,6 +1014,38 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "busboy": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz",
+      "integrity": "sha1-bCpiLvz0fFe7vh4qnDetNseSVFM=",
+      "requires": {
+        "dicer": "0.2.5",
+        "readable-stream": "1.1.14"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -942,6 +1068,11 @@
         "unset-value": "1.0.0"
       }
     },
+    "callsites": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-1.0.1.tgz",
+      "integrity": "sha1-wUwkGIzo4dagMLTDyULmuolbaho="
+    },
     "camel-case": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
@@ -1224,9 +1355,9 @@
       "dev": true
     },
     "codelyzer": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-3.2.2.tgz",
-      "integrity": "sha512-VNvW9gRThsqRarEnLioiILd0Pdk0yCq/7cVgYvqHpC+3CHqfnrJfmXjoana7vzWfSis+9pODXofjCWX+nlU9Gw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.0.2.tgz",
+      "integrity": "sha512-nYwOr49+IV09e7C4aXkVALRz0+XpHqZiUUcxHuDZH4xP1FBcHINyr3qvVhv5Gfm7XRmoLx32tsIhrQhW/gBcog==",
       "dev": true,
       "requires": {
         "app-root-path": "2.0.1",
@@ -1294,7 +1425,8 @@
     "colors": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
     },
     "combined-stream": {
       "version": "1.0.5",
@@ -1345,6 +1477,16 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      }
+    },
     "config": {
       "version": "1.28.1",
       "resolved": "https://registry.npmjs.org/config/-/config-1.28.1.tgz",
@@ -1396,6 +1538,15 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
       "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
     },
+    "cookie-parser": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz",
+      "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=",
+      "requires": {
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6"
+      }
+    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -1444,14 +1595,22 @@
     "core-js": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.2.tgz",
-      "integrity": "sha1-vEZIZW59ydyA19PHu8Fy2W50TmM=",
-      "dev": true
+      "integrity": "sha1-vEZIZW59ydyA19PHu8Fy2W50TmM="
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cors": {
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz",
+      "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=",
+      "requires": {
+        "object-assign": "4.1.1",
+        "vary": "1.1.2"
+      }
+    },
     "cosmiconfig": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
@@ -1749,53 +1908,6 @@
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
-    "db-migrate": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/db-migrate/-/db-migrate-0.10.2.tgz",
-      "integrity": "sha512-uU3AXQ89DPKAePCHHoZSJRnLam6/zgOBhgSXVXB9Z3JeHms5OMTQuCdj1leUwYvI6ygHdQ3Z9CS6S9yOuELdcw==",
-      "requires": {
-        "balanced-match": "0.4.2",
-        "bluebird": "3.5.1",
-        "db-migrate-shared": "1.1.3",
-        "deep-extend": "0.4.2",
-        "dotenv": "2.0.0",
-        "final-fs": "1.6.1",
-        "inflection": "1.12.0",
-        "mkdirp": "0.5.1",
-        "moment": "2.19.3",
-        "optimist": "0.6.1",
-        "parse-database-url": "0.3.0",
-        "pkginfo": "0.4.1",
-        "prompt": "1.0.0",
-        "rc": "1.2.2",
-        "resolve": "1.4.0",
-        "semver": "5.4.1",
-        "tunnel-ssh": "4.1.3"
-      }
-    },
-    "db-migrate-base": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/db-migrate-base/-/db-migrate-base-1.5.3.tgz",
-      "integrity": "sha512-dbJHFVYIY75vSOL3MD4qbpjilcwrYn7ZnTqsdA2AGs6w1mYugspfWEBea+uMgJVH/YsUFxw2AYPKRHCHUjhirw==",
-      "requires": {
-        "bluebird": "3.5.1"
-      }
-    },
-    "db-migrate-shared": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/db-migrate-shared/-/db-migrate-shared-1.1.3.tgz",
-      "integrity": "sha1-7bPIF7KVAixhmEwYcmdBm7NqLVg="
-    },
-    "db-migrate-sqlite3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/db-migrate-sqlite3/-/db-migrate-sqlite3-0.2.1.tgz",
-      "integrity": "sha1-ox1nudNtz5lWSymLz9C5hx+2bmc=",
-      "requires": {
-        "bluebird": "3.5.1",
-        "db-migrate-base": "1.5.3",
-        "sqlite3": "3.1.13"
-      }
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1816,16 +1928,6 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
-    "deep-equal": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz",
-      "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0="
-    },
-    "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
-    },
     "define-properties": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
@@ -1910,6 +2012,38 @@
       "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=",
       "dev": true
     },
+    "dicer": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz",
+      "integrity": "sha1-WZbAhrszIYyBLAkL3cCc0S+stw8=",
+      "requires": {
+        "readable-stream": "1.1.14",
+        "streamsearch": "0.1.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
     "diff": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
@@ -2026,11 +2160,6 @@
         "domelementtype": "1.3.0"
       }
     },
-    "dotenv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-2.0.0.tgz",
-      "integrity": "sha1-vXWcNXqqcDZeAclrewvsCKbg2Uk="
-    },
     "dottie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.0.tgz",
@@ -2075,6 +2204,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/embed-video/-/embed-video-2.0.0.tgz",
       "integrity": "sha1-1/JouzRkIg9pXbM6YCHhpgjI4fk=",
+      "dev": true,
       "requires": {
         "fetch-ponyfill": "4.1.0",
         "lodash.escape": "4.0.1",
@@ -2096,6 +2226,7 @@
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "dev": true,
       "requires": {
         "iconv-lite": "0.4.15"
       }
@@ -2216,6 +2347,11 @@
         "event-emitter": "0.3.5"
       }
     },
+    "es6-shim": {
+      "version": "0.35.3",
+      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.3.tgz",
+      "integrity": "sha1-m/tzY/7//4emzbbNk+QF7DxLbyY="
+    },
     "es6-symbol": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
@@ -2606,6 +2742,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-4.1.0.tgz",
       "integrity": "sha1-rjzl9zLGReq4fkroeTQUcJsjmJM=",
+      "dev": true,
       "requires": {
         "node-fetch": "1.7.3"
       }
@@ -2638,15 +2775,6 @@
         "to-regex-range": "2.1.1"
       }
     },
-    "final-fs": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/final-fs/-/final-fs-1.6.1.tgz",
-      "integrity": "sha1-1tzZLvb+T+jAer1WjHE1YQ7eMjY=",
-      "requires": {
-        "node-fs": "0.1.7",
-        "when": "2.0.1"
-      }
-    },
     "finalhandler": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
@@ -2739,6 +2867,15 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
+    "fs-extra": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+      "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "2.4.0"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2909,7 +3046,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
       "requires": {
         "array-union": "1.0.2",
         "glob": "7.1.2",
@@ -2941,8 +3077,7 @@
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "handle-thing": {
       "version": "1.2.5",
@@ -3388,15 +3523,11 @@
       "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
       "dev": true
     },
-    "i": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz",
-      "integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0="
-    },
     "iconv-lite": {
       "version": "0.4.15",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+      "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
+      "dev": true
     },
     "icss-replace-symbols": {
       "version": "1.1.0",
@@ -3503,11 +3634,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
-    },
     "internal-ip": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
@@ -3682,8 +3808,7 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-finite": {
       "version": "1.0.2",
@@ -3822,7 +3947,8 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
     },
     "is-svg": {
       "version": "2.1.0",
@@ -3859,8 +3985,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isexe": {
       "version": "2.0.0",
@@ -3965,6 +4090,14 @@
       "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz",
       "integrity": "sha1-BUNS5MTIDIbAkjh31EneF2pzLI0="
     },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -4103,15 +4236,11 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.defaults": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
-      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
-    },
     "lodash.escape": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg="
+      "integrity": "sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=",
+      "dev": true
     },
     "lodash.memoize": {
       "version": "4.1.2",
@@ -4228,17 +4357,36 @@
       "dev": true
     },
     "matrix-js-sdk": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.8.5.tgz",
-      "integrity": "sha1-1ZAVTx53ADVyZw+p28rH5APnbk8=",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.9.2.tgz",
+      "integrity": "sha1-KlIb3c9jfL796ROHhOYn6kNkW3c=",
       "requires": {
         "another-json": "0.2.0",
+        "babel-runtime": "6.26.0",
         "bluebird": "3.5.1",
         "browser-request": "0.3.3",
         "content-type": "1.0.4",
         "request": "2.83.0"
       }
     },
+    "matrix-js-snippets": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/matrix-js-snippets/-/matrix-js-snippets-0.2.5.tgz",
+      "integrity": "sha512-Q/asN11Bd9giHnQ5kWRPixkAErUJKwprUSLPM5n2ju2W7JgqkSdXhSWBZ7YM9Yc9pc/W8Sb6t1CHAbdbyK3ArA==",
+      "requires": {
+        "chalk": "2.3.0",
+        "moment": "2.20.0",
+        "typescript": "2.6.2",
+        "winston": "2.4.0"
+      },
+      "dependencies": {
+        "moment": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.0.tgz",
+          "integrity": "sha512-r7aEpLB/mhMUiC5ksahDajF/Jr3wS/qLzUnwOJCZyKWF34ibdvW8saujBKfR7aQlov//JgFA38HXOoIt7lXzcA=="
+        }
+      }
+    },
     "md5.js": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -4275,6 +4423,11 @@
         "mimic-fn": "1.1.0"
       }
     },
+    "memory-cache": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz",
+      "integrity": "sha1-eJCwHVLADI68nVM+H46xfjA0hxo="
+    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -4353,10 +4506,9 @@
       }
     },
     "mime": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
-      "dev": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz",
+      "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug=="
     },
     "mime-db": {
       "version": "1.30.0",
@@ -4377,6 +4529,11 @@
       "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
       "dev": true
     },
+    "mini-deep-assign": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mini-deep-assign/-/mini-deep-assign-0.0.8.tgz",
+      "integrity": "sha1-FPpMrZPUfPu0OSeWqLABXn9gy80="
+    },
     "minimalistic-assert": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
@@ -4449,6 +4606,11 @@
         "minimist": "0.0.8"
       }
     },
+    "module-parent": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/module-parent/-/module-parent-0.0.2.tgz",
+      "integrity": "sha1-vhy7PLalUGD8hkZ9Ly0s0KYA4Zk="
+    },
     "moment": {
       "version": "2.19.3",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz",
@@ -4462,16 +4624,33 @@
         "moment": "2.19.3"
       }
     },
-    "mongodb-uri": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/mongodb-uri/-/mongodb-uri-0.9.7.tgz",
-      "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE="
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "multer": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz",
+      "integrity": "sha1-CSsmcPaEb6SRSWXvyM+Uwg/sbNI=",
+      "requires": {
+        "append-field": "0.1.0",
+        "busboy": "0.2.14",
+        "concat-stream": "1.6.0",
+        "mkdirp": "0.5.1",
+        "object-assign": "3.0.0",
+        "on-finished": "2.3.0",
+        "type-is": "1.6.15",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
+        }
+      }
+    },
     "multicast-dns": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz",
@@ -4488,11 +4667,6 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-    },
     "nan": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
@@ -4535,11 +4709,6 @@
         "xml-char-classes": "1.0.0"
       }
     },
-    "ncp": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz",
-      "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY="
-    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -4557,9 +4726,9 @@
       "dev": true
     },
     "ngx-modialog": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/ngx-modialog/-/ngx-modialog-3.0.4.tgz",
-      "integrity": "sha512-rkjLI2GPsikdEKqDxooBdTl8BXh4ndGnLg8iLk4xGNSq+ltRzm7QH4C62V8XcKdG7Kk7VSVc7tGKMtooxLcORQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-modialog/-/ngx-modialog-5.0.0.tgz",
+      "integrity": "sha512-EYqlwoHHMzKBhQegIVIAKGqAk23riah485tEFFdiPHeNbtgBfpSUJ8L7fW3YtHQGuV2tUc+mU8Ty728VwPP1mQ==",
       "dev": true
     },
     "no-case": {
@@ -4575,6 +4744,7 @@
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
       "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "dev": true,
       "requires": {
         "encoding": "0.1.12",
         "is-stream": "1.1.0"
@@ -4586,11 +4756,6 @@
       "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=",
       "dev": true
     },
-    "node-fs": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz",
-      "integrity": "sha1-MjI8zLRsn78PwRgS1FAhzDHTJbs="
-    },
     "node-gyp": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
@@ -4955,8 +5120,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -5096,15 +5260,6 @@
         "is-wsl": "1.1.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "0.0.8",
-        "wordwrap": "0.0.3"
-      }
-    },
     "original": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
@@ -5204,6 +5359,14 @@
         "no-case": "2.3.1"
       }
     },
+    "parent-module": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-0.1.0.tgz",
+      "integrity": "sha1-tSkoY6HoxHbs+Ffn11yYkgskuKY=",
+      "requires": {
+        "callsites": "1.0.1"
+      }
+    },
     "parse-asn1": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
@@ -5217,14 +5380,6 @@
         "pbkdf2": "3.0.14"
       }
     },
-    "parse-database-url": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/parse-database-url/-/parse-database-url-0.3.0.tgz",
-      "integrity": "sha1-NpZmMh6SfJreY838Gqr2+zdFPQ0=",
-      "requires": {
-        "mongodb-uri": "0.9.7"
-      }
-    },
     "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
@@ -5274,12 +5429,26 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "requires": {
+        "process": "0.11.10",
+        "util": "0.10.3"
+      }
+    },
     "path-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
       "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
       "dev": true
     },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+    },
     "path-exists": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -5309,7 +5478,8 @@
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -5348,20 +5518,17 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
       "requires": {
         "pinkie": "2.0.4"
       }
@@ -5420,11 +5587,6 @@
         }
       }
     },
-    "pkginfo": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
-      "integrity": "sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8="
-    },
     "pleeease-filters": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-4.0.0.tgz",
@@ -6171,27 +6333,41 @@
       }
     },
     "postcss-import": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-10.0.0.tgz",
-      "integrity": "sha1-TIXJewmRNsxeoCQNwd/b/eTi674=",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz",
+      "integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "postcss": "6.0.9",
+        "postcss": "6.0.14",
         "postcss-value-parser": "3.3.0",
         "read-cache": "1.0.0",
         "resolve": "1.4.0"
       },
       "dependencies": {
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
+          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
           "dev": true,
           "requires": {
             "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "source-map": "0.6.1",
+            "supports-color": "4.5.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
           }
         }
       }
@@ -6854,65 +7030,18 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-      "dev": true
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "promise-polyfill": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz",
-      "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI="
-    },
-    "prompt": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz",
-      "integrity": "sha1-jlcSPDlquYiJf7Mn/Trtw+c15P4=",
-      "requires": {
-        "colors": "1.1.2",
-        "pkginfo": "0.4.1",
-        "read": "1.0.7",
-        "revalidator": "0.1.8",
-        "utile": "0.3.0",
-        "winston": "2.1.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
-          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k="
-        },
-        "winston": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz",
-          "integrity": "sha1-PJNJ0ZYgf9G9/51LxD73JRDjoS4=",
-          "requires": {
-            "async": "1.0.0",
-            "colors": "1.0.3",
-            "cycle": "1.0.3",
-            "eyes": "0.1.8",
-            "isstream": "0.1.2",
-            "pkginfo": "0.3.1",
-            "stack-trace": "0.0.10"
-          },
-          "dependencies": {
-            "colors": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-              "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
-            },
-            "pkginfo": {
-              "version": "0.3.1",
-              "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-              "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE="
-            }
-          }
-        }
-      }
+      "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=",
+      "dev": true
     },
     "proxy-addr": {
       "version": "2.0.2",
@@ -7071,32 +7200,6 @@
       "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
       "dev": true
     },
-    "rc": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
-      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
-      "requires": {
-        "deep-extend": "0.4.2",
-        "ini": "1.3.5",
-        "minimist": "1.2.0",
-        "strip-json-comments": "2.0.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
-      }
-    },
-    "read": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-      "requires": {
-        "mute-stream": "0.0.7"
-      }
-    },
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -7131,7 +7234,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -7216,8 +7318,7 @@
     "reflect-metadata": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
-      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=",
-      "dev": true
+      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
     },
     "regenerate": {
       "version": "1.3.3",
@@ -7228,8 +7329,7 @@
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
-      "dev": true
+      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
     },
     "regex-cache": {
       "version": "0.4.4",
@@ -7358,6 +7458,15 @@
         "uuid": "3.1.0"
       }
     },
+    "require-dir-all": {
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/require-dir-all/-/require-dir-all-0.4.12.tgz",
+      "integrity": "sha1-7HxyFadukiB5IMlx8VR3aZ6vY6c=",
+      "requires": {
+        "mini-deep-assign": "0.0.8",
+        "module-parent": "0.0.2"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -7370,6 +7479,35 @@
       "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
       "dev": true
     },
+    "require-glob": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/require-glob/-/require-glob-3.2.0.tgz",
+      "integrity": "sha1-kL/iyO+0ufly65o/XlgIMuBPZNM=",
+      "requires": {
+        "glob-parent": "3.1.0",
+        "globby": "6.1.0",
+        "parent-module": "0.1.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "3.1.0",
+            "path-dirname": "1.0.2"
+          }
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        }
+      }
+    },
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -7386,6 +7524,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
       "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
+      "dev": true,
       "requires": {
         "path-parse": "1.0.5"
       }
@@ -7420,11 +7559,6 @@
         "debug": "2.6.9"
       }
     },
-    "revalidator": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz",
-      "integrity": "sha1-/s5hv6DBtSoga9axgZgYS91SOjs="
-    },
     "rgb": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
@@ -7450,6 +7584,7 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
       "requires": {
         "glob": "7.1.2"
       }
@@ -7552,7 +7687,8 @@
     "screenfull": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-3.3.2.tgz",
-      "integrity": "sha512-zrnT8EidEWGFkmXEa1d/YUYNvvJaMX05g4O82K+Oiy9jR6Fh3ZTsovsccJOjRJyhS0KPV7AQpDFQRAYXBl9a5A=="
+      "integrity": "sha512-zrnT8EidEWGFkmXEa1d/YUYNvvJaMX05g4O82K+Oiy9jR6Fh3ZTsovsccJOjRJyhS0KPV7AQpDFQRAYXBl9a5A==",
+      "dev": true
     },
     "scss-tokenizer": {
       "version": "0.2.3",
@@ -7670,6 +7806,26 @@
         }
       }
     },
+    "sequelize-typescript": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.1.tgz",
+      "integrity": "sha512-DbKayDlqzg13qMGvhDg7/wvoaNYO1dIhHdyt12Nbf6Kr12yFS/apqe9MecniEXYFt0nsqQFa/6RZXVM0IJt3/g==",
+      "requires": {
+        "@types/bluebird": "3.5.18",
+        "@types/node": "6.0.41",
+        "@types/reflect-metadata": "0.0.4",
+        "@types/sequelize": "4.0.79",
+        "es6-shim": "0.35.3",
+        "glob": "7.1.2"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "6.0.41",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.41.tgz",
+          "integrity": "sha1-V4z1Oq7GWIe8rxZ5L4ciky6P+Oo="
+        }
+      }
+    },
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
@@ -8815,24 +8971,6 @@
         }
       }
     },
-    "ssh2": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-0.5.4.tgz",
-      "integrity": "sha1-G/a2soyW6u8mf01sRqWiUXpZnic=",
-      "requires": {
-        "ssh2-streams": "0.1.20"
-      }
-    },
-    "ssh2-streams": {
-      "version": "0.1.20",
-      "resolved": "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.1.20.tgz",
-      "integrity": "sha1-URGNFUVV31Rp7h9n4M8efoosDjo=",
-      "requires": {
-        "asn1": "0.2.3",
-        "semver": "5.4.1",
-        "streamsearch": "0.1.2"
-      }
-    },
     "sshpk": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
@@ -8943,7 +9081,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -8997,15 +9134,10 @@
         "get-stdin": "4.0.1"
       }
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-    },
     "style-loader": {
-      "version": "0.18.2",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz",
-      "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
+      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
@@ -9053,6 +9185,11 @@
         }
       }
     },
+    "swagger-ui-express": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-2.0.13.tgz",
+      "integrity": "sha1-IDQ1GPIxPHiVps3/ZHjg7xPLn2Q="
+    },
     "symbol-observable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
@@ -9310,31 +9447,6 @@
         "safe-buffer": "5.1.1"
       }
     },
-    "tunnel-ssh": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tunnel-ssh/-/tunnel-ssh-4.1.3.tgz",
-      "integrity": "sha1-kRIWrXnfEAkILFcT/tJkdu0jm60=",
-      "requires": {
-        "debug": "2.6.0",
-        "lodash.defaults": "4.2.0",
-        "ssh2": "0.5.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
-          "integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
-          "requires": {
-            "ms": "0.7.2"
-          }
-        },
-        "ms": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
-          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U="
-        }
-      }
-    },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
@@ -9350,11 +9462,50 @@
         "mime-types": "2.1.17"
       }
     },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
     "typescript": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-      "dev": true
+      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q="
+    },
+    "typescript-rest": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/typescript-rest/-/typescript-rest-1.2.0.tgz",
+      "integrity": "sha1-4B+oM2VU/tYt6qmQuq7VK2gISQ8=",
+      "requires": {
+        "@types/body-parser": "0.0.33",
+        "@types/cookie-parser": "1.4.1",
+        "@types/express": "4.0.39",
+        "@types/express-serve-static-core": "4.0.57",
+        "@types/multer": "0.0.32",
+        "@types/serve-static": "1.13.1",
+        "body-parser": "1.18.2",
+        "cookie-parser": "1.4.3",
+        "cors": "2.8.4",
+        "express": "4.16.2",
+        "fs-extra": "2.1.2",
+        "lodash": "4.17.4",
+        "multer": "1.3.0",
+        "path": "0.12.7",
+        "reflect-metadata": "0.1.10",
+        "require-glob": "3.2.0",
+        "swagger-ui-express": "2.0.13",
+        "yamljs": "0.2.10"
+      },
+      "dependencies": {
+        "@types/body-parser": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-0.0.33.tgz",
+          "integrity": "sha1-M8oUmPw35Rxd8MgcrjRWnnBB4CU=",
+          "requires": {
+            "@types/express": "4.0.39"
+          }
+        }
+      }
     },
     "uglify-js": {
       "version": "3.0.28",
@@ -9563,13 +9714,22 @@
       }
     },
     "url-loader": {
-      "version": "0.5.9",
-      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
-      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
+      "integrity": "sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "mime": "1.3.4"
+        "mime": "1.6.0",
+        "schema-utils": "0.3.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true
+        }
       }
     },
     "url-parse": {
@@ -9633,7 +9793,6 @@
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
       "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
       "requires": {
         "inherits": "2.0.1"
       },
@@ -9641,16 +9800,14 @@
         "inherits": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
         }
       }
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "utila": {
       "version": "0.4.0",
@@ -9658,19 +9815,6 @@
       "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
       "dev": true
     },
-    "utile": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz",
-      "integrity": "sha1-E1LDQOuCDk2N26A5pPv6oy7U7zo=",
-      "requires": {
-        "async": "0.9.2",
-        "deep-equal": "0.2.2",
-        "i": "0.3.6",
-        "mkdirp": "0.5.1",
-        "ncp": "1.0.1",
-        "rimraf": "2.6.2"
-      }
-    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -10100,11 +10244,6 @@
       "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
-    "when": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/when/-/when-2.0.1.tgz",
-      "integrity": "sha1-jYcv4V5oQkyRtLck6EjggH2rZkI="
-    },
     "whet.extend": {
       "version": "0.9.9",
       "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
@@ -10171,14 +10310,9 @@
       "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.2.tgz",
       "integrity": "sha1-d201pjSlwi5lbkdEvetU+D/Szo0=",
       "requires": {
-        "@types/node": "6.0.92"
+        "@types/node": "8.5.1"
       }
     },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -10203,8 +10337,7 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     },
     "y18n": {
       "version": "3.2.1",
@@ -10218,6 +10351,15 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
+    "yamljs": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.2.10.tgz",
+      "integrity": "sha1-SBzHwlynOvWfWR8MluPOVsdXpA8=",
+      "requires": {
+        "argparse": "1.0.9",
+        "glob": "7.1.2"
+      }
+    },
     "yargs": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
diff --git a/package.json b/package.json
index fe4885b..e4c57d3 100644
--- a/package.json
+++ b/package.json
@@ -2,46 +2,49 @@
   "name": "matrix-dimension",
   "version": "1.0.0",
   "description": "An alternative integrations manager for Riot",
-  "main": "app.js",
+  "main": "build/app/index.js",
   "license": "GPL-3.0",
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
-    "build": "rimraf web-dist && webpack --progress --profile --bail"
+    "start:dev": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
+    "start:app": "npm run-script build && node build/app/index.js",
+    "build": "rimraf build && npm run-script build:web && npm run-script build:app",
+    "build:web": "webpack --progress --profile --bail",
+    "build:app": "tsc -p tsconfig-app.json",
+    "lint:app": "tslint --project ./tsconfig-app.json -t stylish"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/turt2live/matrix-dimension.git"
   },
-  "greenkeeper": {
-    "ignore": [
-      "@types/node"
-    ]
-  },
   "author": "Travis Ralston",
   "dependencies": {
+    "@types/body-parser": "^1.16.8",
+    "@types/node": "^8.5.1",
     "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
-    "chalk": "^2.3.0",
     "config": "^1.28.1",
-    "db-migrate": "^0.10.2",
-    "db-migrate-sqlite3": "^0.2.1",
     "dns-then": "^0.1.0",
-    "embed-video": "^2.0.0",
     "express": "^4.16.2",
     "js-yaml": "^3.10.0",
     "lodash": "^4.17.4",
-    "matrix-js-sdk": "^0.8.5",
+    "matrix-js-sdk": "^0.9.2",
+    "matrix-js-snippets": "^0.2.5",
+    "memory-cache": "^0.2.0",
+    "mime": "^2.0.3",
     "moment": "^2.19.3",
     "netmask": "^1.0.6",
     "random-string": "^0.2.0",
     "request": "^2.83.0",
-    "screenfull": "^3.3.2",
+    "require-dir-all": "^0.4.12",
     "sequelize": "^4.27.0",
+    "sequelize-typescript": "^0.6.1",
     "sqlite3": "^3.1.13",
-    "url": "^0.11.0",
-    "winston": "^2.4.0"
+    "typescript-rest": "^1.2.0",
+    "url": "^0.11.0"
   },
   "devDependencies": {
+    "embed-video": "^2.0.0",
+    "screenfull": "^3.3.2",
     "@angular/animations": "^5.0.0",
     "@angular/common": "^5.0.0",
     "@angular/compiler": "^5.0.0",
@@ -55,12 +58,11 @@
     "@angularclass/hmr-loader": "^3.0.2",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.7",
     "@types/jquery": "^3.2.16",
-    "@types/node": "^6.0.92",
     "angular2-template-loader": "^0.6.2",
     "angular2-toaster": "^4.0.0",
     "angular2-ui-switch": "^1.2.0",
     "awesome-typescript-loader": "^3.4.1",
-    "codelyzer": "^3.2.2",
+    "codelyzer": "^4.0.2",
     "copy-webpack-plugin": "^4.2.3",
     "core-js": "^2.5.2",
     "css-loader": "^0.28.7",
@@ -73,10 +75,10 @@
     "jquery": "^3.2.1",
     "json-loader": "^0.5.4",
     "ng2-breadcrumbs": "^0.1.281",
-    "ngx-modialog": "^3.0.4",
+    "ngx-modialog": "^5.0.0",
     "node-sass": "^4.7.2",
     "postcss-cssnext": "^3.0.0",
-    "postcss-import": "^10.0.0",
+    "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.9",
     "postcss-scss": "^1.0.0",
     "raw-loader": "^0.5.1",
@@ -86,12 +88,12 @@
     "sass-loader": "^6.0.3",
     "shelljs": "^0.7.8",
     "spinkit": "^1.2.5",
-    "style-loader": "^0.18.2",
+    "style-loader": "^0.19.1",
     "ts-helpers": "^1.1.2",
     "tslint": "^5.8.0",
     "tslint-loader": "^3.4.3",
     "typescript": "^2.6.2",
-    "url-loader": "^0.5.8",
+    "url-loader": "^0.6.2",
     "webpack": "^3.10.0",
     "webpack-dev-server": "^2.9.7",
     "zone.js": "^0.8.18"
diff --git a/src-ts/MemoryCache.ts b/src-ts/MemoryCache.ts
new file mode 100644
index 0000000..6934d32
--- /dev/null
+++ b/src-ts/MemoryCache.ts
@@ -0,0 +1,25 @@
+import * as cache from "memory-cache";
+
+export class MemoryCache {
+
+    private internalCache = new cache.Cache();
+
+    constructor() {
+    }
+
+    public put(key: string, value: any, timeoutMs?: number): void {
+        this.internalCache.put(key, value, timeoutMs);
+    }
+
+    public get(key: string): any {
+        return this.internalCache.get(key);
+    }
+
+    public del(key: string): void {
+        this.internalCache.del(key);
+    }
+
+    public clear(): void {
+        this.internalCache.clear();
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/ApiError.ts b/src-ts/api/ApiError.ts
new file mode 100644
index 0000000..6e99257
--- /dev/null
+++ b/src-ts/api/ApiError.ts
@@ -0,0 +1,14 @@
+export class ApiError {
+
+    public statusCode: number;
+    public jsonResponse: any;
+
+    constructor(statusCode: number, json: any) {
+        // Because typescript is just plain dumb
+        // https://stackoverflow.com/questions/31626231/custom-error-class-in-typescript
+        Error.apply(this, ["ApiError"]);
+
+        this.jsonResponse = json;
+        this.statusCode = statusCode;
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/Webserver.ts b/src-ts/api/Webserver.ts
new file mode 100644
index 0000000..7e7296a
--- /dev/null
+++ b/src-ts/api/Webserver.ts
@@ -0,0 +1,76 @@
+import * as express from "express";
+import * as path from "path";
+import * as bodyParser from "body-parser";
+import * as URL from "url";
+import { LogService } from "matrix-js-snippets";
+import { Server } from "typescript-rest";
+import * as _ from "lodash";
+import config from "../config";
+import { ApiError } from "./ApiError";
+
+export default class Webserver {
+
+    private app: express.Application;
+
+    constructor() {
+        this.app = express();
+
+        this.configure();
+        this.loadRoutes();
+    }
+
+    private loadRoutes() {
+        const apis = ["scalar", "dimension"].map(a => path.join(__dirname, a, "*.js"));
+        const router = express.Router();
+        Server.loadServices(router, apis);
+        const routes = _.uniq(router.stack.map(r => r.route.path));
+        for (const route of routes) {
+            this.app.options(route, (_req, res) => res.sendStatus(200));
+            LogService.info("Webserver", "Registered route: " + route);
+        }
+        this.app.use(router);
+
+        // We register the default route last to make sure we don't override anything by accident.
+        // We'll pass off all other requests to the web app
+        this.app.get("*", (_req, res) => {
+            res.sendFile(path.join(__dirname, "..", "..", "web", "index.html"));
+        });
+
+        // Set up the error handler
+        this.app.use((err: any, _req, res, next) => {
+            if (err instanceof ApiError) {
+                // Don't do anything for 'connection reset'
+                if (res.headersSent) return next(err);
+
+                LogService.warn("Webserver", "Handling ApiError " + err.statusCode + " " + JSON.stringify(err.jsonResponse));
+                res.setHeader("Content-Type", "application/json");
+                res.status(err.statusCode);
+                res.json(err.jsonResponse);
+            } else next(err);
+        });
+    }
+
+    private configure() {
+        this.app.use(express.static(path.join(__dirname, "..", "..", "web")));
+        this.app.use(bodyParser.json());
+        this.app.use((req, _res, next) => {
+            const parsedUrl = URL.parse(req.url, true);
+            if (parsedUrl.query && parsedUrl.query["scalar_token"]) {
+                parsedUrl.query["scalar_token"] = "redacted";
+                parsedUrl.search = undefined; // to force URL.format to use `query`
+            }
+            LogService.verbose("Webserver", "Incoming request: " + req.method + " " + URL.format(parsedUrl));
+            next();
+        });
+        this.app.use((_req, res, next) => {
+            res.setHeader("Access-Control-Allow-Origin", "*");
+            res.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+            next();
+        });
+    }
+
+    start() {
+        this.app.listen(config.web.port, config.web.address);
+        LogService.info("Webserver", "API and UI listening on " + config.web.address + ":" + config.web.port);
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/scalar/ScalarService.ts b/src-ts/api/scalar/ScalarService.ts
new file mode 100644
index 0000000..71e5d4f
--- /dev/null
+++ b/src-ts/api/scalar/ScalarService.ts
@@ -0,0 +1,106 @@
+import { GET, Path, POST, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { MatrixOpenIdClient } from "../../matrix/MatrixOpenIdClient";
+import Upstream from "../../db/models/Upstream";
+import { ScalarClient } from "../../scalar/ScalarClient";
+import User from "../../db/models/User";
+import UserScalarToken from "../../db/models/UserScalarToken";
+import { LogService } from "matrix-js-snippets";
+import { ApiError } from "../ApiError";
+import * as randomString from "random-string";
+import { OpenId } from "../../models/OpenId";
+import { ScalarAccountResponse, ScalarRegisterResponse } from "../../models/ScalarResponses";
+import { DimensionStore } from "../../db/DimensionStore";
+import { MemoryCache } from "../../MemoryCache";
+
+interface RegisterRequest {
+    access_token: string;
+    token_type: string;
+    matrix_server_name: string;
+    expires_in: number;
+}
+
+@Path("/api/v1/scalar")
+export class ScalarService {
+
+    private static accountCache = new MemoryCache();
+
+    public static clearAccountCache(): void {
+        ScalarService.accountCache.clear();
+    }
+
+    public static getTokenOwner(scalarToken: string): Promise<string> {
+        const cachedUserId = ScalarService.accountCache.get(scalarToken);
+        if (cachedUserId) return Promise.resolve(cachedUserId);
+
+        return DimensionStore.getTokenOwner(scalarToken).then(user => {
+            if (!user) return Promise.reject("Invalid token");
+            ScalarService.accountCache.put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
+            return Promise.resolve(user.userId);
+        });
+    }
+
+    @POST
+    @Path("register")
+    public register(request: RegisterRequest): Promise<ScalarRegisterResponse> {
+        let userId = null;
+        const mxClient = new MatrixOpenIdClient(<OpenId>request);
+        return mxClient.getUserId().then(mxUserId => {
+            userId = mxUserId;
+            return User.findByPrimary(userId).then(user => {
+                if (!user) {
+                    // There's a small chance we'll get a validation error because of:
+                    // https://github.com/vector-im/riot-web/issues/5846
+                    LogService.verbose("ScalarService", "User " + userId + " never seen before - creating");
+                    return User.create({userId: userId});
+                }
+            });
+        }).then(() => {
+            return Upstream.findAll();
+        }).then(upstreams => {
+            return Promise.all(upstreams.map(u => {
+                return UserScalarToken.findAll({where: {userId: userId, upstreamId: u.id}}).then(tokens => {
+                    if (!tokens || tokens.length === 0) {
+                        LogService.info("ScalarService", "Registering " + userId + " for token at upstream " + u.id + " (" + u.name + ")");
+                        const client = new ScalarClient(u);
+                        return client.register(<OpenId>request).then(registerResponse => {
+                            return UserScalarToken.create({
+                                userId: userId,
+                                scalarToken: registerResponse.scalar_token,
+                                isDimensionToken: false,
+                                upstreamId: u.id,
+                            });
+                        });
+                    }
+                });
+            }));
+        }).then(() => {
+            const dimensionToken = randomString({length: 25});
+            return UserScalarToken.create({
+                userId: userId,
+                scalarToken: dimensionToken,
+                isDimensionToken: true,
+            });
+        }).then(userToken => {
+            return {scalar_token: userToken.scalarToken};
+        }).catch(err => {
+            LogService.error("ScalarService", err);
+            throw new ApiError(401, {message: "Failed to authenticate user"});
+        });
+    }
+
+    @GET
+    @Path("account")
+    public getAccount(@QueryParam("scalar_token") scalarToken: string): Promise<ScalarAccountResponse> {
+        return ScalarService.getTokenOwner(scalarToken).then(userId => {
+            return {user_id: userId};
+        }, err => {
+            if (err !== "Invalid token") {
+                LogService.error("ScalarService", "Error getting account information for user");
+                LogService.error("ScalarService", err);
+            }
+            throw new ApiError(401, {message: "Invalid token"});
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/src-ts/api/scalar/ScalarWidgetService.ts b/src-ts/api/scalar/ScalarWidgetService.ts
new file mode 100644
index 0000000..cba14bf
--- /dev/null
+++ b/src-ts/api/scalar/ScalarWidgetService.ts
@@ -0,0 +1,81 @@
+import { GET, Path, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { LogService } from "matrix-js-snippets";
+import { ApiError } from "../ApiError";
+import { MemoryCache } from "../../MemoryCache";
+import { MatrixLiteClient } from "../../matrix/MatrixLiteClient";
+import config from "../../config";
+import { ScalarService } from "./ScalarService";
+import moment = require("moment");
+
+interface UrlPreviewResponse {
+    cached_response: boolean;
+    page_title_cache_item: {
+        expires: string; // "2017-12-18T04:20:04.001806738Z"
+        cached_response_err: string;
+        cached_title: string; // the actual thing riot uses
+    };
+    error: {
+        message: string;
+    };
+}
+
+@Path("/api/v1/scalar/widgets")
+export class ScalarWidgetService {
+
+    private static urlCache = new MemoryCache();
+
+    private static getUrlTitle(url: string): Promise<UrlPreviewResponse> {
+        const cachedResult = ScalarWidgetService.urlCache.get(url);
+        if (cachedResult) {
+            cachedResult.cached_response = true;
+            return Promise.resolve(cachedResult);
+        }
+
+        const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
+        return client.getUrlPreview(url).then(preview => {
+            const expirationTime = 60 * 80 * 1000; // 1 hour
+            const expirationAsString = moment().add(expirationTime, "milliseconds").toISOString();
+            const cachedItem = {
+                cached_response: false, // we're not cached yet
+                page_title_cache_item: {
+                    expires: expirationAsString,
+                    cached_response_err: null,
+                    cached_title: preview["og:title"],
+                },
+                error: {message: null},
+            };
+            ScalarWidgetService.urlCache.put(url, cachedItem, expirationTime);
+            return cachedItem;
+        }).catch(err => {
+            LogService.error("ScalarWidgetService", "Error getting URL preview");
+            LogService.error("ScalarWidgetService", err);
+            return <UrlPreviewResponse>{
+                // All of this is to match scalar's response :/
+                cached_response: false,
+                page_title_cache_item: {
+                    expires: null,
+                    cached_response_err: "Failed to get URL preview",
+                    cached_title: null
+                },
+                error: {
+                    message: "Failed to get URL preview",
+                },
+            };
+        })
+    }
+
+    @GET
+    @Path("title_lookup")
+    public register(@QueryParam("scalar_token") scalarToken: string, @QueryParam("curl") url: string): Promise<UrlPreviewResponse> {
+        return ScalarService.getTokenOwner(scalarToken).then(_userId => {
+            return ScalarWidgetService.getUrlTitle(url);
+        }, err => {
+            if (err !== "Invalid token") {
+                LogService.error("ScalarWidgetService", "Error getting account information for user");
+                LogService.error("ScalarWidgetService", err);
+            }
+            throw new ApiError(401, {message: "Invalid token"});
+        })
+    }
+}
\ No newline at end of file
diff --git a/src-ts/config.ts b/src-ts/config.ts
new file mode 100644
index 0000000..7149e0a
--- /dev/null
+++ b/src-ts/config.ts
@@ -0,0 +1,21 @@
+import * as config from "config";
+import { LogConfig } from "matrix-js-snippets";
+
+export interface DimensionConfig {
+    web: {
+        port: number;
+        address: string;
+    };
+    homeserver: {
+        name: string;
+        accessToken: string;
+    };
+    widgetBlacklist: string[];
+    database: {
+        file: string;
+    };
+    admins: string[];
+    logging: LogConfig;
+}
+
+export default <DimensionConfig>config;
\ No newline at end of file
diff --git a/src-ts/db/DimensionStore.ts b/src-ts/db/DimensionStore.ts
new file mode 100644
index 0000000..a044270
--- /dev/null
+++ b/src-ts/db/DimensionStore.ts
@@ -0,0 +1,75 @@
+import { Model, Sequelize } from "sequelize-typescript";
+import config from "../config";
+import { LogService } from "matrix-js-snippets";
+import User from "./models/User";
+import UserScalarToken from "./models/UserScalarToken";
+import Upstream from "./models/Upstream";
+import * as Promise from "bluebird";
+
+class _DimensionStore {
+    private sequelize: Sequelize;
+
+    constructor() {
+        this.sequelize = new Sequelize({
+            dialect: 'sqlite',
+            database: "dimension",
+            storage: config.database.file,
+            username: "",
+            password: "",
+            logging: i => LogService.verbose("DimensionStore [SQL]", i)
+        });
+        this.sequelize.addModels(<Array<typeof Model>>[
+            User,
+            UserScalarToken,
+            Upstream,
+        ]);
+    }
+
+    public updateSchema(): Promise<any> {
+        LogService.info("DimensionStore", "Updating schema...");
+        return this.sequelize.sync();
+    }
+
+    public doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
+        let upstreamTokenIds: number[] = [];
+        let hasDimensionToken = false;
+        return UserScalarToken.findAll({where: {userId: userId}}).then(results => {
+            upstreamTokenIds = results.filter(t => !t.isDimensionToken).map(t => t.upstreamId);
+            hasDimensionToken = results.filter(t => t.isDimensionToken).length >= 1;
+            return Upstream.findAll();
+        }).then(upstreams => {
+            if (!hasDimensionToken) {
+                LogService.warn("DimensionStore", "User " + userId + " is missing a Dimension scalar token");
+                return false;
+            }
+
+            for (const upstream of upstreams) {
+                if (upstreamTokenIds.indexOf(upstream.id) === -1) {
+                    LogService.warn("DimensionStore", "User " + userId + " is missing a scalar token for upstream " + upstream.id + " (" + upstream.name + ")");
+                    return false;
+                }
+            }
+
+            return true;
+        });
+    }
+
+    public getTokenOwner(scalarToken: string): Promise<User> {
+        let user: User = null;
+        return UserScalarToken.findAll({where: {isDimensionToken: true, scalarToken: scalarToken}, include: [User]}).then(tokens => {
+            if (!tokens || tokens.length === 0) {
+                return Promise.reject("Invalid token");
+            }
+
+            user = tokens[0].user;
+            return this.doesUserHaveTokensForAllUpstreams(user.userId);
+        }).then(hasUpstreams => {
+            if (!hasUpstreams) {
+                return Promise.reject("Invalid token"); // missing one or more upstreams == no validation
+            }
+            return Promise.resolve(user);
+        });
+    }
+}
+
+export const DimensionStore = new _DimensionStore();
\ No newline at end of file
diff --git a/src-ts/db/models/Upstream.ts b/src-ts/db/models/Upstream.ts
new file mode 100644
index 0000000..908a1bc
--- /dev/null
+++ b/src-ts/db/models/Upstream.ts
@@ -0,0 +1,25 @@
+import { AutoIncrement, Column, Model, PrimaryKey, Table } from "sequelize-typescript";
+
+@Table({
+    tableName: "dimension_upstreams",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class Upstream extends Model<Upstream> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    name: string;
+
+    @Column
+    type: string;
+
+    @Column
+    scalarUrl: string;
+
+    @Column
+    apiUrl: string;
+}
\ No newline at end of file
diff --git a/src-ts/db/models/User.ts b/src-ts/db/models/User.ts
new file mode 100644
index 0000000..36a28f4
--- /dev/null
+++ b/src-ts/db/models/User.ts
@@ -0,0 +1,14 @@
+import { Column, Model, PrimaryKey, Table } from "sequelize-typescript";
+
+@Table({
+    tableName: "dimension_users",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class User extends Model<User> {
+    // This is really just a holding class to keep foreign keys alive
+
+    @PrimaryKey
+    @Column
+    userId: string;
+}
\ No newline at end of file
diff --git a/src-ts/db/models/UserScalarToken.ts b/src-ts/db/models/UserScalarToken.ts
new file mode 100644
index 0000000..522d573
--- /dev/null
+++ b/src-ts/db/models/UserScalarToken.ts
@@ -0,0 +1,39 @@
+import {
+    AllowNull, AutoIncrement, BelongsTo, Column, ForeignKey, Model, PrimaryKey,
+    Table
+} from "sequelize-typescript";
+import User from "./User";
+import Upstream from "./Upstream";
+
+@Table({
+    tableName: "dimension_scalar_tokens",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class UserScalarToken extends Model<UserScalarToken> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    @ForeignKey(() => User)
+    userId: string;
+
+    @BelongsTo(() => User)
+    user: User;
+
+    @Column
+    scalarToken: string;
+
+    @Column
+    isDimensionToken: boolean;
+
+    @AllowNull
+    @Column
+    @ForeignKey(() => Upstream)
+    upstreamId?: number;
+
+    @BelongsTo(() => Upstream)
+    upstream: Upstream;
+}
\ No newline at end of file
diff --git a/src-ts/index.ts b/src-ts/index.ts
new file mode 100644
index 0000000..ac720b8
--- /dev/null
+++ b/src-ts/index.ts
@@ -0,0 +1,15 @@
+import { LogService } from "matrix-js-snippets";
+import config from "./config";
+import { DimensionStore } from "./db/DimensionStore";
+import Webserver from "./api/Webserver";
+
+LogService.configure(config.logging);
+LogService.info("index", "Starting voyager...");
+
+const webserver = new Webserver();
+
+DimensionStore.updateSchema()
+    .then(() => webserver.start())
+    .then(() => {
+        LogService.info("index", "Dimension is ready!");
+    });
\ No newline at end of file
diff --git a/src-ts/matrix/MatrixLiteClient.ts b/src-ts/matrix/MatrixLiteClient.ts
new file mode 100644
index 0000000..ccde92e
--- /dev/null
+++ b/src-ts/matrix/MatrixLiteClient.ts
@@ -0,0 +1,24 @@
+import * as Promise from "bluebird";
+import { doFederatedApiCall } from "./helpers";
+
+export interface MatrixUrlPreview {
+    // This is really the only parameter we care about
+    "og:title"?: string;
+}
+
+export class MatrixLiteClient {
+
+    constructor(private homeserverName: string, private accessToken: string) {
+    }
+
+    public getUrlPreview(url: string): Promise<MatrixUrlPreview> {
+        return doFederatedApiCall(
+            "GET",
+            this.homeserverName,
+            "/_matrix/media/r0/preview_url",
+            {access_token: this.accessToken, url: url}
+        ).then(response => {
+            return response;
+        });
+    }
+}
diff --git a/src-ts/matrix/MatrixOpenIdClient.ts b/src-ts/matrix/MatrixOpenIdClient.ts
new file mode 100644
index 0000000..beec738
--- /dev/null
+++ b/src-ts/matrix/MatrixOpenIdClient.ts
@@ -0,0 +1,20 @@
+import * as Promise from "bluebird";
+import { doFederatedApiCall } from "./helpers";
+import { OpenId } from "../models/OpenId";
+
+export class MatrixOpenIdClient {
+
+    constructor(private openId: OpenId) {
+    }
+
+    public getUserId(): Promise<string> {
+        return doFederatedApiCall(
+            "GET",
+            this.openId.matrix_server_name,
+            "/_matrix/federation/v1/openid/userinfo",
+            {access_token: this.openId.access_token}
+        ).then(response => {
+            return response['sub'];
+        });
+    }
+}
diff --git a/src-ts/matrix/helpers.ts b/src-ts/matrix/helpers.ts
new file mode 100644
index 0000000..28a7be6
--- /dev/null
+++ b/src-ts/matrix/helpers.ts
@@ -0,0 +1,61 @@
+import * as dns from "dns-then";
+import * as Promise from "bluebird";
+import { LogService } from "matrix-js-snippets";
+import { MemoryCache } from "../MemoryCache";
+import * as request from "request";
+
+const federationUrlCache = new MemoryCache();
+
+export function getFederationUrl(serverName: string): Promise<string> {
+    const cachedUrl = federationUrlCache.get(serverName);
+    if (cachedUrl) {
+        LogService.verbose("matrix", "Cached federation URL for " + serverName + " is " + cachedUrl);
+        return Promise.resolve(cachedUrl);
+    }
+
+    let serverUrl = null;
+    let expirationMs = 4 * 60 * 60 * 1000; // default is 4 hours
+    const dnsPromise = dns.resolveSrv("_matrix._tcp." + serverName);
+    return Promise.resolve(dnsPromise).then(records => {
+        if (records && records.length > 0) {
+            serverUrl = "https://" + records[0].name + ":" + records[0].port;
+            expirationMs = records[0].ttl * 1000;
+        }
+    }, _err => {
+        // Not having the SRV record isn't bad, it just means that the server operator decided to not use SRV records.
+        // When there's no SRV record we default to port 8448 (as per the federation rules) in the lower .then()
+        // People tend to think that the lack of an SRV record is bad, but in reality it's only a problem if one was set and
+        // it's not being found. Most people don't set up the SRV record, but some do.
+        LogService.warn("matrix", "Could not find _matrix._tcp." + serverName + " DNS record. This is normal for most servers.");
+    }).then(() => {
+        if (!serverUrl) serverUrl = "https://" + serverName + ":8448";
+        LogService.verbose("matrix", "Federation URL for " + serverName + " is " + serverUrl + " - caching for " + expirationMs + " ms");
+        federationUrlCache.put(serverName, serverUrl, expirationMs);
+        return serverUrl;
+    });
+}
+
+export function doFederatedApiCall(method: string, serverName: string, endpoint: string, query?: object, body?:object):Promise<any> {
+    return getFederationUrl(serverName).then(federationUrl => {
+        return new Promise((resolve, reject) => {
+            request({
+                method: method,
+                url: federationUrl + endpoint,
+                qs: query,
+                json: body,
+                rejectUnauthorized: false, // allow self signed certs (for federation)
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("matrix", "Error calling " + endpoint);
+                    LogService.error("matrix", err);
+                    reject(err);
+                } else if (res.statusCode !== 200) {
+                    LogService.error("matrix", "Got status code " + res.statusCode + " while calling " + endpoint);
+                    reject(new Error("Error in request: invalid status code"));
+                } else {
+                    resolve(res.body);
+                }
+            });
+        });
+    });
+}
\ No newline at end of file
diff --git a/src-ts/models/OpenId.ts b/src-ts/models/OpenId.ts
new file mode 100644
index 0000000..6f61827
--- /dev/null
+++ b/src-ts/models/OpenId.ts
@@ -0,0 +1,6 @@
+export interface OpenId {
+    access_token: string;
+    matrix_server_name: string;
+    expires_in: number;
+    token_type: 'Bearer';
+}
\ No newline at end of file
diff --git a/src-ts/models/ScalarResponses.ts b/src-ts/models/ScalarResponses.ts
new file mode 100644
index 0000000..5039c61
--- /dev/null
+++ b/src-ts/models/ScalarResponses.ts
@@ -0,0 +1,8 @@
+export interface ScalarRegisterResponse {
+    scalar_token: string;
+}
+
+export interface ScalarAccountResponse {
+    user_id: string;
+    //credit: number; // present on scalar-web
+}
\ No newline at end of file
diff --git a/src-ts/scalar/ScalarClient.ts b/src-ts/scalar/ScalarClient.ts
new file mode 100644
index 0000000..f064ab7
--- /dev/null
+++ b/src-ts/scalar/ScalarClient.ts
@@ -0,0 +1,32 @@
+import { OpenId } from "../models/OpenId";
+import { ScalarRegisterResponse } from "../models/ScalarResponses";
+import * as Promise from "bluebird";
+import * as request from "request";
+import { LogService } from "matrix-js-snippets";
+import Upstream from "../db/models/Upstream";
+
+export class ScalarClient {
+    constructor(private upstream: Upstream) {
+    }
+
+    public register(openId: OpenId): Promise<ScalarRegisterResponse> {
+        return new Promise((resolve, reject) => {
+            request({
+                method: "POST",
+                url: this.upstream.scalarUrl + "/register",
+                json: openId,
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("ScalarClient", "Error registering for token");
+                    LogService.error("ScalarClient", err);
+                    reject(err);
+                } else if (res.statusCode !== 200) {
+                    LogService.error("ScalarClient", "Got status code " + res.statusCode + " while registering for token");
+                    reject(new Error("Could not get token"));
+                } else {
+                    resolve(res.body);
+                }
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/src-ts/temp_todo.txt b/src-ts/temp_todo.txt
new file mode 100644
index 0000000..796bc2f
--- /dev/null
+++ b/src-ts/temp_todo.txt
@@ -0,0 +1,5 @@
+* dimension apis
+* integration management
+* admin ui
+* delete old src
+* import from old db/config (script)
\ No newline at end of file
diff --git a/tsconfig-app.json b/tsconfig-app.json
new file mode 100644
index 0000000..e58ba89
--- /dev/null
+++ b/tsconfig-app.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "target": "es2015",
+    "noImplicitAny": false,
+    "sourceMap": true,
+    "outDir": "./build/app",
+    "types": [
+      "node"
+    ]
+  },
+  "include": [
+    "./src-ts/**/*"
+  ]
+}
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index 697a78d..25c7919 100644
--- a/tslint.json
+++ b/tslint.json
@@ -9,7 +9,7 @@
       "check-space"
     ],
     "curly": false,
-    "eofline": true,
+    "eofline": false,
     "forin": false,
     "indent": [
       true,
@@ -107,9 +107,6 @@
     ],
     "no-attribute-parameter-decorator": true,
     "no-forward-ref": true,
-    "import-destructuring-spacing": true,
-    "no-access-missing-member": true,
-    "templates-use-public": true,
-    "invoke-injectable": true
+    "import-destructuring-spacing": true
   }
 }
\ No newline at end of file
diff --git a/web/app/integration-bag/integration-bag.component.scss b/web/app/integration-bag/integration-bag.component.scss
index 757f71e..063ff49 100644
--- a/web/app/integration-bag/integration-bag.component.scss
+++ b/web/app/integration-bag/integration-bag.component.scss
@@ -11,7 +11,7 @@
   border: 1px solid #eee;
   border-radius: 5px;
   margin: 7px;
-  padding: 5px;
+  padding: 6px;
   width: calc(325px - 14px);
   position: relative;
   cursor: pointer;
@@ -21,7 +21,7 @@
   display: none;
   position: absolute;
   top: calc(50% - 12px); // icon happens to be 24px tall
-  right: 0;
+  right: 1px;
   color: #bbb;
 }
 
diff --git a/webpack.config.js b/webpack.config.js
index 4ac4b0b..85eb0f4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,7 +6,7 @@ var HtmlWebpackPlugin = require('html-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 
-var isProd = process.env.npm_lifecycle_event == 'build';
+var isProd = process.env.npm_lifecycle_event === 'build';
 
 module.exports = function () {
     var config = {};
@@ -21,7 +21,7 @@ module.exports = function () {
     };
 
     config.output = {
-        path: root('web-dist'),
+        path: path.join(root('build'), 'web'),
         publicPath: isProd ? '/' : '/', //http://0.0.0.0:8080',
         filename: isProd ? 'js/[name].[hash].js' : 'js/[name].js',
         chunkFilename: isProd ? '[id].[hash].chunk.js' : '[id].chunk.js'

From 599fb80112f1677efc8993a28e11b39ffe51831f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 18 Dec 2017 21:44:01 -0700
Subject: [PATCH 013/111] Add the start of an admin API and re-add widgets

The frontend is still broken and doesn't use these endpoints at all. A migration tool still needs to be written to pull in existing widget configurations.
---
 .gitignore                                    |  4 ++
 package-lock.json                             | 15 +++-
 package.json                                  |  6 +-
 src-ts/api/Webserver.ts                       |  2 +-
 src-ts/api/dimension/DimensionAdminService.ts | 35 +++++++++
 .../dimension/DimensionIntegrationsService.ts | 54 ++++++++++++++
 src-ts/api/scalar/ScalarService.ts            | 16 +++--
 src-ts/api/scalar/ScalarWidgetService.ts      | 11 +--
 src-ts/db/DimensionStore.ts                   | 28 +++++++-
 .../db/migrations/20171218203245-AddTables.ts | 42 +++++++++++
 .../migrations/20171218203245-AddWidgets.ts   | 72 +++++++++++++++++++
 src-ts/db/models/IntegrationRecord.ts         |  8 +++
 src-ts/db/models/WidgetRecord.ts              | 35 +++++++++
 src-ts/integrations/Integration.ts            | 30 ++++++++
 src-ts/integrations/Widget.ts                 | 21 ++++++
 15 files changed, 354 insertions(+), 25 deletions(-)
 create mode 100644 src-ts/api/dimension/DimensionAdminService.ts
 create mode 100644 src-ts/api/dimension/DimensionIntegrationsService.ts
 create mode 100644 src-ts/db/migrations/20171218203245-AddTables.ts
 create mode 100644 src-ts/db/migrations/20171218203245-AddWidgets.ts
 create mode 100644 src-ts/db/models/IntegrationRecord.ts
 create mode 100644 src-ts/db/models/WidgetRecord.ts
 create mode 100644 src-ts/integrations/Integration.ts
 create mode 100644 src-ts/integrations/Widget.ts

diff --git a/.gitignore b/.gitignore
index 6d832e7..1de6ce0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,10 @@ config/integrations/*_development.yaml
 config/integrations/*_production.yaml
 build/
 dimension.db
+src-ts/**/*.js
+src-ts/**/*.js.map
+web/**/*.js
+web/**/*.js.map
 
 # Logs
 logs
diff --git a/package-lock.json b/package-lock.json
index 494863d..3421508 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5478,8 +5478,7 @@
     "path-parse": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-      "dev": true
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -7524,7 +7523,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
       "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
-      "dev": true,
       "requires": {
         "path-parse": "1.0.5"
       }
@@ -9583,6 +9581,17 @@
         }
       }
     },
+    "umzug": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/umzug/-/umzug-2.1.0.tgz",
+      "integrity": "sha512-BgT+ekpItEWaG+3JjLLj6yVTxw2wIH8Cr6JyKYIzukWAx9nzGhC6BGHb/IRMjpobMM1qtIrReATwLUjKpU2iOQ==",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "bluebird": "3.5.1",
+        "lodash": "4.17.4",
+        "resolve": "1.4.0"
+      }
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
diff --git a/package.json b/package.json
index e4c57d3..24faf72 100644
--- a/package.json
+++ b/package.json
@@ -40,11 +40,10 @@
     "sequelize-typescript": "^0.6.1",
     "sqlite3": "^3.1.13",
     "typescript-rest": "^1.2.0",
+    "umzug": "^2.1.0",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "embed-video": "^2.0.0",
-    "screenfull": "^3.3.2",
     "@angular/animations": "^5.0.0",
     "@angular/common": "^5.0.0",
     "@angular/compiler": "^5.0.0",
@@ -67,6 +66,7 @@
     "core-js": "^2.5.2",
     "css-loader": "^0.28.7",
     "cssnano": "^3.10.0",
+    "embed-video": "^2.0.0",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.5",
     "goby": "^1.1.2",
@@ -86,13 +86,13 @@
     "rimraf": "^2.6.2",
     "rxjs": "^5.5.5",
     "sass-loader": "^6.0.3",
+    "screenfull": "^3.3.2",
     "shelljs": "^0.7.8",
     "spinkit": "^1.2.5",
     "style-loader": "^0.19.1",
     "ts-helpers": "^1.1.2",
     "tslint": "^5.8.0",
     "tslint-loader": "^3.4.3",
-    "typescript": "^2.6.2",
     "url-loader": "^0.6.2",
     "webpack": "^3.10.0",
     "webpack-dev-server": "^2.9.7",
diff --git a/src-ts/api/Webserver.ts b/src-ts/api/Webserver.ts
index 7e7296a..03fd332 100644
--- a/src-ts/api/Webserver.ts
+++ b/src-ts/api/Webserver.ts
@@ -22,7 +22,7 @@ export default class Webserver {
     private loadRoutes() {
         const apis = ["scalar", "dimension"].map(a => path.join(__dirname, a, "*.js"));
         const router = express.Router();
-        Server.loadServices(router, apis);
+        apis.forEach(a => Server.loadServices(router, [a]));
         const routes = _.uniq(router.stack.map(r => r.route.path));
         for (const route of routes) {
             this.app.options(route, (_req, res) => res.sendStatus(200));
diff --git a/src-ts/api/dimension/DimensionAdminService.ts b/src-ts/api/dimension/DimensionAdminService.ts
new file mode 100644
index 0000000..6f061e8
--- /dev/null
+++ b/src-ts/api/dimension/DimensionAdminService.ts
@@ -0,0 +1,35 @@
+import { GET, Path, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { ScalarService } from "../scalar/ScalarService";
+import config from "../../config";
+import { ApiError } from "../ApiError";
+
+interface DimensionInfoResponse {
+    admins: string[],
+}
+
+@Path("/api/v1/dimension/admin")
+export class DimensionAdminService {
+
+    public static isAdmin(userId: string) {
+        return config.admins.indexOf(userId) >= 0;
+    }
+
+    public static validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
+        return ScalarService.getTokenOwner(scalarToken).then(userId => {
+            if (!DimensionAdminService.isAdmin(userId))
+                throw new ApiError(401, {message: "You must be an administrator to use this API"});
+            else return userId;
+        }, ScalarService.invalidTokenErrorHandler);
+    }
+
+    @GET
+    @Path("info")
+    public getInfo(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionInfoResponse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            // Only let admins see other admins
+            // A 200 OK essentially means "you're an admin".
+            return {admins: config.admins};
+        });
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
new file mode 100644
index 0000000..250fe5d
--- /dev/null
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -0,0 +1,54 @@
+import { GET, Path, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { ScalarService } from "../scalar/ScalarService";
+import { DimensionStore } from "../../db/DimensionStore";
+import { DimensionAdminService } from "./DimensionAdminService";
+import { Widget } from "../../integrations/Widget";
+import { MemoryCache } from "../../MemoryCache";
+
+interface IntegrationsResponse {
+    widgets: Widget[],
+}
+
+@Path("/api/v1/dimension/integrations")
+export class DimensionIntegrationsService {
+
+    private static integrationCache = new MemoryCache();
+
+    public static clearIntegrationCache() {
+        DimensionIntegrationsService.integrationCache.clear();
+    }
+
+    @GET
+    @Path("enabled")
+    public getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
+        return ScalarService.getTokenOwner(scalarToken).then(_userId => {
+            return this.getIntegrations(true);
+        }, ScalarService.invalidTokenErrorHandler);
+    }
+
+    @GET
+    @Path("all")
+    public getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return this.getIntegrations(null);
+        });
+    }
+
+    private getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
+        const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
+        if (cachedResponse) {
+            return cachedResponse;
+        }
+        const response = <IntegrationsResponse>{
+            widgets: [],
+        };
+        return Promise.resolve()
+            .then(() => DimensionStore.getWidgets(isEnabledCheck))
+            .then(widgets => response.widgets = widgets)
+
+            // Cache and return response
+            .then(() => DimensionIntegrationsService.integrationCache.put("integrations_" + isEnabledCheck, response))
+            .then(() => response);
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/scalar/ScalarService.ts b/src-ts/api/scalar/ScalarService.ts
index 71e5d4f..79499c3 100644
--- a/src-ts/api/scalar/ScalarService.ts
+++ b/src-ts/api/scalar/ScalarService.ts
@@ -40,6 +40,14 @@ export class ScalarService {
         });
     }
 
+    public static invalidTokenErrorHandler(error: any): any {
+        if (error !== "Invalid token") {
+            LogService.error("ScalarWidgetService", "Error processing request");
+            LogService.error("ScalarWidgetService", error);
+        }
+        throw new ApiError(401, {message: "Invalid token"});
+    }
+
     @POST
     @Path("register")
     public register(request: RegisterRequest): Promise<ScalarRegisterResponse> {
@@ -94,13 +102,7 @@ export class ScalarService {
     public getAccount(@QueryParam("scalar_token") scalarToken: string): Promise<ScalarAccountResponse> {
         return ScalarService.getTokenOwner(scalarToken).then(userId => {
             return {user_id: userId};
-        }, err => {
-            if (err !== "Invalid token") {
-                LogService.error("ScalarService", "Error getting account information for user");
-                LogService.error("ScalarService", err);
-            }
-            throw new ApiError(401, {message: "Invalid token"});
-        });
+        }, ScalarService.invalidTokenErrorHandler);
     }
 
 }
\ No newline at end of file
diff --git a/src-ts/api/scalar/ScalarWidgetService.ts b/src-ts/api/scalar/ScalarWidgetService.ts
index cba14bf..39f91bd 100644
--- a/src-ts/api/scalar/ScalarWidgetService.ts
+++ b/src-ts/api/scalar/ScalarWidgetService.ts
@@ -1,7 +1,6 @@
 import { GET, Path, QueryParam } from "typescript-rest";
 import * as Promise from "bluebird";
 import { LogService } from "matrix-js-snippets";
-import { ApiError } from "../ApiError";
 import { MemoryCache } from "../../MemoryCache";
 import { MatrixLiteClient } from "../../matrix/MatrixLiteClient";
 import config from "../../config";
@@ -67,15 +66,9 @@ export class ScalarWidgetService {
 
     @GET
     @Path("title_lookup")
-    public register(@QueryParam("scalar_token") scalarToken: string, @QueryParam("curl") url: string): Promise<UrlPreviewResponse> {
+    public titleLookup(@QueryParam("scalar_token") scalarToken: string, @QueryParam("curl") url: string): Promise<UrlPreviewResponse> {
         return ScalarService.getTokenOwner(scalarToken).then(_userId => {
             return ScalarWidgetService.getUrlTitle(url);
-        }, err => {
-            if (err !== "Invalid token") {
-                LogService.error("ScalarWidgetService", "Error getting account information for user");
-                LogService.error("ScalarWidgetService", err);
-            }
-            throw new ApiError(401, {message: "Invalid token"});
-        })
+        }, ScalarService.invalidTokenErrorHandler);
     }
 }
\ No newline at end of file
diff --git a/src-ts/db/DimensionStore.ts b/src-ts/db/DimensionStore.ts
index a044270..ca326d3 100644
--- a/src-ts/db/DimensionStore.ts
+++ b/src-ts/db/DimensionStore.ts
@@ -5,6 +5,10 @@ import User from "./models/User";
 import UserScalarToken from "./models/UserScalarToken";
 import Upstream from "./models/Upstream";
 import * as Promise from "bluebird";
+import WidgetRecord from "./models/WidgetRecord";
+import * as path from "path";
+import * as Umzug from "umzug";
+import { Widget } from "../integrations/Widget";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -22,12 +26,23 @@ class _DimensionStore {
             User,
             UserScalarToken,
             Upstream,
+            WidgetRecord,
         ]);
     }
 
     public updateSchema(): Promise<any> {
         LogService.info("DimensionStore", "Updating schema...");
-        return this.sequelize.sync();
+
+        const migrator = new Umzug({
+            storage: "sequelize",
+            storageOptions: {sequelize: this.sequelize},
+            migrations: {
+                params: [this.sequelize.getQueryInterface()],
+                path: path.join(__dirname, "migrations"),
+            }
+        });
+
+        return migrator.up();
     }
 
     public doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
@@ -56,7 +71,10 @@ class _DimensionStore {
 
     public getTokenOwner(scalarToken: string): Promise<User> {
         let user: User = null;
-        return UserScalarToken.findAll({where: {isDimensionToken: true, scalarToken: scalarToken}, include: [User]}).then(tokens => {
+        return UserScalarToken.findAll({
+            where: {isDimensionToken: true, scalarToken: scalarToken},
+            include: [User]
+        }).then(tokens => {
             if (!tokens || tokens.length === 0) {
                 return Promise.reject("Invalid token");
             }
@@ -70,6 +88,12 @@ class _DimensionStore {
             return Promise.resolve(user);
         });
     }
+
+    public getWidgets(isEnabled?: boolean): Promise<Widget[]> {
+        let conditions = {};
+        if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
+        return WidgetRecord.findAll(conditions).then(widgets => widgets.map(w => new Widget(w)));
+    }
 }
 
 export const DimensionStore = new _DimensionStore();
\ No newline at end of file
diff --git a/src-ts/db/migrations/20171218203245-AddTables.ts b/src-ts/db/migrations/20171218203245-AddTables.ts
new file mode 100644
index 0000000..2bb1847
--- /dev/null
+++ b/src-ts/db/migrations/20171218203245-AddTables.ts
@@ -0,0 +1,42 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+import * as Promise from "bluebird";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_users", {
+                "userId": {type: DataType.STRING, primaryKey: true, allowNull: false},
+            }))
+            .then(() => queryInterface.createTable("dimension_upstreams", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "name": {type: DataType.STRING, allowNull: false},
+                "type": {type: DataType.STRING, allowNull: false},
+                "scalarUrl": {type: DataType.STRING, allowNull: false},
+                "apiUrl": {type: DataType.STRING, allowNull: false},
+            }))
+            .then(() => queryInterface.createTable("dimension_scalar_tokens", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "userId": {
+                    type: DataType.STRING,
+                    allowNull: false,
+                    references: {model: "dimension_users", key: "userId"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "scalarToken": {type: DataType.STRING, allowNull: false},
+                "isDimensionToken": {type: DataType.BOOLEAN, allowNull: false},
+                "upstreamId": {
+                    type: DataType.INTEGER,
+                    allowNull: true,
+                    references: {model: "dimension_upstreams", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.dropTable("dimension_users"))
+            .then(() => queryInterface.dropTable("dimension_upstreams"))
+            .then(() => queryInterface.dropTable("dimension_scalar_tokens"));
+    }
+}
\ No newline at end of file
diff --git a/src-ts/db/migrations/20171218203245-AddWidgets.ts b/src-ts/db/migrations/20171218203245-AddWidgets.ts
new file mode 100644
index 0000000..1218af7
--- /dev/null
+++ b/src-ts/db/migrations/20171218203245-AddWidgets.ts
@@ -0,0 +1,72 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+import * as Promise from "bluebird";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_widgets", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "type": {type: DataType.STRING, allowNull: false},
+                "name": {type: DataType.STRING, allowNull: false},
+                "avatarUrl": {type: DataType.STRING, allowNull: false},
+                "description": {type: DataType.STRING, allowNull: false},
+                "isEnabled": {type: DataType.BOOLEAN, allowNull: false},
+                "optionsJson": {type: DataType.STRING, allowNull: true},
+            }))
+            .then(() => queryInterface.bulkInsert("dimension_widgets", [
+                {
+                    type: "custom",
+                    name: "Custom Widget",
+                    avatarUrl: "/img/avatars/customwidget.png",
+                    isEnabled: true,
+                    isPublic: true,
+                    description: "A webpage embedded in the room.",
+                },
+                {
+                    type: "etherpad",
+                    name: "Etherpad",
+                    avatarUrl: "/img/avatars/etherpad.png",
+                    isEnabled: true,
+                    isPublic: true,
+                    description: "Collaborate on documents with members of your room.",
+                    optionsJson: '{"defaultUrl":"https://demo.riot.im/etherpad/p/$roomId_$padName"}',
+                },
+                {
+                    type: "googlecalendar",
+                    name: "Google Calendar",
+                    isEnabled: true,
+                    isPublic: true,
+                    avatarUrl: "/img/avatars/googlecalendar.png",
+                    description: "Share upcoming events in your room with a Google Calendar.",
+                },
+                {
+                    type: "googledocs",
+                    name: "Google Docs",
+                    isEnabled: true,
+                    isPublic: true,
+                    avatarUrl: "/img/avatars/googledocs.png",
+                    description: "Collaborate on and share documents using Google Docs.",
+                },
+                {
+                    type: "youtube",
+                    name: "YouTube Video",
+                    isEnabled: true,
+                    isPublic: true,
+                    avatarUrl: "/img/avatars/youtube.png",
+                    description: "Embed a YouTube, Vimeo, or DailyMotion video in your room.",
+                },
+                {
+                    type: "twitch",
+                    name: "Twitch Livestream",
+                    isEnabled: true,
+                    isPublic: true,
+                    avatarUrl: "/img/avatars/twitch.png",
+                    description: "Embed a Twitch livestream into your room.",
+                },
+            ]));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return queryInterface.dropTable("dimension_widgets");
+    }
+}
\ No newline at end of file
diff --git a/src-ts/db/models/IntegrationRecord.ts b/src-ts/db/models/IntegrationRecord.ts
new file mode 100644
index 0000000..2846644
--- /dev/null
+++ b/src-ts/db/models/IntegrationRecord.ts
@@ -0,0 +1,8 @@
+export interface IntegrationRecord {
+    type: string;
+    name: string;
+    avatarUrl: string;
+    description: string;
+    isEnabled: boolean;
+    isPublic: boolean;
+}
\ No newline at end of file
diff --git a/src-ts/db/models/WidgetRecord.ts b/src-ts/db/models/WidgetRecord.ts
new file mode 100644
index 0000000..eb0437d
--- /dev/null
+++ b/src-ts/db/models/WidgetRecord.ts
@@ -0,0 +1,35 @@
+import { AutoIncrement, Column, Model, PrimaryKey, Table } from "sequelize-typescript";
+import { IntegrationRecord } from "./IntegrationRecord";
+
+@Table({
+    tableName: "dimension_widgets",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class WidgetRecord extends Model<WidgetRecord> implements IntegrationRecord {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    type: string;
+
+    @Column
+    name: string;
+
+    @Column
+    avatarUrl: string;
+
+    @Column
+    description: string;
+
+    @Column
+    isEnabled: boolean;
+
+    @Column
+    isPublic: boolean;
+
+    @Column
+    optionsJson: string;
+}
\ No newline at end of file
diff --git a/src-ts/integrations/Integration.ts b/src-ts/integrations/Integration.ts
new file mode 100644
index 0000000..808e896
--- /dev/null
+++ b/src-ts/integrations/Integration.ts
@@ -0,0 +1,30 @@
+import { IntegrationRecord } from "../db/models/IntegrationRecord";
+
+export class Integration {
+    // These are meant to be set by the underlying integration
+    public category: "bot" | "complex-bot" | "bridge" | "widget";
+    public type: string;
+    public requirements: IntegrationRequirement[];
+
+    // These are meant to be set by us
+    public displayName: string;
+    public avatarUrl: string;
+    public description: string;
+    public isEnabled: boolean;
+    public isPublic: boolean;
+
+    constructor(record: IntegrationRecord) {
+        this.type = record.type;
+        this.displayName = record.name;
+        this.avatarUrl = record.avatarUrl;
+        this.description = record.description;
+        this.isEnabled = record.isEnabled;
+        this.isPublic = record.isPublic;
+    }
+}
+
+export interface IntegrationRequirement {
+    condition: "publicRoom" | "canSendEventTypes";
+    argument: any;
+    expectedValue: any;
+}
\ No newline at end of file
diff --git a/src-ts/integrations/Widget.ts b/src-ts/integrations/Widget.ts
new file mode 100644
index 0000000..d546b75
--- /dev/null
+++ b/src-ts/integrations/Widget.ts
@@ -0,0 +1,21 @@
+import { Integration } from "./Integration";
+import WidgetRecord from "../db/models/WidgetRecord";
+
+export interface EtherpadWidgetOptions {
+    defaultUrl: string;
+}
+
+export class Widget extends Integration {
+    public options: any;
+
+    constructor(widgetRecord: WidgetRecord) {
+        super(widgetRecord);
+        this.category = "widget";
+        this.options = widgetRecord.optionsJson ? JSON.parse(widgetRecord.optionsJson) : {};
+        this.requirements = [{
+            condition: "canSendEventTypes",
+            argument: ["im.vector.widget"],
+            expectedValue: true,
+        }];
+    }
+}
\ No newline at end of file

From 4965b61f2de369d1ed8e08c86c2b1232119759b2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Dec 2017 21:28:43 -0700
Subject: [PATCH 014/111] Re-wire the UI to support the new backend

This still doesn't allow editing, but it supports showing the widgets at least.
---
 .../dimension/DimensionIntegrationsService.ts |   9 +-
 .../migrations/20171218203245-AddWidgets.ts   |  10 +
 src-ts/integrations/Integration.ts            |   5 +
 src-ts/integrations/Widget.ts                 |  10 +-
 src-ts/matrix/MatrixOpenIdClient.ts           |   2 +
 web/app/app.module.ts                         |  19 +-
 .../circleci/circleci-config.component.ts     |   4 +-
 web/app/configs/irc/irc-config.component.ts   |   6 +-
 web/app/configs/rss/rss-config.component.ts   |   4 +-
 .../travisci/travisci-config.component.ts     |   4 +-
 .../custom_widget-config.component.ts         |   4 +-
 .../etherpad/etherpad-config.component.ts     |   6 +-
 .../googlecalendar-config.component.ts        |   4 +-
 .../googledocs/googledocs-config.component.ts |   4 +-
 .../widget/jitsi/jitsi-config.component.ts    |   6 +-
 .../widget/twitch/twitch-config.component.ts  |   4 +-
 web/app/configs/widget/widget.component.ts    |   8 +-
 .../youtube/youtube-config.component.ts       |   4 +-
 .../integration-bag.component.html            |   8 +-
 .../integration-bag.component.ts              |   5 +-
 web/app/integration/integration.component.ts  |   6 +-
 web/app/riot/riot-home/home.component.ts      | 200 ++++++++----------
 .../scalar-close/scalar-close.component.ts    |   4 +-
 web/app/shared/models/dimension_responses.ts  |   5 +
 web/app/shared/models/integration.ts          |  65 +++---
 web/app/shared/models/legacyintegration.ts    |  49 +++++
 ...esponses.ts => scalar_client_responses.ts} |   0
 .../shared/models/scalar_server_responses.ts  |   3 +
 web/app/shared/models/widget.ts               |   2 +-
 web/app/shared/services/AuthedApi.ts          |  15 ++
 web/app/shared/services/admin-api.service.ts  |  10 +
 .../shared/services/dimension-api.service.ts  |  15 ++
 .../shared/services/integration.service.ts    |  58 ++---
 .../services/{ => legacy}/api.service.ts      |   6 +-
 .../legacy}/integration.service.ts            |  50 ++---
 .../services/{ => legacy}/irc-api.service.ts  |   0
 ...ervice.ts => scalar-client-api.service.ts} |  12 +-
 .../services/scalar-server-api.service.ts     |  15 ++
 .../generic/generic.component.ts              |   2 +-
 .../widget_wrappers/jitsi/jitsi.component.ts  |   4 +-
 40 files changed, 373 insertions(+), 274 deletions(-)
 create mode 100644 web/app/shared/models/dimension_responses.ts
 create mode 100644 web/app/shared/models/legacyintegration.ts
 rename web/app/shared/models/{scalar_responses.ts => scalar_client_responses.ts} (100%)
 create mode 100644 web/app/shared/models/scalar_server_responses.ts
 create mode 100644 web/app/shared/services/AuthedApi.ts
 create mode 100644 web/app/shared/services/admin-api.service.ts
 create mode 100644 web/app/shared/services/dimension-api.service.ts
 rename web/app/shared/services/{ => legacy}/api.service.ts (95%)
 rename web/app/shared/{ => services/legacy}/integration.service.ts (52%)
 rename web/app/shared/services/{ => legacy}/irc-api.service.ts (100%)
 rename web/app/shared/services/{scalar.service.ts => scalar-client-api.service.ts} (91%)
 create mode 100644 web/app/shared/services/scalar-server-api.service.ts

diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
index 250fe5d..eaf9f38 100644
--- a/src-ts/api/dimension/DimensionIntegrationsService.ts
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -1,4 +1,4 @@
-import { GET, Path, QueryParam } from "typescript-rest";
+import { GET, Path, PathParam, QueryParam } from "typescript-rest";
 import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
 import { DimensionStore } from "../../db/DimensionStore";
@@ -35,6 +35,13 @@ export class DimensionIntegrationsService {
         });
     }
 
+    @GET
+    @Path("room/:roomId")
+    public getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string) :Promise<IntegrationsResponse>{
+        console.log(roomId);
+        return this.getEnabledIntegrations(scalarToken);
+    }
+
     private getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
         const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
         if (cachedResponse) {
diff --git a/src-ts/db/migrations/20171218203245-AddWidgets.ts b/src-ts/db/migrations/20171218203245-AddWidgets.ts
index 1218af7..7ad07fa 100644
--- a/src-ts/db/migrations/20171218203245-AddWidgets.ts
+++ b/src-ts/db/migrations/20171218203245-AddWidgets.ts
@@ -12,6 +12,7 @@ export default {
                 "avatarUrl": {type: DataType.STRING, allowNull: false},
                 "description": {type: DataType.STRING, allowNull: false},
                 "isEnabled": {type: DataType.BOOLEAN, allowNull: false},
+                "isPublic": {type: DataType.BOOLEAN, allowNull: false},
                 "optionsJson": {type: DataType.STRING, allowNull: true},
             }))
             .then(() => queryInterface.bulkInsert("dimension_widgets", [
@@ -64,6 +65,15 @@ export default {
                     avatarUrl: "/img/avatars/twitch.png",
                     description: "Embed a Twitch livestream into your room.",
                 },
+                {
+                    type: "jitsi",
+                    name: "Jitsi Conference",
+                    isEnabled: true,
+                    isPublic: true,
+                    avatarUrl: "/img/avatars/jitsi.png",
+                    description: "Hold a video conference with Jitsi Meet",
+                    optionsJson: '{"jitsiDomain":"jitsi.riot.im", "scriptUrl":"https://jitsi.riot.im/libs/external_api.min.js"}',
+                },
             ]));
     },
     down: (queryInterface: QueryInterface) => {
diff --git a/src-ts/integrations/Integration.ts b/src-ts/integrations/Integration.ts
index 808e896..38e74ec 100644
--- a/src-ts/integrations/Integration.ts
+++ b/src-ts/integrations/Integration.ts
@@ -5,6 +5,7 @@ export class Integration {
     public category: "bot" | "complex-bot" | "bridge" | "widget";
     public type: string;
     public requirements: IntegrationRequirement[];
+    public isEncryptionSupported = false;
 
     // These are meant to be set by us
     public displayName: string;
@@ -26,5 +27,9 @@ export class Integration {
 export interface IntegrationRequirement {
     condition: "publicRoom" | "canSendEventTypes";
     argument: any;
+
+    // For publicRoom this is true or false (boolean)
+    // For canSendEventTypes this is an array of {isState: boolean, type: string}
+    // For userInRoom this is the user ID
     expectedValue: any;
 }
\ No newline at end of file
diff --git a/src-ts/integrations/Widget.ts b/src-ts/integrations/Widget.ts
index d546b75..536d3b8 100644
--- a/src-ts/integrations/Widget.ts
+++ b/src-ts/integrations/Widget.ts
@@ -5,6 +5,11 @@ export interface EtherpadWidgetOptions {
     defaultUrl: string;
 }
 
+export interface JitsiWidgetOptions {
+    jitsiDomain: string;
+    scriptUrl: string;
+}
+
 export class Widget extends Integration {
     public options: any;
 
@@ -14,8 +19,11 @@ export class Widget extends Integration {
         this.options = widgetRecord.optionsJson ? JSON.parse(widgetRecord.optionsJson) : {};
         this.requirements = [{
             condition: "canSendEventTypes",
-            argument: ["im.vector.widget"],
+            argument: [{isState: true, type: "im.vector.widget"}],
             expectedValue: true,
         }];
+
+        // Technically widgets are supported in encrypted rooms, although at risk.
+        this.isEncryptionSupported = true;
     }
 }
\ No newline at end of file
diff --git a/src-ts/matrix/MatrixOpenIdClient.ts b/src-ts/matrix/MatrixOpenIdClient.ts
index beec738..fe516f5 100644
--- a/src-ts/matrix/MatrixOpenIdClient.ts
+++ b/src-ts/matrix/MatrixOpenIdClient.ts
@@ -14,6 +14,8 @@ export class MatrixOpenIdClient {
             "/_matrix/federation/v1/openid/userinfo",
             {access_token: this.openId.access_token}
         ).then(response => {
+            // Annoyingly, the response isn't JSON for this
+            response = JSON.parse(response);
             return response['sub'];
         });
     }
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 440c96c..d3474fe 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -8,16 +8,14 @@ import { routing } from "./app.routing";
 import { createNewHosts, removeNgStyles } from "@angularclass/hmr";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import { RiotComponent } from "./riot/riot.component";
-import { ApiService } from "./shared/services/api.service";
 import { UiSwitchModule } from "angular2-ui-switch";
-import { ScalarService } from "./shared/services/scalar.service";
+import { ScalarClientApiService } from "./shared/services/scalar-client-api.service";
 import { ToasterModule } from "angular2-toaster";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { ScalarCloseComponent } from "./riot/scalar-close/scalar-close.component";
-import { IntegrationService } from "./shared/services/integration.service";
+import { LegacyIntegrationService } from "./shared/services/legacy/integration.service";
 import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap";
 import { ModalModule } from "ngx-modialog";
-import { IrcApiService } from "./shared/services/irc-api.service";
 import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic.component";
 import { ToggleFullscreenDirective } from "./shared/directives/toggle-fullscreen.directive";
 import { FullscreenButtonComponent } from "./fullscreen-button/fullscreen-button.component";
@@ -30,8 +28,11 @@ import { BreadcrumbsModule } from "ng2-breadcrumbs";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { IntegrationBagComponent } from "./integration-bag/integration-bag.component";
 import { IntegrationComponent } from "./integration/integration.component";
+import { ScalarServerApiService } from "./shared/services/scalar-server-api.service";
+import { DimensionApiService } from "./shared/services/dimension-api.service";
+import { AdminApiService } from "./shared/services/admin-api.service";
 
-const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigComponents();
+const WIDGET_CONFIGURATION_COMPONENTS: any[] = LegacyIntegrationService.getAllConfigComponents();
 
 @NgModule({
     imports: [
@@ -68,10 +69,10 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = IntegrationService.getAllConfigCo
         // Vendor
     ],
     providers: [
-        ApiService,
-        ScalarService,
-        IntegrationService,
-        IrcApiService,
+        ScalarClientApiService,
+        ScalarServerApiService,
+        DimensionApiService,
+        AdminApiService,
         {provide: Window, useValue: window},
 
         // Vendor
diff --git a/web/app/configs/circleci/circleci-config.component.ts b/web/app/configs/circleci/circleci-config.component.ts
index 384065e..ee0f9bf 100644
--- a/web/app/configs/circleci/circleci-config.component.ts
+++ b/web/app/configs/circleci/circleci-config.component.ts
@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
-import { CircleCiIntegration } from "../../shared/models/integration";
+import { CircleCiIntegration } from "../../shared/models/legacyintegration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/services/api.service";
+import { ApiService } from "../../shared/services/legacy/api.service";
 
 @Component({
     selector: "my-circleci-config",
diff --git a/web/app/configs/irc/irc-config.component.ts b/web/app/configs/irc/irc-config.component.ts
index 4bf0d67..822c431 100644
--- a/web/app/configs/irc/irc-config.component.ts
+++ b/web/app/configs/irc/irc-config.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnDestroy } from "@angular/core";
-import { IRCIntegration } from "../../shared/models/integration";
+import { IRCIntegration } from "../../shared/models/legacyintegration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
-import { IrcApiService } from "../../shared/services/irc-api.service";
+import { IrcApiService } from "../../shared/services/legacy/irc-api.service";
 import { ToasterService } from "angular2-toaster";
 import { IntervalObservable } from "rxjs/observable/IntervalObservable";
-import { ApiService } from "../../shared/services/api.service";
+import { ApiService } from "../../shared/services/legacy/api.service";
 import { Subscription } from "rxjs";
 
 @Component({
diff --git a/web/app/configs/rss/rss-config.component.ts b/web/app/configs/rss/rss-config.component.ts
index fdc342b..c906714 100644
--- a/web/app/configs/rss/rss-config.component.ts
+++ b/web/app/configs/rss/rss-config.component.ts
@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
-import { RSSIntegration } from "../../shared/models/integration";
+import { RSSIntegration } from "../../shared/models/legacyintegration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/services/api.service";
+import { ApiService } from "../../shared/services/legacy/api.service";
 
 @Component({
     selector: "my-rss-config",
diff --git a/web/app/configs/travisci/travisci-config.component.ts b/web/app/configs/travisci/travisci-config.component.ts
index f755946..58cce40 100644
--- a/web/app/configs/travisci/travisci-config.component.ts
+++ b/web/app/configs/travisci/travisci-config.component.ts
@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
-import { TravisCiIntegration } from "../../shared/models/integration";
+import { TravisCiIntegration } from "../../shared/models/legacyintegration";
 import { ModalComponent, DialogRef } from "ngx-modialog";
 import { ConfigModalContext } from "../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/services/api.service";
+import { ApiService } from "../../shared/services/legacy/api.service";
 
 @Component({
     selector: "my-travisci-config",
diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts b/web/app/configs/widget/custom_widget/custom_widget-config.component.ts
index 27c15e6..9cf559a 100644
--- a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts
+++ b/web/app/configs/widget/custom_widget/custom_widget-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { WIDGET_CUSTOM } from "../../../shared/models/widget";
@@ -15,7 +15,7 @@ export class CustomWidgetConfigComponent extends WidgetComponent implements Moda
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.ts b/web/app/configs/widget/etherpad/etherpad-config.component.ts
index 1afc303..ff84f58 100644
--- a/web/app/configs/widget/etherpad/etherpad-config.component.ts
+++ b/web/app/configs/widget/etherpad/etherpad-config.component.ts
@@ -1,11 +1,11 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { WIDGET_ETHERPAD } from "../../../shared/models/widget";
-import { EtherpadWidgetIntegration } from "../../../shared/models/integration";
+import { EtherpadWidgetIntegration } from "../../../shared/models/legacyintegration";
 
 @Component({
     selector: "my-etherpadwidget-config",
@@ -18,7 +18,7 @@ export class EtherpadWidgetConfigComponent extends WidgetComponent implements Mo
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts b/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
index 6fefa91..1710075 100644
--- a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
+++ b/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_GOOGLE_CALENDAR } from "../../../shared/models/widget";
@@ -15,7 +15,7 @@ export class GoogleCalendarWidgetConfigComponent extends WidgetComponent impleme
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/configs/widget/googledocs/googledocs-config.component.ts b/web/app/configs/widget/googledocs/googledocs-config.component.ts
index 74f25e4..e9fe721 100644
--- a/web/app/configs/widget/googledocs/googledocs-config.component.ts
+++ b/web/app/configs/widget/googledocs/googledocs-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { WIDGET_GOOGLE_DOCS } from "../../../shared/models/widget";
@@ -15,7 +15,7 @@ export class GoogleDocsWidgetConfigComponent extends WidgetComponent implements
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.ts b/web/app/configs/widget/jitsi/jitsi-config.component.ts
index fc5a3f1..dae5091 100644
--- a/web/app/configs/widget/jitsi/jitsi-config.component.ts
+++ b/web/app/configs/widget/jitsi/jitsi-config.component.ts
@@ -1,11 +1,11 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_JITSI } from "../../../shared/models/widget";
-import { JitsiWidgetIntegration } from "../../../shared/models/integration";
+import { JitsiWidgetIntegration } from "../../../shared/models/legacyintegration";
 import * as gobyInit from "goby";
 import * as url from "url";
 
@@ -26,7 +26,7 @@ export class JitsiWidgetConfigComponent extends WidgetComponent implements Modal
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/configs/widget/twitch/twitch-config.component.ts b/web/app/configs/widget/twitch/twitch-config.component.ts
index e15e2b5..2e8e334 100644
--- a/web/app/configs/widget/twitch/twitch-config.component.ts
+++ b/web/app/configs/widget/twitch/twitch-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_TWITCH } from "../../../shared/models/widget";
@@ -15,7 +15,7 @@ export class TwitchWidgetConfigComponent extends WidgetComponent implements Moda
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 1821178..6816fda 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,7 +1,7 @@
-import { ScalarService } from "../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
 import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
-import { Integration } from "../../shared/models/integration";
+import { LegacyIntegration } from "../../shared/models/legacyintegration";
 
 const SCALAR_WIDGET_LINKS = [
     "https://scalar-staging.riot.im/scalar/api/widgets/__TYPE__.html?url=",
@@ -23,9 +23,9 @@ export class WidgetComponent {
 
     constructor(window: Window,
                 protected toaster: ToasterService,
-                protected scalarApi: ScalarService,
+                protected scalarApi: ScalarClientApiService,
                 public roomId: string,
-                public integration: Integration,
+                public integration: LegacyIntegration,
                 editWidgetId: string,
                 private widgetIds: string[],
                 private defaultName: string,
diff --git a/web/app/configs/widget/youtube/youtube-config.component.ts b/web/app/configs/widget/youtube/youtube-config.component.ts
index 938f667..0962728 100644
--- a/web/app/configs/widget/youtube/youtube-config.component.ts
+++ b/web/app/configs/widget/youtube/youtube-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetComponent } from "../widget.component";
-import { ScalarService } from "../../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
 import { ConfigModalContext } from "../../../integration/integration.component";
 import { ToasterService } from "angular2-toaster";
 import { EditableWidget, WIDGET_YOUTUBE } from "../../../shared/models/widget";
@@ -17,7 +17,7 @@ export class YoutubeWidgetConfigComponent extends WidgetComponent implements Mod
 
     constructor(public dialog: DialogRef<ConfigModalContext>,
                 toaster: ToasterService,
-                scalarService: ScalarService,
+                scalarService: ScalarClientApiService,
                 window: Window) {
         super(
             window,
diff --git a/web/app/integration-bag/integration-bag.component.html b/web/app/integration-bag/integration-bag.component.html
index 29e2b3c..a74afe6 100644
--- a/web/app/integration-bag/integration-bag.component.html
+++ b/web/app/integration-bag/integration-bag.component.html
@@ -1,10 +1,8 @@
 <div class="integration-bag">
-    <!--<my-integration *ngFor="let integration of integrations"-->
-                    <!--[integration]="integration" (selected)="onClick(integration)"></my-integration>-->
     <div class="integration" *ngFor="let integration of integrations">
-        <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
-        <div class="integration-name">{{ integration.name }}</div>
-        <div class="integration-description">{{ integration.about }}</div>
+        <img class="integration-avatar" [src]="getSafeUrl(integration.avatarUrl)"/>
+        <div class="integration-name">{{ integration.displayName }}</div>
+        <div class="integration-description">{{ integration.description }}</div>
         <div class="integration-arrow"><i class="fa fa-chevron-right"></i></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/integration-bag/integration-bag.component.ts b/web/app/integration-bag/integration-bag.component.ts
index dfd1874..7e25b29 100644
--- a/web/app/integration-bag/integration-bag.component.ts
+++ b/web/app/integration-bag/integration-bag.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { Integration } from "../shared/models/integration";
+import { LegacyIntegration } from "../shared/models/legacyintegration";
 import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
+import { Integration } from "../shared/models/integration";
 
 @Component({
     selector: "my-integration-bag",
@@ -9,7 +10,7 @@ import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 })
 export class IntegrationBagComponent {
 
-    @Input() integrations: Integration[];
+    @Input() integrations: LegacyIntegration[];
     @Output() integrationClicked: EventEmitter<Integration> = new EventEmitter<Integration>();
 
     constructor(private sanitizer: DomSanitizer) {
diff --git a/web/app/integration/integration.component.ts b/web/app/integration/integration.component.ts
index 5416c8b..82fa88c 100644
--- a/web/app/integration/integration.component.ts
+++ b/web/app/integration/integration.component.ts
@@ -1,10 +1,10 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { Integration } from "../shared/models/integration";
+import { LegacyIntegration } from "../shared/models/legacyintegration";
 import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
 import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 
 export class ConfigModalContext extends BSModalContext {
-    public integration: Integration;
+    public integration: LegacyIntegration;
     public roomId: string;
     public userId: string;
     public scalarToken: string;
@@ -18,7 +18,7 @@ export class ConfigModalContext extends BSModalContext {
 })
 export class IntegrationComponent {
 
-    @Input() integration: Integration;
+    @Input() integration: LegacyIntegration;
     @Output() selected: EventEmitter<any> = new EventEmitter<any>();
 
     constructor(private sanitizer: DomSanitizer) {
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index fcb10f0..9b94f9c 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -1,12 +1,13 @@
-import { Component, ViewChildren } from "@angular/core";
-import { IntegrationService } from "../../shared/services/integration.service";
-import { IntegrationComponent } from "../../integration/integration.component";
+import { Component } from "@angular/core";
 import { ToasterService } from "angular2-toaster";
-import { Integration } from "../../shared/models/integration";
 import { ActivatedRoute } from "@angular/router";
-import { ApiService } from "../../shared/services/api.service";
-import { ScalarService } from "../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
 import * as _ from "lodash";
+import { ScalarServerApiService } from "../../shared/services/scalar-server-api.service";
+import { AuthedApi } from "../../shared/services/AuthedApi";
+import { DimensionApiService } from "../../shared/services/dimension-api.service";
+import { Integration, IntegrationRequirement } from "../../shared/models/integration";
+import { IntegrationService } from "../../shared/services/integration.service";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -20,14 +21,11 @@ const CATEGORY_MAP = {
     styleUrls: ["./home.component.scss"],
 })
 export class RiotHomeComponent {
-    @ViewChildren(IntegrationComponent) integrationComponents: Array<IntegrationComponent>;
-
     public isLoading = true;
     public isError = false;
     public errorMessage: string;
     public isRoomEncrypted: boolean;
 
-    private scalarToken: string;
     private roomId: string;
     private userId: string;
     private requestedScreen: string = null;
@@ -36,8 +34,9 @@ export class RiotHomeComponent {
     private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
 
     constructor(private activatedRoute: ActivatedRoute,
-                private api: ApiService,
-                private scalar: ScalarService,
+                private scalarApi: ScalarServerApiService,
+                private scalar: ScalarClientApiService,
+                private dimensionApi: DimensionApiService,
                 private toaster: ToasterService) {
         let params: any = this.activatedRoute.snapshot.queryParams;
 
@@ -51,9 +50,10 @@ export class RiotHomeComponent {
             this.errorMessage = "Unable to load Dimension - missing room ID or token.";
         } else {
             this.roomId = params.room_id;
-            this.scalarToken = params.scalar_token;
+            AuthedApi.SCALAR_TOKEN = params.scalar_token;
 
-            this.api.getTokenOwner(params.scalar_token).then(userId => {
+            this.scalarApi.getAccount().then(response => {
+                const userId = response.user_id;
                 if (!userId) {
                     console.error("No user returned for token. Is the token registered in Dimension?");
                     this.isError = true;
@@ -89,31 +89,42 @@ export class RiotHomeComponent {
         return this.integrationsForCategory[category];
     }
 
-    public modifyIntegration(integration: Integration) {
-        console.log(this.userId + " is trying to modify " + integration.name);
+    private getIntegrations(): Integration[] {
+        const result: Integration[] = [];
 
-        if (integration.hasAdditionalConfig) {
-            // TODO: Navigate to edit screen
-            console.log("EDIT SCREEN FOR " + integration.name);
-        } else {
-            // It's a flip-a-bit (simple bot)
+        for (const category of this.getCategories()) {
+            for (const integration of this.getIntegrationsIn(category)) {
+                result.push(integration);
+            }
+        }
+
+        return result;
+    }
+
+
+    public modifyIntegration(integration: Integration) {
+        console.log(this.userId + " is trying to modify " + integration.displayName);
+
+        if (integration.category === "bot") {
+            // It's a bot
             // TODO: "Are you sure?" dialog
 
-            let promise = null;
-            if (!integration.isEnabled) {
-                promise = this.scalar.inviteUser(this.roomId, integration.userId);
-            } else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
-
+            // let promise = null;
+            const promise = Promise.resolve();
+            // if (!integration._inRoom) {
+            //     promise = this.scalar.inviteUser(this.roomId, integration.userId);
+            // } else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
             // We set this ahead of the promise for debouncing
-            integration.isEnabled = !integration.isEnabled;
-            integration.isUpdating = true;
+
+            integration._inRoom = !integration._inRoom;
+            integration._isUpdating = true;
             promise.then(() => {
-                integration.isUpdating = false;
-                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");
+                integration._isUpdating = false;
+                if (integration._inRoom) this.toaster.pop("success", integration.displayName + " was invited to the room");
+                else this.toaster.pop("success", integration.displayName + " was removed from the room");
             }).catch(err => {
-                integration.isEnabled = !integration.isEnabled; // revert the status change
-                integration.isUpdating = false;
+                integration._inRoom = !integration._inRoom; // revert the status change
+                integration._isUpdating = false;
                 console.error(err);
 
                 let errorMessage = null;
@@ -122,31 +133,27 @@ export class RiotHomeComponent {
                 if (!errorMessage) errorMessage = "Could not update integration status";
 
                 this.toaster.pop("error", errorMessage);
-            })
+            });
+        } else {
+            // TODO: Navigate to edit screen
+            console.log("EDIT SCREEN FOR " + integration.displayName);
         }
     }
 
     private prepareIntegrations() {
         this.scalar.isRoomEncrypted(this.roomId).then(payload => {
             this.isRoomEncrypted = payload.response;
-            return this.api.getIntegrations(this.roomId, this.scalarToken);
-        }).then(integrations => {
+            return this.dimensionApi.getIntegrations(this.roomId);
+        }).then(response => {
+            const integrations: Integration[] = _.flatten(Object.keys(response).map(k => response[k]));
             const supportedIntegrations: Integration[] = _.filter(integrations, i => IntegrationService.isSupported(i));
 
-            for (const integration of supportedIntegrations) {
-                // Widgets technically support encrypted rooms, so unless they explicitly declare that
-                // they don't, we'll assume they do. A warning about adding widgets in encrypted rooms
-                // is displayed to users elsewhere.
-                if (integration.type === "widget" && integration.supportsEncryptedRooms !== false)
-                    integration.supportsEncryptedRooms = true;
-            }
-
             // Flag integrations that aren't supported in encrypted rooms
             if (this.isRoomEncrypted) {
                 for (const integration of supportedIntegrations) {
-                    if (!integration.supportsEncryptedRooms) {
-                        integration.isSupported = false;
-                        integration.notSupportedReason = "This integration is not supported in encrypted rooms";
+                    if (!integration.isEncryptionSupported) {
+                        integration._isSupported = false;
+                        integration._notSupportedReason = "This integration is not supported in encrypted rooms";
                     }
                 }
             }
@@ -154,7 +161,7 @@ export class RiotHomeComponent {
             // Set up the categories
             for (const category of Object.keys(this.categoryMap)) {
                 const supportedTypes = this.categoryMap[category];
-                this.integrationsForCategory[category] = _.filter(supportedIntegrations, i => supportedTypes.indexOf(i.type) !== -1);
+                this.integrationsForCategory[category] = _.filter(supportedIntegrations, i => supportedTypes.indexOf(i.category) !== -1);
             }
 
             let promises = supportedIntegrations.map(i => this.updateIntegrationState(i));
@@ -173,92 +180,57 @@ export class RiotHomeComponent {
     }
 
     private tryOpenConfigScreen() {
+        let category = null;
         let type = null;
-        let integrationType = null;
         if (!this.requestedScreen) return;
 
         const targetIntegration = IntegrationService.getIntegrationForScreen(this.requestedScreen);
         if (targetIntegration) {
+            category = targetIntegration.category;
             type = targetIntegration.type;
-            integrationType = targetIntegration.integrationType;
         } else {
             console.log("Unknown screen requested: " + this.requestedScreen);
         }
 
-        let opened = false;
-        this.integrationComponents.forEach(component => {
-            if (opened) return;
-            if (component.integration.type !== type || component.integration.integrationType !== integrationType) return;
-            console.log("Configuring integration " + this.requestedIntegration + " type=" + type + " integrationType=" + integrationType);
-            //component.configureIntegration(this.requestedIntegration);
-            // TODO: Support editing integrations
-            opened = true;
-        });
-        if (!opened) {
-            console.log("Failed to find integration component for type=" + type + " integrationType=" + integrationType);
+        for (const integration of this.getIntegrations()) {
+            if (integration.category === category && integration.type === type) {
+                console.log("Configuring integration " + this.requestedIntegration + " category=" + category + " type=" + type);
+                // TODO: Actually edit integration
+                return;
+            }
         }
+
+        console.log("Failed to find integration component for category=" + category + " type=" + type);
     }
 
     private updateIntegrationState(integration: Integration) {
-        integration.hasAdditionalConfig = IntegrationService.hasConfig(integration);
+        if (!integration.requirements) return;
 
-        if (integration.type === "widget") {
-            if (!integration.requirements) integration.requirements = {};
-            integration.requirements["canSetWidget"] = true;
-        }
+        let promises = integration.requirements.map(r => this.checkRequirement(r));
 
-        // If the integration has requirements, then we'll check those instead of anything else
-        if (integration.requirements) {
-            let keys = _.keys(integration.requirements);
-            let promises = [];
-
-            for (let key of keys) {
-                let requirement = this.checkRequirement(integration, key);
-                promises.push(requirement);
-            }
-
-            return Promise.all(promises).then(() => {
-                integration.isSupported = true;
-                integration.notSupportedReason = null;
-            }, error => {
-                console.error(error);
-                integration.isSupported = false;
-                integration.notSupportedReason = error;
-            });
-        }
-
-        // The integration doesn't have requirements, so we'll just make sure the bot user can be retrieved.
-        return this.scalar.getMembershipState(this.roomId, integration.userId).then(payload => {
-            if (payload.response) {
-                integration.isSupported = true;
-                integration.notSupportedReason = null;
-                integration.isEnabled = (payload.response.membership === "join" || payload.response.membership === "invite");
-            } else {
-                console.error("No response received to membership query of " + integration.userId);
-                integration.isSupported = false;
-                integration.notSupportedReason = "Unable to query membership state for this bot";
-            }
-        }, (error) => {
+        return Promise.all(promises).then(() => {
+            integration._isSupported = true;
+            integration._notSupportedReason = null;
+        }, error => {
             console.error(error);
-            integration.isSupported = false;
-            integration.notSupportedReason = "Unable to query membership state for this bot";
+            integration._isSupported = false;
+            integration._notSupportedReason = error;
         });
     }
 
-    private checkRequirement(integration: Integration, key: string) {
-        let requirement = integration.requirements[key];
-
-        switch (key) {
-            case "joinRule":
+    private checkRequirement(requirement: IntegrationRequirement) {
+        switch (requirement.condition) {
+            case "publicRoom":
                 return this.scalar.getJoinRule(this.roomId).then(payload => {
                     if (!payload.response) {
                         return Promise.reject("Could not communicate with Riot");
                     }
-                    return payload.response.join_rule === requirement
-                        ? Promise.resolve()
-                        : Promise.reject("The room must be " + requirement + " to use this integration.");
+                    const isPublic = payload.response.join_rule === "public";
+                    if (isPublic !== requirement.expectedValue) {
+                        return Promise.reject("The room must be " + (isPublic ? "non-public" : "public") + " to use this integration");
+                    } else return Promise.resolve();
                 });
-            case "canSetWidget":
+            case "canSendEventTypes":
                 const processPayload = payload => {
                     const response = <any>payload.response;
                     if (response === true) return Promise.resolve();
@@ -266,9 +238,17 @@ export class RiotHomeComponent {
                         return Promise.reject("You cannot modify widgets in this room");
                     return Promise.reject("Error communicating with Riot");
                 };
-                return this.scalar.canSendEvent(this.roomId, "im.vector.modular.widgets", true).then(processPayload).catch(processPayload);
+
+                let promiseChain = Promise.resolve();
+                requirement.argument.forEach(e => promiseChain = promiseChain.then(() => this.scalar.canSendEvent(this.roomId, e.type, e.isState).then(processPayload).catch(processPayload)));
+                return promiseChain.then(() => {
+                    if (!requirement.expectedValue) return Promise.reject("Expected to not be able to send specific event types");
+                }).catch(err => {
+                    console.error(err);
+                    if (requirement.expectedValue) return Promise.reject("Expected to be able to send specific event types");
+                });
             default:
-                return Promise.reject("Requirement '" + key + "' not found");
+                return Promise.reject("Requirement '" + requirement.condition + "' not found");
         }
     }
 }
diff --git a/web/app/riot/scalar-close/scalar-close.component.ts b/web/app/riot/scalar-close/scalar-close.component.ts
index 2c073bc..9d1e85f 100644
--- a/web/app/riot/scalar-close/scalar-close.component.ts
+++ b/web/app/riot/scalar-close/scalar-close.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ScalarService } from "../../shared/services/scalar.service";
+import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
 
 @Component({
     selector: "my-scalar-close",
@@ -8,7 +8,7 @@ import { ScalarService } from "../../shared/services/scalar.service";
 })
 export class ScalarCloseComponent {
 
-    constructor(private scalar: ScalarService) {
+    constructor(private scalar: ScalarClientApiService) {
     }
 
     public closeScalar() {
diff --git a/web/app/shared/models/dimension_responses.ts b/web/app/shared/models/dimension_responses.ts
new file mode 100644
index 0000000..4da941f
--- /dev/null
+++ b/web/app/shared/models/dimension_responses.ts
@@ -0,0 +1,5 @@
+import { Widget } from "./integration";
+
+export interface DimensionIntegrationsResponse {
+    widgets: Widget[];
+}
\ No newline at end of file
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index 61418b4..949bce4 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -1,49 +1,40 @@
 export interface Integration {
-    // These are from the server
+    category: "bot" | "complex-bot" | "bridge" | "widget";
     type: string;
-    integrationType: string;
-    userId: string;
-    name: string;
-    avatar: string;
-    about: string; // nullable
-    supportsEncryptedRooms: boolean;
-    requirements: any; // nullable
+    requirements: IntegrationRequirement[];
+    isEncryptionSupported: boolean;
+    displayName: string;
+    avatarUrl: string;
+    description: string;
+    isEnabled: boolean;
+    isPublic: boolean;
 
-    // These are set in the UI
-    isSupported: boolean;
-    notSupportedReason: string;
-    hasAdditionalConfig: boolean;
-    isEnabled: boolean; // for the flip-a-bit integrations
-    isUpdating: boolean;
+    // Used by us
+    _inRoom: boolean;
+    _isUpdating: boolean;
+    _isSupported: boolean;
+    _notSupportedReason: string;
 }
 
-export interface RSSIntegration extends Integration {
-    feeds: string[];
-    immutableFeeds: { url: string, ownerId: string }[];
+export interface Widget extends Integration {
+    options: any;
 }
 
-export interface TravisCiIntegration extends Integration {
-    repoTemplates: { repoKey: string, template: string, newTemplate: string }[]; // newTemplate is local
-    immutableRepoTemplates: { repoKey: string, template: string, ownerId: string }[];
-    webhookUrl: string; // immutable
+export interface EtherpadWidget extends Widget {
+    options: {
+        defaultUrl: string;
+    };
 }
 
-export interface CircleCiIntegration extends Integration {
-    repoTemplates: { repoKey: string, template: string, newTemplate: string }[]; // newTemplate is local
-    immutableRepoTemplates: { repoKey: string, template: string, ownerId: string }[];
-    webhookUrl: string; // immutable
+export interface JitsiWidget extends Widget {
+    options: {
+        jitsiDomain: string;
+        scriptUrl: string;
+    };
 }
 
-export interface IRCIntegration extends Integration {
-    availableNetworks: { name: string, id: string }[];
-    channels: { [networkId: string]: string[] };
-}
-
-export interface EtherpadWidgetIntegration extends Integration {
-    defaultUrl: string;
-}
-
-export interface JitsiWidgetIntegration extends Integration {
-    jitsiDomain: string;
-    scriptUrl: string
+export interface IntegrationRequirement {
+    condition: "publicRoom" | "canSendEventTypes";
+    argument: any;
+    expectedValue: any;
 }
\ No newline at end of file
diff --git a/web/app/shared/models/legacyintegration.ts b/web/app/shared/models/legacyintegration.ts
new file mode 100644
index 0000000..e8cce38
--- /dev/null
+++ b/web/app/shared/models/legacyintegration.ts
@@ -0,0 +1,49 @@
+export interface LegacyIntegration {
+    // These are from the server
+    type: string;
+    integrationType: string;
+    userId: string;
+    name: string;
+    avatar: string;
+    about: string; // nullable
+    supportsEncryptedRooms: boolean;
+    requirements: any; // nullable
+
+    // These are set in the UI
+    isSupported: boolean;
+    notSupportedReason: string;
+    hasAdditionalConfig: boolean;
+    isEnabled: boolean; // for the flip-a-bit integrations
+    isUpdating: boolean;
+}
+
+export interface RSSIntegration extends LegacyIntegration {
+    feeds: string[];
+    immutableFeeds: { url: string, ownerId: string }[];
+}
+
+export interface TravisCiIntegration extends LegacyIntegration {
+    repoTemplates: { repoKey: string, template: string, newTemplate: string }[]; // newTemplate is local
+    immutableRepoTemplates: { repoKey: string, template: string, ownerId: string }[];
+    webhookUrl: string; // immutable
+}
+
+export interface CircleCiIntegration extends LegacyIntegration {
+    repoTemplates: { repoKey: string, template: string, newTemplate: string }[]; // newTemplate is local
+    immutableRepoTemplates: { repoKey: string, template: string, ownerId: string }[];
+    webhookUrl: string; // immutable
+}
+
+export interface IRCIntegration extends LegacyIntegration {
+    availableNetworks: { name: string, id: string }[];
+    channels: { [networkId: string]: string[] };
+}
+
+export interface EtherpadWidgetIntegration extends LegacyIntegration {
+    defaultUrl: string;
+}
+
+export interface JitsiWidgetIntegration extends LegacyIntegration {
+    jitsiDomain: string;
+    scriptUrl: string
+}
\ No newline at end of file
diff --git a/web/app/shared/models/scalar_responses.ts b/web/app/shared/models/scalar_client_responses.ts
similarity index 100%
rename from web/app/shared/models/scalar_responses.ts
rename to web/app/shared/models/scalar_client_responses.ts
diff --git a/web/app/shared/models/scalar_server_responses.ts b/web/app/shared/models/scalar_server_responses.ts
new file mode 100644
index 0000000..9d29191
--- /dev/null
+++ b/web/app/shared/models/scalar_server_responses.ts
@@ -0,0 +1,3 @@
+export interface ScalarAccountResponse {
+    user_id: string;
+}
\ No newline at end of file
diff --git a/web/app/shared/models/widget.ts b/web/app/shared/models/widget.ts
index e851f7a..fb707a3 100644
--- a/web/app/shared/models/widget.ts
+++ b/web/app/shared/models/widget.ts
@@ -1,4 +1,4 @@
-import { WidgetsResponse } from "./scalar_responses";
+import { WidgetsResponse } from "./scalar_client_responses";
 
 export const WIDGET_CUSTOM = ["customwidget", "dimension-customwidget"];
 export const WIDGET_ETHERPAD = ["etherpad", "dimension-etherpad"];
diff --git a/web/app/shared/services/AuthedApi.ts b/web/app/shared/services/AuthedApi.ts
new file mode 100644
index 0000000..062e852
--- /dev/null
+++ b/web/app/shared/services/AuthedApi.ts
@@ -0,0 +1,15 @@
+import { Http, Response } from "@angular/http";
+import { Observable } from "rxjs/Observable";
+
+export class AuthedApi {
+    public static SCALAR_TOKEN: string = null;
+
+    constructor(protected http: Http) {
+    }
+
+    protected authedGet(url: string, qs?: any): Observable<Response> {
+        if (!qs) qs = {};
+        qs["scalar_token"] = AuthedApi.SCALAR_TOKEN;
+        return this.http.get(url, {params: qs});
+    }
+}
diff --git a/web/app/shared/services/admin-api.service.ts b/web/app/shared/services/admin-api.service.ts
new file mode 100644
index 0000000..7bda7cd
--- /dev/null
+++ b/web/app/shared/services/admin-api.service.ts
@@ -0,0 +1,10 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "./AuthedApi";
+
+@Injectable()
+export class AdminApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+}
diff --git a/web/app/shared/services/dimension-api.service.ts b/web/app/shared/services/dimension-api.service.ts
new file mode 100644
index 0000000..ffa7738
--- /dev/null
+++ b/web/app/shared/services/dimension-api.service.ts
@@ -0,0 +1,15 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "./AuthedApi";
+import { DimensionIntegrationsResponse } from "../models/dimension_responses";
+
+@Injectable()
+export class DimensionApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getIntegrations(roomId: string): Promise<DimensionIntegrationsResponse> {
+        return this.authedGet("/api/v1/dimension/integrations/room/" + roomId).map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/integration.service.ts b/web/app/shared/services/integration.service.ts
index 841e7fe..29d4be0 100644
--- a/web/app/shared/services/integration.service.ts
+++ b/web/app/shared/services/integration.service.ts
@@ -1,21 +1,9 @@
-import { Injectable } from "@angular/core";
-import { Integration } from "../models/integration";
-import { RssConfigComponent } from "../../configs/rss/rss-config.component";
-import { ContainerContent } from "ngx-modialog";
-import { IrcConfigComponent } from "../../configs/irc/irc-config.component";
-import { TravisCiConfigComponent } from "../../configs/travisci/travisci-config.component";
-import { CustomWidgetConfigComponent } from "../../configs/widget/custom_widget/custom_widget-config.component";
-import { YoutubeWidgetConfigComponent } from "../../configs/widget/youtube/youtube-config.component";
-import { TwitchWidgetConfigComponent } from "../../configs/widget/twitch/twitch-config.component";
-import { EtherpadWidgetConfigComponent } from "../../configs/widget/etherpad/etherpad-config.component";
-import { JitsiWidgetConfigComponent } from "../../configs/widget/jitsi/jitsi-config.component";
+import { Component, Injectable } from "@angular/core";
 import {
     WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
     WIDGET_YOUTUBE
 } from "../models/widget";
-import { GoogleDocsWidgetConfigComponent } from "../../configs/widget/googledocs/googledocs-config.component";
-import { GoogleCalendarWidgetConfigComponent } from "../../configs/widget/googlecalendar/googlecalendar-config.component";
-import { CircleCiConfigComponent } from "../../configs/circleci/circleci-config.component";
+import { Integration } from "../models/integration";
 
 @Injectable()
 export class IntegrationService {
@@ -24,53 +12,53 @@ export class IntegrationService {
         "bot": {}, // empty == supported
         "complex-bot": {
             "rss": {
-                component: RssConfigComponent,
+                //component: RssConfigComponent,
             },
             "travisci": {
-                component: TravisCiConfigComponent,
+                //component: TravisCiConfigComponent,
             },
             "circleci": {
-                component: CircleCiConfigComponent,
+                //component: CircleCiConfigComponent,
             },
         },
         "bridge": {
             "irc": {
-                component: IrcConfigComponent,
+                //component: IrcConfigComponent,
             },
         },
         "widget": {
             "customwidget": {
-                component: CustomWidgetConfigComponent,
+                //component: CustomWidgetConfigComponent,
                 types: WIDGET_CUSTOM,
             },
             "youtube": {
-                component: YoutubeWidgetConfigComponent,
+                //component: YoutubeWidgetConfigComponent,
                 types: WIDGET_YOUTUBE
             },
             "etherpad": {
-                component: EtherpadWidgetConfigComponent,
+                //component: EtherpadWidgetConfigComponent,
                 types: WIDGET_ETHERPAD,
             },
             "twitch": {
-                component: TwitchWidgetConfigComponent,
+                //component: TwitchWidgetConfigComponent,
                 types: WIDGET_TWITCH,
             },
             "jitsi": {
-                component: JitsiWidgetConfigComponent,
+                //component: JitsiWidgetConfigComponent,
                 types: WIDGET_JITSI,
             },
             "googledocs": {
-                component: GoogleDocsWidgetConfigComponent,
+                //component: GoogleDocsWidgetConfigComponent,
                 types: WIDGET_GOOGLE_DOCS,
             },
             "googlecalendar": {
-                component: GoogleCalendarWidgetConfigComponent,
+                //component: GoogleCalendarWidgetConfigComponent,
                 types: WIDGET_GOOGLE_CALENDAR,
             },
         },
     };
 
-    static getAllConfigComponents(): ContainerContent[] {
+    static getAllConfigComponents(): Component[] {
         const components = [];
 
         for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
@@ -84,34 +72,30 @@ export class IntegrationService {
     }
 
     static isSupported(integration: Integration): boolean {
-        const forType = IntegrationService.supportedIntegrationsMap[integration.type];
+        const forType = IntegrationService.supportedIntegrationsMap[integration.category];
         if (!forType) return false;
 
         if (Object.keys(forType).length === 0) return true;
 
-        return forType[integration.integrationType]; // has sub type
+        return forType[integration.type]; // has sub type
     }
 
-    static hasConfig(integration: Integration): boolean {
-        return integration.type !== "bot";
+    static getConfigComponent(integration: Integration): Component {
+        return IntegrationService.supportedIntegrationsMap[integration.category][integration.type].component;
     }
 
-    static getConfigComponent(integration: Integration): ContainerContent {
-        return IntegrationService.supportedIntegrationsMap[integration.type][integration.integrationType].component;
-    }
-
-    static getIntegrationForScreen(screen: string): { type: string, integrationType: string } {
+    static getIntegrationForScreen(screen: string): { category: string, type: string } {
         for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
             for (const iiType of Object.keys(IntegrationService.supportedIntegrationsMap[iType])) {
                 const integrationTypes = IntegrationService.supportedIntegrationsMap[iType][iiType].types;
                 const integrationScreens = integrationTypes.map(t => "type_" + t);
-                if (integrationScreens.includes(screen)) return {type: iType, integrationType: iiType};
+                if (integrationScreens.includes(screen)) return {category: iType, type: iiType};
             }
         }
 
         return null;
     }
 
-    constructor() {
+    private constructor() {
     }
 }
diff --git a/web/app/shared/services/api.service.ts b/web/app/shared/services/legacy/api.service.ts
similarity index 95%
rename from web/app/shared/services/api.service.ts
rename to web/app/shared/services/legacy/api.service.ts
index b5d3b16..1eb5185 100644
--- a/web/app/shared/services/api.service.ts
+++ b/web/app/shared/services/legacy/api.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { Integration } from "../models/integration";
+import { LegacyIntegration } from "../../models/legacyintegration";
 
 @Injectable()
 export class ApiService {
@@ -17,7 +17,7 @@ export class ApiService {
             .map(res => res.status === 200 ? res.json()["userId"] : null).toPromise();
     }
 
-    getIntegrations(roomId: string, scalarToken: string): Promise<Integration[]> {
+    getIntegrations(roomId: string, scalarToken: string): Promise<LegacyIntegration[]> {
         return this.http.get("/api/v1/dimension/integrations/" + roomId, {params: {scalar_token: scalarToken}})
             .map(res => res.json()).toPromise();
     }
@@ -46,7 +46,7 @@ export class ApiService {
             .map(res => res.json()).toPromise();
     }
 
-    getIntegration(type: string, integrationType: string): Promise<Integration> {
+    getIntegration(type: string, integrationType: string): Promise<LegacyIntegration> {
         const url = "/api/v1/dimension/integration/" + type + "/" + integrationType;
         return this.http.get(url).map(res => res.json()).toPromise();
     }
diff --git a/web/app/shared/integration.service.ts b/web/app/shared/services/legacy/integration.service.ts
similarity index 52%
rename from web/app/shared/integration.service.ts
rename to web/app/shared/services/legacy/integration.service.ts
index 67c5e5e..2db28cc 100644
--- a/web/app/shared/integration.service.ts
+++ b/web/app/shared/services/legacy/integration.service.ts
@@ -1,24 +1,24 @@
 import { Injectable } from "@angular/core";
-import { Integration } from "./models/integration";
-import { RssConfigComponent } from "../configs/rss/rss-config.component";
+import { LegacyIntegration } from "../../models/legacyintegration";
+import { RssConfigComponent } from "../../../configs/rss/rss-config.component";
 import { ContainerContent } from "ngx-modialog";
-import { IrcConfigComponent } from "../configs/irc/irc-config.component";
-import { TravisCiConfigComponent } from "../configs/travisci/travisci-config.component";
-import { CircleCiConfigComponent } from "../configs/circleci/circleci-config.component";
-import { CustomWidgetConfigComponent } from "../configs/widget/custom_widget/custom_widget-config.component";
-import { YoutubeWidgetConfigComponent } from "../configs/widget/youtube/youtube-config.component";
-import { TwitchWidgetConfigComponent } from "../configs/widget/twitch/twitch-config.component";
-import { EtherpadWidgetConfigComponent } from "../configs/widget/etherpad/etherpad-config.component";
-import { JitsiWidgetConfigComponent } from "../configs/widget/jitsi/jitsi-config.component";
+import { IrcConfigComponent } from "../../../configs/irc/irc-config.component";
+import { TravisCiConfigComponent } from "../../../configs/travisci/travisci-config.component";
+import { CustomWidgetConfigComponent } from "../../../configs/widget/custom_widget/custom_widget-config.component";
+import { YoutubeWidgetConfigComponent } from "../../../configs/widget/youtube/youtube-config.component";
+import { TwitchWidgetConfigComponent } from "../../../configs/widget/twitch/twitch-config.component";
+import { EtherpadWidgetConfigComponent } from "../../../configs/widget/etherpad/etherpad-config.component";
+import { JitsiWidgetConfigComponent } from "../../../configs/widget/jitsi/jitsi-config.component";
 import {
     WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
     WIDGET_YOUTUBE
-} from "./models/widget";
-import { GoogleDocsWidgetConfigComponent } from "../configs/widget/googledocs/googledocs-config.component";
-import { GoogleCalendarWidgetConfigComponent } from "../configs/widget/googlecalendar/googlecalendar-config.component";
+} from "../../models/widget";
+import { GoogleDocsWidgetConfigComponent } from "../../../configs/widget/googledocs/googledocs-config.component";
+import { GoogleCalendarWidgetConfigComponent } from "../../../configs/widget/googlecalendar/googlecalendar-config.component";
+import { CircleCiConfigComponent } from "../../../configs/circleci/circleci-config.component";
 
 @Injectable()
-export class IntegrationService {
+export class LegacyIntegrationService {
 
     private static supportedIntegrationsMap = {
         "bot": {}, // empty == supported
@@ -73,9 +73,9 @@ export class IntegrationService {
     static getAllConfigComponents(): ContainerContent[] {
         const components = [];
 
-        for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
-            for (const iiType of Object.keys(IntegrationService.supportedIntegrationsMap[iType])) {
-                const component = IntegrationService.supportedIntegrationsMap[iType][iiType].component;
+        for (const iType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap)) {
+            for (const iiType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap[iType])) {
+                const component = LegacyIntegrationService.supportedIntegrationsMap[iType][iiType].component;
                 if (component) components.push(component);
             }
         }
@@ -83,8 +83,8 @@ export class IntegrationService {
         return components;
     }
 
-    static isSupported(integration: Integration): boolean {
-        const forType = IntegrationService.supportedIntegrationsMap[integration.type];
+    static isSupported(integration: LegacyIntegration): boolean {
+        const forType = LegacyIntegrationService.supportedIntegrationsMap[integration.type];
         if (!forType) return false;
 
         if (Object.keys(forType).length === 0) return true;
@@ -92,18 +92,18 @@ export class IntegrationService {
         return forType[integration.integrationType]; // has sub type
     }
 
-    static hasConfig(integration: Integration): boolean {
+    static hasConfig(integration: LegacyIntegration): boolean {
         return integration.type !== "bot";
     }
 
-    static getConfigComponent(integration: Integration): ContainerContent {
-        return IntegrationService.supportedIntegrationsMap[integration.type][integration.integrationType].component;
+    static getConfigComponent(integration: LegacyIntegration): ContainerContent {
+        return LegacyIntegrationService.supportedIntegrationsMap[integration.type][integration.integrationType].component;
     }
 
     static getIntegrationForScreen(screen: string): { type: string, integrationType: string } {
-        for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
-            for (const iiType of Object.keys(IntegrationService.supportedIntegrationsMap[iType])) {
-                const integrationTypes = IntegrationService.supportedIntegrationsMap[iType][iiType].types;
+        for (const iType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap)) {
+            for (const iiType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap[iType])) {
+                const integrationTypes = LegacyIntegrationService.supportedIntegrationsMap[iType][iiType].types;
                 const integrationScreens = integrationTypes.map(t => "type_" + t);
                 if (integrationScreens.includes(screen)) return {type: iType, integrationType: iiType};
             }
diff --git a/web/app/shared/services/irc-api.service.ts b/web/app/shared/services/legacy/irc-api.service.ts
similarity index 100%
rename from web/app/shared/services/irc-api.service.ts
rename to web/app/shared/services/legacy/irc-api.service.ts
diff --git a/web/app/shared/services/scalar.service.ts b/web/app/shared/services/scalar-client-api.service.ts
similarity index 91%
rename from web/app/shared/services/scalar.service.ts
rename to web/app/shared/services/scalar-client-api.service.ts
index 0a86582..b117d52 100644
--- a/web/app/shared/services/scalar.service.ts
+++ b/web/app/shared/services/scalar-client-api.service.ts
@@ -6,17 +6,17 @@ import {
     MembershipStateResponse, RoomEncryptionStatusResponse,
     ScalarSuccessResponse,
     WidgetsResponse
-} from "../models/scalar_responses";
+} from "../models/scalar_client_responses";
 import { EditableWidget } from "../models/widget";
 
 @Injectable()
-export class ScalarService {
+export class ScalarClientApiService {
 
     private static actionMap: { [key: string]: { resolve: (obj: any) => void, reject: (obj: any) => void } } = {};
 
     public static getAndRemoveActionHandler(requestKey: string): { resolve: (obj: any) => void, reject: (obj: any) => void } {
-        let handler = ScalarService.actionMap[requestKey];
-        ScalarService.actionMap[requestKey] = null;
+        let handler = ScalarClientApiService.actionMap[requestKey];
+        ScalarClientApiService.actionMap[requestKey] = null;
         return handler;
     }
 
@@ -96,7 +96,7 @@ export class ScalarService {
                 return;
             }
 
-            ScalarService.actionMap[requestKey] = {
+            ScalarClientApiService.actionMap[requestKey] = {
                 resolve: resolve,
                 reject: reject
             };
@@ -117,7 +117,7 @@ window.addEventListener("message", event => {
     let requestKey = event.data["request_id"];
     if (!requestKey) return;
 
-    let action = ScalarService.getAndRemoveActionHandler(requestKey);
+    let action = ScalarClientApiService.getAndRemoveActionHandler(requestKey);
     if (!action) return;
 
     if (event.data.response && event.data.response.error) action.reject(event.data);
diff --git a/web/app/shared/services/scalar-server-api.service.ts b/web/app/shared/services/scalar-server-api.service.ts
new file mode 100644
index 0000000..e0703a8
--- /dev/null
+++ b/web/app/shared/services/scalar-server-api.service.ts
@@ -0,0 +1,15 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { ScalarAccountResponse } from "../models/scalar_server_responses";
+import { AuthedApi } from "./AuthedApi";
+
+@Injectable()
+export class ScalarServerApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http)
+    }
+
+    public getAccount(): Promise<ScalarAccountResponse> {
+        return this.authedGet("/api/v1/scalar/account").map(res => res.json()).toPromise();
+    }
+}
diff --git a/web/app/widget_wrappers/generic/generic.component.ts b/web/app/widget_wrappers/generic/generic.component.ts
index 3957941..1fda647 100644
--- a/web/app/widget_wrappers/generic/generic.component.ts
+++ b/web/app/widget_wrappers/generic/generic.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ApiService } from "../../shared/services/api.service";
+import { ApiService } from "../../shared/services/legacy/api.service";
 import { ActivatedRoute } from "@angular/router";
 import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
 
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.ts b/web/app/widget_wrappers/jitsi/jitsi.component.ts
index b1500e2..c5e81f6 100644
--- a/web/app/widget_wrappers/jitsi/jitsi.component.ts
+++ b/web/app/widget_wrappers/jitsi/jitsi.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import * as $ from "jquery";
-import { ApiService } from "../../shared/services/api.service";
-import { JitsiWidgetIntegration } from "../../shared/models/integration";
+import { ApiService } from "../../shared/services/legacy/api.service";
+import { JitsiWidgetIntegration } from "../../shared/models/legacyintegration";
 
 declare var JitsiMeetExternalAPI: any;
 

From 26530b1becfbe82a79cda0105b3ee1d1cd14ef08 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Dec 2017 21:39:06 -0700
Subject: [PATCH 015/111] Use FA close icon

---
 .../riot/scalar-close/scalar-close.component.html |  2 +-
 .../riot/scalar-close/scalar-close.component.scss |  8 +++++++-
 web/public/img/close.svg                          | 15 ---------------
 web/style/_riot.scss                              |  2 +-
 4 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 web/public/img/close.svg

diff --git a/web/app/riot/scalar-close/scalar-close.component.html b/web/app/riot/scalar-close/scalar-close.component.html
index 34fa9ab..f9ee58b 100644
--- a/web/app/riot/scalar-close/scalar-close.component.html
+++ b/web/app/riot/scalar-close/scalar-close.component.html
@@ -1 +1 @@
-<img src="/img/close.svg" (click)="closeScalar()" alt="close" title="close" />
\ No newline at end of file
+<i class="fa fa-times-circle-o scalarClose" (click)="closeScalar()"></i>
\ No newline at end of file
diff --git a/web/app/riot/scalar-close/scalar-close.component.scss b/web/app/riot/scalar-close/scalar-close.component.scss
index 4569620..a30ea6a 100644
--- a/web/app/riot/scalar-close/scalar-close.component.scss
+++ b/web/app/riot/scalar-close/scalar-close.component.scss
@@ -1,4 +1,10 @@
 // component styles are encapsulated and only applied to their components
-img {
+.scalarClose {
+  font-size: 35px;
   cursor: pointer;
+  color: #ccc;
+}
+
+.scalarClose:hover {
+  color: #888;
 }
\ No newline at end of file
diff --git a/web/public/img/close.svg b/web/public/img/close.svg
deleted file mode 100644
index 4c28aa3..0000000
--- a/web/public/img/close.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="35px" height="35px" viewBox="0 0 35 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>00C6DB7A-67D6-4431-8FB5-07BB1C1AE079</title>
-    <desc>Created with sketchtool.</desc>
-    <defs></defs>
-    <g id="Scalar" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="vector_integrations_popup" transform="translate(-884.000000, -156.000000)">
-            <g id="icons_close" transform="translate(884.000000, 156.000000)">
-                <path d="M17.5,35 C27.1649831,35 35,27.1649831 35,17.5 C35,7.83501688 27.1649831,0 17.5,0 C7.83501688,0 0,7.83501688 0,17.5 C0,27.1649831 7.83501688,35 17.5,35 Z" id="Oval-1-Copy-7" fill="#EEECEC"></path>
-                <polyline id="icon_close" fill="#535353" opacity="0.9" transform="translate(17.468897, 17.470577) rotate(-315.000000) translate(-17.468897, -17.470577) " points="18.2115394 5.97057742 16.674774 5.97057742 16.674774 16.7275762 5.9688975 16.7275762 5.9688975 18.2642903 16.674774 18.2642903 16.674774 28.9705774 18.2115394 28.9705774 18.2115394 18.2642903 28.9688975 18.2642903 28.9688975 16.7275762 18.2115394 16.7275762 18.2115394 5.97057742"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/web/style/_riot.scss b/web/style/_riot.scss
index 51ef99a..2214b7f 100644
--- a/web/style/_riot.scss
+++ b/web/style/_riot.scss
@@ -26,7 +26,7 @@
   padding-top: 4px;
 }
 
-.header .quickAction .closeButton img {
+.header .quickAction .closeButton .scalarClose {
   position: absolute;
   top: 25px;
   right: 15px;

From 9a9bd2c5aca66a5f86285b97f55b076468bbef05 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Dec 2017 21:41:40 -0700
Subject: [PATCH 016/111] Can't forget the most important parts

---
 src-ts/temp_todo.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src-ts/temp_todo.txt b/src-ts/temp_todo.txt
index 796bc2f..8785980 100644
--- a/src-ts/temp_todo.txt
+++ b/src-ts/temp_todo.txt
@@ -2,4 +2,6 @@
 * integration management
 * admin ui
 * delete old src
-* import from old db/config (script)
\ No newline at end of file
+* import from old db/config (script)
+* document how to add integrations (as a dev)
+* update readme

From fac404e16fbec725722b8e5332ef84fc7d41d0e2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 20 Dec 2017 21:47:35 -0700
Subject: [PATCH 017/111] Custom widgets are custom now

---
 web/app/shared/services/integration.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/shared/services/integration.service.ts b/web/app/shared/services/integration.service.ts
index 29d4be0..57f7685 100644
--- a/web/app/shared/services/integration.service.ts
+++ b/web/app/shared/services/integration.service.ts
@@ -27,7 +27,7 @@ export class IntegrationService {
             },
         },
         "widget": {
-            "customwidget": {
+            "custom": {
                 //component: CustomWidgetConfigComponent,
                 types: WIDGET_CUSTOM,
             },

From d3ab2debbc2008b95e50600f77a60a1489751690 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 16:38:48 -0700
Subject: [PATCH 018/111] Update some documentation

---
 DEVELOPMENT.md                     | 51 +++++++++++++++++
 INTEGRATIONS.md                    | 64 ---------------------
 README.md                          | 90 ++++++++++++++----------------
 docs/development/adding_widgets.md | 86 ----------------------------
 4 files changed, 94 insertions(+), 197 deletions(-)
 create mode 100644 DEVELOPMENT.md
 delete mode 100644 INTEGRATIONS.md
 delete mode 100644 docs/development/adding_widgets.md

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 0000000..474db28
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,51 @@
+# Dimension Development
+
+Dimension is split into two layers: the frontend (web) and backend. The frontend is responsible for interacting with the client (Riot) directly and hands off any complex work to the backend for processing.
+
+**For help and support related to Dimension development, please visit:**
+[![#dimension:t2bot.io](https://img.shields.io/badge/matrix-%23dimension:t2bot.io-brightgreen.svg)](https://matrix.to/#/#dimension:t2bot.io)
+
+## Running
+
+The prerequisites for development are the same as running Dimension in a production environment.
+
+```
+# Edit the configuration to your specifications.
+# Be sure to add yourself as an admin!
+cp config/default.yaml config/development.yaml
+nano config/development.yaml
+
+# Run the webserver (it watches for changes)
+npm run start:dev
+
+# Run the backend (does not watch for changes)
+npm run build:app && node build/app/index.js
+```
+
+## General architecture
+
+Integrations are defined in the database for administrators to enable, disable, and configure as they please. They are added using migrations (or in some cases, manually by the administrators) and should always be added as "disabled" by default.
+
+The frontend has two sections: the admin and non-admin sections. The admin section is used by authorized users to configure the various integrations, or parts of integrations. The non-admin section is used by everyone else to add the integrations to their rooms.
+
+The frontend automatically routes edit pages in both the admin and non-admin sections to the appropriate routes. It does this by using a combination of the `category` and `type` of the integrations. For example, a `widget` with the type `jitsi` will be redirected to the `/riot-app/widget/jitsi` route for editing. Both the admin and non-admin routes need to be declared in the `app.routing.ts` class. After that, it is best to copy/paste a similar widget component and edit it to your needs.
+
+The backend is slightly more complicated, where particular integrations may have their own API defined depending on the complexity involved. For example, all bridges have their own admin and non-admin API to configure the various parts. The required changes to the backend are described in the later sections of this document.
+
+## Adding new widgets
+
+TODO
+
+## Adding new go-neb services
+
+TODO
+
+## Adding new bridges
+
+TODO
+
+## Adding new bots
+
+TODO
+
+*note to self: are simple bots even a thing anymore?*
diff --git a/INTEGRATIONS.md b/INTEGRATIONS.md
deleted file mode 100644
index 912035c..0000000
--- a/INTEGRATIONS.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Integrations in Dimension
-
-Integrations take the form of bots, bridges, widgets, and other tools that enhance user experience in particular rooms. This document goes through the various setup procedures for the different types of integrations.
-
-Several integrations already have configuration files in the `config/integrations` folder. Each default configuration has additional information as to how to configure it. Some integrations are disabled by default and can be found in the `config/integrations/samples` folder.
-
-## Simple Bots
-
-A simple bot is a bot that requires no configuration by users. It simply exists in the room and provides some minor functionality. Examples of this are the Giphy, Guggy, and Wikipedia bots.
-
-1. Create a new configuration file in `config/integrations` for the bot.
-2. Put the following contents in the configuration file:
-   ```
-   # This is required. Leave it as "bot" for this configuration.
-   type: "bot"
-
-   # We should probably make sure it is enabled too ;)
-   enabled: true
-   
-   # This is a unique key to identify your bot. For example, "giphy".
-   integrationType: "YOUR_BOT_NAME"
-
-   # The matrix user ID for the bot. This is likely to be on your server.
-   userId: "@userID:server.com"
-
-   # The name to use in the UI for Dimension. Try to keep this short.
-   name: "Some Friendly Bot"
-
-   # A brief description of the bot. These are best kept under 60 characters.
-   about: "Use `!some command` to interact with the bot"
-
-   # A logo for your bot. We'll upload this in a moment.
-   avatar: "img/avatars/YOUR_BOT_NAME.png"
-
-   # This is the actual bot configuration so Dimension can control some aspects of the bot's behaviour (leaving rooms, etc).
-   hosted:
-     # The URL to the client/server API. This is the "Homeserver URL" in Riot.
-     homeserverUrl: "https://matrix.org"
-
-     # The access token for the bot. For information on how to get this, visit https://t2bot.io/docs/access_tokens
-     accessToken: "your_matrix_access_token_here"
-   ```
-3. Upload/copy the logo for the bot to the `img/avatars` folder, as mentioned above.
-4. Restart Dimension
-
-Your bot should now be in Dimension!
-
-## Complex Bots
-
-Complex bots are the bots that require configuration within Dimension in order to work. Examples include the Github bot or RSS bot. Currently these bots are not as easy to set up in Dimension as they could be, and require a developer to write code for Dimension to understand the requirements.
-
-To request a particular complex bot to be supported, please open a new issue on Github.
-
-## Bridges
-
-Bridges allow people in matrix to talk to people not in matrix, and vice-versa. Like complex bots, bridges require additional code in Dimension in order to be supported.
-
-To request a particular bridge to be supported, please open a new issue on Github.
-
-## Widgets
-
-Widgets are web applications that can be embedded in a room for users to interact with. Like bridges and complex bots, widgets require additional code in Dimension to be supported.
-
-To request a particular widget, please open a new issue on Github.
diff --git a/README.md b/README.md
index 9e6bf2e..642340e 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,9 @@
-# Dimension
+![dimension](https://t2bot.io/_matrix/media/v1/download/t2l.io/CceFARjXLjomNdUbKjXbGrDF)
  
 [![TravisCI badge](https://travis-ci.org/turt2live/matrix-dimension.svg?branch=master)](https://travis-ci.org/turt2live/matrix-dimension)
+[![#dimension:t2bot.io](https://img.shields.io/badge/matrix-%23dimension:t2bot.io-brightgreen.svg)](https://matrix.to/#/#dimension:t2bot.io)
 
-An alternative integrations manager for [Riot](https://riot.im). Join us on matrix: [#dimension:t2l.io](https://matrix.to/#/#dimension:t2l.io)
-
-![screenshot](https://t2bot.io/_matrix/media/v1/download/t2l.io/kWDyaWXqdsjOJgGYAMMRgGiE)
-
-# ⚠️ Dimension is in Alpha ⚠️
-
-Dimension supports some bridges and bots, however using Dimension in a production scenario is not recommended. Dimension uses features available in recent builds of Riot and may not work on older versions.
-
-There are plans on the matrix.org front to better support integration managers. Those changes may require an updated homeserver and Riot when made available.
+An alternative integrations manager for [Riot.im](https://riot.im).
 
 # Configuring Riot to use Dimension
 
@@ -22,29 +15,46 @@ Change the values in Riot's `config.json` as shown below. If you do not have a `
 "integrations_widgets_urls": ["https://dimension.t2bot.io/widgets"],
 ``` 
 
-The remaining settings should be tailored for your Riot deployment.
-
-# Building
-
-To create a production build of Dimension, run `npm run build`. For development environments, see the Development section below.
+The remaining settings should be tailored for your Riot deployment. If you're self-hosting Dimension, replace "dimension.t2bot.io" with your Dimension URL.
 
 # Running your own
 
-1. Run `npm run build`
-2. Copy `config/default.yaml` to `config/production.yaml` and edit `config/production.yaml`
-3. Edit any integration settings in `config/integrations`
-4. Run Dimension with `NODE_ENV=production node app.js`
+Prerequisites:
+* [NodeJS](https://nodejs.org/en/download/) 8 or higher
+* npm 5 or higher (`npm install -g npm@latest`)
+* TypeScript 2.6 or higher (`npm install -g typescript`)
+* A webserver running Riot
 
-Dimension is now available on the port/host you configured.
+```bash
+# Download dimension 
+git clone https://github.com/turt2live/matrix-dimension.git
+cd matrix-dimension
+
+# Edit the configuration to your specifications.
+# Be sure to add yourself as an admin!
+cp config/default.yaml config/production.yaml
+nano config/production.yaml
+
+# Run
+NODE_ENV=production npm run start:app
+```
+
+If you didn't change the port, Dimension should now be running on port 8184. It's best to set up your environment so that Dimension runs on a dedicated subdomain that *is not* the same as your Riot domain. This is to help keep Riot and Dimension safe and secure. 
+
+In your Riot `config.json`, set the integration manager to be your Dimension URL. Replace `dimension.t2bot.io` in the example above (under "Configuring Riot to use Dimension") with your Dimension URLs.
+
+After Riot has been configured to use Dimension, refresh Riot and click the "Integrations" button in the top right of the room. It should be an icon that looks like this:
+
+![3x3 square](https://t2bot.io/_matrix/media/v1/thumbnail/t2l.io/gOgboDPEMfiYOQryYwvvHkFz?width=800&height=600)
+
+That button should open Dimension. If you've configured everything correctly, you'll see a gear icon in the top right of the window - click this to start editing your integrations.
 
 ### Running Dimension behind nginx
 
-1. Run `npm run build`
-2. Copy `config/default.yaml` to `config/production.yaml` and edit `config/production.yaml`
-3. Edit any integration settings in `config/integrations`
-4. Set the host for Dimension to listen on to `localhost` or `127.0.0.1`
-5. Run Dimension with `NODE_ENV=production node app.js`
-6. Set up the following reverse proxy information as applicable
+1. Follow the steps outlined above.
+2. Set the host for Dimension to listen on to `localhost` or `127.0.0.1`
+3. Restart Dimension (`CTRL+C` and run `NODE_ENV=production npm run start:app` again)
+4. Set up the following reverse proxy information as applicable
     ```
     location / {
         proxy_set_header X-Forwarded-For $remote_addr;
@@ -53,11 +63,15 @@ Dimension is now available on the port/host you configured.
     ```
    Be sure to also configure any SSL offloading.
 
+### "Could not contact integrations server" error
+
+1. **Check that federation is enabled and working on your homeserver.** Even in a private, or non-federated environment, the federation API still needs to be accessible. If federation is a major concern, limit the servers that can use the API by IP or install Dimension on the same server as your homeserver, only exposing federation to localhost.
+2. **Check your SRV records.** If you are using SRV records to point to your federation port, make sure that the hostname and port are correct, and that HTTPS is listening on that port. Dimension will use the first record it sees and will only communicate over HTTPS.
+3. **Log out of Riot and log back in.** When switching from the default integrations manager (Scalar) to Dimension the authentication tokens can change. Logging out and back in will reset this token, allowing Dimension to work. More advanced users can delete the "mx_scalar_token" localstorage key.
+
 # Development
 
-1. Copy `config/default.yaml` to `config/development.yaml` and make any edits
-2. Run Dimension with `NODE_ENV=development node app.js`
-3. Run the web app with `npm run dev`
+For information on how to run Dimension in a local environment, and for information about how the project is structured, see DEVELOPMENT.md
 
 # Do I need an integrations manager?
 
@@ -84,24 +98,6 @@ The infrastructure diagram looks something like this:
 +-----------+                                     +-------------+
 ```
 
-# Common Problems / Setup Questions
-
-Dimension uses unstable and undocumented parts of Riot and can sometimes be a bit difficult to set up. If you're running into issues, check the solutions below. If you're still having issues, come by [#dimension:t2bot.io](https://matrix.to/#/#dimension:t2bot.io) and we can help you out.
-
-## Setting up integrations (including custom)
-
-The INTEGRATIONS.md file in this repository explains how to add custom integrations. For assistance, please visit [#dimension:t2bot.io](https://matrix.to/#/#dimension:t2bot.io)
-
-## "Could not contact integrations server"
-
-1. **Check that federation is enabled and working on your homeserver.** Even in a private, or non-federated environment, the federation API still needs to be accessible. If federation is a major concern, limit the servers that can use the API by IP or install Dimension on the same server as your homeserver, only exposing federation to localhost.
-2. **Check your SRV records.** If you are using SRV records to point to your federation port, make sure that the hostname and port are correct, and that HTTPS is listening on that port. Dimension will use the first record it sees and will only communicate over HTTPS.
-3. **Log out of Riot and log back in.** When switching from the default integrations manager (Scalar) to Dimension the authentication tokens can change. Logging out and back in will reset this token, allowing Dimension to work. More advanced users can delete the "mx_scalar_token" localstorage key.
-
-## Turning off matrix.org/Scalar dependency
-
-To completely disconnect Dimension from using the matrix.org bots and bridges, remove the `vector` upstream from your config. This will force anything using the upstream (matrix.org bots and bridges) to not load.
-
 # License
 
 For information about Dimension's license, please see the LICENSE file included in this repository.
diff --git a/docs/development/adding_widgets.md b/docs/development/adding_widgets.md
deleted file mode 100644
index a839370..0000000
--- a/docs/development/adding_widgets.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Adding new widgets to Dimension
-
-Widgets are small/simple applications that can be loaded via iframes in a Riot.im room. Dimension supports "wrapped widgets" where each widget URL is held in some kind of wrapper to ensure it can make everything work for that widget. For example, Jitsi widgets are wrapped so that the Jitsi elements can be set up.
-
-To add a new widget to Dimension:
-
-1. Copy and existing widget's configuration file from `config/integrations` and update it accordingly. The bare minimum is:
-    ```yaml
-    # These two options should never change
-    type: "widget"
-    enabled: true
-
-    integrationType: "mywidget" # This is the widget type
-    name: "My Widget" # The human-readable name for the widget
-    about: "This is a very brief description of the widget"
-    avatar: "img/avatars/mywidget.png" # Should be a 120x120 PNG image. 
-                                       # Located at `web/public/img/avatars/mywidget.png`
-    ```
-2. In `web/app/shared/models/widget.ts` add a constant for your widget. In this example, it would be:
-    ```typescript
-    export const WIDGET_MY_WIDGET = ["mywidget"];
-    ```
-3. Add a new component to configure your widget under `web/app/configs/widget` (this is best done by copy/pasting another similar widget's component and renaming the files and class name).
-4. Register the component in `web/app/shared/integration.service.ts` under the `supportedIntegrationsMap` like so:
-    ```typescript
-    private static supportedIntegrationsMap = {
-      "widget": {
-        "mywidget": {
-          component: MyWidgetConfigComponent,
-          types: WIDGET_MY_WIDGET,
-        },
-      },
-    };
-    ```
-5. Start building out the widget configuration component.
-
-
-## Widget configuration component methods
-
-Most widgets should be able to specify their entire behaviour through use of the constructor, however some do require some additional hooks to operate correctly. For example, widgets being imported from older versions of Dimension or other integration managers may have to be massaged into compatible widgets.
-
-All widgets rely on the `data` property bag to store state information, such as a channel name or conference name. This information is automatically persisted as part of the widget. Whenever you are interacting with a widget in the context of editing or creating it be sure to use the properties under `dimension` on the widget, otherwise your changes may be overwritten.
-
-Here's a few examples of how to use the hooks supplied by the widget configuration component. For more information on all of the hooks available, please see the bottom of `web/app/configs/widget/widget.component.ts`.
-
-#### Expanding the widget's data prior to creation
-
-This is common for when a widget wants to create a new widget based on a channel name (for example). 
-
-```typescript
-protected onNewWidgetPrepared() {
-  this.newWidget.dimension.newData.channelName = "";
-}
-```
-
-#### Modifying the widget URL (or other properties) before adding/saving
-
-```typescript
-// Make sure to call these methods instead of addWidget and saveWidget in the view!
-
-public validateAndAddWidget() {
-  this.newWidget.dimension.newUrl = "https://somewhere.com";
-  this.addWidget();
-}
-
-public validateAndSaveWidget(widget: EditableWidget) {
-  widget.dimension.newUrl = "https://somewhere.com";
-  this.saveWidget(widget);
-}
-```
-
-#### Converting widgets from other data sources (Scalar, older versions, etc)
-
-```typescript
-protected onWidgetsDiscovered() {
-  for (const widget of this.widgets) {
-    // Note the use of .data instead of .dimension here.
-    // This is because we're not editing or creating a widget - just preparing it.
-
-    if (widget.data.oldDataKey) {
-      widget.data.newDataKey = widget.data.oldDataKey;
-    }
-  }
-}
-```
-

From 6740571183f9966dd158e7fd418a919e11cdc443 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 21:08:10 -0700
Subject: [PATCH 019/111] Prepare UI for editing of integrations

---
 web/app/app.module.ts                         |  20 +-
 web/app/app.routing.ts                        |  17 +-
 .../circleci/circleci-config.component.html   |   0
 .../circleci/circleci-config.component.scss   |   0
 .../circleci/circleci-config.component.ts     |   0
 .../config.component.scss                     |   0
 .../irc/irc-config.component.html             |   0
 .../irc/irc-config.component.scss             |   0
 .../irc/irc-config.component.ts               |   0
 .../rss/rss-config.component.html             |   0
 .../rss/rss-config.component.scss             |   0
 .../rss/rss-config.component.ts               |   0
 .../travisci/travisci-config.component.html   |   0
 .../travisci/travisci-config.component.scss   |   0
 .../travisci/travisci-config.component.ts     |   0
 .../custom_widget-config.component.html       |   0
 .../custom_widget-config.component.scss       |   0
 .../custom_widget-config.component.ts         |   0
 .../etherpad/etherpad-config.component.html   |   0
 .../etherpad/etherpad-config.component.scss   |   0
 .../etherpad/etherpad-config.component.ts     |   0
 .../googlecalendar-config.component.html      |   0
 .../googlecalendar-config.component.scss      |   0
 .../googlecalendar-config.component.ts        |   0
 .../googledocs-config.component.html          |   0
 .../googledocs-config.component.scss          |   0
 .../googledocs/googledocs-config.component.ts |   0
 .../widget/jitsi/jitsi-config.component.html  |   0
 .../widget/jitsi/jitsi-config.component.scss  |   0
 .../widget/jitsi/jitsi-config.component.ts    |   0
 .../twitch/twitch-config.component.html       |   0
 .../twitch/twitch-config.component.scss       |   0
 .../widget/twitch/twitch-config.component.ts  |   0
 .../configs-old/widget/widget.component.ts    | 395 ++++++++++++++++++
 .../youtube/youtube-config.component.html     |   0
 .../youtube/youtube-config.component.scss     |   0
 .../youtube/youtube-config.component.ts       |   0
 web/app/configs/widget/widget.component.ts    | 172 +++-----
 .../fullscreen-button.component.html          |   0
 .../fullscreen-button.component.scss          |   0
 .../fullscreen-button.component.ts            |   0
 web/app/elements/ibox/ibox.component.html     |  12 +
 .../elements/ibox/ibox.component.scss}        |   8 +-
 web/app/elements/ibox/ibox.component.ts       |  18 +
 .../spinner/spinner.component.html            |   0
 .../elements/spinner/spinner.component.scss   |   2 +
 .../spinner/spinner.component.ts              |   0
 .../integration-bag.component.html            |   2 +-
 web/app/riot/riot-home/home.component.html    |  11 +-
 web/app/riot/riot-home/home.component.ts      |  27 +-
 web/app/shared/SessionStorage.ts              |  14 +
 web/app/shared/services/AuthedApi.ts          |   5 +-
 .../shared/services/integration.service.ts    |  42 +-
 .../services/legacy/integration.service.ts    |  22 +-
 web/app/shared/services/locator.service.ts    |   5 +
 web/app/spinner/spinner.component.scss        |   2 -
 web/style/app.scss                            |   1 -
 57 files changed, 575 insertions(+), 200 deletions(-)
 rename web/app/{configs => configs-old}/circleci/circleci-config.component.html (100%)
 rename web/app/{configs => configs-old}/circleci/circleci-config.component.scss (100%)
 rename web/app/{configs => configs-old}/circleci/circleci-config.component.ts (100%)
 rename web/app/{configs => configs-old}/config.component.scss (100%)
 rename web/app/{configs => configs-old}/irc/irc-config.component.html (100%)
 rename web/app/{configs => configs-old}/irc/irc-config.component.scss (100%)
 rename web/app/{configs => configs-old}/irc/irc-config.component.ts (100%)
 rename web/app/{configs => configs-old}/rss/rss-config.component.html (100%)
 rename web/app/{configs => configs-old}/rss/rss-config.component.scss (100%)
 rename web/app/{configs => configs-old}/rss/rss-config.component.ts (100%)
 rename web/app/{configs => configs-old}/travisci/travisci-config.component.html (100%)
 rename web/app/{configs => configs-old}/travisci/travisci-config.component.scss (100%)
 rename web/app/{configs => configs-old}/travisci/travisci-config.component.ts (100%)
 rename web/app/{configs => configs-old}/widget/custom_widget/custom_widget-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/custom_widget/custom_widget-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/custom_widget/custom_widget-config.component.ts (100%)
 rename web/app/{configs => configs-old}/widget/etherpad/etherpad-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/etherpad/etherpad-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/etherpad/etherpad-config.component.ts (100%)
 rename web/app/{configs => configs-old}/widget/googlecalendar/googlecalendar-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/googlecalendar/googlecalendar-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/googlecalendar/googlecalendar-config.component.ts (100%)
 rename web/app/{configs => configs-old}/widget/googledocs/googledocs-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/googledocs/googledocs-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/googledocs/googledocs-config.component.ts (100%)
 rename web/app/{configs => configs-old}/widget/jitsi/jitsi-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/jitsi/jitsi-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/jitsi/jitsi-config.component.ts (100%)
 rename web/app/{configs => configs-old}/widget/twitch/twitch-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/twitch/twitch-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/twitch/twitch-config.component.ts (100%)
 create mode 100644 web/app/configs-old/widget/widget.component.ts
 rename web/app/{configs => configs-old}/widget/youtube/youtube-config.component.html (100%)
 rename web/app/{configs => configs-old}/widget/youtube/youtube-config.component.scss (100%)
 rename web/app/{configs => configs-old}/widget/youtube/youtube-config.component.ts (100%)
 rename web/app/{ => elements}/fullscreen-button/fullscreen-button.component.html (100%)
 rename web/app/{ => elements}/fullscreen-button/fullscreen-button.component.scss (100%)
 rename web/app/{ => elements}/fullscreen-button/fullscreen-button.component.ts (100%)
 create mode 100644 web/app/elements/ibox/ibox.component.html
 rename web/{style/components/ibox.scss => app/elements/ibox/ibox.component.scss} (73%)
 create mode 100644 web/app/elements/ibox/ibox.component.ts
 rename web/app/{ => elements}/spinner/spinner.component.html (100%)
 create mode 100644 web/app/elements/spinner/spinner.component.scss
 rename web/app/{ => elements}/spinner/spinner.component.ts (100%)
 create mode 100644 web/app/shared/SessionStorage.ts
 create mode 100644 web/app/shared/services/locator.service.ts
 delete mode 100644 web/app/spinner/spinner.component.scss

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index d3474fe..0863efa 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -1,4 +1,4 @@
-import { ApplicationRef, NgModule } from "@angular/core";
+import { ApplicationRef, Injector, NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 import { HttpModule } from "@angular/http";
 import { FormsModule } from "@angular/forms";
@@ -13,17 +13,16 @@ import { ScalarClientApiService } from "./shared/services/scalar-client-api.serv
 import { ToasterModule } from "angular2-toaster";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { ScalarCloseComponent } from "./riot/scalar-close/scalar-close.component";
-import { LegacyIntegrationService } from "./shared/services/legacy/integration.service";
 import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap";
 import { ModalModule } from "ngx-modialog";
 import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic.component";
 import { ToggleFullscreenDirective } from "./shared/directives/toggle-fullscreen.directive";
-import { FullscreenButtonComponent } from "./fullscreen-button/fullscreen-button.component";
+import { FullscreenButtonComponent } from "./elements/fullscreen-button/fullscreen-button.component";
 import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component";
 import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
 import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
 import { PageHeaderComponent } from "./page-header/page-header.component";
-import { SpinnerComponent } from "./spinner/spinner.component";
+import { SpinnerComponent } from "./elements/spinner/spinner.component";
 import { BreadcrumbsModule } from "ng2-breadcrumbs";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { IntegrationBagComponent } from "./integration-bag/integration-bag.component";
@@ -31,8 +30,8 @@ import { IntegrationComponent } from "./integration/integration.component";
 import { ScalarServerApiService } from "./shared/services/scalar-server-api.service";
 import { DimensionApiService } from "./shared/services/dimension-api.service";
 import { AdminApiService } from "./shared/services/admin-api.service";
-
-const WIDGET_CONFIGURATION_COMPONENTS: any[] = LegacyIntegrationService.getAllConfigComponents();
+import { ServiceLocator } from "./shared/services/locator.service";
+import { IboxComponent } from "./elements/ibox/ibox.component";
 
 @NgModule({
     imports: [
@@ -49,7 +48,6 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = LegacyIntegrationService.getAllCo
         BreadcrumbsModule,
     ],
     declarations: [
-        ...WIDGET_CONFIGURATION_COMPONENTS,
         AppComponent,
         HomeComponent,
         RiotComponent,
@@ -65,6 +63,7 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = LegacyIntegrationService.getAllCo
         JitsiWidgetWrapperComponent,
         GCalWidgetWrapperComponent,
         RiotHomeComponent,
+        IboxComponent,
 
         // Vendor
     ],
@@ -78,12 +77,11 @@ const WIDGET_CONFIGURATION_COMPONENTS: any[] = LegacyIntegrationService.getAllCo
         // Vendor
     ],
     bootstrap: [AppComponent],
-    entryComponents: [
-        ...WIDGET_CONFIGURATION_COMPONENTS,
-    ]
+    entryComponents: []
 })
 export class AppModule {
-    constructor(public appRef: ApplicationRef) {
+    constructor(public appRef: ApplicationRef, injector: Injector) {
+        ServiceLocator.injector = injector;
     }
 
     hmrOnInit(store) {
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 960c7f4..404f797 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -9,15 +9,26 @@ import { RiotHomeComponent } from "./riot/riot-home/home.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
-    {path: "riot", pathMatch: "full", redirectTo: "riot-app/home"},
+    {path: "riot", pathMatch: "full", redirectTo: "riot-app"},
     {
         path: "riot-app",
         component: RiotComponent,
+        data: {breadcrumb: "Home", name: "Dimension"},
         children: [
             {
-                path: "home",
+                path: "",
                 component: RiotHomeComponent,
-                data: {breadcrumb: "Home", name: "Dimension"},
+            },
+            {
+                path: "widget",
+                children: [],
+                // children: [
+                //     {
+                //         path: "custom",
+                //         component: NewTestWidgetComponent,
+                //         data: {breadcrumb: "Custom Widgets", name: "Custom Widgets"}
+                //     },
+                // ],
             },
         ],
     },
diff --git a/web/app/configs/circleci/circleci-config.component.html b/web/app/configs-old/circleci/circleci-config.component.html
similarity index 100%
rename from web/app/configs/circleci/circleci-config.component.html
rename to web/app/configs-old/circleci/circleci-config.component.html
diff --git a/web/app/configs/circleci/circleci-config.component.scss b/web/app/configs-old/circleci/circleci-config.component.scss
similarity index 100%
rename from web/app/configs/circleci/circleci-config.component.scss
rename to web/app/configs-old/circleci/circleci-config.component.scss
diff --git a/web/app/configs/circleci/circleci-config.component.ts b/web/app/configs-old/circleci/circleci-config.component.ts
similarity index 100%
rename from web/app/configs/circleci/circleci-config.component.ts
rename to web/app/configs-old/circleci/circleci-config.component.ts
diff --git a/web/app/configs/config.component.scss b/web/app/configs-old/config.component.scss
similarity index 100%
rename from web/app/configs/config.component.scss
rename to web/app/configs-old/config.component.scss
diff --git a/web/app/configs/irc/irc-config.component.html b/web/app/configs-old/irc/irc-config.component.html
similarity index 100%
rename from web/app/configs/irc/irc-config.component.html
rename to web/app/configs-old/irc/irc-config.component.html
diff --git a/web/app/configs/irc/irc-config.component.scss b/web/app/configs-old/irc/irc-config.component.scss
similarity index 100%
rename from web/app/configs/irc/irc-config.component.scss
rename to web/app/configs-old/irc/irc-config.component.scss
diff --git a/web/app/configs/irc/irc-config.component.ts b/web/app/configs-old/irc/irc-config.component.ts
similarity index 100%
rename from web/app/configs/irc/irc-config.component.ts
rename to web/app/configs-old/irc/irc-config.component.ts
diff --git a/web/app/configs/rss/rss-config.component.html b/web/app/configs-old/rss/rss-config.component.html
similarity index 100%
rename from web/app/configs/rss/rss-config.component.html
rename to web/app/configs-old/rss/rss-config.component.html
diff --git a/web/app/configs/rss/rss-config.component.scss b/web/app/configs-old/rss/rss-config.component.scss
similarity index 100%
rename from web/app/configs/rss/rss-config.component.scss
rename to web/app/configs-old/rss/rss-config.component.scss
diff --git a/web/app/configs/rss/rss-config.component.ts b/web/app/configs-old/rss/rss-config.component.ts
similarity index 100%
rename from web/app/configs/rss/rss-config.component.ts
rename to web/app/configs-old/rss/rss-config.component.ts
diff --git a/web/app/configs/travisci/travisci-config.component.html b/web/app/configs-old/travisci/travisci-config.component.html
similarity index 100%
rename from web/app/configs/travisci/travisci-config.component.html
rename to web/app/configs-old/travisci/travisci-config.component.html
diff --git a/web/app/configs/travisci/travisci-config.component.scss b/web/app/configs-old/travisci/travisci-config.component.scss
similarity index 100%
rename from web/app/configs/travisci/travisci-config.component.scss
rename to web/app/configs-old/travisci/travisci-config.component.scss
diff --git a/web/app/configs/travisci/travisci-config.component.ts b/web/app/configs-old/travisci/travisci-config.component.ts
similarity index 100%
rename from web/app/configs/travisci/travisci-config.component.ts
rename to web/app/configs-old/travisci/travisci-config.component.ts
diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.html b/web/app/configs-old/widget/custom_widget/custom_widget-config.component.html
similarity index 100%
rename from web/app/configs/widget/custom_widget/custom_widget-config.component.html
rename to web/app/configs-old/widget/custom_widget/custom_widget-config.component.html
diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.scss b/web/app/configs-old/widget/custom_widget/custom_widget-config.component.scss
similarity index 100%
rename from web/app/configs/widget/custom_widget/custom_widget-config.component.scss
rename to web/app/configs-old/widget/custom_widget/custom_widget-config.component.scss
diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.ts b/web/app/configs-old/widget/custom_widget/custom_widget-config.component.ts
similarity index 100%
rename from web/app/configs/widget/custom_widget/custom_widget-config.component.ts
rename to web/app/configs-old/widget/custom_widget/custom_widget-config.component.ts
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.html b/web/app/configs-old/widget/etherpad/etherpad-config.component.html
similarity index 100%
rename from web/app/configs/widget/etherpad/etherpad-config.component.html
rename to web/app/configs-old/widget/etherpad/etherpad-config.component.html
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.scss b/web/app/configs-old/widget/etherpad/etherpad-config.component.scss
similarity index 100%
rename from web/app/configs/widget/etherpad/etherpad-config.component.scss
rename to web/app/configs-old/widget/etherpad/etherpad-config.component.scss
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.ts b/web/app/configs-old/widget/etherpad/etherpad-config.component.ts
similarity index 100%
rename from web/app/configs/widget/etherpad/etherpad-config.component.ts
rename to web/app/configs-old/widget/etherpad/etherpad-config.component.ts
diff --git a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.html b/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.html
similarity index 100%
rename from web/app/configs/widget/googlecalendar/googlecalendar-config.component.html
rename to web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.html
diff --git a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.scss b/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.scss
similarity index 100%
rename from web/app/configs/widget/googlecalendar/googlecalendar-config.component.scss
rename to web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.scss
diff --git a/web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts b/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.ts
similarity index 100%
rename from web/app/configs/widget/googlecalendar/googlecalendar-config.component.ts
rename to web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.ts
diff --git a/web/app/configs/widget/googledocs/googledocs-config.component.html b/web/app/configs-old/widget/googledocs/googledocs-config.component.html
similarity index 100%
rename from web/app/configs/widget/googledocs/googledocs-config.component.html
rename to web/app/configs-old/widget/googledocs/googledocs-config.component.html
diff --git a/web/app/configs/widget/googledocs/googledocs-config.component.scss b/web/app/configs-old/widget/googledocs/googledocs-config.component.scss
similarity index 100%
rename from web/app/configs/widget/googledocs/googledocs-config.component.scss
rename to web/app/configs-old/widget/googledocs/googledocs-config.component.scss
diff --git a/web/app/configs/widget/googledocs/googledocs-config.component.ts b/web/app/configs-old/widget/googledocs/googledocs-config.component.ts
similarity index 100%
rename from web/app/configs/widget/googledocs/googledocs-config.component.ts
rename to web/app/configs-old/widget/googledocs/googledocs-config.component.ts
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.html b/web/app/configs-old/widget/jitsi/jitsi-config.component.html
similarity index 100%
rename from web/app/configs/widget/jitsi/jitsi-config.component.html
rename to web/app/configs-old/widget/jitsi/jitsi-config.component.html
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.scss b/web/app/configs-old/widget/jitsi/jitsi-config.component.scss
similarity index 100%
rename from web/app/configs/widget/jitsi/jitsi-config.component.scss
rename to web/app/configs-old/widget/jitsi/jitsi-config.component.scss
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.ts b/web/app/configs-old/widget/jitsi/jitsi-config.component.ts
similarity index 100%
rename from web/app/configs/widget/jitsi/jitsi-config.component.ts
rename to web/app/configs-old/widget/jitsi/jitsi-config.component.ts
diff --git a/web/app/configs/widget/twitch/twitch-config.component.html b/web/app/configs-old/widget/twitch/twitch-config.component.html
similarity index 100%
rename from web/app/configs/widget/twitch/twitch-config.component.html
rename to web/app/configs-old/widget/twitch/twitch-config.component.html
diff --git a/web/app/configs/widget/twitch/twitch-config.component.scss b/web/app/configs-old/widget/twitch/twitch-config.component.scss
similarity index 100%
rename from web/app/configs/widget/twitch/twitch-config.component.scss
rename to web/app/configs-old/widget/twitch/twitch-config.component.scss
diff --git a/web/app/configs/widget/twitch/twitch-config.component.ts b/web/app/configs-old/widget/twitch/twitch-config.component.ts
similarity index 100%
rename from web/app/configs/widget/twitch/twitch-config.component.ts
rename to web/app/configs-old/widget/twitch/twitch-config.component.ts
diff --git a/web/app/configs-old/widget/widget.component.ts b/web/app/configs-old/widget/widget.component.ts
new file mode 100644
index 0000000..6816fda
--- /dev/null
+++ b/web/app/configs-old/widget/widget.component.ts
@@ -0,0 +1,395 @@
+import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
+import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
+import { ToasterService } from "angular2-toaster";
+import { LegacyIntegration } from "../../shared/models/legacyintegration";
+
+const SCALAR_WIDGET_LINKS = [
+    "https://scalar-staging.riot.im/scalar/api/widgets/__TYPE__.html?url=",
+    "https://scalar-staging.vector.im/scalar/api/widgets/__TYPE__.html?url=",
+    "https://scalar-develop.riot.im/scalar/api/widgets/__TYPE__.html?url=",
+    "https://demo.riot.im/scalar/api/widgets/__TYPE__.html?url=",
+];
+
+export class WidgetComponent {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public widgets: EditableWidget[];
+    public newWidget: EditableWidget;
+
+    private toggledWidgetIds: string[] = [];
+    private scalarWrapperUrls: string[] = [];
+    private wrapperUrl = "";
+
+    constructor(window: Window,
+                protected toaster: ToasterService,
+                protected scalarApi: ScalarClientApiService,
+                public roomId: string,
+                public integration: LegacyIntegration,
+                editWidgetId: string,
+                private widgetIds: string[],
+                private defaultName: string,
+                private wrapperId = "generic",
+                private scalarWrapperId = null) {
+        this.isLoading = true;
+        this.isUpdating = false;
+
+        if (wrapperId) {
+            this.wrapperUrl = window.location.origin + "/widgets/" + wrapperId + "?url=";
+
+            if (!scalarWrapperId) scalarWrapperId = wrapperId;
+            for (let widgetLink of SCALAR_WIDGET_LINKS) {
+                this.scalarWrapperUrls.push(widgetLink.replace("__TYPE__", scalarWrapperId));
+            }
+        }
+
+        this.prepareNewWidget();
+        this.getWidgetsOfType(widgetIds).then(widgets => {
+            this.widgets = widgets;
+            for (let widget of this.widgets) {
+                this.unpackWidget(widget);
+            }
+
+            this.onWidgetsDiscovered();
+            this.isLoading = false;
+            this.isUpdating = false;
+
+            // See if we should request editing a particular widget
+            if (editWidgetId) {
+                for (let widget of this.widgets) {
+                    if (widget.id === editWidgetId) {
+                        console.log("Requesting edit for " + widget.id);
+                        this.editWidget(widget);
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Populates the Dimension-specific fields of the widget, overwriting any values that
+     * were there previously.
+     * @param {EditableWidget} widget The widget to unpack.
+     */
+    private unpackWidget(widget: EditableWidget) {
+        widget.dimension = {
+            newUrl: this.unwrapUrl(widget.url),
+            newName: widget.name,
+            newTitle: widget.data ? widget.data.title : null,
+            newData: JSON.parse(JSON.stringify(widget.data || "{}")),
+        };
+    }
+
+    /**
+     * Packs a widget, converting the Dimension-specific parameters into a widget. This will
+     * overwrite any values in the widget which need to be committed to from the Dimension
+     * fields.
+     * @param {EditableWidget} widget The widget to pack.
+     */
+    private packWidget(widget: EditableWidget) {
+        // The widget already has an ID and type, we just need to fill in the bits
+        widget.name = widget.dimension.newName || this.defaultName;
+        widget.data = widget.dimension.newData || {};
+        widget.url = this.wrapUrl(widget.dimension.newUrl, Object.keys(widget.data).map(k => "$" + k));
+        widget.type = this.widgetIds[0]; // always set the type to be the latest type
+
+        // Populate our stuff
+        widget.data["dimension:app:metadata"] = {
+            inRoomId: this.roomId,
+            wrapperUrlBase: this.wrapperUrl,
+            wrapperId: this.wrapperId,
+            scalarWrapperId: this.scalarWrapperId,
+            integration: {
+                type: this.integration.type,
+                integrationType: this.integration.integrationType,
+            },
+            lastUpdatedTs: new Date().getTime(),
+        };
+
+        // Set the title to an appropriate value. Empty strings are valid titles, but other falsey
+        // values should be considered as "no title".
+        if (widget.dimension.newTitle || widget.dimension.newTitle === "")
+            widget.data["title"] = widget.dimension.newTitle;
+        else widget.data["title"] = undefined;
+    }
+
+    /**
+     * Builds a new widget and assigns it to the newWidget property. This also expands the
+     * Dimension-specific fields for the widget with reasonable defaults.
+     */
+    protected prepareNewWidget() {
+        this.newWidget = <EditableWidget>{
+            id: "dimension-" + this.widgetIds[0] + "-" + (new Date().getTime()),
+            type: this.widgetIds[0],
+            name: this.defaultName,
+            url: window.location.origin,
+            //ownerId: this.userId, // we don't have a user id
+            dimension: {
+                newUrl: "",
+                newName: "",
+                newTitle: null, // by default we don't offer a title (empty strings are valid titles)
+                newData: {},
+            },
+        };
+        this.onNewWidgetPrepared();
+    }
+
+    /**
+     * Gets widgets from the Scalar API. The widgets returned from here are not unpacked and
+     * may not have the Dimension-specific fields set.
+     * @param {string[]} types The widget types to look for
+     * @return {Promise<EditableWidget[]>} The widgets discovered
+     */
+    private getWidgetsOfType(types: string[]): Promise<EditableWidget[]> {
+        return this.scalarApi.getWidgets(this.roomId)
+            .then(resp => convertScalarWidgetsToDtos(resp))
+            .then(widgets => widgets.filter(w => types.indexOf(w.type) !== -1));
+    }
+
+    /**
+     * Gets the actual URL from known wrappers. If the URL is found to be not wrapped, or no
+     * wrappers are applicable, then the given URL is returned.
+     * @param {string} url The URL to unwrap
+     * @return {string} The unwrapped URL
+     */
+    private unwrapUrl(url: string): string {
+        console.log(this.scalarWrapperUrls);
+        if (!this.wrapperUrl) return url;
+
+        const urls = [this.wrapperUrl].concat(this.scalarWrapperUrls);
+        for (let scalarUrl of urls) {
+            if (url.startsWith(scalarUrl)) {
+                return decodeURIComponent(url.substring(scalarUrl.length));
+            }
+        }
+
+        return url;
+    }
+
+    /**
+     * Wraps the URL with an appropriate wrapper. If no wrapper is defined for this component
+     * then the given URL is returned.
+     * @param {string} url The URL to wrap
+     * @param {string[]} customVars The values in the URL which should not be encoded
+     * @return {string} The wrapped URL
+     */
+    private wrapUrl(url: string, customVars: string[]): string {
+        if (!this.wrapperUrl) return url;
+
+        let encodedURL = this.wrapperUrl + encodeURIComponent(url);
+        encodedURL = this.decodeParams(encodedURL, customVars);
+
+        return encodedURL;
+    }
+
+    /**
+     * Decodes the given URL to make the parameters safe for interpretation by clients. The variables
+     * specified in the widget spec will be decoded automatically.
+     * @param {string} encodedURL The encoded URL
+     * @param {string[]} customVars The custom variables to decode
+     * @returns {string} The URL with variables decoded accordingly
+     */
+    protected decodeParams(encodedURL: string, customVars: string[]): string {
+        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_user_id"), "$matrix_user_id");
+        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_room_id"), "$matrix_room_id");
+        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_display_name"), "$matrix_display_name");
+        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_avatar_url"), "$matrix_avatar_url");
+        for (const key of customVars) {
+            encodedURL = encodedURL.replace(encodeURIComponent(key), key);
+        }
+
+        return encodedURL;
+    }
+
+    /**
+     * Adds the widget stored in newWidget to the room.
+     * @returns {Promise<*>} Resolves when the widget has been added and newWidget is populated
+     * with a new widget.
+     */
+    public addWidget(): Promise<any> {
+        this.packWidget(this.newWidget);
+
+        this.isUpdating = true;
+        this.onWidgetBeforeAdd();
+        return this.scalarApi.setWidget(this.roomId, this.newWidget)
+            .then(() => this.widgets.push(this.newWidget))
+            .then(() => {
+                this.isUpdating = false;
+                this.onWidgetAfterAdd();
+                this.prepareNewWidget();
+                this.toaster.pop("success", "Widget added!");
+            })
+            .catch(err => {
+                this.isUpdating = false;
+                console.error(err);
+                this.toaster.pop("error", err.json().error);
+            });
+    }
+
+    /**
+     * Saves a widget, persisting the changes to the room.
+     * @param {EditableWidget} widget The widget to save.
+     * @returns {Promise<any>} Resolves when the widget has been updated in the room.
+     */
+    public saveWidget(widget: EditableWidget): Promise<any> {
+        if (!widget.dimension.newUrl || widget.dimension.newUrl.trim().length === 0) {
+            this.toaster.pop("warning", "Please enter a URL for the widget");
+            return;
+        }
+
+        this.packWidget(widget);
+
+        this.isUpdating = true;
+        this.onWidgetBeforeEdit(widget);
+        return this.scalarApi.setWidget(this.roomId, widget)
+            .then(() => this.toggleWidget(widget))
+            .then(() => {
+                this.isUpdating = false;
+                this.onWidgetAfterEdit(widget);
+                this.toaster.pop("success", "Widget updated!");
+            })
+            .catch(err => {
+                this.isUpdating = false;
+                console.error(err);
+                this.toaster.pop("error", err.json().error);
+            });
+    }
+
+    /**
+     * Removes a widget from the room
+     * @param {EditableWidget} widget The widget to remove
+     * @returns {Promise<*>} Resolves when the widget has been removed.
+     */
+    public removeWidget(widget: EditableWidget): Promise<any> {
+        this.isUpdating = true;
+        this.onWidgetBeforeDelete(widget);
+        return this.scalarApi.deleteWidget(this.roomId, widget)
+            .then(() => this.widgets.splice(this.widgets.indexOf(widget), 1))
+            .then(() => {
+                this.isUpdating = false;
+                this.onWidgetAfterDelete(widget);
+                this.toaster.pop("success", "Widget deleted!");
+            })
+            .catch(err => {
+                this.isUpdating = false;
+                console.error(err);
+                this.toaster.pop("error", err.json().error);
+            });
+    }
+
+    /**
+     * Puts a widget in the edit state.
+     * @param {EditableWidget} widget
+     */
+    public editWidget(widget: EditableWidget) {
+        this.toggleWidget(widget, "edit");
+    }
+
+    /**
+     * Toggles a widget between the "edit" and "canceled" state. If a targetState is
+     * defined, the widget is forced into that state.
+     * @param {EditableWidget} widget The widget to set the state of.
+     * @param {"edit"|"cancel"|null} targetState The target state, optional
+     */
+    public toggleWidget(widget: EditableWidget, targetState: "edit" | "cancel" | null = null) {
+        let idx = this.toggledWidgetIds.indexOf(widget.id);
+        if (targetState === null) targetState = idx === -1 ? "edit" : "cancel";
+
+        if (targetState === "edit") {
+            this.unpackWidget(widget);
+            this.onWidgetPreparedForEdit(widget);
+
+            if (idx === -1) this.toggledWidgetIds.push(widget.id);
+        }
+        else this.toggledWidgetIds.splice(idx, 1);
+    }
+
+    /**
+     * Determines if a widget is in the edit state
+     * @param {EditableWidget} widget The widget to check
+     * @returns {boolean} true if the widget is in the edit state
+     */
+    public isWidgetToggled(widget: EditableWidget) {
+        return this.toggledWidgetIds.indexOf(widget.id) !== -1;
+    }
+
+    // Component hooks below here
+    // ------------------------------------------------------------------
+
+    /**
+     * Called when a new widget has been created in the newWidget field
+     */
+    protected onNewWidgetPrepared(): void {
+        // Component hook
+    }
+
+    /**
+     * Called after all the widgets have been discovered and unpacked for the room.
+     */
+    protected onWidgetsDiscovered(): void {
+        // Component hook
+    }
+
+    /**
+     * Called before the widget is added to the room, but after the Dimension-specific
+     * settings have been copied over to the primary fields.
+     */
+    protected onWidgetBeforeAdd(): void {
+        // Component hook
+    }
+
+    /**
+     * Called after the widget has been added to the room, but before the newWidget field
+     * has been set to a new widget.
+     */
+    protected onWidgetAfterAdd(): void {
+        // Component hook
+    }
+
+    /**
+     * Called when the given widget has been asked to be prepared for editing. At this point
+     * the widget is not being persisted to the room, it is just updating the EditingWidget's
+     * properties for the user's ability to edit it.
+     * @param {EditableWidget} _widget The widget that has been prepared for editing
+     */
+    protected onWidgetPreparedForEdit(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called before the given widget has been updated in the room, but after the
+     * Dimension-specific settings have been copied over to the primary fields.
+     * This is not called for widgets being deleted.
+     * @param {EditableWidget} _widget The widget about to be edited
+     */
+    protected onWidgetBeforeEdit(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called after a given widget has been updated in the room. This is not called for
+     * widgets being deleted.
+     * @param {EditableWidget} _widget The widget that has been updated.
+     */
+    protected onWidgetAfterEdit(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called before the given widget has been removed from the room. No changes to the
+     * widget have been made at this point.
+     * @param {EditableWidget} _widget The widget about to be deleted.
+     */
+    protected onWidgetBeforeDelete(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called after a given widget has been deleted from the room. The widget will be in
+     * the deleted state and will no longer be tracked anywhere on the component.
+     * @param {EditableWidget} _widget The widget that has been deleted.
+     */
+    protected onWidgetAfterDelete(_widget: EditableWidget): void {
+        // Component hook
+    }
+}
diff --git a/web/app/configs/widget/youtube/youtube-config.component.html b/web/app/configs-old/widget/youtube/youtube-config.component.html
similarity index 100%
rename from web/app/configs/widget/youtube/youtube-config.component.html
rename to web/app/configs-old/widget/youtube/youtube-config.component.html
diff --git a/web/app/configs/widget/youtube/youtube-config.component.scss b/web/app/configs-old/widget/youtube/youtube-config.component.scss
similarity index 100%
rename from web/app/configs/widget/youtube/youtube-config.component.scss
rename to web/app/configs-old/widget/youtube/youtube-config.component.scss
diff --git a/web/app/configs/widget/youtube/youtube-config.component.ts b/web/app/configs-old/widget/youtube/youtube-config.component.ts
similarity index 100%
rename from web/app/configs/widget/youtube/youtube-config.component.ts
rename to web/app/configs-old/widget/youtube/youtube-config.component.ts
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 6816fda..3389f25 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,7 +1,9 @@
-import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
+import { EventEmitter } from "@angular/core";
 import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
-import { LegacyIntegration } from "../../shared/models/legacyintegration";
+import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
+import { ServiceLocator } from "../../shared/services/locator.service";
+import { SessionStorage } from "../../shared/SessionStorage";
 
 const SCALAR_WIDGET_LINKS = [
     "https://scalar-staging.riot.im/scalar/api/widgets/__TYPE__.html?url=",
@@ -10,7 +12,7 @@ const SCALAR_WIDGET_LINKS = [
     "https://demo.riot.im/scalar/api/widgets/__TYPE__.html?url=",
 ];
 
-export class WidgetComponent {
+export class NewWidgetComponent {
 
     public isLoading = true;
     public isUpdating = false;
@@ -21,13 +23,21 @@ export class WidgetComponent {
     private scalarWrapperUrls: string[] = [];
     private wrapperUrl = "";
 
-    constructor(window: Window,
-                protected toaster: ToasterService,
-                protected scalarApi: ScalarClientApiService,
-                public roomId: string,
-                public integration: LegacyIntegration,
-                editWidgetId: string,
-                private widgetIds: string[],
+    protected toaster = ServiceLocator.injector.get(ToasterService);
+    private window = ServiceLocator.injector.get(Window);
+    private scalarApi = ServiceLocator.injector.get(ScalarClientApiService);
+
+    protected OnNewWidgetPrepared = new EventEmitter<EditableWidget>();
+    protected OnWidgetsDiscovered = new EventEmitter<EditableWidget[]>();
+    protected OnWidgetBeforeAdd = new EventEmitter<EditableWidget>();
+    protected OnWidgetAfterAdd = new EventEmitter<EditableWidget>();
+    protected OnWidgetPreparedForEdit = new EventEmitter<EditableWidget>();
+    protected OnWidgetBeforeEdit = new EventEmitter<EditableWidget>();
+    protected OnWidgetAfterEdit = new EventEmitter<EditableWidget>();
+    protected OnWidgetBeforeDelete = new EventEmitter<EditableWidget>();
+    protected OnWidgetAfterDelete = new EventEmitter<EditableWidget>();
+
+    constructor(private widgetTypes: string[],
                 private defaultName: string,
                 private wrapperId = "generic",
                 private scalarWrapperId = null) {
@@ -35,7 +45,7 @@ export class WidgetComponent {
         this.isUpdating = false;
 
         if (wrapperId) {
-            this.wrapperUrl = window.location.origin + "/widgets/" + wrapperId + "?url=";
+            this.wrapperUrl = this.window.location.origin + "/widgets/" + wrapperId + "?url=";
 
             if (!scalarWrapperId) scalarWrapperId = wrapperId;
             for (let widgetLink of SCALAR_WIDGET_LINKS) {
@@ -44,23 +54,31 @@ export class WidgetComponent {
         }
 
         this.prepareNewWidget();
-        this.getWidgetsOfType(widgetIds).then(widgets => {
+        this.getWidgetsOfType(widgetTypes).then(widgets => {
             this.widgets = widgets;
             for (let widget of this.widgets) {
                 this.unpackWidget(widget);
             }
 
-            this.onWidgetsDiscovered();
+            this.OnWidgetsDiscovered.emit(this.widgets);
             this.isLoading = false;
             this.isUpdating = false;
 
             // See if we should request editing a particular widget
-            if (editWidgetId) {
+            if (SessionStorage.editWidgetId && SessionStorage.editsRequested === 1) {
+                let editWidget: EditableWidget = null;
+                let otherWidgets: EditableWidget[] = [];
                 for (let widget of this.widgets) {
-                    if (widget.id === editWidgetId) {
-                        console.log("Requesting edit for " + widget.id);
-                        this.editWidget(widget);
-                    }
+                    if (widget.id === SessionStorage.editWidgetId) {
+                        editWidget = widget;
+                    } else otherWidgets.push(widget);
+                }
+
+                if (editWidget) {
+                    console.log("Requesting edit for " + editWidget.id);
+                    this.widgets = [editWidget];
+                    otherWidgets.forEach(w => this.widgets.push(w));
+                    this.editWidget(editWidget);
                 }
             }
         });
@@ -91,17 +109,17 @@ export class WidgetComponent {
         widget.name = widget.dimension.newName || this.defaultName;
         widget.data = widget.dimension.newData || {};
         widget.url = this.wrapUrl(widget.dimension.newUrl, Object.keys(widget.data).map(k => "$" + k));
-        widget.type = this.widgetIds[0]; // always set the type to be the latest type
+        widget.type = this.widgetTypes[0]; // always set the type to be the latest type
 
         // Populate our stuff
         widget.data["dimension:app:metadata"] = {
-            inRoomId: this.roomId,
+            inRoomId: SessionStorage.roomId,
             wrapperUrlBase: this.wrapperUrl,
             wrapperId: this.wrapperId,
             scalarWrapperId: this.scalarWrapperId,
             integration: {
-                type: this.integration.type,
-                integrationType: this.integration.integrationType,
+                category: SessionStorage.editIntegration.category,
+                type: SessionStorage.editIntegration.type,
             },
             lastUpdatedTs: new Date().getTime(),
         };
@@ -119,8 +137,8 @@ export class WidgetComponent {
      */
     protected prepareNewWidget() {
         this.newWidget = <EditableWidget>{
-            id: "dimension-" + this.widgetIds[0] + "-" + (new Date().getTime()),
-            type: this.widgetIds[0],
+            id: "dimension-" + this.widgetTypes[0] + "-" + (new Date().getTime()),
+            type: this.widgetTypes[0],
             name: this.defaultName,
             url: window.location.origin,
             //ownerId: this.userId, // we don't have a user id
@@ -131,7 +149,7 @@ export class WidgetComponent {
                 newData: {},
             },
         };
-        this.onNewWidgetPrepared();
+        this.OnNewWidgetPrepared.emit(this.newWidget);
     }
 
     /**
@@ -141,7 +159,7 @@ export class WidgetComponent {
      * @return {Promise<EditableWidget[]>} The widgets discovered
      */
     private getWidgetsOfType(types: string[]): Promise<EditableWidget[]> {
-        return this.scalarApi.getWidgets(this.roomId)
+        return this.scalarApi.getWidgets(SessionStorage.roomId)
             .then(resp => convertScalarWidgetsToDtos(resp))
             .then(widgets => widgets.filter(w => types.indexOf(w.type) !== -1));
     }
@@ -210,12 +228,12 @@ export class WidgetComponent {
         this.packWidget(this.newWidget);
 
         this.isUpdating = true;
-        this.onWidgetBeforeAdd();
-        return this.scalarApi.setWidget(this.roomId, this.newWidget)
+        this.OnWidgetBeforeAdd.emit(this.newWidget);
+        return this.scalarApi.setWidget(SessionStorage.roomId, this.newWidget)
             .then(() => this.widgets.push(this.newWidget))
             .then(() => {
                 this.isUpdating = false;
-                this.onWidgetAfterAdd();
+                this.OnWidgetAfterAdd.emit(this.newWidget);
                 this.prepareNewWidget();
                 this.toaster.pop("success", "Widget added!");
             })
@@ -240,12 +258,12 @@ export class WidgetComponent {
         this.packWidget(widget);
 
         this.isUpdating = true;
-        this.onWidgetBeforeEdit(widget);
-        return this.scalarApi.setWidget(this.roomId, widget)
+        this.OnWidgetBeforeEdit.emit(widget);
+        return this.scalarApi.setWidget(SessionStorage.roomId, widget)
             .then(() => this.toggleWidget(widget))
             .then(() => {
                 this.isUpdating = false;
-                this.onWidgetAfterEdit(widget);
+                this.OnWidgetAfterEdit.emit(widget);
                 this.toaster.pop("success", "Widget updated!");
             })
             .catch(err => {
@@ -262,12 +280,12 @@ export class WidgetComponent {
      */
     public removeWidget(widget: EditableWidget): Promise<any> {
         this.isUpdating = true;
-        this.onWidgetBeforeDelete(widget);
-        return this.scalarApi.deleteWidget(this.roomId, widget)
+        this.OnWidgetBeforeDelete.emit(widget);
+        return this.scalarApi.deleteWidget(SessionStorage.roomId, widget)
             .then(() => this.widgets.splice(this.widgets.indexOf(widget), 1))
             .then(() => {
                 this.isUpdating = false;
-                this.onWidgetAfterDelete(widget);
+                this.OnWidgetAfterDelete.emit(widget);
                 this.toaster.pop("success", "Widget deleted!");
             })
             .catch(err => {
@@ -297,7 +315,7 @@ export class WidgetComponent {
 
         if (targetState === "edit") {
             this.unpackWidget(widget);
-            this.onWidgetPreparedForEdit(widget);
+            this.OnWidgetPreparedForEdit.emit(widget);
 
             if (idx === -1) this.toggledWidgetIds.push(widget.id);
         }
@@ -312,84 +330,4 @@ export class WidgetComponent {
     public isWidgetToggled(widget: EditableWidget) {
         return this.toggledWidgetIds.indexOf(widget.id) !== -1;
     }
-
-    // Component hooks below here
-    // ------------------------------------------------------------------
-
-    /**
-     * Called when a new widget has been created in the newWidget field
-     */
-    protected onNewWidgetPrepared(): void {
-        // Component hook
-    }
-
-    /**
-     * Called after all the widgets have been discovered and unpacked for the room.
-     */
-    protected onWidgetsDiscovered(): void {
-        // Component hook
-    }
-
-    /**
-     * Called before the widget is added to the room, but after the Dimension-specific
-     * settings have been copied over to the primary fields.
-     */
-    protected onWidgetBeforeAdd(): void {
-        // Component hook
-    }
-
-    /**
-     * Called after the widget has been added to the room, but before the newWidget field
-     * has been set to a new widget.
-     */
-    protected onWidgetAfterAdd(): void {
-        // Component hook
-    }
-
-    /**
-     * Called when the given widget has been asked to be prepared for editing. At this point
-     * the widget is not being persisted to the room, it is just updating the EditingWidget's
-     * properties for the user's ability to edit it.
-     * @param {EditableWidget} _widget The widget that has been prepared for editing
-     */
-    protected onWidgetPreparedForEdit(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called before the given widget has been updated in the room, but after the
-     * Dimension-specific settings have been copied over to the primary fields.
-     * This is not called for widgets being deleted.
-     * @param {EditableWidget} _widget The widget about to be edited
-     */
-    protected onWidgetBeforeEdit(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called after a given widget has been updated in the room. This is not called for
-     * widgets being deleted.
-     * @param {EditableWidget} _widget The widget that has been updated.
-     */
-    protected onWidgetAfterEdit(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called before the given widget has been removed from the room. No changes to the
-     * widget have been made at this point.
-     * @param {EditableWidget} _widget The widget about to be deleted.
-     */
-    protected onWidgetBeforeDelete(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called after a given widget has been deleted from the room. The widget will be in
-     * the deleted state and will no longer be tracked anywhere on the component.
-     * @param {EditableWidget} _widget The widget that has been deleted.
-     */
-    protected onWidgetAfterDelete(_widget: EditableWidget): void {
-        // Component hook
-    }
-}
+}
\ No newline at end of file
diff --git a/web/app/fullscreen-button/fullscreen-button.component.html b/web/app/elements/fullscreen-button/fullscreen-button.component.html
similarity index 100%
rename from web/app/fullscreen-button/fullscreen-button.component.html
rename to web/app/elements/fullscreen-button/fullscreen-button.component.html
diff --git a/web/app/fullscreen-button/fullscreen-button.component.scss b/web/app/elements/fullscreen-button/fullscreen-button.component.scss
similarity index 100%
rename from web/app/fullscreen-button/fullscreen-button.component.scss
rename to web/app/elements/fullscreen-button/fullscreen-button.component.scss
diff --git a/web/app/fullscreen-button/fullscreen-button.component.ts b/web/app/elements/fullscreen-button/fullscreen-button.component.ts
similarity index 100%
rename from web/app/fullscreen-button/fullscreen-button.component.ts
rename to web/app/elements/fullscreen-button/fullscreen-button.component.ts
diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
new file mode 100644
index 0000000..c72735e
--- /dev/null
+++ b/web/app/elements/ibox/ibox.component.html
@@ -0,0 +1,12 @@
+<div class="ibox">
+    <div class="ibox-title">
+        <h5>{{ title }}</h5>
+        <ng-content select=".my-ibox-addl-title"></ng-content>
+        <i class="ibox-icon fa" *ngIf="isCollapsible"
+           [ngClass]="[collapsed ? 'fa-chevron-right' : 'fa-chevron-down']"
+           (click)="collapsed = !collapsed"></i>
+    </div>
+    <div class="ibox-content" *ngIf="!collapsed">
+        <ng-content select=".my-ibox-content"></ng-content>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/style/components/ibox.scss b/web/app/elements/ibox/ibox.component.scss
similarity index 73%
rename from web/style/components/ibox.scss
rename to web/app/elements/ibox/ibox.component.scss
index 71bd302..13966ec 100644
--- a/web/style/components/ibox.scss
+++ b/web/app/elements/ibox/ibox.component.scss
@@ -11,7 +11,7 @@
 }
 
 .ibox .ibox-title h5 {
-  display: inline-block;
+  display: inline;
   font-size: 1.1em;
   padding: 5px;
   margin: 0;
@@ -19,4 +19,10 @@
 
 .ibox .ibox-content {
   padding: 15px;
+}
+
+.ibox .ibox-title .ibox-icon {
+  float: right;
+  margin-top: 4px;
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/web/app/elements/ibox/ibox.component.ts b/web/app/elements/ibox/ibox.component.ts
new file mode 100644
index 0000000..ce310bd
--- /dev/null
+++ b/web/app/elements/ibox/ibox.component.ts
@@ -0,0 +1,18 @@
+import { Component, Input, OnInit } from "@angular/core";
+
+@Component({
+    selector: "my-ibox",
+    templateUrl: "./ibox.component.html",
+    styleUrls: ["./ibox.component.scss"],
+})
+export class IboxComponent implements OnInit {
+    @Input() title: string;
+    @Input() isCollapsible: boolean;
+    @Input() defaultCollapsed: boolean;
+
+    public collapsed = false;
+
+    public ngOnInit(): void {
+        this.collapsed = this.defaultCollapsed;
+    }
+}
diff --git a/web/app/spinner/spinner.component.html b/web/app/elements/spinner/spinner.component.html
similarity index 100%
rename from web/app/spinner/spinner.component.html
rename to web/app/elements/spinner/spinner.component.html
diff --git a/web/app/elements/spinner/spinner.component.scss b/web/app/elements/spinner/spinner.component.scss
new file mode 100644
index 0000000..1a5c430
--- /dev/null
+++ b/web/app/elements/spinner/spinner.component.scss
@@ -0,0 +1,2 @@
+// component styles are encapsulated and only applied to their components
+@import "../../../../node_modules/spinkit/scss/spinners/11-folding-cube";
\ No newline at end of file
diff --git a/web/app/spinner/spinner.component.ts b/web/app/elements/spinner/spinner.component.ts
similarity index 100%
rename from web/app/spinner/spinner.component.ts
rename to web/app/elements/spinner/spinner.component.ts
diff --git a/web/app/integration-bag/integration-bag.component.html b/web/app/integration-bag/integration-bag.component.html
index a74afe6..df8789f 100644
--- a/web/app/integration-bag/integration-bag.component.html
+++ b/web/app/integration-bag/integration-bag.component.html
@@ -1,5 +1,5 @@
 <div class="integration-bag">
-    <div class="integration" *ngFor="let integration of integrations">
+    <div class="integration" *ngFor="let integration of integrations" (click)="onClick(integration)">
         <img class="integration-avatar" [src]="getSafeUrl(integration.avatarUrl)"/>
         <div class="integration-name">{{ integration.displayName }}</div>
         <div class="integration-description">{{ integration.description }}</div>
diff --git a/web/app/riot/riot-home/home.component.html b/web/app/riot/riot-home/home.component.html
index 2cba7ec..7dfd4b2 100644
--- a/web/app/riot/riot-home/home.component.html
+++ b/web/app/riot/riot-home/home.component.html
@@ -33,13 +33,10 @@
     <!-- CATEGORIES               -->
     <!-- ------------------------ -->
     <div *ngFor="let category of getCategories()">
-        <div class="ibox" *ngIf="getIntegrationsIn(category).length > 0">
-            <div class="ibox-title">
-                <h5>{{ category }}</h5>
+        <my-ibox *ngIf="getIntegrationsIn(category).length > 0" title="{{category}}" [isCollapsible]="true">
+            <div class="my-ibox-content">
+                <my-integration-bag [integrations]="getIntegrationsIn(category)" (integrationClicked)="modifyIntegration($event)"></my-integration-bag>
             </div>
-            <div class="ibox-content">
-                <my-integration-bag [integrations]="getIntegrationsIn(category)"></my-integration-bag>
-            </div>
-        </div>
+        </my-ibox>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 9b94f9c..215bf82 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -1,13 +1,13 @@
 import { Component } from "@angular/core";
 import { ToasterService } from "angular2-toaster";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
 import * as _ from "lodash";
 import { ScalarServerApiService } from "../../shared/services/scalar-server-api.service";
-import { AuthedApi } from "../../shared/services/AuthedApi";
 import { DimensionApiService } from "../../shared/services/dimension-api.service";
 import { Integration, IntegrationRequirement } from "../../shared/models/integration";
 import { IntegrationService } from "../../shared/services/integration.service";
+import { SessionStorage } from "../../shared/SessionStorage";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -37,12 +37,21 @@ export class RiotHomeComponent {
                 private scalarApi: ScalarServerApiService,
                 private scalar: ScalarClientApiService,
                 private dimensionApi: DimensionApiService,
-                private toaster: ToasterService) {
+                private toaster: ToasterService,
+                private router: Router) {
         let params: any = this.activatedRoute.snapshot.queryParams;
 
         this.requestedScreen = params.screen;
         this.requestedIntegration = params.integ_id;
 
+        if (SessionStorage.roomId && SessionStorage.userId) {
+            this.roomId = SessionStorage.roomId;
+            this.userId = SessionStorage.userId;
+            console.log("Already checked scalar token and other params - continuing startup");
+            this.prepareIntegrations();
+            return;
+        }
+
         if (!params.scalar_token || !params.room_id) {
             console.error("Unable to load Dimension. Missing room ID or scalar token.");
             this.isError = true;
@@ -50,10 +59,12 @@ export class RiotHomeComponent {
             this.errorMessage = "Unable to load Dimension - missing room ID or token.";
         } else {
             this.roomId = params.room_id;
-            AuthedApi.SCALAR_TOKEN = params.scalar_token;
+            SessionStorage.scalarToken = params.scalar_token;
+            SessionStorage.roomId = this.roomId;
 
             this.scalarApi.getAccount().then(response => {
                 const userId = response.user_id;
+                SessionStorage.userId = userId;
                 if (!userId) {
                     console.error("No user returned for token. Is the token registered in Dimension?");
                     this.isError = true;
@@ -101,8 +112,9 @@ export class RiotHomeComponent {
         return result;
     }
 
-
     public modifyIntegration(integration: Integration) {
+        SessionStorage.editIntegration = integration;
+        SessionStorage.editsRequested++;
         console.log(this.userId + " is trying to modify " + integration.displayName);
 
         if (integration.category === "bot") {
@@ -137,6 +149,7 @@ export class RiotHomeComponent {
         } else {
             // TODO: Navigate to edit screen
             console.log("EDIT SCREEN FOR " + integration.displayName);
+            this.router.navigate(['riot-app', integration.category, integration.type]);
         }
     }
 
@@ -192,10 +205,12 @@ export class RiotHomeComponent {
             console.log("Unknown screen requested: " + this.requestedScreen);
         }
 
+        console.log("Searching for integration for requested screen");
         for (const integration of this.getIntegrations()) {
             if (integration.category === category && integration.type === type) {
                 console.log("Configuring integration " + this.requestedIntegration + " category=" + category + " type=" + type);
-                // TODO: Actually edit integration
+                SessionStorage.editIntegration = integration;
+                this.modifyIntegration(integration);
                 return;
             }
         }
diff --git a/web/app/shared/SessionStorage.ts b/web/app/shared/SessionStorage.ts
new file mode 100644
index 0000000..c76df03
--- /dev/null
+++ b/web/app/shared/SessionStorage.ts
@@ -0,0 +1,14 @@
+import { Integration } from "./models/integration";
+
+export class SessionStorage {
+
+    public static scalarToken: string;
+    public static userId: string;
+    public static roomId: string;
+    public static editIntegration: Integration;
+    public static editWidgetId: string;
+    public static editsRequested: number = 0;
+
+    private constructor() {
+    }
+}
\ No newline at end of file
diff --git a/web/app/shared/services/AuthedApi.ts b/web/app/shared/services/AuthedApi.ts
index 062e852..eb6161c 100644
--- a/web/app/shared/services/AuthedApi.ts
+++ b/web/app/shared/services/AuthedApi.ts
@@ -1,15 +1,14 @@
 import { Http, Response } from "@angular/http";
 import { Observable } from "rxjs/Observable";
+import { SessionStorage } from "../SessionStorage";
 
 export class AuthedApi {
-    public static SCALAR_TOKEN: string = null;
-
     constructor(protected http: Http) {
     }
 
     protected authedGet(url: string, qs?: any): Observable<Response> {
         if (!qs) qs = {};
-        qs["scalar_token"] = AuthedApi.SCALAR_TOKEN;
+        qs["scalar_token"] = SessionStorage.scalarToken;
         return this.http.get(url, {params: qs});
     }
 }
diff --git a/web/app/shared/services/integration.service.ts b/web/app/shared/services/integration.service.ts
index 57f7685..bb1e832 100644
--- a/web/app/shared/services/integration.service.ts
+++ b/web/app/shared/services/integration.service.ts
@@ -1,4 +1,4 @@
-import { Component, Injectable } from "@angular/core";
+import { Injectable } from "@angular/core";
 import {
     WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
     WIDGET_YOUTUBE
@@ -11,66 +11,38 @@ export class IntegrationService {
     private static supportedIntegrationsMap = {
         "bot": {}, // empty == supported
         "complex-bot": {
-            "rss": {
-                //component: RssConfigComponent,
-            },
-            "travisci": {
-                //component: TravisCiConfigComponent,
-            },
-            "circleci": {
-                //component: CircleCiConfigComponent,
-            },
+            "rss": {},
+            "travisci": {},
+            "circleci": {},
         },
         "bridge": {
-            "irc": {
-                //component: IrcConfigComponent,
-            },
+            "irc": {},
         },
         "widget": {
             "custom": {
-                //component: CustomWidgetConfigComponent,
                 types: WIDGET_CUSTOM,
             },
             "youtube": {
-                //component: YoutubeWidgetConfigComponent,
                 types: WIDGET_YOUTUBE
             },
             "etherpad": {
-                //component: EtherpadWidgetConfigComponent,
                 types: WIDGET_ETHERPAD,
             },
             "twitch": {
-                //component: TwitchWidgetConfigComponent,
                 types: WIDGET_TWITCH,
             },
             "jitsi": {
-                //component: JitsiWidgetConfigComponent,
                 types: WIDGET_JITSI,
             },
             "googledocs": {
-                //component: GoogleDocsWidgetConfigComponent,
                 types: WIDGET_GOOGLE_DOCS,
             },
             "googlecalendar": {
-                //component: GoogleCalendarWidgetConfigComponent,
                 types: WIDGET_GOOGLE_CALENDAR,
             },
         },
     };
 
-    static getAllConfigComponents(): Component[] {
-        const components = [];
-
-        for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
-            for (const iiType of Object.keys(IntegrationService.supportedIntegrationsMap[iType])) {
-                const component = IntegrationService.supportedIntegrationsMap[iType][iiType].component;
-                if (component) components.push(component);
-            }
-        }
-
-        return components;
-    }
-
     static isSupported(integration: Integration): boolean {
         const forType = IntegrationService.supportedIntegrationsMap[integration.category];
         if (!forType) return false;
@@ -80,10 +52,6 @@ export class IntegrationService {
         return forType[integration.type]; // has sub type
     }
 
-    static getConfigComponent(integration: Integration): Component {
-        return IntegrationService.supportedIntegrationsMap[integration.category][integration.type].component;
-    }
-
     static getIntegrationForScreen(screen: string): { category: string, type: string } {
         for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
             for (const iiType of Object.keys(IntegrationService.supportedIntegrationsMap[iType])) {
diff --git a/web/app/shared/services/legacy/integration.service.ts b/web/app/shared/services/legacy/integration.service.ts
index 2db28cc..f181cbd 100644
--- a/web/app/shared/services/legacy/integration.service.ts
+++ b/web/app/shared/services/legacy/integration.service.ts
@@ -1,21 +1,21 @@
 import { Injectable } from "@angular/core";
 import { LegacyIntegration } from "../../models/legacyintegration";
-import { RssConfigComponent } from "../../../configs/rss/rss-config.component";
+import { RssConfigComponent } from "../../../configs-old/rss/rss-config.component";
 import { ContainerContent } from "ngx-modialog";
-import { IrcConfigComponent } from "../../../configs/irc/irc-config.component";
-import { TravisCiConfigComponent } from "../../../configs/travisci/travisci-config.component";
-import { CustomWidgetConfigComponent } from "../../../configs/widget/custom_widget/custom_widget-config.component";
-import { YoutubeWidgetConfigComponent } from "../../../configs/widget/youtube/youtube-config.component";
-import { TwitchWidgetConfigComponent } from "../../../configs/widget/twitch/twitch-config.component";
-import { EtherpadWidgetConfigComponent } from "../../../configs/widget/etherpad/etherpad-config.component";
-import { JitsiWidgetConfigComponent } from "../../../configs/widget/jitsi/jitsi-config.component";
+import { IrcConfigComponent } from "../../../configs-old/irc/irc-config.component";
+import { TravisCiConfigComponent } from "../../../configs-old/travisci/travisci-config.component";
+import { CustomWidgetConfigComponent } from "../../../configs-old/widget/custom_widget/custom_widget-config.component";
+import { YoutubeWidgetConfigComponent } from "../../../configs-old/widget/youtube/youtube-config.component";
+import { TwitchWidgetConfigComponent } from "../../../configs-old/widget/twitch/twitch-config.component";
+import { EtherpadWidgetConfigComponent } from "../../../configs-old/widget/etherpad/etherpad-config.component";
+import { JitsiWidgetConfigComponent } from "../../../configs-old/widget/jitsi/jitsi-config.component";
 import {
     WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
     WIDGET_YOUTUBE
 } from "../../models/widget";
-import { GoogleDocsWidgetConfigComponent } from "../../../configs/widget/googledocs/googledocs-config.component";
-import { GoogleCalendarWidgetConfigComponent } from "../../../configs/widget/googlecalendar/googlecalendar-config.component";
-import { CircleCiConfigComponent } from "../../../configs/circleci/circleci-config.component";
+import { GoogleDocsWidgetConfigComponent } from "../../../configs-old/widget/googledocs/googledocs-config.component";
+import { GoogleCalendarWidgetConfigComponent } from "../../../configs-old/widget/googlecalendar/googlecalendar-config.component";
+import { CircleCiConfigComponent } from "../../../configs-old/circleci/circleci-config.component";
 
 @Injectable()
 export class LegacyIntegrationService {
diff --git a/web/app/shared/services/locator.service.ts b/web/app/shared/services/locator.service.ts
new file mode 100644
index 0000000..ab27421
--- /dev/null
+++ b/web/app/shared/services/locator.service.ts
@@ -0,0 +1,5 @@
+import {Injector} from "@angular/core";
+
+export class ServiceLocator {
+    static injector: Injector;
+}
\ No newline at end of file
diff --git a/web/app/spinner/spinner.component.scss b/web/app/spinner/spinner.component.scss
deleted file mode 100644
index 6150188..0000000
--- a/web/app/spinner/spinner.component.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-// component styles are encapsulated and only applied to their components
-@import "../../../node_modules/spinkit/scss/spinners/11-folding-cube.scss";
\ No newline at end of file
diff --git a/web/style/app.scss b/web/style/app.scss
index b981442..7a3ccb0 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -1,7 +1,6 @@
 // styles in src/style directory are applied to the whole page
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
 @import '../../node_modules/angular2-toaster/toaster';
-@import "components/ibox.scss";
 @import "riot";
 
 body {

From dd02c6df2c4c1e7684880bbebdd5166886500303 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 21:33:37 -0700
Subject: [PATCH 020/111] Custom widget edit screen

---
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        | 16 ++---
 .../custom/custom.widget.component.html       | 58 +++++++++++++++++
 .../custom/custom.widget.component.scss       |  0
 .../widget/custom/custom.widget.component.ts  | 13 ++++
 web/app/configs/widget/widget.component.ts    | 63 +++++++++----------
 web/style/app.scss                            |  4 ++
 7 files changed, 116 insertions(+), 40 deletions(-)
 create mode 100644 web/app/configs/widget/custom/custom.widget.component.html
 create mode 100644 web/app/configs/widget/custom/custom.widget.component.scss
 create mode 100644 web/app/configs/widget/custom/custom.widget.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 0863efa..aa10a1b 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -32,6 +32,7 @@ import { DimensionApiService } from "./shared/services/dimension-api.service";
 import { AdminApiService } from "./shared/services/admin-api.service";
 import { ServiceLocator } from "./shared/services/locator.service";
 import { IboxComponent } from "./elements/ibox/ibox.component";
+import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 
 @NgModule({
     imports: [
@@ -64,6 +65,7 @@ import { IboxComponent } from "./elements/ibox/ibox.component";
         GCalWidgetWrapperComponent,
         RiotHomeComponent,
         IboxComponent,
+        CustomWidgetConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 404f797..df889b8 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -6,6 +6,7 @@ import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.compo
 import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
 import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
+import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -21,14 +22,13 @@ const routes: Routes = [
             },
             {
                 path: "widget",
-                children: [],
-                // children: [
-                //     {
-                //         path: "custom",
-                //         component: NewTestWidgetComponent,
-                //         data: {breadcrumb: "Custom Widgets", name: "Custom Widgets"}
-                //     },
-                // ],
+                children: [
+                    {
+                        path: "custom",
+                        component: CustomWidgetConfigComponent,
+                        data: {breadcrumb: "Custom Widgets", name: "Custom Widgets"}
+                    },
+                ],
             },
         ],
     },
diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
new file mode 100644
index 0000000..d7bf43c
--- /dev/null
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -0,0 +1,58 @@
+<my-ibox title="Add {{ defaultName }}">
+    <div class="my-ibox-content">
+        <form (submit)="addWidget()" novalidate name="addForm">
+            <label class="label-block">
+                Widget Name
+                <input type="text" class="form-control"
+                       placeholder="{{ defaultName }}"
+                       [(ngModel)]="newWidget.dimension.newName" name="widget-name-new"
+                       [disabled]="isUpdating"/>
+            </label>
+            <label class="label-block">
+                Widget URL
+                <input type="text" class="form-control"
+                       placeholder="https://matrix.org"
+                       [(ngModel)]="newWidget.dimension.newUrl" name="widget-url-new"
+                       [disabled]="isUpdating"/>
+            </label>
+
+            <button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
+                <i class="fa fa-plus"></i> Add Widget
+            </button>
+        </form>
+    </div>
+</my-ibox>
+
+<my-ibox *ngFor="let widget of widgets trackById"
+         [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId"
+         title="{{ widget.name || widget.url || defaultName }}">
+    <div class="my-ibox-content">
+        <form (submit)="saveWidget(widget)" novalidate name="addForm">
+            <label class="label-block">
+                Widget Name
+                <input type="text" class="form-control"
+                       placeholder="{{ defaultName }}"
+                       [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
+                       [disabled]="isUpdating"/>
+            </label>
+            <label class="label-block">
+                Widget URL
+                <input type="text" class="form-control"
+                       placeholder="https://matrix.org"
+                       [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
+                       [disabled]="isUpdating"/>
+            </label>
+
+            <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
+                <i class="fa fa-save"></i> Save Widget
+            </button>
+            <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
+                <i class="fa fa-times"></i> Remove Widget
+            </button>
+            <button type="button" class="btn btn-sm btn-white" [disabled]="isUpdating" (click)="resetWidget(widget)"
+                    *ngIf="hasChanges(widget)">
+                <i class="fa fa-reset"></i> Undo Changes
+            </button>
+        </form>
+    </div>
+</my-ibox>
\ No newline at end of file
diff --git a/web/app/configs/widget/custom/custom.widget.component.scss b/web/app/configs/widget/custom/custom.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/custom/custom.widget.component.ts b/web/app/configs/widget/custom/custom.widget.component.ts
new file mode 100644
index 0000000..50d4687
--- /dev/null
+++ b/web/app/configs/widget/custom/custom.widget.component.ts
@@ -0,0 +1,13 @@
+import { NewWidgetComponent } from "../widget.component";
+import { WIDGET_CUSTOM } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "custom.widget.component.html",
+    styleUrls: ["custom.widget.component.scss"],
+})
+export class CustomWidgetConfigComponent extends NewWidgetComponent {
+    constructor() {
+        super(WIDGET_CUSTOM, "Custom Widget", "generic");
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 3389f25..0edc5e1 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -18,8 +18,8 @@ export class NewWidgetComponent {
     public isUpdating = false;
     public widgets: EditableWidget[];
     public newWidget: EditableWidget;
+    public defaultExpandedWidgetId: string;
 
-    private toggledWidgetIds: string[] = [];
     private scalarWrapperUrls: string[] = [];
     private wrapperUrl = "";
 
@@ -38,7 +38,7 @@ export class NewWidgetComponent {
     protected OnWidgetAfterDelete = new EventEmitter<EditableWidget>();
 
     constructor(private widgetTypes: string[],
-                private defaultName: string,
+                public defaultName: string,
                 private wrapperId = "generic",
                 private scalarWrapperId = null) {
         this.isLoading = true;
@@ -64,6 +64,12 @@ export class NewWidgetComponent {
             this.isLoading = false;
             this.isUpdating = false;
 
+            // We reset after discovering to ensure that the widget component can correctly
+            // set the state of the widget prior to us unpacking it (again)
+            for (let widget of this.widgets) {
+                this.resetWidget(widget);
+            }
+
             // See if we should request editing a particular widget
             if (SessionStorage.editWidgetId && SessionStorage.editsRequested === 1) {
                 let editWidget: EditableWidget = null;
@@ -78,7 +84,7 @@ export class NewWidgetComponent {
                     console.log("Requesting edit for " + editWidget.id);
                     this.widgets = [editWidget];
                     otherWidgets.forEach(w => this.widgets.push(w));
-                    this.editWidget(editWidget);
+                    this.defaultExpandedWidgetId = editWidget.id;
                 }
             }
         });
@@ -171,7 +177,6 @@ export class NewWidgetComponent {
      * @return {string} The unwrapped URL
      */
     private unwrapUrl(url: string): string {
-        console.log(this.scalarWrapperUrls);
         if (!this.wrapperUrl) return url;
 
         const urls = [this.wrapperUrl].concat(this.scalarWrapperUrls);
@@ -225,6 +230,11 @@ export class NewWidgetComponent {
      * with a new widget.
      */
     public addWidget(): Promise<any> {
+        if (!this.newWidget.dimension.newUrl || this.newWidget.dimension.newUrl.trim().length === 0) {
+            this.toaster.pop("warning", "Please enter a URL for the widget");
+            return;
+        }
+
         this.packWidget(this.newWidget);
 
         this.isUpdating = true;
@@ -260,7 +270,6 @@ export class NewWidgetComponent {
         this.isUpdating = true;
         this.OnWidgetBeforeEdit.emit(widget);
         return this.scalarApi.setWidget(SessionStorage.roomId, widget)
-            .then(() => this.toggleWidget(widget))
             .then(() => {
                 this.isUpdating = false;
                 this.OnWidgetAfterEdit.emit(widget);
@@ -296,38 +305,28 @@ export class NewWidgetComponent {
     }
 
     /**
-     * Puts a widget in the edit state.
-     * @param {EditableWidget} widget
+     * Resets a widget to before it had changes made to it
+     * @param {EditableWidget} widget The widget to reset
      */
-    public editWidget(widget: EditableWidget) {
-        this.toggleWidget(widget, "edit");
+    public resetWidget(widget: EditableWidget) {
+        this.unpackWidget(widget);
+        this.OnWidgetPreparedForEdit.emit(widget);
     }
 
     /**
-     * Toggles a widget between the "edit" and "canceled" state. If a targetState is
-     * defined, the widget is forced into that state.
-     * @param {EditableWidget} widget The widget to set the state of.
-     * @param {"edit"|"cancel"|null} targetState The target state, optional
-     */
-    public toggleWidget(widget: EditableWidget, targetState: "edit" | "cancel" | null = null) {
-        let idx = this.toggledWidgetIds.indexOf(widget.id);
-        if (targetState === null) targetState = idx === -1 ? "edit" : "cancel";
-
-        if (targetState === "edit") {
-            this.unpackWidget(widget);
-            this.OnWidgetPreparedForEdit.emit(widget);
-
-            if (idx === -1) this.toggledWidgetIds.push(widget.id);
-        }
-        else this.toggledWidgetIds.splice(idx, 1);
-    }
-
-    /**
-     * Determines if a widget is in the edit state
+     * Determines if a widget has had any changes made to it
      * @param {EditableWidget} widget The widget to check
-     * @returns {boolean} true if the widget is in the edit state
+     * @returns {boolean} True if the widget has been edited
      */
-    public isWidgetToggled(widget: EditableWidget) {
-        return this.toggledWidgetIds.indexOf(widget.id) !== -1;
+    public hasChanges(widget: EditableWidget):boolean {
+        if (widget.dimension.newUrl !== this.unwrapUrl(widget.url)) return true;
+        if (widget.dimension.newName !== widget.name) return true;
+        if (widget.dimension.newTitle !== widget.data.title) return true;
+
+        const currentData = JSON.parse(JSON.stringify(widget.data || "{}"));
+        const newData = JSON.parse(JSON.stringify(widget.dimension.newData || "{}"));
+        if (currentData !== newData) return true;
+
+        return false;
     }
 }
\ No newline at end of file
diff --git a/web/style/app.scss b/web/style/app.scss
index 7a3ccb0..50db95e 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -29,4 +29,8 @@ body {
 
 button {
   cursor: pointer;
+}
+
+.label-block {
+  display: block;
 }
\ No newline at end of file

From 63a3b6b4c22c9580d8303c5ca935bfcac10c7fe1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 21:42:43 -0700
Subject: [PATCH 021/111] Fix edit widget button

---
 .../custom/custom.widget.component.html       | 116 +++++++++---------
 web/app/configs/widget/widget.component.ts    |   7 +-
 web/app/riot/riot-home/home.component.ts      |   7 +-
 web/app/shared/SessionStorage.ts              |   2 +-
 .../shared/services/integration.service.ts    |  10 +-
 5 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
index d7bf43c..96308f1 100644
--- a/web/app/configs/widget/custom/custom.widget.component.html
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -1,58 +1,64 @@
-<my-ibox title="Add {{ defaultName }}">
-    <div class="my-ibox-content">
-        <form (submit)="addWidget()" novalidate name="addForm">
-            <label class="label-block">
-                Widget Name
-                <input type="text" class="form-control"
-                       placeholder="{{ defaultName }}"
-                       [(ngModel)]="newWidget.dimension.newName" name="widget-name-new"
-                       [disabled]="isUpdating"/>
-            </label>
-            <label class="label-block">
-                Widget URL
-                <input type="text" class="form-control"
-                       placeholder="https://matrix.org"
-                       [(ngModel)]="newWidget.dimension.newUrl" name="widget-url-new"
-                       [disabled]="isUpdating"/>
-            </label>
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
 
-            <button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
-                <i class="fa fa-plus"></i> Add Widget
-            </button>
-        </form>
-    </div>
-</my-ibox>
+<div *ngIf="!isLoading">
+    <my-ibox title="Add {{ defaultName }}" [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
+        <div class="my-ibox-content">
+            <form (submit)="addWidget()" novalidate name="addForm">
+                <label class="label-block">
+                    Widget Name
+                    <input type="text" class="form-control"
+                           placeholder="{{ defaultName }}"
+                           [(ngModel)]="newWidget.dimension.newName" name="widget-name-new"
+                           [disabled]="isUpdating"/>
+                </label>
+                <label class="label-block">
+                    Widget URL
+                    <input type="text" class="form-control"
+                           placeholder="https://matrix.org"
+                           [(ngModel)]="newWidget.dimension.newUrl" name="widget-url-new"
+                           [disabled]="isUpdating"/>
+                </label>
 
-<my-ibox *ngFor="let widget of widgets trackById"
-         [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId"
-         title="{{ widget.name || widget.url || defaultName }}">
-    <div class="my-ibox-content">
-        <form (submit)="saveWidget(widget)" novalidate name="addForm">
-            <label class="label-block">
-                Widget Name
-                <input type="text" class="form-control"
-                       placeholder="{{ defaultName }}"
-                       [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-                       [disabled]="isUpdating"/>
-            </label>
-            <label class="label-block">
-                Widget URL
-                <input type="text" class="form-control"
-                       placeholder="https://matrix.org"
-                       [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-                       [disabled]="isUpdating"/>
-            </label>
+                <button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
+                    <i class="fa fa-plus"></i> Add Widget
+                </button>
+            </form>
+        </div>
+    </my-ibox>
 
-            <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
-                <i class="fa fa-save"></i> Save Widget
-            </button>
-            <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
-                <i class="fa fa-times"></i> Remove Widget
-            </button>
-            <button type="button" class="btn btn-sm btn-white" [disabled]="isUpdating" (click)="resetWidget(widget)"
-                    *ngIf="hasChanges(widget)">
-                <i class="fa fa-reset"></i> Undo Changes
-            </button>
-        </form>
-    </div>
-</my-ibox>
\ No newline at end of file
+    <my-ibox *ngFor="let widget of widgets trackById"
+             [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId"
+             title="{{ widget.name || widget.url || defaultName }}">
+        <div class="my-ibox-content">
+            <form (submit)="saveWidget(widget)" novalidate name="addForm">
+                <label class="label-block">
+                    Widget Name
+                    <input type="text" class="form-control"
+                           placeholder="{{ defaultName }}"
+                           [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
+                           [disabled]="isUpdating"/>
+                </label>
+                <label class="label-block">
+                    Widget URL
+                    <input type="text" class="form-control"
+                           placeholder="https://matrix.org"
+                           [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
+                           [disabled]="isUpdating"/>
+                </label>
+
+                <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
+                    <i class="fa fa-save"></i> Save Widget
+                </button>
+                <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
+                    <i class="fa fa-times"></i> Remove Widget
+                </button>
+                <button type="button" class="btn btn-sm btn-white" [disabled]="isUpdating" (click)="resetWidget(widget)"
+                        *ngIf="hasChanges(widget)">
+                    <i class="fa fa-undo"></i> Undo Changes
+                </button>
+            </form>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 0edc5e1..fce9cb8 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -71,11 +71,12 @@ export class NewWidgetComponent {
             }
 
             // See if we should request editing a particular widget
-            if (SessionStorage.editWidgetId && SessionStorage.editsRequested === 1) {
+            console.log(SessionStorage.editIntegrationId +" " +SessionStorage.editsRequested);
+            if (SessionStorage.editIntegrationId && SessionStorage.editsRequested === 1) {
                 let editWidget: EditableWidget = null;
                 let otherWidgets: EditableWidget[] = [];
                 for (let widget of this.widgets) {
-                    if (widget.id === SessionStorage.editWidgetId) {
+                    if (widget.id === SessionStorage.editIntegrationId) {
                         editWidget = widget;
                     } else otherWidgets.push(widget);
                 }
@@ -318,7 +319,7 @@ export class NewWidgetComponent {
      * @param {EditableWidget} widget The widget to check
      * @returns {boolean} True if the widget has been edited
      */
-    public hasChanges(widget: EditableWidget):boolean {
+    public hasChanges(widget: EditableWidget): boolean {
         if (widget.dimension.newUrl !== this.unwrapUrl(widget.url)) return true;
         if (widget.dimension.newName !== widget.name) return true;
         if (widget.dimension.newTitle !== widget.data.title) return true;
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 215bf82..a686d32 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -29,7 +29,7 @@ export class RiotHomeComponent {
     private roomId: string;
     private userId: string;
     private requestedScreen: string = null;
-    private requestedIntegration: string = null;
+    private requestedIntegrationId: string = null;
     public integrationsForCategory: { [category: string]: Integration[] } = {};
     private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
 
@@ -42,7 +42,7 @@ export class RiotHomeComponent {
         let params: any = this.activatedRoute.snapshot.queryParams;
 
         this.requestedScreen = params.screen;
-        this.requestedIntegration = params.integ_id;
+        this.requestedIntegrationId = params.integ_id;
 
         if (SessionStorage.roomId && SessionStorage.userId) {
             this.roomId = SessionStorage.roomId;
@@ -208,8 +208,9 @@ export class RiotHomeComponent {
         console.log("Searching for integration for requested screen");
         for (const integration of this.getIntegrations()) {
             if (integration.category === category && integration.type === type) {
-                console.log("Configuring integration " + this.requestedIntegration + " category=" + category + " type=" + type);
+                console.log("Configuring integration " + this.requestedIntegrationId + " category=" + category + " type=" + type);
                 SessionStorage.editIntegration = integration;
+                SessionStorage.editIntegrationId = this.requestedIntegrationId;
                 this.modifyIntegration(integration);
                 return;
             }
diff --git a/web/app/shared/SessionStorage.ts b/web/app/shared/SessionStorage.ts
index c76df03..8e89c51 100644
--- a/web/app/shared/SessionStorage.ts
+++ b/web/app/shared/SessionStorage.ts
@@ -6,7 +6,7 @@ export class SessionStorage {
     public static userId: string;
     public static roomId: string;
     public static editIntegration: Integration;
-    public static editWidgetId: string;
+    public static editIntegrationId: string;
     public static editsRequested: number = 0;
 
     private constructor() {
diff --git a/web/app/shared/services/integration.service.ts b/web/app/shared/services/integration.service.ts
index bb1e832..1a73f70 100644
--- a/web/app/shared/services/integration.service.ts
+++ b/web/app/shared/services/integration.service.ts
@@ -53,11 +53,13 @@ export class IntegrationService {
     }
 
     static getIntegrationForScreen(screen: string): { category: string, type: string } {
-        for (const iType of Object.keys(IntegrationService.supportedIntegrationsMap)) {
-            for (const iiType of Object.keys(IntegrationService.supportedIntegrationsMap[iType])) {
-                const integrationTypes = IntegrationService.supportedIntegrationsMap[iType][iiType].types;
+        for (const category of Object.keys(IntegrationService.supportedIntegrationsMap)) {
+            for (const type of Object.keys(IntegrationService.supportedIntegrationsMap[category])) {
+                const integrationTypes = IntegrationService.supportedIntegrationsMap[category][type].types;
+                if (!integrationTypes) continue;
+
                 const integrationScreens = integrationTypes.map(t => "type_" + t);
-                if (integrationScreens.includes(screen)) return {category: iType, type: iiType};
+                if (integrationScreens.includes(screen)) return {category: category, type: type};
             }
         }
 

From 0b63c8eb85a7d10af36e95fc8c87c0afafe3bc85 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 21:44:21 -0700
Subject: [PATCH 022/111] Make the whole box title clickable

---
 web/app/elements/ibox/ibox.component.html | 5 ++---
 web/app/elements/ibox/ibox.component.scss | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index c72735e..482aa26 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -1,10 +1,9 @@
 <div class="ibox">
-    <div class="ibox-title">
+    <div class="ibox-title" (click)="collapsed = !collapsed" [ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']">
         <h5>{{ title }}</h5>
         <ng-content select=".my-ibox-addl-title"></ng-content>
         <i class="ibox-icon fa" *ngIf="isCollapsible"
-           [ngClass]="[collapsed ? 'fa-chevron-right' : 'fa-chevron-down']"
-           (click)="collapsed = !collapsed"></i>
+           [ngClass]="[collapsed ? 'fa-chevron-right' : 'fa-chevron-down']"></i>
     </div>
     <div class="ibox-content" *ngIf="!collapsed">
         <ng-content select=".my-ibox-content"></ng-content>
diff --git a/web/app/elements/ibox/ibox.component.scss b/web/app/elements/ibox/ibox.component.scss
index 13966ec..43a9c84 100644
--- a/web/app/elements/ibox/ibox.component.scss
+++ b/web/app/elements/ibox/ibox.component.scss
@@ -25,4 +25,8 @@
   float: right;
   margin-top: 4px;
   cursor: pointer;
+}
+
+.ibox .ibox-title.ibox-title-collapsible {
+  cursor: pointer;
 }
\ No newline at end of file

From c95ab2bbb2cdb86b720cd30978422fe312259def Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 21:52:24 -0700
Subject: [PATCH 023/111] Use templating for the edit/add views

---
 .../custom/custom.widget.component.html       | 73 ++++++++-----------
 web/app/configs/widget/widget.component.ts    | 17 -----
 2 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
index 96308f1..94ae81f 100644
--- a/web/app/configs/widget/custom/custom.widget.component.html
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -2,28 +2,34 @@
     <my-spinner></my-spinner>
 </div>
 
+<ng-template #widgetParams let-widget="widget">
+    <label class="label-block">
+        Widget Name
+        <input type="text" class="form-control"
+               placeholder="{{ defaultName }}"
+               [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
+               [disabled]="isUpdating"/>
+    </label>
+    <label class="label-block">
+        Widget URL
+        <input type="text" class="form-control"
+               placeholder="https://matrix.org"
+               [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
+               [disabled]="isUpdating"/>
+    </label>
+</ng-template>
+
 <div *ngIf="!isLoading">
     <my-ibox title="Add {{ defaultName }}" [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
         <div class="my-ibox-content">
             <form (submit)="addWidget()" novalidate name="addForm">
-                <label class="label-block">
-                    Widget Name
-                    <input type="text" class="form-control"
-                           placeholder="{{ defaultName }}"
-                           [(ngModel)]="newWidget.dimension.newName" name="widget-name-new"
-                           [disabled]="isUpdating"/>
-                </label>
-                <label class="label-block">
-                    Widget URL
-                    <input type="text" class="form-control"
-                           placeholder="https://matrix.org"
-                           [(ngModel)]="newWidget.dimension.newUrl" name="widget-url-new"
-                           [disabled]="isUpdating"/>
-                </label>
+                <ng-container *ngTemplateOutlet="widgetParams;context:{widget:newWidget}"></ng-container>
 
-                <button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
-                    <i class="fa fa-plus"></i> Add Widget
-                </button>
+                <div style="margin-top: 25px">
+                    <button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
+                        <i class="fa fa-plus"></i> Add Widget
+                    </button>
+                </div>
             </form>
         </div>
     </my-ibox>
@@ -33,31 +39,16 @@
              title="{{ widget.name || widget.url || defaultName }}">
         <div class="my-ibox-content">
             <form (submit)="saveWidget(widget)" novalidate name="addForm">
-                <label class="label-block">
-                    Widget Name
-                    <input type="text" class="form-control"
-                           placeholder="{{ defaultName }}"
-                           [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-                           [disabled]="isUpdating"/>
-                </label>
-                <label class="label-block">
-                    Widget URL
-                    <input type="text" class="form-control"
-                           placeholder="https://matrix.org"
-                           [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-                           [disabled]="isUpdating"/>
-                </label>
+                <ng-container *ngTemplateOutlet="widgetParams;context:{widget:widget}"></ng-container>
 
-                <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
-                    <i class="fa fa-save"></i> Save Widget
-                </button>
-                <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
-                    <i class="fa fa-times"></i> Remove Widget
-                </button>
-                <button type="button" class="btn btn-sm btn-white" [disabled]="isUpdating" (click)="resetWidget(widget)"
-                        *ngIf="hasChanges(widget)">
-                    <i class="fa fa-undo"></i> Undo Changes
-                </button>
+                <div style="margin-top: 25px">
+                    <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
+                        <i class="fa fa-save"></i> Save Widget
+                    </button>
+                    <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
+                        <i class="fa fa-times"></i> Remove Widget
+                    </button>
+                </div>
             </form>
         </div>
     </my-ibox>
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index fce9cb8..17408b2 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -313,21 +313,4 @@ export class NewWidgetComponent {
         this.unpackWidget(widget);
         this.OnWidgetPreparedForEdit.emit(widget);
     }
-
-    /**
-     * Determines if a widget has had any changes made to it
-     * @param {EditableWidget} widget The widget to check
-     * @returns {boolean} True if the widget has been edited
-     */
-    public hasChanges(widget: EditableWidget): boolean {
-        if (widget.dimension.newUrl !== this.unwrapUrl(widget.url)) return true;
-        if (widget.dimension.newName !== widget.name) return true;
-        if (widget.dimension.newTitle !== widget.data.title) return true;
-
-        const currentData = JSON.parse(JSON.stringify(widget.data || "{}"));
-        const newData = JSON.parse(JSON.stringify(widget.dimension.newData || "{}"));
-        if (currentData !== newData) return true;
-
-        return false;
-    }
 }
\ No newline at end of file

From 290e244a4e8dafdaf02f0f53bb2010138e6460f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 21:54:00 -0700
Subject: [PATCH 024/111] Actually remove widgets when requested

---
 .../widget/custom/custom.widget.component.html       | 12 ++++++------
 web/app/configs/widget/widget.component.ts           |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
index 94ae81f..bb687d8 100644
--- a/web/app/configs/widget/custom/custom.widget.component.html
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -1,7 +1,3 @@
-<div *ngIf="isLoading">
-    <my-spinner></my-spinner>
-</div>
-
 <ng-template #widgetParams let-widget="widget">
     <label class="label-block">
         Widget Name
@@ -19,6 +15,10 @@
     </label>
 </ng-template>
 
+<!-- Annoyingly, this has to be copy/pasted to all the integration configs -->
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
 <div *ngIf="!isLoading">
     <my-ibox title="Add {{ defaultName }}" [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
         <div class="my-ibox-content">
@@ -38,14 +38,14 @@
              [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId"
              title="{{ widget.name || widget.url || defaultName }}">
         <div class="my-ibox-content">
-            <form (submit)="saveWidget(widget)" novalidate name="addForm">
+            <form (submit)="saveWidget(widget)" novalidate name="editForm">
                 <ng-container *ngTemplateOutlet="widgetParams;context:{widget:widget}"></ng-container>
 
                 <div style="margin-top: 25px">
                     <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
                         <i class="fa fa-save"></i> Save Widget
                     </button>
-                    <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating">
+                    <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating" (click)="removeWidget(widget)">
                         <i class="fa fa-times"></i> Remove Widget
                     </button>
                 </div>
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 17408b2..f510fb0 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -71,7 +71,6 @@ export class NewWidgetComponent {
             }
 
             // See if we should request editing a particular widget
-            console.log(SessionStorage.editIntegrationId +" " +SessionStorage.editsRequested);
             if (SessionStorage.editIntegrationId && SessionStorage.editsRequested === 1) {
                 let editWidget: EditableWidget = null;
                 let otherWidgets: EditableWidget[] = [];

From f37a70b7d8b9ce43e3c89bc6c174f0f654ed5160 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 22:07:18 -0700
Subject: [PATCH 025/111] Appease the linter

---
 src-ts/api/dimension/DimensionIntegrationsService.ts | 2 +-
 src-ts/matrix/helpers.ts                             | 2 +-
 src-ts/models/ScalarResponses.ts                     | 2 +-
 tslint.json                                          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
index eaf9f38..f37200b 100644
--- a/src-ts/api/dimension/DimensionIntegrationsService.ts
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -37,7 +37,7 @@ export class DimensionIntegrationsService {
 
     @GET
     @Path("room/:roomId")
-    public getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string) :Promise<IntegrationsResponse>{
+    public getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string): Promise<IntegrationsResponse> {
         console.log(roomId);
         return this.getEnabledIntegrations(scalarToken);
     }
diff --git a/src-ts/matrix/helpers.ts b/src-ts/matrix/helpers.ts
index 28a7be6..0e2543e 100644
--- a/src-ts/matrix/helpers.ts
+++ b/src-ts/matrix/helpers.ts
@@ -35,7 +35,7 @@ export function getFederationUrl(serverName: string): Promise<string> {
     });
 }
 
-export function doFederatedApiCall(method: string, serverName: string, endpoint: string, query?: object, body?:object):Promise<any> {
+export function doFederatedApiCall(method: string, serverName: string, endpoint: string, query?: object, body?: object): Promise<any> {
     return getFederationUrl(serverName).then(federationUrl => {
         return new Promise((resolve, reject) => {
             request({
diff --git a/src-ts/models/ScalarResponses.ts b/src-ts/models/ScalarResponses.ts
index 5039c61..a90dfa9 100644
--- a/src-ts/models/ScalarResponses.ts
+++ b/src-ts/models/ScalarResponses.ts
@@ -4,5 +4,5 @@ export interface ScalarRegisterResponse {
 
 export interface ScalarAccountResponse {
     user_id: string;
-    //credit: number; // present on scalar-web
+    // credit: number; // present on scalar-web
 }
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index 25c7919..94550bd 100644
--- a/tslint.json
+++ b/tslint.json
@@ -3,7 +3,7 @@
     "node_modules/codelyzer"
   ],
   "rules": {
-    "class-name": true,
+    "class-name": false,
     "comment-format": [
       true,
       "check-space"
@@ -54,7 +54,7 @@
       "check-else",
       "check-whitespace"
     ],
-    "quotemark": [],
+    "quotemark": false,
     "radix": true,
     "semicolon": [
       "always"

From 7956f03f0e649a18b9d6005e5ef9f554001177c6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 22:11:47 -0700
Subject: [PATCH 026/111] Use nodejs 8 in travis; Update web start script

---
 .travis.yml    |  3 ++-
 DEVELOPMENT.md |  2 +-
 app.js         | 17 -----------------
 package.json   |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 app.js

diff --git a/.travis.yml b/.travis.yml
index 297b85c..ded455e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
 language: node_js
 node_js:
-  - "6"
+  - "8"
 env:
 - NODE_ENV=development
 before_install:
 - npm i -g npm
+- npm i -g typescript
 install:
   - npm install
 script:
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 474db28..1cefaa8 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -16,7 +16,7 @@ cp config/default.yaml config/development.yaml
 nano config/development.yaml
 
 # Run the webserver (it watches for changes)
-npm run start:dev
+npm run start:web
 
 # Run the backend (does not watch for changes)
 npm run build:app && node build/app/index.js
diff --git a/app.js b/app.js
deleted file mode 100644
index 7a2003b..0000000
--- a/app.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var log = require("./src/util/LogService");
-var Dimension = require("./src/Dimension");
-var DimensionStore = require("./src/storage/DimensionStore");
-var DemoBot = require("./src/matrix/DemoBot");
-var config = require("config");
-
-log.info("app", "Bootstrapping Dimension...");
-var db = new DimensionStore();
-db.prepare().then(() => {
-    Dimension.start(db);
-
-    if (config.get("demobot.enabled")) {
-        log.info("app", "Demo bot enabled - starting up");
-        var bot = new DemoBot(config.get("demobot.homeserverUrl"), config.get("demobot.userId"), config.get("demobot.accessToken"));
-        bot.start();
-    }
-}, err => log.error("app", err)).catch(err => log.error("app", err));
\ No newline at end of file
diff --git a/package.json b/package.json
index 24faf72..bcc7d46 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "build/app/index.js",
   "license": "GPL-3.0",
   "scripts": {
-    "start:dev": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
+    "start:web": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
     "start:app": "npm run-script build && node build/app/index.js",
     "build": "rimraf build && npm run-script build:web && npm run-script build:app",
     "build:web": "webpack --progress --profile --bail",

From faeea3b3a533071f51616a7dc3e66a249ae70a01 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 22:17:09 -0700
Subject: [PATCH 027/111] Appease the linter some more

---
 web/app/configs/widget/widget.component.ts    | 2 +-
 web/app/shared/SessionStorage.ts              | 2 +-
 web/app/shared/services/legacy/api.service.ts | 2 +-
 web/app/shared/services/locator.service.ts    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index f510fb0..3e2254d 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -147,7 +147,7 @@ export class NewWidgetComponent {
             type: this.widgetTypes[0],
             name: this.defaultName,
             url: window.location.origin,
-            //ownerId: this.userId, // we don't have a user id
+            ownerId: SessionStorage.userId,
             dimension: {
                 newUrl: "",
                 newName: "",
diff --git a/web/app/shared/SessionStorage.ts b/web/app/shared/SessionStorage.ts
index 8e89c51..d6a6926 100644
--- a/web/app/shared/SessionStorage.ts
+++ b/web/app/shared/SessionStorage.ts
@@ -7,7 +7,7 @@ export class SessionStorage {
     public static roomId: string;
     public static editIntegration: Integration;
     public static editIntegrationId: string;
-    public static editsRequested: number = 0;
+    public static editsRequested = 0;
 
     private constructor() {
     }
diff --git a/web/app/shared/services/legacy/api.service.ts b/web/app/shared/services/legacy/api.service.ts
index 1eb5185..5ca30da 100644
--- a/web/app/shared/services/legacy/api.service.ts
+++ b/web/app/shared/services/legacy/api.service.ts
@@ -13,7 +13,7 @@ export class ApiService {
     }
 
     getTokenOwner(scalarToken: String): Promise<string> {
-        return this.http.get("/api/v1/dimension/whoami", {params:{scalar_token:scalarToken}})
+        return this.http.get("/api/v1/dimension/whoami", {params: {scalar_token: scalarToken}})
             .map(res => res.status === 200 ? res.json()["userId"] : null).toPromise();
     }
 
diff --git a/web/app/shared/services/locator.service.ts b/web/app/shared/services/locator.service.ts
index ab27421..90cd297 100644
--- a/web/app/shared/services/locator.service.ts
+++ b/web/app/shared/services/locator.service.ts
@@ -1,4 +1,4 @@
-import {Injector} from "@angular/core";
+import { Injector } from "@angular/core";
 
 export class ServiceLocator {
     static injector: Injector;

From 1407718999398ba99a7137ba45f27ffc0128011e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 23:19:30 -0700
Subject: [PATCH 028/111] Upgrade to font awesome 5 (free)

---
 package-lock.json                             | 24 ++++++++++++++
 package.json                                  |  4 +++
 .../custom/custom.widget.component.html       | 16 +++++----
 web/app/elements/ibox/ibox.component.html     |  8 +++--
 web/app/elements/ibox/ibox.component.scss     | 33 +------------------
 .../scalar-close/scalar-close.component.html  |  2 +-
 web/public/index.html                         |  1 -
 web/style/app.scss                            |  3 +-
 web/style/components/ibox.scss                | 32 ++++++++++++++++++
 web/vendor.ts                                 |  8 ++++-
 10 files changed, 87 insertions(+), 44 deletions(-)
 create mode 100644 web/style/components/ibox.scss

diff --git a/package-lock.json b/package-lock.json
index 3421508..e78e918 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,6 +100,30 @@
         "loader-utils": "1.1.0"
       }
     },
+    "@fortawesome/fontawesome": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.0.tgz",
+      "integrity": "sha512-HitzVVotHB70QGYaoKvkvaGqKL2P/xdpeg1KK1ESEyI5qBcZdRTWpH9W5XVB72Ev02V4Qo/Ldxjf4UL+kakWdw==",
+      "dev": true
+    },
+    "@fortawesome/fontawesome-free-brands": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.2.tgz",
+      "integrity": "sha512-J7SyvuBFxx3/4VcuSkVlsWxDLCj34Pc1zkOkxQkBDIvmbv6uXC3IUqkhZjyV7AHSM9iDoDeI9CczLk0sJwW25g==",
+      "dev": true
+    },
+    "@fortawesome/fontawesome-free-regular": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.2.tgz",
+      "integrity": "sha512-E4mG2ab0SH9+uEuPvPoDWnIshBGMD3LKih73pR2Kn+qPHujJw/UQXy1D2ousaSD7oLPBO1g0c3dx3laX2i/Neg==",
+      "dev": true
+    },
+    "@fortawesome/fontawesome-free-solid": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.2.tgz",
+      "integrity": "sha512-By7V/yO2XyMonzTmo6KxPcw0OLqycozNDJaASAcky+YZkIL7p1hJ8Ki5OlF4X2z1fMQfpXbbBVfeU6atr1rlUQ==",
+      "dev": true
+    },
     "@ng-bootstrap/ng-bootstrap": {
       "version": "1.0.0-beta.7",
       "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-beta.7.tgz",
diff --git a/package.json b/package.json
index bcc7d46..5935e30 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,10 @@
     "@angular/router": "^5.0.0",
     "@angularclass/hmr": "^2.1.0",
     "@angularclass/hmr-loader": "^3.0.2",
+    "@fortawesome/fontawesome": "^1.1.0",
+    "@fortawesome/fontawesome-free-brands": "^5.0.2",
+    "@fortawesome/fontawesome-free-regular": "^5.0.2",
+    "@fortawesome/fontawesome-free-solid": "^5.0.2",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.7",
     "@types/jquery": "^3.2.16",
     "angular2-template-loader": "^0.6.2",
diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
index bb687d8..af713df 100644
--- a/web/app/configs/widget/custom/custom.widget.component.html
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -20,7 +20,10 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Add {{ defaultName }}" [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
+    <my-ibox [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
+        <h5 class="my-ibox-title">
+            <i class="far fa-plus-square"></i> Add {{ defaultName }}
+        </h5>
         <div class="my-ibox-content">
             <form (submit)="addWidget()" novalidate name="addForm">
                 <ng-container *ngTemplateOutlet="widgetParams;context:{widget:newWidget}"></ng-container>
@@ -34,19 +37,20 @@
         </div>
     </my-ibox>
 
-    <my-ibox *ngFor="let widget of widgets trackById"
-             [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId"
-             title="{{ widget.name || widget.url || defaultName }}">
+    <my-ibox *ngFor="let widget of widgets trackById" [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId">
+        <h5 class="my-ibox-title">
+            <i class="far fa-edit"></i> {{ widget.name || widget.url || defaultName }}
+        </h5>
         <div class="my-ibox-content">
             <form (submit)="saveWidget(widget)" novalidate name="editForm">
                 <ng-container *ngTemplateOutlet="widgetParams;context:{widget:widget}"></ng-container>
 
                 <div style="margin-top: 25px">
                     <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
-                        <i class="fa fa-save"></i> Save Widget
+                        <i class="far fa-save"></i> Save Widget
                     </button>
                     <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating" (click)="removeWidget(widget)">
-                        <i class="fa fa-times"></i> Remove Widget
+                        <i class="far fa-trash-alt"></i> Remove Widget
                     </button>
                 </div>
             </form>
diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index 482aa26..6d6dd30 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -1,6 +1,10 @@
 <div class="ibox">
-    <div class="ibox-title" (click)="collapsed = !collapsed" [ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']">
-        <h5>{{ title }}</h5>
+    <div class="ibox-title" (click)="collapsed = !collapsed"
+         [ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']">
+        <h5 *ngIf="title">
+            {{ title }}
+        </h5>
+        <ng-content select=".my-ibox-title" *ngIf="!title"></ng-content>
         <ng-content select=".my-ibox-addl-title"></ng-content>
         <i class="ibox-icon fa" *ngIf="isCollapsible"
            [ngClass]="[collapsed ? 'fa-chevron-right' : 'fa-chevron-down']"></i>
diff --git a/web/app/elements/ibox/ibox.component.scss b/web/app/elements/ibox/ibox.component.scss
index 43a9c84..aa16a24 100644
--- a/web/app/elements/ibox/ibox.component.scss
+++ b/web/app/elements/ibox/ibox.component.scss
@@ -1,32 +1 @@
-.ibox {
-  background-color: #fff;
-  padding: 0;
-  margin-bottom: 30px;
-}
-
-.ibox .ibox-title {
-  padding: 5px;
-  border-bottom: 1px solid #e7eaec;
-  border-top: 2px solid #e7eaec;
-}
-
-.ibox .ibox-title h5 {
-  display: inline;
-  font-size: 1.1em;
-  padding: 5px;
-  margin: 0;
-}
-
-.ibox .ibox-content {
-  padding: 15px;
-}
-
-.ibox .ibox-title .ibox-icon {
-  float: right;
-  margin-top: 4px;
-  cursor: pointer;
-}
-
-.ibox .ibox-title.ibox-title-collapsible {
-  cursor: pointer;
-}
\ No newline at end of file
+// The styles for iboxes are applied at an app level
\ No newline at end of file
diff --git a/web/app/riot/scalar-close/scalar-close.component.html b/web/app/riot/scalar-close/scalar-close.component.html
index f9ee58b..a6d4d5c 100644
--- a/web/app/riot/scalar-close/scalar-close.component.html
+++ b/web/app/riot/scalar-close/scalar-close.component.html
@@ -1 +1 @@
-<i class="fa fa-times-circle-o scalarClose" (click)="closeScalar()"></i>
\ No newline at end of file
+<i class="far fa-times-circle scalarClose" (click)="closeScalar()"></i>
\ No newline at end of file
diff --git a/web/public/index.html b/web/public/index.html
index 566bbec..2ec6d7d 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -9,7 +9,6 @@
     <link rel="icon" type="image/png" href="/img/favicon.png">
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
 
     <base href="/">
 </head>
diff --git a/web/style/app.scss b/web/style/app.scss
index 50db95e..159ce79 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -1,6 +1,7 @@
 // styles in src/style directory are applied to the whole page
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
 @import '../../node_modules/angular2-toaster/toaster';
+@import "components/ibox";
 @import "riot";
 
 body {
@@ -8,7 +9,7 @@ body {
   margin: 0;
   padding: 0;
   color: #333;
-  font-family: 'Open Sans', sans-serif;
+  font-family: 'Open Sans', sans-serif !important;
 }
 
 // HACK: Work around dialog not showing up
diff --git a/web/style/components/ibox.scss b/web/style/components/ibox.scss
new file mode 100644
index 0000000..43a9c84
--- /dev/null
+++ b/web/style/components/ibox.scss
@@ -0,0 +1,32 @@
+.ibox {
+  background-color: #fff;
+  padding: 0;
+  margin-bottom: 30px;
+}
+
+.ibox .ibox-title {
+  padding: 5px;
+  border-bottom: 1px solid #e7eaec;
+  border-top: 2px solid #e7eaec;
+}
+
+.ibox .ibox-title h5 {
+  display: inline;
+  font-size: 1.1em;
+  padding: 5px;
+  margin: 0;
+}
+
+.ibox .ibox-content {
+  padding: 15px;
+}
+
+.ibox .ibox-title .ibox-icon {
+  float: right;
+  margin-top: 4px;
+  cursor: pointer;
+}
+
+.ibox .ibox-title.ibox-title-collapsible {
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/web/vendor.ts b/web/vendor.ts
index caab141..73f44c5 100644
--- a/web/vendor.ts
+++ b/web/vendor.ts
@@ -5,4 +5,10 @@ import "@angular/common";
 import "@angular/http";
 import "@angular/router";
 import "rxjs";
-import "@angularclass/hmr";
\ No newline at end of file
+import "@angularclass/hmr";
+import fontawesome from '@fortawesome/fontawesome';
+import solid from '@fortawesome/fontawesome-free-solid';
+import regular from '@fortawesome/fontawesome-free-regular';
+import brands from '@fortawesome/fontawesome-free-brands';
+
+fontawesome.library.add(regular, solid, brands);
\ No newline at end of file

From 111423cc7dfc4264c79ee1c3dd1aa5146880d054 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 22 Dec 2017 23:30:42 -0700
Subject: [PATCH 029/111] Move widget configuration template out to its own
 component

---
 web/app/app.module.ts                         |  2 +
 .../config_screen.component.html              | 41 ++++++++++
 .../config_screen.widget.component.scss       |  0
 .../config_screen.widget.component.ts         | 16 ++++
 .../custom/custom.widget.component.html       | 77 +++++--------------
 5 files changed, 77 insertions(+), 59 deletions(-)
 create mode 100644 web/app/configs/widget/config_screen/config_screen.component.html
 create mode 100644 web/app/configs/widget/config_screen/config_screen.widget.component.scss
 create mode 100644 web/app/configs/widget/config_screen/config_screen.widget.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index aa10a1b..1ebc263 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -33,6 +33,7 @@ import { AdminApiService } from "./shared/services/admin-api.service";
 import { ServiceLocator } from "./shared/services/locator.service";
 import { IboxComponent } from "./elements/ibox/ibox.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
+import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/config_screen.widget.component";
 
 @NgModule({
     imports: [
@@ -65,6 +66,7 @@ import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widg
         GCalWidgetWrapperComponent,
         RiotHomeComponent,
         IboxComponent,
+        ConfigScreenWidgetComponent,
         CustomWidgetConfigComponent,
 
         // Vendor
diff --git a/web/app/configs/widget/config_screen/config_screen.component.html b/web/app/configs/widget/config_screen/config_screen.component.html
new file mode 100644
index 0000000..f8ec86d
--- /dev/null
+++ b/web/app/configs/widget/config_screen/config_screen.component.html
@@ -0,0 +1,41 @@
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox [isCollapsible]="true" [defaultCollapsed]="widgetComponent.defaultExpandedWidgetId">
+        <h5 class="my-ibox-title">
+            <i class="far fa-plus-square"></i> Add {{ widgetComponent.defaultName }}
+        </h5>
+        <div class="my-ibox-content">
+            <form (submit)="widgetComponent.addWidget()" novalidate name="addForm">
+                <ng-container *ngTemplateOutlet="widgetParamsTemplate;context:{widget:widgetComponent.newWidget}"></ng-container>
+
+                <div style="margin-top: 25px">
+                    <button type="submit" class="btn btn-sm btn-success" [disabled]="widgetComponent.isUpdating">
+                        <i class="fa fa-plus"></i> Add Widget
+                    </button>
+                </div>
+            </form>
+        </div>
+    </my-ibox>
+
+    <my-ibox *ngFor="let widget of widgetComponent.widgets trackById" [isCollapsible]="true" [defaultCollapsed]="widget.id !== widgetComponent.defaultExpandedWidgetId">
+        <h5 class="my-ibox-title">
+            <i class="far fa-edit"></i> {{ widget.name || widget.url || widgetComponent.defaultName }}
+        </h5>
+        <div class="my-ibox-content">
+            <form (submit)="widgetComponent.saveWidget(widget)" novalidate name="editForm">
+                <ng-container *ngTemplateOutlet="widgetParamsTemplate;context:{widget:widget}"></ng-container>
+
+                <div style="margin-top: 25px">
+                    <button type="submit" class="btn btn-sm btn-primary" [disabled]="widgetComponent.isUpdating">
+                        <i class="far fa-save"></i> Save Widget
+                    </button>
+                    <button type="button" class="btn btn-sm btn-danger" [disabled]="widgetComponent.isUpdating" (click)="widgetComponent.removeWidget(widget)">
+                        <i class="far fa-trash-alt"></i> Remove Widget
+                    </button>
+                </div>
+            </form>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/configs/widget/config_screen/config_screen.widget.component.scss b/web/app/configs/widget/config_screen/config_screen.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/config_screen/config_screen.widget.component.ts b/web/app/configs/widget/config_screen/config_screen.widget.component.ts
new file mode 100644
index 0000000..591351c
--- /dev/null
+++ b/web/app/configs/widget/config_screen/config_screen.widget.component.ts
@@ -0,0 +1,16 @@
+import { NewWidgetComponent } from "../widget.component";
+import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
+
+@Component({
+    selector: "my-widget-config",
+    templateUrl: "config_screen.component.html",
+    styleUrls: ["config_screen.widget.component.scss"],
+})
+export class ConfigScreenWidgetComponent {
+
+    @Input() widgetComponent: NewWidgetComponent;
+    @ContentChild(TemplateRef) widgetParamsTemplate: TemplateRef<any>;
+
+    constructor() {
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/widget/custom/custom.widget.component.html b/web/app/configs/widget/custom/custom.widget.component.html
index af713df..f00ca1d 100644
--- a/web/app/configs/widget/custom/custom.widget.component.html
+++ b/web/app/configs/widget/custom/custom.widget.component.html
@@ -1,59 +1,18 @@
-<ng-template #widgetParams let-widget="widget">
-    <label class="label-block">
-        Widget Name
-        <input type="text" class="form-control"
-               placeholder="{{ defaultName }}"
-               [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-               [disabled]="isUpdating"/>
-    </label>
-    <label class="label-block">
-        Widget URL
-        <input type="text" class="form-control"
-               placeholder="https://matrix.org"
-               [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-               [disabled]="isUpdating"/>
-    </label>
-</ng-template>
-
-<!-- Annoyingly, this has to be copy/pasted to all the integration configs -->
-<div *ngIf="isLoading">
-    <my-spinner></my-spinner>
-</div>
-<div *ngIf="!isLoading">
-    <my-ibox [isCollapsible]="true" [defaultCollapsed]="defaultExpandedWidgetId">
-        <h5 class="my-ibox-title">
-            <i class="far fa-plus-square"></i> Add {{ defaultName }}
-        </h5>
-        <div class="my-ibox-content">
-            <form (submit)="addWidget()" novalidate name="addForm">
-                <ng-container *ngTemplateOutlet="widgetParams;context:{widget:newWidget}"></ng-container>
-
-                <div style="margin-top: 25px">
-                    <button type="submit" class="btn btn-sm btn-success" [disabled]="isUpdating">
-                        <i class="fa fa-plus"></i> Add Widget
-                    </button>
-                </div>
-            </form>
-        </div>
-    </my-ibox>
-
-    <my-ibox *ngFor="let widget of widgets trackById" [isCollapsible]="true" [defaultCollapsed]="widget.id !== defaultExpandedWidgetId">
-        <h5 class="my-ibox-title">
-            <i class="far fa-edit"></i> {{ widget.name || widget.url || defaultName }}
-        </h5>
-        <div class="my-ibox-content">
-            <form (submit)="saveWidget(widget)" novalidate name="editForm">
-                <ng-container *ngTemplateOutlet="widgetParams;context:{widget:widget}"></ng-container>
-
-                <div style="margin-top: 25px">
-                    <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
-                        <i class="far fa-save"></i> Save Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-danger" [disabled]="isUpdating" (click)="removeWidget(widget)">
-                        <i class="far fa-trash-alt"></i> Remove Widget
-                    </button>
-                </div>
-            </form>
-        </div>
-    </my-ibox>
-</div>
\ No newline at end of file
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Widget Name
+            <input type="text" class="form-control"
+                   placeholder="{{ defaultName }}"
+                   [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+        <label class="label-block">
+            Widget URL
+            <input type="text" class="form-control"
+                   placeholder="https://matrix.org"
+                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file

From 7fd674a8ff7f5e17376b8c1ca5f09dc16058e8b0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 13:15:54 -0700
Subject: [PATCH 030/111] Remove legacy configurations for now

---
 web/app/app.module.ts                         |   2 -
 .../circleci/circleci-config.component.html   |  63 ---
 .../circleci/circleci-config.component.scss   |  19 -
 .../circleci/circleci-config.component.ts     | 116 -----
 web/app/configs-old/config.component.scss     |  32 --
 .../configs-old/irc/irc-config.component.html |  75 ----
 .../configs-old/irc/irc-config.component.scss |   1 -
 .../configs-old/irc/irc-config.component.ts   | 168 --------
 .../configs-old/rss/rss-config.component.html |  38 --
 .../configs-old/rss/rss-config.component.scss |  13 -
 .../configs-old/rss/rss-config.component.ts   |  68 ---
 .../travisci/travisci-config.component.html   |  63 ---
 .../travisci/travisci-config.component.scss   |  19 -
 .../travisci/travisci-config.component.ts     | 116 -----
 .../custom_widget-config.component.html       |  65 ---
 .../custom_widget-config.component.scss       |   4 -
 .../custom_widget-config.component.ts         |  32 --
 .../etherpad/etherpad-config.component.html   |  66 ---
 .../etherpad/etherpad-config.component.scss   |   4 -
 .../etherpad/etherpad-config.component.ts     |  61 ---
 .../googlecalendar-config.component.html      |  59 ---
 .../googlecalendar-config.component.scss      |   4 -
 .../googlecalendar-config.component.ts        |  57 ---
 .../googledocs-config.component.html          |  59 ---
 .../googledocs-config.component.scss          |   4 -
 .../googledocs/googledocs-config.component.ts |  33 --
 .../widget/jitsi/jitsi-config.component.html  |  60 ---
 .../widget/jitsi/jitsi-config.component.scss  |   4 -
 .../widget/jitsi/jitsi-config.component.ts    | 140 -------
 .../twitch/twitch-config.component.html       |  66 ---
 .../twitch/twitch-config.component.scss       |   4 -
 .../widget/twitch/twitch-config.component.ts  |  72 ----
 .../configs-old/widget/widget.component.ts    | 395 ------------------
 .../youtube/youtube-config.component.html     |  66 ---
 .../youtube/youtube-config.component.scss     |   4 -
 .../youtube/youtube-config.component.ts       |  70 ----
 .../integration-bag.component.ts              |   3 +-
 .../integration/integration.component.html    |   5 -
 .../integration/integration.component.scss    |  31 --
 web/app/integration/integration.component.ts  |  30 --
 web/app/shared/models/legacyintegration.ts    |  49 ---
 .../shared/services/dimension-api.service.ts  |  10 +
 web/app/shared/services/legacy/api.service.ts |  53 ---
 .../services/legacy/integration.service.ts    | 117 ------
 .../shared/services/legacy/irc-api.service.ts |  27 --
 .../generic/generic.component.ts              |   4 +-
 .../widget_wrappers/jitsi/jitsi.component.ts  |  12 +-
 47 files changed, 19 insertions(+), 2444 deletions(-)
 delete mode 100644 web/app/configs-old/circleci/circleci-config.component.html
 delete mode 100644 web/app/configs-old/circleci/circleci-config.component.scss
 delete mode 100644 web/app/configs-old/circleci/circleci-config.component.ts
 delete mode 100644 web/app/configs-old/config.component.scss
 delete mode 100644 web/app/configs-old/irc/irc-config.component.html
 delete mode 100644 web/app/configs-old/irc/irc-config.component.scss
 delete mode 100644 web/app/configs-old/irc/irc-config.component.ts
 delete mode 100644 web/app/configs-old/rss/rss-config.component.html
 delete mode 100644 web/app/configs-old/rss/rss-config.component.scss
 delete mode 100644 web/app/configs-old/rss/rss-config.component.ts
 delete mode 100644 web/app/configs-old/travisci/travisci-config.component.html
 delete mode 100644 web/app/configs-old/travisci/travisci-config.component.scss
 delete mode 100644 web/app/configs-old/travisci/travisci-config.component.ts
 delete mode 100644 web/app/configs-old/widget/custom_widget/custom_widget-config.component.html
 delete mode 100644 web/app/configs-old/widget/custom_widget/custom_widget-config.component.scss
 delete mode 100644 web/app/configs-old/widget/custom_widget/custom_widget-config.component.ts
 delete mode 100644 web/app/configs-old/widget/etherpad/etherpad-config.component.html
 delete mode 100644 web/app/configs-old/widget/etherpad/etherpad-config.component.scss
 delete mode 100644 web/app/configs-old/widget/etherpad/etherpad-config.component.ts
 delete mode 100644 web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.html
 delete mode 100644 web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.scss
 delete mode 100644 web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.ts
 delete mode 100644 web/app/configs-old/widget/googledocs/googledocs-config.component.html
 delete mode 100644 web/app/configs-old/widget/googledocs/googledocs-config.component.scss
 delete mode 100644 web/app/configs-old/widget/googledocs/googledocs-config.component.ts
 delete mode 100644 web/app/configs-old/widget/jitsi/jitsi-config.component.html
 delete mode 100644 web/app/configs-old/widget/jitsi/jitsi-config.component.scss
 delete mode 100644 web/app/configs-old/widget/jitsi/jitsi-config.component.ts
 delete mode 100644 web/app/configs-old/widget/twitch/twitch-config.component.html
 delete mode 100644 web/app/configs-old/widget/twitch/twitch-config.component.scss
 delete mode 100644 web/app/configs-old/widget/twitch/twitch-config.component.ts
 delete mode 100644 web/app/configs-old/widget/widget.component.ts
 delete mode 100644 web/app/configs-old/widget/youtube/youtube-config.component.html
 delete mode 100644 web/app/configs-old/widget/youtube/youtube-config.component.scss
 delete mode 100644 web/app/configs-old/widget/youtube/youtube-config.component.ts
 delete mode 100644 web/app/integration/integration.component.html
 delete mode 100644 web/app/integration/integration.component.scss
 delete mode 100644 web/app/integration/integration.component.ts
 delete mode 100644 web/app/shared/models/legacyintegration.ts
 delete mode 100644 web/app/shared/services/legacy/api.service.ts
 delete mode 100644 web/app/shared/services/legacy/integration.service.ts
 delete mode 100644 web/app/shared/services/legacy/irc-api.service.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 1ebc263..94e1b46 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -26,7 +26,6 @@ import { SpinnerComponent } from "./elements/spinner/spinner.component";
 import { BreadcrumbsModule } from "ng2-breadcrumbs";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { IntegrationBagComponent } from "./integration-bag/integration-bag.component";
-import { IntegrationComponent } from "./integration/integration.component";
 import { ScalarServerApiService } from "./shared/services/scalar-server-api.service";
 import { DimensionApiService } from "./shared/services/dimension-api.service";
 import { AdminApiService } from "./shared/services/admin-api.service";
@@ -53,7 +52,6 @@ import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/conf
         AppComponent,
         HomeComponent,
         RiotComponent,
-        IntegrationComponent,
         IntegrationBagComponent,
         PageHeaderComponent,
         SpinnerComponent,
diff --git a/web/app/configs-old/circleci/circleci-config.component.html b/web/app/configs-old/circleci/circleci-config.component.html
deleted file mode 100644
index 4685cec..0000000
--- a/web/app/configs-old/circleci/circleci-config.component.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure CircleCI hooks</h4>
-    </div>
-    <div class="config-content">
-        <form (submit)="addRepository()" novalidate name="addRepoForm">
-            <div class="row">
-                <div class="col-md-12" style="margin-bottom: 12px;">
-                    <h6>.circleci/config.yml configuration</h6>
-                    The following will need to be added to your .circleci/config.yml file:
-                    <pre class="yaml">{{ circleYaml }}</pre>
-                </div>
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <h6>Your CircleCI hooks</h6>
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="owner/repo-name"
-                               [(ngModel)]="repoKey" name="repoKey"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Repository
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable" *ngFor="let repo of integration.repoTemplates trackById">
-                    {{ repo.repoKey }}
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editTemplate(repo.repoKey)"
-                            style="margin-top: -5px;" [disabled]="isUpdating" *ngIf="!isTemplateToggled(repo.repoKey)">
-                        <i class="fa fa-pencil"></i> Edit
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeRepository(repo.repoKey)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Repository
-                    </button>
-                    <div *ngIf="isTemplateToggled(repo.repoKey)">
-                        <textarea [(ngModel)]="repo.newTemplate" name="template-{{repo.repoKey}}"
-                                  style="width: 100%; height: 100px; margin-top: 5px;"></textarea>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="saveTemplate(repo.repoKey)">Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleTemplate(repo.repoKey)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-                <div class="col-md-12" *ngIf="integration.immutableRepoTemplates.length > 0">
-                    <h6 class="other-items-title">Hooks from other users in the room</h6>
-                </div>
-                <div class="col-md-12 list" *ngFor="let repo of integration.immutableRepoTemplates trackById">
-                    {{ repo.repoKey }} <span class="text-muted">(added by {{ repo.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="toggleTemplate(repo.repoKey)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        {{ isTemplateToggled(repo.repoKey) ? "Hide" : "Show" }} Template
-                    </button>
-                    <pre *ngIf="isTemplateToggled(repo.repoKey)">{{ repo.template }}</pre>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/circleci/circleci-config.component.scss b/web/app/configs-old/circleci/circleci-config.component.scss
deleted file mode 100644
index 0430df4..0000000
--- a/web/app/configs-old/circleci/circleci-config.component.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.list {
-  margin-top: 5px;
-}
-
-.removable {
-  margin-top: 3px;
-}
-
-.other-items-title {
-  margin-top: 25px;
-  margin-bottom: 0;
-}
-
-.yaml {
-  border: 1px solid #ccc;
-  background: #eee;
-  padding: 5px;
-}
\ No newline at end of file
diff --git a/web/app/configs-old/circleci/circleci-config.component.ts b/web/app/configs-old/circleci/circleci-config.component.ts
deleted file mode 100644
index ee0f9bf..0000000
--- a/web/app/configs-old/circleci/circleci-config.component.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Component } from "@angular/core";
-import { CircleCiIntegration } from "../../shared/models/legacyintegration";
-import { ModalComponent, DialogRef } from "ngx-modialog";
-import { ConfigModalContext } from "../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/services/legacy/api.service";
-
-@Component({
-    selector: "my-circleci-config",
-    templateUrl: "./circleci-config.component.html",
-    styleUrls: ["./circleci-config.component.scss", "./../config.component.scss"],
-})
-export class CircleCiConfigComponent implements ModalComponent<ConfigModalContext> {
-
-    public integration: CircleCiIntegration;
-
-    public isUpdating = false;
-    public repoKey = "";
-    public repoTemplate = "";
-    public circleYaml = "";
-
-    private roomId: string;
-    private scalarToken: string;
-    private knownRepos: string[] = [];
-    private visibleTemplates = [];
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                private toaster: ToasterService,
-                private api: ApiService) {
-        this.integration = <CircleCiIntegration>dialog.context.integration;
-        this.roomId = dialog.context.roomId;
-        this.scalarToken = dialog.context.scalarToken;
-
-        this.circleYaml = "notify:\n    webhooks:\n        - url: " + this.integration.webhookUrl;
-
-        this.calculateKnownRepos();
-        this.reset();
-    }
-
-    private calculateKnownRepos() {
-        for (let repo of this.integration.repoTemplates)
-            this.knownRepos.push(repo.repoKey);
-        for (let immutableRepo of this.integration.immutableRepoTemplates)
-            this.knownRepos.push(immutableRepo.repoKey);
-    }
-
-    public toggleTemplate(repoKey: string) {
-        let idx = this.visibleTemplates.indexOf(repoKey);
-        if (idx === -1) this.visibleTemplates.push(repoKey);
-        else this.visibleTemplates.splice(idx, 1);
-    }
-
-    public isTemplateToggled(repoKey: string) {
-        return this.visibleTemplates.indexOf(repoKey) !== -1;
-    }
-
-    public editTemplate(repoKey: string) {
-        this.toggleTemplate(repoKey);
-        let repoConfig = this.integration.repoTemplates.find(r => r.repoKey === repoKey);
-        repoConfig.newTemplate = repoConfig.template;
-    }
-
-    public saveTemplate(repoKey: string) {
-        let repoConfig = this.integration.repoTemplates.find(r => r.repoKey === repoKey);
-        repoConfig.template = repoConfig.newTemplate;
-        this.updateTemplates().then(() => this.toggleTemplate(repoKey));
-    }
-
-    public addRepository() {
-        if (!this.repoKey || this.repoKey.trim().length === 0) {
-            this.toaster.pop("warning", "Please enter a repository");
-            return;
-        }
-        if (this.knownRepos.indexOf(this.repoKey) !== -1) {
-            this.toaster.pop("error", "Repository " + this.repoKey + " is already being tracked");
-            return;
-        }
-
-        this.integration.repoTemplates.push({repoKey: this.repoKey, template: this.repoTemplate, newTemplate: ""});
-        this.updateTemplates().then(() => this.reset());
-    }
-
-    private reset() {
-        this.repoKey = "";
-        this.repoTemplate = "%{build_num}#%{build_num} (%{branch} - %{commit} : %{committer_name}): %{outcome}\n    Build details : %{build_url}\n";
-    }
-
-    public removeRepository(repoKey: string) {
-        for (let i = 0; i < this.integration.repoTemplates.length; i++) {
-            if (this.integration.repoTemplates[i].repoKey === repoKey) {
-                this.integration.repoTemplates.splice(i, 1);
-                this.updateTemplates().then(() => this.reset());
-                return;
-            }
-        }
-
-        this.toaster.pop("error", "Could not find target repository");
-    }
-
-    public updateTemplates() {
-        this.isUpdating = true;
-        return this.api.updateIntegrationState(this.roomId, this.integration.type, this.integration.integrationType, this.scalarToken, {
-            repoTemplates: this.integration.repoTemplates
-        }).then(response => {
-            this.integration.repoTemplates = response.repoTemplates;
-            this.integration.immutableRepoTemplates = response.immutableRepoTemplates;
-            this.calculateKnownRepos();
-            this.isUpdating = false;
-            this.toaster.pop("success", "Repositories updated");
-        }).catch(err => {
-            this.toaster.pop("error", err.json().error);
-            console.error(err);
-            this.isUpdating = false;
-        });
-    }
-}
diff --git a/web/app/configs-old/config.component.scss b/web/app/configs-old/config.component.scss
deleted file mode 100644
index ce39ba5..0000000
--- a/web/app/configs-old/config.component.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// shared styling for all config screens
-.config-wrapper {
-  padding: 25px;
-}
-
-.config-header {
-  padding-bottom: 8px;
-  margin-bottom: 14px;
-  border-bottom: 1px solid #dadada;
-}
-
-.config-header h4 {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.config-header img {
-  margin-right: 7px;
-  width: 35px;
-  height: 35px;
-  border-radius: 35px;
-}
-
-.close-icon {
-  float: right;
-  margin: -17px;
-  cursor: pointer;
-}
-
-.config-content {
-  display: block;
-}
\ No newline at end of file
diff --git a/web/app/configs-old/irc/irc-config.component.html b/web/app/configs-old/irc/irc-config.component.html
deleted file mode 100644
index b14f4d7..0000000
--- a/web/app/configs-old/irc/irc-config.component.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img src="/img/avatars/irc.png">
-        <h4>Configure IRC Bridge</h4>
-    </div>
-    <div class="config-content">
-        <div class="alert alert-info">
-            Bridging a channel requires authorization from a channel operator. When entering a channel below, a bot will
-            join the channel to ensure it exists and has operators available.
-        </div>
-        <div *ngIf="!opsLoaded">
-            <h6>Add a channel</h6>
-            <div class="row form-group" style="margin-bottom: 0.1rem;">
-                <label class="col-sm-2 col-form-label">Network</label>
-                <div class="col-md-4">
-                    <select class="form-control form-control-sm" [(ngModel)]="newChannel.network" [disabled]="loadingOps">
-                        <option *ngFor="let network of integration.availableNetworks" [ngValue]="network.id">
-                            {{ network.name }}
-                        </option>
-                    </select>
-                </div>
-            </div>
-            <div class="row form-group" style="margin-bottom: 0.1rem;">
-                <label class="col-sm-2 col-form-label">Channel</label>
-                <div class="col-md-4 input-group input-group-sm">
-                    <div class="input-group-addon">#</div>
-                    <input type="text" class="form-control form-control-sm" [(ngModel)]="newChannel.channel" [disabled]="loadingOps">
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12">
-                    <p *ngIf="opsError" class="text-danger">{{ opsError }}</p>
-                    <button type="button" class="btn btn-primary btn-sm" (click)="checkOps()" [disabled]="loadingOps">
-                        Next <i class="fa fa-arrow-right"></i>
-                    </button>
-                </div>
-            </div>
-        </div>
-        <div *ngIf="opsLoaded">
-            <h6>Add a channel</h6>
-            <div class="row form-group" style="margin-bottom: 0.1rem;">
-                <label class="col-sm-2 col-form-label">Operator</label>
-                <div class="col-md-4">
-                    <select class="form-control form-control-sm" [(ngModel)]="newChannel.op" [disabled]="addingChannel">
-                        <option *ngFor="let op of channelOps" [ngValue]="op">{{ op }}</option>
-                    </select>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12">
-                    <p>A request to bridge #{{ newChannel.channel }} on {{ getNewChannelNetworkName() }} will be sent to {{ newChannel.op }}. Once they accept, the channel will show up below.</p>
-                    <button type="button" class="btn btn-primary btn-sm" (click)="addChannel()" [disabled]="addingChannel">
-                        <i class="fa fa-plus-circle"></i> Request Bridge
-                    </button>
-                </div>
-            </div>
-        </div>
-        <div class="row" style="margin-top: 40px;">
-            <div class="col-md-12">
-                <h6>Linked channels</h6>
-                <p *ngIf="channelLinks.length <= 0">No linked channels.</p>
-            </div>
-            <div class="col-md-12" *ngFor="let link of channelLinks">
-                <strong>{{ link.displayName }}</strong>
-                <div *ngFor="let channel of link.channels" style="padding-left: 10px;">
-                    {{ channel }}
-                    <button type="button" class="btn btn-outline-danger btn-sm" (click)="removeChannelLink(link, channel)" [disabled]="link.beingRemoved.indexOf(channel) !== -1">
-                        <i class="fa fa-times"></i> Unlink
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/irc/irc-config.component.scss b/web/app/configs-old/irc/irc-config.component.scss
deleted file mode 100644
index 12e299a..0000000
--- a/web/app/configs-old/irc/irc-config.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-// component styles are encapsulated and only applied to their components
diff --git a/web/app/configs-old/irc/irc-config.component.ts b/web/app/configs-old/irc/irc-config.component.ts
deleted file mode 100644
index 822c431..0000000
--- a/web/app/configs-old/irc/irc-config.component.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import { Component, OnDestroy } from "@angular/core";
-import { IRCIntegration } from "../../shared/models/legacyintegration";
-import { ModalComponent, DialogRef } from "ngx-modialog";
-import { ConfigModalContext } from "../../integration/integration.component";
-import { IrcApiService } from "../../shared/services/legacy/irc-api.service";
-import { ToasterService } from "angular2-toaster";
-import { IntervalObservable } from "rxjs/observable/IntervalObservable";
-import { ApiService } from "../../shared/services/legacy/api.service";
-import { Subscription } from "rxjs";
-
-@Component({
-    selector: "my-irc-config",
-    templateUrl: "./irc-config.component.html",
-    styleUrls: ["./irc-config.component.scss", "./../config.component.scss"],
-})
-export class IrcConfigComponent implements ModalComponent<ConfigModalContext>, OnDestroy {
-
-    public integration: IRCIntegration;
-    public loadingOps = false;
-    public opsLoaded = false;
-    public addingChannel = false;
-    public newChannel = {
-        network: "",
-        channel: "",
-        op: ""
-    };
-    public channelOps: string[];
-    public opsError: string = null;
-    public channelLinks: ChannelLink[];
-
-    private roomId: string;
-    private scalarToken: string;
-    private stateTimer: Subscription;
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                private ircApi: IrcApiService,
-                private toaster: ToasterService,
-                private api: ApiService) {
-        this.integration = <IRCIntegration>dialog.context.integration;
-        this.roomId = dialog.context.roomId;
-        this.scalarToken = dialog.context.scalarToken;
-
-        this.newChannel.network = this.integration.availableNetworks[0].id;
-        this.buildChannelLinks();
-
-        this.stateTimer = IntervalObservable.create(5000).subscribe(() => {
-            this.api.getIntegrationState(this.roomId, this.integration.type, this.integration.integrationType, this.scalarToken)
-                .then(state => {
-                    for (let key in state) {
-                        this.integration[key] = state[key];
-                    }
-                    this.buildChannelLinks();
-                });
-        });
-    }
-
-    public ngOnDestroy(): void {
-        this.stateTimer.unsubscribe();
-    }
-
-    public checkOps(): void {
-        if (this.newChannel.channel.trim().length === 0) {
-            this.toaster.pop("warning", "Please enter a channel name");
-            return;
-        }
-
-        this.loadingOps = true;
-        this.ircApi.getChannelOps(this.roomId, this.newChannel.network, this.newChannel.channel, this.scalarToken).then(ops => {
-            this.channelOps = ops;
-            if (this.channelOps.length === 0) {
-                this.opsError = "No channel operators available";
-            } else {
-                this.newChannel.op = this.channelOps[0];
-                this.loadingOps = false;
-                this.opsLoaded = true;
-            }
-        }).catch(err => {
-            this.toaster.pop("error", err.json().error);
-            console.error(err);
-            this.loadingOps = false;
-        });
-    }
-
-    public getNewChannelNetworkName(): string {
-        for (let network of this.integration.availableNetworks) {
-            if (network.id === this.newChannel.network) {
-                return network.name;
-            }
-        }
-        return "Unknown";
-    }
-
-    public addChannel(): void {
-        this.addingChannel = true;
-        this.ircApi.linkChannel(
-            this.roomId,
-            this.newChannel.network,
-            this.newChannel.channel,
-            this.newChannel.op,
-            this.scalarToken)
-            .then(() => {
-                this.newChannel = {
-                    network: this.integration.availableNetworks[0].id,
-                    channel: "",
-                    op: ""
-                };
-                this.channelOps = [];
-                this.addingChannel = false;
-                this.opsLoaded = false;
-
-                this.toaster.pop("success", "Channel bridge requested");
-            })
-            .catch(err => {
-                this.toaster.pop("error", err.json().error);
-                console.error(err);
-                this.addingChannel = false;
-            });
-    }
-
-    private buildChannelLinks(): void {
-        this.channelLinks = [];
-
-        for (let network in this.integration.channels) {
-            if (this.integration.channels[network].length <= 0) continue;
-
-            let displayName = "Unknown Network";
-            for (let parentNetwork of this.integration.availableNetworks) {
-                if (parentNetwork.id === network) {
-                    displayName = parentNetwork.name;
-                    break;
-                }
-            }
-
-            this.channelLinks.push({
-                displayName: displayName,
-                network: network,
-                channels: this.integration.channels[network],
-                beingRemoved: []
-            });
-        }
-    }
-
-    public removeChannelLink(link: ChannelLink, channel: string): void {
-        link.beingRemoved.push(channel);
-        this.ircApi.unlinkChannel(this.roomId, link.network, channel.substring(1), this.scalarToken).then(() => {
-            this.toaster.pop("success", "Channel " + channel + " unlinked");
-
-            link.channels.splice(link.channels.indexOf(channel), 1);
-            link.beingRemoved.splice(link.beingRemoved.indexOf(channel), 1);
-
-            if (link.channels.length === 0) {
-                this.channelLinks.splice(this.channelLinks.indexOf(link), 1);
-            }
-        }).catch(err => {
-            this.toaster.pop("error", err.json().error);
-            console.error(err);
-
-            link.beingRemoved.splice(link.beingRemoved.indexOf(channel), 1);
-        });
-    }
-}
-
-interface ChannelLink {
-    displayName: string;
-    channels: string[];
-    network: string;
-    beingRemoved: string[];
-}
diff --git a/web/app/configs-old/rss/rss-config.component.html b/web/app/configs-old/rss/rss-config.component.html
deleted file mode 100644
index 028bbac..0000000
--- a/web/app/configs-old/rss/rss-config.component.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure RSS/Atom Feeds</h4>
-    </div>
-    <div class="config-content">
-        <form (submit)="addFeed()" novalidate name="addFeedForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               [(ngModel)]="feedUrl" name="feedUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Feed
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable-feed" *ngFor="let feed of integration.feeds trackById">
-                    <a [href]="feed" rel="noopener" target="_blank">{{ feed }}</a>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeFeed(feed)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Feed
-                    </button>
-                </div>
-                <div class="col-md-12" *ngIf="integration.immutableFeeds.length > 0">
-                    <h6 class="other-feeds-title">Feeds from other users in the room</h6>
-                </div>
-                <div class="col-md-12 feed-list" *ngFor="let feed of integration.immutableFeeds trackById">
-                    <a [href]="feed.url" rel="noopener" target="_blank">{{ feed.url }}</a> <span class="text-muted">(added by {{ feed.ownerId }})</span>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/rss/rss-config.component.scss b/web/app/configs-old/rss/rss-config.component.scss
deleted file mode 100644
index ca12682..0000000
--- a/web/app/configs-old/rss/rss-config.component.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.feed-list {
-  margin-top: 5px;
-}
-
-.removable-feed {
-  margin-top: 3px;
-}
-
-.other-feeds-title {
-  margin-top: 25px;
-  margin-bottom: 0;
-}
\ No newline at end of file
diff --git a/web/app/configs-old/rss/rss-config.component.ts b/web/app/configs-old/rss/rss-config.component.ts
deleted file mode 100644
index c906714..0000000
--- a/web/app/configs-old/rss/rss-config.component.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Component } from "@angular/core";
-import { RSSIntegration } from "../../shared/models/legacyintegration";
-import { ModalComponent, DialogRef } from "ngx-modialog";
-import { ConfigModalContext } from "../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/services/legacy/api.service";
-
-@Component({
-    selector: "my-rss-config",
-    templateUrl: "./rss-config.component.html",
-    styleUrls: ["./rss-config.component.scss", "./../config.component.scss"],
-})
-export class RssConfigComponent implements ModalComponent<ConfigModalContext> {
-
-    public integration: RSSIntegration;
-
-    public isUpdating = false;
-    public feedUrl = "";
-
-    private roomId: string;
-    private scalarToken: string;
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                private toaster: ToasterService,
-                private api: ApiService) {
-        this.integration = <RSSIntegration>dialog.context.integration;
-        this.roomId = dialog.context.roomId;
-        this.scalarToken = dialog.context.scalarToken;
-    }
-
-    public addFeed() {
-        if (!this.feedUrl || this.feedUrl.trim().length === 0) {
-            this.toaster.pop("warning", "Please enter a feed URL");
-            return;
-        }
-        if (this.integration.feeds.indexOf(this.feedUrl) !== -1) {
-            this.toaster.pop("error", "This feed has already been added");
-            return;
-        }
-
-        let feedCopy = JSON.parse(JSON.stringify(this.integration.feeds));
-        feedCopy.push(this.feedUrl);
-        this.updateFeeds(feedCopy).then(() => this.feedUrl = "");
-    }
-
-    public removeFeed(feedUrl) {
-        let feedCopy = JSON.parse(JSON.stringify(this.integration.feeds));
-        const idx = feedCopy.indexOf(feedUrl);
-        feedCopy.splice(idx, 1);
-        this.updateFeeds(feedCopy);
-    }
-
-    private updateFeeds(newFeeds) {
-        this.isUpdating = true;
-        return this.api.updateIntegrationState(this.roomId, this.integration.type, this.integration.integrationType, this.scalarToken, {
-            feeds: newFeeds
-        }).then(response => {
-            this.integration.feeds = response.feeds;
-            this.integration.immutableFeeds = response.immutableFeeds;
-            this.isUpdating = false;
-            this.toaster.pop("success", "Feeds updated");
-        }).catch(err => {
-            this.toaster.pop("error", err.json().error);
-            console.error(err);
-            this.isUpdating = false;
-        });
-    }
-}
diff --git a/web/app/configs-old/travisci/travisci-config.component.html b/web/app/configs-old/travisci/travisci-config.component.html
deleted file mode 100644
index 15dbe7a..0000000
--- a/web/app/configs-old/travisci/travisci-config.component.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure Travis CI hooks</h4>
-    </div>
-    <div class="config-content">
-        <form (submit)="addRepository()" novalidate name="addRepoForm">
-            <div class="row">
-                <div class="col-md-12" style="margin-bottom: 12px;">
-                    <h6>.travis.yml configuration</h6>
-                    The following will need to be added to your .travis.yml file:
-                    <pre class="yaml">{{ travisYaml }}</pre>
-                </div>
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <h6>Your Travis CI hooks</h6>
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="owner/repo-name"
-                               [(ngModel)]="repoKey" name="repoKey"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Repository
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable" *ngFor="let repo of integration.repoTemplates trackById">
-                    {{ repo.repoKey }}
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editTemplate(repo.repoKey)"
-                            style="margin-top: -5px;" [disabled]="isUpdating" *ngIf="!isTemplateToggled(repo.repoKey)">
-                        <i class="fa fa-pencil"></i> Edit
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeRepository(repo.repoKey)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Repository
-                    </button>
-                    <div *ngIf="isTemplateToggled(repo.repoKey)">
-                        <textarea [(ngModel)]="repo.newTemplate" name="template-{{repo.repoKey}}"
-                                  style="width: 100%; height: 100px; margin-top: 5px;"></textarea>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="saveTemplate(repo.repoKey)">Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleTemplate(repo.repoKey)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-                <div class="col-md-12" *ngIf="integration.immutableRepoTemplates.length > 0">
-                    <h6 class="other-items-title">Hooks from other users in the room</h6>
-                </div>
-                <div class="col-md-12 list" *ngFor="let repo of integration.immutableRepoTemplates trackById">
-                    {{ repo.repoKey }} <span class="text-muted">(added by {{ repo.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="toggleTemplate(repo.repoKey)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        {{ isTemplateToggled(repo.repoKey) ? "Hide" : "Show" }} Template
-                    </button>
-                    <pre *ngIf="isTemplateToggled(repo.repoKey)">{{ repo.template }}</pre>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/travisci/travisci-config.component.scss b/web/app/configs-old/travisci/travisci-config.component.scss
deleted file mode 100644
index 0430df4..0000000
--- a/web/app/configs-old/travisci/travisci-config.component.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.list {
-  margin-top: 5px;
-}
-
-.removable {
-  margin-top: 3px;
-}
-
-.other-items-title {
-  margin-top: 25px;
-  margin-bottom: 0;
-}
-
-.yaml {
-  border: 1px solid #ccc;
-  background: #eee;
-  padding: 5px;
-}
\ No newline at end of file
diff --git a/web/app/configs-old/travisci/travisci-config.component.ts b/web/app/configs-old/travisci/travisci-config.component.ts
deleted file mode 100644
index 58cce40..0000000
--- a/web/app/configs-old/travisci/travisci-config.component.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Component } from "@angular/core";
-import { TravisCiIntegration } from "../../shared/models/legacyintegration";
-import { ModalComponent, DialogRef } from "ngx-modialog";
-import { ConfigModalContext } from "../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { ApiService } from "../../shared/services/legacy/api.service";
-
-@Component({
-    selector: "my-travisci-config",
-    templateUrl: "./travisci-config.component.html",
-    styleUrls: ["./travisci-config.component.scss", "./../config.component.scss"],
-})
-export class TravisCiConfigComponent implements ModalComponent<ConfigModalContext> {
-
-    public integration: TravisCiIntegration;
-
-    public isUpdating = false;
-    public repoKey = "";
-    public repoTemplate = "";
-    public travisYaml = "";
-
-    private roomId: string;
-    private scalarToken: string;
-    private knownRepos: string[] = [];
-    private visibleTemplates = [];
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                private toaster: ToasterService,
-                private api: ApiService) {
-        this.integration = <TravisCiIntegration>dialog.context.integration;
-        this.roomId = dialog.context.roomId;
-        this.scalarToken = dialog.context.scalarToken;
-
-        this.travisYaml = "notifications:\n    webhooks:\n        urls:\n        - " + this.integration.webhookUrl + "\n    on_success: change # always | never | change\n    on_failure: always\n    on_start: never";
-
-        this.calculateKnownRepos();
-        this.reset();
-    }
-
-    private calculateKnownRepos() {
-        for (let repo of this.integration.repoTemplates)
-            this.knownRepos.push(repo.repoKey);
-        for (let immutableRepo of this.integration.immutableRepoTemplates)
-            this.knownRepos.push(immutableRepo.repoKey);
-    }
-
-    public toggleTemplate(repoKey: string) {
-        let idx = this.visibleTemplates.indexOf(repoKey);
-        if (idx === -1) this.visibleTemplates.push(repoKey);
-        else this.visibleTemplates.splice(idx, 1);
-    }
-
-    public isTemplateToggled(repoKey: string) {
-        return this.visibleTemplates.indexOf(repoKey) !== -1;
-    }
-
-    public editTemplate(repoKey: string) {
-        this.toggleTemplate(repoKey);
-        let repoConfig = this.integration.repoTemplates.find(r => r.repoKey === repoKey);
-        repoConfig.newTemplate = repoConfig.template;
-    }
-
-    public saveTemplate(repoKey: string) {
-        let repoConfig = this.integration.repoTemplates.find(r => r.repoKey === repoKey);
-        repoConfig.template = repoConfig.newTemplate;
-        this.updateTemplates().then(() => this.toggleTemplate(repoKey));
-    }
-
-    public addRepository() {
-        if (!this.repoKey || this.repoKey.trim().length === 0) {
-            this.toaster.pop("warning", "Please enter a repository");
-            return;
-        }
-        if (this.knownRepos.indexOf(this.repoKey) !== -1) {
-            this.toaster.pop("error", "Repository " + this.repoKey + " is already being tracked");
-            return;
-        }
-
-        this.integration.repoTemplates.push({repoKey: this.repoKey, template: this.repoTemplate, newTemplate: ""});
-        this.updateTemplates().then(() => this.reset());
-    }
-
-    private reset() {
-        this.repoKey = "";
-        this.repoTemplate = "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}\n    Change view : %{compare_url}\n    Build details : %{build_url}\n";
-    }
-
-    public removeRepository(repoKey: string) {
-        for (let i = 0; i < this.integration.repoTemplates.length; i++) {
-            if (this.integration.repoTemplates[i].repoKey === repoKey) {
-                this.integration.repoTemplates.splice(i, 1);
-                this.updateTemplates().then(() => this.reset());
-                return;
-            }
-        }
-
-        this.toaster.pop("error", "Could not find target repository");
-    }
-
-    public updateTemplates() {
-        this.isUpdating = true;
-        return this.api.updateIntegrationState(this.roomId, this.integration.type, this.integration.integrationType, this.scalarToken, {
-            repoTemplates: this.integration.repoTemplates
-        }).then(response => {
-            this.integration.repoTemplates = response.repoTemplates;
-            this.integration.immutableRepoTemplates = response.immutableRepoTemplates;
-            this.calculateKnownRepos();
-            this.isUpdating = false;
-            this.toaster.pop("success", "Repositories updated");
-        }).catch(err => {
-            this.toaster.pop("error", err.json().error);
-            console.error(err);
-            this.isUpdating = false;
-        });
-    }
-}
diff --git a/web/app/configs-old/widget/custom_widget/custom_widget-config.component.html b/web/app/configs-old/widget/custom_widget/custom_widget-config.component.html
deleted file mode 100644
index a0fd44f..0000000
--- a/web/app/configs-old/widget/custom_widget/custom_widget-config.component.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure custom widgets</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="addWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="Custom widget URL"
-                               [(ngModel)]="newWidget.dimension.newUrl" name="newWidgetUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Widget
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.name || widget.url }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Widget
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label>
-                            Widget Name
-                            <input type="text" class="form-control"
-                                   placeholder="Custom Widget"
-                                   [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <label>
-                            Widget URL
-                            <input type="text" class="form-control"
-                                   placeholder="Custom widget URL"
-                                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="saveWidget(widget)">Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/widget/custom_widget/custom_widget-config.component.scss b/web/app/configs-old/widget/custom_widget/custom_widget-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/custom_widget/custom_widget-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/custom_widget/custom_widget-config.component.ts b/web/app/configs-old/widget/custom_widget/custom_widget-config.component.ts
deleted file mode 100644
index 9cf559a..0000000
--- a/web/app/configs-old/widget/custom_widget/custom_widget-config.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { WIDGET_CUSTOM } from "../../../shared/models/widget";
-
-@Component({
-    selector: "my-customwidget-config",
-    templateUrl: "custom_widget-config.component.html",
-    styleUrls: ["custom_widget-config.component.scss", "./../../config.component.scss"],
-})
-export class CustomWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_CUSTOM,
-            "Custom Widget",
-            "generic" // wrapper
-        );
-    }
-}
diff --git a/web/app/configs-old/widget/etherpad/etherpad-config.component.html b/web/app/configs-old/widget/etherpad/etherpad-config.component.html
deleted file mode 100644
index fde4c5a..0000000
--- a/web/app/configs-old/widget/etherpad/etherpad-config.component.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure Etherpad widgets</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="validateAndAddWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="Etherpad name or URL"
-                               [(ngModel)]="newWidget.dimension.newUrl" name="newWidgetUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Widget
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.name || widget.url }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Widget
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label>
-                            Pad Name
-                            <input type="text" class="form-control"
-                                   placeholder="Etherpad Widget"
-                                   [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <label>
-                            Pad URL
-                            <input type="text" class="form-control"
-                                   placeholder="https://your-pad-url"
-                                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="saveWidget(widget)">
-                            Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/web/app/configs-old/widget/etherpad/etherpad-config.component.scss b/web/app/configs-old/widget/etherpad/etherpad-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/etherpad/etherpad-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/etherpad/etherpad-config.component.ts b/web/app/configs-old/widget/etherpad/etherpad-config.component.ts
deleted file mode 100644
index ff84f58..0000000
--- a/web/app/configs-old/widget/etherpad/etherpad-config.component.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { WIDGET_ETHERPAD } from "../../../shared/models/widget";
-import { EtherpadWidgetIntegration } from "../../../shared/models/legacyintegration";
-
-@Component({
-    selector: "my-etherpadwidget-config",
-    templateUrl: "etherpad-config.component.html",
-    styleUrls: ["etherpad-config.component.scss", "./../../config.component.scss"],
-})
-export class EtherpadWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    private widgetOpts: EtherpadWidgetIntegration;
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_ETHERPAD,
-            "Etherpad Widget",
-            "generic", // wrapper
-            "etherpad" // scalar wrapper
-        );
-
-        this.widgetOpts = <EtherpadWidgetIntegration>dialog.context.integration;
-    }
-
-    public validateAndAddWidget() {
-        if (this.newWidget.dimension.newUrl.startsWith("http://") || this.newWidget.dimension.newUrl.startsWith("https://")) {
-            this.newWidget.dimension.newName = "Etherpad";
-        } else {
-            this.newWidget.dimension.newName = this.newWidget.dimension.newUrl;
-            this.newWidget.dimension.newUrl = this.generatePadUrl(this.newWidget.dimension.newName);
-        }
-
-        this.addWidget();
-    }
-
-    private generatePadUrl(forName: string): string {
-        let template = "https://demo.riot.im/etherpad/p/$roomId_$padName";
-        if (this.widgetOpts && this.widgetOpts.defaultUrl) {
-            template = this.widgetOpts.defaultUrl;
-        }
-
-        template = template.replace("$roomId", encodeURIComponent(this.roomId));
-        template = template.replace("$padName", encodeURIComponent(forName));
-
-        return template;
-    }
-}
diff --git a/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.html b/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.html
deleted file mode 100644
index 442ff8d..0000000
--- a/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure Google Calendars</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="validateAndAddWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="Calendar ID, example: en.uk#holiday@group.v.calendar.google.com"
-                               [(ngModel)]="newWidget.dimension.newData.src" name="newWidgetUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Widget
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.name || widget.url }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Widget
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label class="col-md-8" style="padding-left: 0; margin-left: 0;">
-                            Shared Calendar ID
-                            <input type="text" class="form-control"
-                                   placeholder="en.uk#holiday@group.v.calendar.google.com"
-                                   [(ngModel)]="widget.dimension.newData.src" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="validateAndSaveWidget(widget)">
-                            Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.scss b/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.ts b/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.ts
deleted file mode 100644
index 1710075..0000000
--- a/web/app/configs-old/widget/googlecalendar/googlecalendar-config.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { EditableWidget, WIDGET_GOOGLE_CALENDAR } from "../../../shared/models/widget";
-
-@Component({
-    selector: "my-googlecalendarwidget-config",
-    templateUrl: "googlecalendar-config.component.html",
-    styleUrls: ["googlecalendar-config.component.scss", "./../../config.component.scss"],
-})
-export class GoogleCalendarWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_GOOGLE_CALENDAR,
-            "Google Calendar",
-            "", // we intentionally don't specify the wrapper so we can control the behaviour
-            "googleCalendar" // scalar wrapper
-        );
-    }
-
-    protected onWidgetsDiscovered() {
-        for (const widget of this.widgets) {
-            if (widget.data.dimSrc) {
-                // Convert legacy Dimension widgets to use src
-                widget.data.src = widget.data.dimSrc;
-            }
-        }
-    }
-
-    public validateAndAddWidget() {
-        this.setCalendarUrl(this.newWidget);
-        this.addWidget();
-    }
-
-    public validateAndSaveWidget(widget: EditableWidget) {
-        this.setCalendarUrl(widget);
-        this.saveWidget(widget);
-    }
-
-    private setCalendarUrl(widget: EditableWidget) {
-        const encodedId = encodeURIComponent(widget.dimension.newData.src);
-        widget.dimension.newUrl = window.location.origin + "/widget/gcal?calendarId=" + encodedId;
-    }
-}
diff --git a/web/app/configs-old/widget/googledocs/googledocs-config.component.html b/web/app/configs-old/widget/googledocs/googledocs-config.component.html
deleted file mode 100644
index 7ba1891..0000000
--- a/web/app/configs-old/widget/googledocs/googledocs-config.component.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure embedded Google Docs</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="addWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="Link to Google Doc"
-                               [(ngModel)]="newWidget.dimension.newUrl" name="newWidgetUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Widget
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.name || widget.url }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Widget
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label class="col-md-8" style="padding-left: 0; margin-left: 0;">
-                            Google Doc
-                            <input type="text" class="form-control"
-                                   placeholder="Link to Google Doc"
-                                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="saveWidget(widget)">
-                            Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/web/app/configs-old/widget/googledocs/googledocs-config.component.scss b/web/app/configs-old/widget/googledocs/googledocs-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/googledocs/googledocs-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/googledocs/googledocs-config.component.ts b/web/app/configs-old/widget/googledocs/googledocs-config.component.ts
deleted file mode 100644
index e9fe721..0000000
--- a/web/app/configs-old/widget/googledocs/googledocs-config.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { WIDGET_GOOGLE_DOCS } from "../../../shared/models/widget";
-
-@Component({
-    selector: "my-googledocswidget-config",
-    templateUrl: "googledocs-config.component.html",
-    styleUrls: ["googledocs-config.component.scss", "./../../config.component.scss"],
-})
-export class GoogleDocsWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_GOOGLE_DOCS,
-            "Google Docs",
-            "generic", // wrapper
-            "googleDocs" // scalar wrapper
-        );
-    }
-}
diff --git a/web/app/configs-old/widget/jitsi/jitsi-config.component.html b/web/app/configs-old/widget/jitsi/jitsi-config.component.html
deleted file mode 100644
index c81b009..0000000
--- a/web/app/configs-old/widget/jitsi/jitsi-config.component.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure Jitsi Conferences</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="validateAndAddWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <span class="input-group-addon">https://{{ newWidget.dimension.newData.domain }}/</span>
-                        <input type="text" class="form-control"
-                               placeholder="MyConferenceName"
-                               [(ngModel)]="newWidget.dimension.newData.conferenceId" name="newWidgetName"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.data.conferenceUrl }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label class="col-md-8" style="padding-left: 0; margin-left: 0;">
-                            Conference URL
-                            <input type="text" class="form-control"
-                                   placeholder="https://jitsi.riot.im/MyConference"
-                                   [(ngModel)]="widget.dimension.newData.conferenceUrl" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="validateAndSaveWidget(widget)">
-                            Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/widget/jitsi/jitsi-config.component.scss b/web/app/configs-old/widget/jitsi/jitsi-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/jitsi/jitsi-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/jitsi/jitsi-config.component.ts b/web/app/configs-old/widget/jitsi/jitsi-config.component.ts
deleted file mode 100644
index dae5091..0000000
--- a/web/app/configs-old/widget/jitsi/jitsi-config.component.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { EditableWidget, WIDGET_JITSI } from "../../../shared/models/widget";
-import { JitsiWidgetIntegration } from "../../../shared/models/legacyintegration";
-import * as gobyInit from "goby";
-import * as url from "url";
-
-const goby = gobyInit.init({
-    // Converts words to a url-safe name
-    // Ie: "hello world how-are you" becomes "HelloWorldHowAreYou"
-    decorator: parts => parts.map(p => p ? p.split('-').map(p2 => p2 ? p2[0].toUpperCase() + p2.substring(1).toLowerCase() : '').join('') : '').join(''),
-});
-
-@Component({
-    selector: "my-jitsi-config",
-    templateUrl: "jitsi-config.component.html",
-    styleUrls: ["jitsi-config.component.scss", "./../../config.component.scss"],
-})
-export class JitsiWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    public integration: JitsiWidgetIntegration;
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_JITSI,
-            "Jitsi Video Conference",
-            "" // we intentionally don't specify the wrapper so we can control the behaviour
-        );
-
-        this.integration = <JitsiWidgetIntegration>dialog.context.integration;
-    }
-
-    protected onNewWidgetPrepared() {
-        this.newWidget.dimension.newData.conferenceId = this.generateConferenceId();
-        this.newWidget.dimension.newData.domain = this.integration.jitsiDomain;
-        this.newWidget.dimension.newData.isAudioConf = false;
-    }
-
-    protected onWidgetsDiscovered() {
-        for (const widget of this.widgets) {
-            const parsedUrl = url.parse(widget.url, true);
-            const conferenceId = parsedUrl.query["conferenceId"];
-            const confId = parsedUrl.query["confId"];
-            const domain = parsedUrl.query["domain"];
-            let isAudioConf = parsedUrl.query["isAudioConf"];
-
-            // Convert isAudioConf to boolean
-            if (isAudioConf === "true") isAudioConf = true;
-            else if (isAudioConf === "false") isAudioConf = false;
-            else if (isAudioConf && isAudioConf[0] === '$') isAudioConf = widget.data[isAudioConf];
-            else isAudioConf = false; // default
-
-            if (conferenceId) {
-                // It's a legacy Dimension widget
-                widget.data.conferenceId = conferenceId;
-            } else widget.data.conferenceId = confId;
-
-            if (domain) widget.data.domain = domain;
-            else widget.data.domain = "jitsi.riot.im";
-
-            widget.data.isAudioConf = isAudioConf;
-
-            if (!widget.data.conferenceUrl) {
-                widget.data.conferenceUrl = "https://" + widget.data.domain + "/" + widget.data.conferenceId;
-            }
-        }
-    }
-
-    protected onWidgetPreparedForEdit(widget: EditableWidget) {
-        if (!widget.dimension.newData.conferenceUrl) {
-            const conferenceId = widget.dimension.newData.conferenceId;
-            const domain = widget.dimension.newData.domain;
-            widget.dimension.newData.conferenceUrl = "https://" + domain + "/" + conferenceId;
-        }
-    }
-
-    public validateAndAddWidget() {
-        if (!this.newWidget.dimension.newData.conferenceId) {
-            this.toaster.pop("warning", "Please enter a conference name");
-            return;
-        }
-
-        this.setJitsiUrl(this.newWidget);
-        this.addWidget();
-    }
-
-    public validateAndSaveWidget(widget: EditableWidget) {
-        if (!widget.dimension.newData.conferenceUrl) {
-            this.toaster.pop("warning", "Please enter a conference URL");
-            return;
-        }
-
-        const jitsiUrl = url.parse(widget.dimension.newData.conferenceUrl);
-        widget.dimension.newData.domain = jitsiUrl.host;
-        widget.dimension.newData.conferenceId = jitsiUrl.path.substring(1);
-        widget.dimension.newData.isAudioConf = false;
-
-        this.setJitsiUrl(widget);
-        this.saveWidget(widget);
-    }
-
-    private setJitsiUrl(widget: EditableWidget) {
-        const conferenceId = widget.dimension.newData.conferenceId;
-        const domain = widget.dimension.newData.domain;
-        const isAudioConf = widget.dimension.newData.isAudioConf;
-
-        let widgetQueryString = url.format({
-            query: {
-                // TODO: Use templating when mobile riot supports it
-                "confId": conferenceId, // named confId for compatibility with mobile clients
-                "domain": domain,
-                "isAudioConf": isAudioConf,
-                "displayName": "$matrix_display_name",
-                "avatarUrl": "$matrix_avatar_url",
-                "userId": "$matrix_user_id",
-            },
-        });
-        widgetQueryString = this.decodeParams(widgetQueryString, Object.keys(widget.dimension.newData).map(k => "$" + k));
-
-        widget.dimension.newUrl = window.location.origin + "/widgets/jitsi" + widgetQueryString;
-        widget.dimension.newData.conferenceUrl = "https://" + domain + "/" + conferenceId;
-    }
-
-    private generateConferenceId() {
-        return goby.generate(["adj", "pre", "suf"]);
-    }
-}
diff --git a/web/app/configs-old/widget/twitch/twitch-config.component.html b/web/app/configs-old/widget/twitch/twitch-config.component.html
deleted file mode 100644
index f42b7ef..0000000
--- a/web/app/configs-old/widget/twitch/twitch-config.component.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure Twitch Livestream widgets</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="validateAndAddWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="Twitch Channel Name"
-                               [(ngModel)]="newWidget.dimension.newData.channelName" name="newWidgetUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Widget
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.name || widget.url }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Widget
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label>
-                            Widget Name
-                            <input type="text" class="form-control"
-                                   placeholder="Twitch Widget"
-                                   [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <label>
-                            Channel Name
-                            <input type="text" class="form-control"
-                                   placeholder="Twitch Channel Name"
-                                   [(ngModel)]="widget.dimension.newData.channelName" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="validateAndSaveWidget(widget)">
-                            Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/web/app/configs-old/widget/twitch/twitch-config.component.scss b/web/app/configs-old/widget/twitch/twitch-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/twitch/twitch-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/twitch/twitch-config.component.ts b/web/app/configs-old/widget/twitch/twitch-config.component.ts
deleted file mode 100644
index 2e8e334..0000000
--- a/web/app/configs-old/widget/twitch/twitch-config.component.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { EditableWidget, WIDGET_TWITCH } from "../../../shared/models/widget";
-
-@Component({
-    selector: "my-twitchwidget-config",
-    templateUrl: "twitch-config.component.html",
-    styleUrls: ["twitch-config.component.scss", "./../../config.component.scss"],
-})
-export class TwitchWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_TWITCH,
-            "Twitch Widget",
-            "video", // wrapper
-            "twitch" // scalar wrapper
-        );
-    }
-
-    protected onNewWidgetPrepared() {
-        this.newWidget.dimension.newData.channelName = "";
-    }
-
-    protected onWidgetsDiscovered() {
-        for (const widget of this.widgets) {
-            // Convert dimChannelName to channelName
-            if (!widget.data.channelName) {
-                widget.data.channelName = widget.data.dimChannelName;
-            }
-        }
-    }
-
-    public validateAndAddWidget() {
-        if (!this.newWidget.dimension.newData.channelName) {
-            this.toaster.pop("warning", "Please enter a Twitch Livestream channel name");
-            return;
-        }
-
-        this.setTwitchUrl(this.newWidget);
-        this.addWidget();
-    }
-
-    public validateAndSaveWidget(widget: EditableWidget) {
-        if (!widget.dimension.newData.channelName) {
-            this.toaster.pop("warning", "Please enter a Twitch Livestream channel name");
-            return;
-        }
-
-        this.setTwitchUrl(widget);
-        this.saveWidget(widget);
-    }
-
-    private setTwitchUrl(widget: EditableWidget) {
-        // TODO: This should use templating when mobile riot supports it
-        widget.dimension.newUrl = "https://player.twitch.tv/?channel=" + widget.dimension.newData.channelName;
-    }
-
-}
diff --git a/web/app/configs-old/widget/widget.component.ts b/web/app/configs-old/widget/widget.component.ts
deleted file mode 100644
index 6816fda..0000000
--- a/web/app/configs-old/widget/widget.component.ts
+++ /dev/null
@@ -1,395 +0,0 @@
-import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
-import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
-import { ToasterService } from "angular2-toaster";
-import { LegacyIntegration } from "../../shared/models/legacyintegration";
-
-const SCALAR_WIDGET_LINKS = [
-    "https://scalar-staging.riot.im/scalar/api/widgets/__TYPE__.html?url=",
-    "https://scalar-staging.vector.im/scalar/api/widgets/__TYPE__.html?url=",
-    "https://scalar-develop.riot.im/scalar/api/widgets/__TYPE__.html?url=",
-    "https://demo.riot.im/scalar/api/widgets/__TYPE__.html?url=",
-];
-
-export class WidgetComponent {
-
-    public isLoading = true;
-    public isUpdating = false;
-    public widgets: EditableWidget[];
-    public newWidget: EditableWidget;
-
-    private toggledWidgetIds: string[] = [];
-    private scalarWrapperUrls: string[] = [];
-    private wrapperUrl = "";
-
-    constructor(window: Window,
-                protected toaster: ToasterService,
-                protected scalarApi: ScalarClientApiService,
-                public roomId: string,
-                public integration: LegacyIntegration,
-                editWidgetId: string,
-                private widgetIds: string[],
-                private defaultName: string,
-                private wrapperId = "generic",
-                private scalarWrapperId = null) {
-        this.isLoading = true;
-        this.isUpdating = false;
-
-        if (wrapperId) {
-            this.wrapperUrl = window.location.origin + "/widgets/" + wrapperId + "?url=";
-
-            if (!scalarWrapperId) scalarWrapperId = wrapperId;
-            for (let widgetLink of SCALAR_WIDGET_LINKS) {
-                this.scalarWrapperUrls.push(widgetLink.replace("__TYPE__", scalarWrapperId));
-            }
-        }
-
-        this.prepareNewWidget();
-        this.getWidgetsOfType(widgetIds).then(widgets => {
-            this.widgets = widgets;
-            for (let widget of this.widgets) {
-                this.unpackWidget(widget);
-            }
-
-            this.onWidgetsDiscovered();
-            this.isLoading = false;
-            this.isUpdating = false;
-
-            // See if we should request editing a particular widget
-            if (editWidgetId) {
-                for (let widget of this.widgets) {
-                    if (widget.id === editWidgetId) {
-                        console.log("Requesting edit for " + widget.id);
-                        this.editWidget(widget);
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Populates the Dimension-specific fields of the widget, overwriting any values that
-     * were there previously.
-     * @param {EditableWidget} widget The widget to unpack.
-     */
-    private unpackWidget(widget: EditableWidget) {
-        widget.dimension = {
-            newUrl: this.unwrapUrl(widget.url),
-            newName: widget.name,
-            newTitle: widget.data ? widget.data.title : null,
-            newData: JSON.parse(JSON.stringify(widget.data || "{}")),
-        };
-    }
-
-    /**
-     * Packs a widget, converting the Dimension-specific parameters into a widget. This will
-     * overwrite any values in the widget which need to be committed to from the Dimension
-     * fields.
-     * @param {EditableWidget} widget The widget to pack.
-     */
-    private packWidget(widget: EditableWidget) {
-        // The widget already has an ID and type, we just need to fill in the bits
-        widget.name = widget.dimension.newName || this.defaultName;
-        widget.data = widget.dimension.newData || {};
-        widget.url = this.wrapUrl(widget.dimension.newUrl, Object.keys(widget.data).map(k => "$" + k));
-        widget.type = this.widgetIds[0]; // always set the type to be the latest type
-
-        // Populate our stuff
-        widget.data["dimension:app:metadata"] = {
-            inRoomId: this.roomId,
-            wrapperUrlBase: this.wrapperUrl,
-            wrapperId: this.wrapperId,
-            scalarWrapperId: this.scalarWrapperId,
-            integration: {
-                type: this.integration.type,
-                integrationType: this.integration.integrationType,
-            },
-            lastUpdatedTs: new Date().getTime(),
-        };
-
-        // Set the title to an appropriate value. Empty strings are valid titles, but other falsey
-        // values should be considered as "no title".
-        if (widget.dimension.newTitle || widget.dimension.newTitle === "")
-            widget.data["title"] = widget.dimension.newTitle;
-        else widget.data["title"] = undefined;
-    }
-
-    /**
-     * Builds a new widget and assigns it to the newWidget property. This also expands the
-     * Dimension-specific fields for the widget with reasonable defaults.
-     */
-    protected prepareNewWidget() {
-        this.newWidget = <EditableWidget>{
-            id: "dimension-" + this.widgetIds[0] + "-" + (new Date().getTime()),
-            type: this.widgetIds[0],
-            name: this.defaultName,
-            url: window.location.origin,
-            //ownerId: this.userId, // we don't have a user id
-            dimension: {
-                newUrl: "",
-                newName: "",
-                newTitle: null, // by default we don't offer a title (empty strings are valid titles)
-                newData: {},
-            },
-        };
-        this.onNewWidgetPrepared();
-    }
-
-    /**
-     * Gets widgets from the Scalar API. The widgets returned from here are not unpacked and
-     * may not have the Dimension-specific fields set.
-     * @param {string[]} types The widget types to look for
-     * @return {Promise<EditableWidget[]>} The widgets discovered
-     */
-    private getWidgetsOfType(types: string[]): Promise<EditableWidget[]> {
-        return this.scalarApi.getWidgets(this.roomId)
-            .then(resp => convertScalarWidgetsToDtos(resp))
-            .then(widgets => widgets.filter(w => types.indexOf(w.type) !== -1));
-    }
-
-    /**
-     * Gets the actual URL from known wrappers. If the URL is found to be not wrapped, or no
-     * wrappers are applicable, then the given URL is returned.
-     * @param {string} url The URL to unwrap
-     * @return {string} The unwrapped URL
-     */
-    private unwrapUrl(url: string): string {
-        console.log(this.scalarWrapperUrls);
-        if (!this.wrapperUrl) return url;
-
-        const urls = [this.wrapperUrl].concat(this.scalarWrapperUrls);
-        for (let scalarUrl of urls) {
-            if (url.startsWith(scalarUrl)) {
-                return decodeURIComponent(url.substring(scalarUrl.length));
-            }
-        }
-
-        return url;
-    }
-
-    /**
-     * Wraps the URL with an appropriate wrapper. If no wrapper is defined for this component
-     * then the given URL is returned.
-     * @param {string} url The URL to wrap
-     * @param {string[]} customVars The values in the URL which should not be encoded
-     * @return {string} The wrapped URL
-     */
-    private wrapUrl(url: string, customVars: string[]): string {
-        if (!this.wrapperUrl) return url;
-
-        let encodedURL = this.wrapperUrl + encodeURIComponent(url);
-        encodedURL = this.decodeParams(encodedURL, customVars);
-
-        return encodedURL;
-    }
-
-    /**
-     * Decodes the given URL to make the parameters safe for interpretation by clients. The variables
-     * specified in the widget spec will be decoded automatically.
-     * @param {string} encodedURL The encoded URL
-     * @param {string[]} customVars The custom variables to decode
-     * @returns {string} The URL with variables decoded accordingly
-     */
-    protected decodeParams(encodedURL: string, customVars: string[]): string {
-        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_user_id"), "$matrix_user_id");
-        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_room_id"), "$matrix_room_id");
-        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_display_name"), "$matrix_display_name");
-        encodedURL = encodedURL.replace(encodeURIComponent("$matrix_avatar_url"), "$matrix_avatar_url");
-        for (const key of customVars) {
-            encodedURL = encodedURL.replace(encodeURIComponent(key), key);
-        }
-
-        return encodedURL;
-    }
-
-    /**
-     * Adds the widget stored in newWidget to the room.
-     * @returns {Promise<*>} Resolves when the widget has been added and newWidget is populated
-     * with a new widget.
-     */
-    public addWidget(): Promise<any> {
-        this.packWidget(this.newWidget);
-
-        this.isUpdating = true;
-        this.onWidgetBeforeAdd();
-        return this.scalarApi.setWidget(this.roomId, this.newWidget)
-            .then(() => this.widgets.push(this.newWidget))
-            .then(() => {
-                this.isUpdating = false;
-                this.onWidgetAfterAdd();
-                this.prepareNewWidget();
-                this.toaster.pop("success", "Widget added!");
-            })
-            .catch(err => {
-                this.isUpdating = false;
-                console.error(err);
-                this.toaster.pop("error", err.json().error);
-            });
-    }
-
-    /**
-     * Saves a widget, persisting the changes to the room.
-     * @param {EditableWidget} widget The widget to save.
-     * @returns {Promise<any>} Resolves when the widget has been updated in the room.
-     */
-    public saveWidget(widget: EditableWidget): Promise<any> {
-        if (!widget.dimension.newUrl || widget.dimension.newUrl.trim().length === 0) {
-            this.toaster.pop("warning", "Please enter a URL for the widget");
-            return;
-        }
-
-        this.packWidget(widget);
-
-        this.isUpdating = true;
-        this.onWidgetBeforeEdit(widget);
-        return this.scalarApi.setWidget(this.roomId, widget)
-            .then(() => this.toggleWidget(widget))
-            .then(() => {
-                this.isUpdating = false;
-                this.onWidgetAfterEdit(widget);
-                this.toaster.pop("success", "Widget updated!");
-            })
-            .catch(err => {
-                this.isUpdating = false;
-                console.error(err);
-                this.toaster.pop("error", err.json().error);
-            });
-    }
-
-    /**
-     * Removes a widget from the room
-     * @param {EditableWidget} widget The widget to remove
-     * @returns {Promise<*>} Resolves when the widget has been removed.
-     */
-    public removeWidget(widget: EditableWidget): Promise<any> {
-        this.isUpdating = true;
-        this.onWidgetBeforeDelete(widget);
-        return this.scalarApi.deleteWidget(this.roomId, widget)
-            .then(() => this.widgets.splice(this.widgets.indexOf(widget), 1))
-            .then(() => {
-                this.isUpdating = false;
-                this.onWidgetAfterDelete(widget);
-                this.toaster.pop("success", "Widget deleted!");
-            })
-            .catch(err => {
-                this.isUpdating = false;
-                console.error(err);
-                this.toaster.pop("error", err.json().error);
-            });
-    }
-
-    /**
-     * Puts a widget in the edit state.
-     * @param {EditableWidget} widget
-     */
-    public editWidget(widget: EditableWidget) {
-        this.toggleWidget(widget, "edit");
-    }
-
-    /**
-     * Toggles a widget between the "edit" and "canceled" state. If a targetState is
-     * defined, the widget is forced into that state.
-     * @param {EditableWidget} widget The widget to set the state of.
-     * @param {"edit"|"cancel"|null} targetState The target state, optional
-     */
-    public toggleWidget(widget: EditableWidget, targetState: "edit" | "cancel" | null = null) {
-        let idx = this.toggledWidgetIds.indexOf(widget.id);
-        if (targetState === null) targetState = idx === -1 ? "edit" : "cancel";
-
-        if (targetState === "edit") {
-            this.unpackWidget(widget);
-            this.onWidgetPreparedForEdit(widget);
-
-            if (idx === -1) this.toggledWidgetIds.push(widget.id);
-        }
-        else this.toggledWidgetIds.splice(idx, 1);
-    }
-
-    /**
-     * Determines if a widget is in the edit state
-     * @param {EditableWidget} widget The widget to check
-     * @returns {boolean} true if the widget is in the edit state
-     */
-    public isWidgetToggled(widget: EditableWidget) {
-        return this.toggledWidgetIds.indexOf(widget.id) !== -1;
-    }
-
-    // Component hooks below here
-    // ------------------------------------------------------------------
-
-    /**
-     * Called when a new widget has been created in the newWidget field
-     */
-    protected onNewWidgetPrepared(): void {
-        // Component hook
-    }
-
-    /**
-     * Called after all the widgets have been discovered and unpacked for the room.
-     */
-    protected onWidgetsDiscovered(): void {
-        // Component hook
-    }
-
-    /**
-     * Called before the widget is added to the room, but after the Dimension-specific
-     * settings have been copied over to the primary fields.
-     */
-    protected onWidgetBeforeAdd(): void {
-        // Component hook
-    }
-
-    /**
-     * Called after the widget has been added to the room, but before the newWidget field
-     * has been set to a new widget.
-     */
-    protected onWidgetAfterAdd(): void {
-        // Component hook
-    }
-
-    /**
-     * Called when the given widget has been asked to be prepared for editing. At this point
-     * the widget is not being persisted to the room, it is just updating the EditingWidget's
-     * properties for the user's ability to edit it.
-     * @param {EditableWidget} _widget The widget that has been prepared for editing
-     */
-    protected onWidgetPreparedForEdit(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called before the given widget has been updated in the room, but after the
-     * Dimension-specific settings have been copied over to the primary fields.
-     * This is not called for widgets being deleted.
-     * @param {EditableWidget} _widget The widget about to be edited
-     */
-    protected onWidgetBeforeEdit(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called after a given widget has been updated in the room. This is not called for
-     * widgets being deleted.
-     * @param {EditableWidget} _widget The widget that has been updated.
-     */
-    protected onWidgetAfterEdit(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called before the given widget has been removed from the room. No changes to the
-     * widget have been made at this point.
-     * @param {EditableWidget} _widget The widget about to be deleted.
-     */
-    protected onWidgetBeforeDelete(_widget: EditableWidget): void {
-        // Component hook
-    }
-
-    /**
-     * Called after a given widget has been deleted from the room. The widget will be in
-     * the deleted state and will no longer be tracked anywhere on the component.
-     * @param {EditableWidget} _widget The widget that has been deleted.
-     */
-    protected onWidgetAfterDelete(_widget: EditableWidget): void {
-        // Component hook
-    }
-}
diff --git a/web/app/configs-old/widget/youtube/youtube-config.component.html b/web/app/configs-old/widget/youtube/youtube-config.component.html
deleted file mode 100644
index 60deb3d..0000000
--- a/web/app/configs-old/widget/youtube/youtube-config.component.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="config-wrapper">
-    <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
-    <div class="config-header">
-        <img [src]="integration.avatar">
-        <h4>Configure video widgets</h4>
-    </div>
-    <div class="config-content" *ngIf="isLoading">
-        <div class="row">
-            <div class="col-md-12">
-                <p><i class="fa fa-circle-notch fa-spin"></i> Loading widgets...</p>
-            </div>
-        </div>
-    </div>
-    <div class="config-content" *ngIf="!isLoading">
-        <form (submit)="validateAndAddWidget()" novalidate name="addForm">
-            <div class="row">
-                <div class="col-md-8" style="margin-bottom: 12px;">
-                    <div class="input-group input-group-sm">
-                        <input type="text" class="form-control"
-                               placeholder="YouTube, Vimeo, or DailyMotion video URL"
-                               [(ngModel)]="newWidget.dimension.newUrl" name="newWidgetUrl"
-                               [disabled]="isUpdating">
-                        <span class="input-group-btn">
-                            <button type="submit" class="btn btn-success" [disabled]="isUpdating">
-                                <i class="fa fa-plus-circle"></i> Add Widget
-                            </button>
-                        </span>
-                    </div>
-                </div>
-                <div class="col-md-12 removable widget-item" *ngFor="let widget of widgets trackById">
-                    {{ widget.name || widget.url }} <span class="text-muted" *ngIf="widget.ownerId">(added by {{ widget.ownerId }})</span>
-                    <button type="button" class="btn btn-outline-info btn-sm" (click)="editWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-pencil"></i> Edit Widget
-                    </button>
-                    <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeWidget(widget)"
-                            style="margin-top: -5px;" [disabled]="isUpdating">
-                        <i class="fa fa-times"></i> Remove Widget
-                    </button>
-                    <div *ngIf="isWidgetToggled(widget)">
-                        <label>
-                            Widget Name
-                            <input type="text" class="form-control"
-                                   placeholder="YouTube Widget"
-                                   [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <label>
-                            Video URL
-                            <input type="text" class="form-control"
-                                   placeholder="YouTube, Vimeo, or DailyMotion video URL"
-                                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
-                                   [disabled]="isUpdating">
-                        </label>
-                        <button type="button" class="btn btn-primary btn-sm" (click)="validateAndSaveWidget(widget)">
-                            Save
-                        </button>
-                        <button type="button" class="btn btn-outline btn-sm" (click)="toggleWidget(widget)">
-                            Cancel
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/web/app/configs-old/widget/youtube/youtube-config.component.scss b/web/app/configs-old/widget/youtube/youtube-config.component.scss
deleted file mode 100644
index 92dce18..0000000
--- a/web/app/configs-old/widget/youtube/youtube-config.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.widget-item {
-  margin-top: 3px;
-}
diff --git a/web/app/configs-old/widget/youtube/youtube-config.component.ts b/web/app/configs-old/widget/youtube/youtube-config.component.ts
deleted file mode 100644
index 0962728..0000000
--- a/web/app/configs-old/widget/youtube/youtube-config.component.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Component } from "@angular/core";
-import { DialogRef, ModalComponent } from "ngx-modialog";
-import { WidgetComponent } from "../widget.component";
-import { ScalarClientApiService } from "../../../shared/services/scalar-client-api.service";
-import { ConfigModalContext } from "../../../integration/integration.component";
-import { ToasterService } from "angular2-toaster";
-import { EditableWidget, WIDGET_YOUTUBE } from "../../../shared/models/widget";
-import * as embed from "embed-video";
-import * as $ from "jquery";
-
-@Component({
-    selector: "my-youtubewidget-config",
-    templateUrl: "youtube-config.component.html",
-    styleUrls: ["youtube-config.component.scss", "./../../config.component.scss"],
-})
-export class YoutubeWidgetConfigComponent extends WidgetComponent implements ModalComponent<ConfigModalContext> {
-
-    constructor(public dialog: DialogRef<ConfigModalContext>,
-                toaster: ToasterService,
-                scalarService: ScalarClientApiService,
-                window: Window) {
-        super(
-            window,
-            toaster,
-            scalarService,
-            dialog.context.roomId,
-            dialog.context.integration,
-            dialog.context.integrationId,
-            WIDGET_YOUTUBE,
-            "Youtube Widget",
-            "video", // wrapper
-            "youtube" // scalar wrapper
-        );
-    }
-
-    public validateAndAddWidget() {
-        const url = this.getRealVideoUrl(this.newWidget.dimension.newUrl);
-        if (!url) {
-            this.toaster.pop("warning", "Please enter a YouTube, Vimeo, or DailyMotion video URL");
-            return;
-        }
-
-        this.newWidget.dimension.newUrl = url;
-        this.addWidget();
-    }
-
-    public validateAndSaveWidget(widget: EditableWidget) {
-        const url = this.getRealVideoUrl(widget.dimension.newUrl);
-        if (!url) {
-            this.toaster.pop("warning", "Please enter a YouTube, Vimeo, or DailyMotion video URL");
-            return;
-        }
-
-        widget.dimension.newUrl = url;
-        this.saveWidget(widget);
-    }
-
-    private getRealVideoUrl(url) {
-        const embedCode = embed(url);
-        if (!embedCode) {
-            return null;
-        }
-
-        // HACK: Grab the video URL from the iframe embed code
-        url = $(embedCode).attr("src");
-        if (url.startsWith("//")) url = "https:" + url;
-
-        return url;
-    }
-}
diff --git a/web/app/integration-bag/integration-bag.component.ts b/web/app/integration-bag/integration-bag.component.ts
index 7e25b29..046e161 100644
--- a/web/app/integration-bag/integration-bag.component.ts
+++ b/web/app/integration-bag/integration-bag.component.ts
@@ -1,5 +1,4 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { LegacyIntegration } from "../shared/models/legacyintegration";
 import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 import { Integration } from "../shared/models/integration";
 
@@ -10,7 +9,7 @@ import { Integration } from "../shared/models/integration";
 })
 export class IntegrationBagComponent {
 
-    @Input() integrations: LegacyIntegration[];
+    @Input() integrations: Integration[];
     @Output() integrationClicked: EventEmitter<Integration> = new EventEmitter<Integration>();
 
     constructor(private sanitizer: DomSanitizer) {
diff --git a/web/app/integration/integration.component.html b/web/app/integration/integration.component.html
deleted file mode 100644
index 19bdddb..0000000
--- a/web/app/integration/integration.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="integration">
-    <img class="integration-avatar" [src]="getSafeUrl(integration.avatar)"/>
-    <div class="integration-name">{{ integration.name }}</div>
-    <div class="integration-description">{{ integration.about }}</div>
-</div>
\ No newline at end of file
diff --git a/web/app/integration/integration.component.scss b/web/app/integration/integration.component.scss
deleted file mode 100644
index b7b4af4..0000000
--- a/web/app/integration/integration.component.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.integration {
-  border: 1px solid #eee;
-  border-radius: 3px;
-  margin-left: 7px;
-  margin-right: 7px;
-  padding: 5px;
-  width: calc(325px - 14px);
-  position: relative;
-  flex: 1;
-}
-
-.integration .integration-avatar {
-  width: 50px;
-  height: 50px;
-  float: left;
-}
-
-.integration .integration-name {
-  display: inline-block;
-  font-size: 1.1em;
-  font-weight: 100;
-  padding-left: 5px;
-}
-
-.integration .integration-description {
-  display: block;
-  font-size: 0.8em;
-  margin-left: 55px;
-  color: #999;
-}
diff --git a/web/app/integration/integration.component.ts b/web/app/integration/integration.component.ts
deleted file mode 100644
index 82fa88c..0000000
--- a/web/app/integration/integration.component.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { LegacyIntegration } from "../shared/models/legacyintegration";
-import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
-import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
-
-export class ConfigModalContext extends BSModalContext {
-    public integration: LegacyIntegration;
-    public roomId: string;
-    public userId: string;
-    public scalarToken: string;
-    public integrationId: string;
-}
-
-@Component({
-    selector: "my-integration",
-    templateUrl: "./integration.component.html",
-    styleUrls: ["./integration.component.scss"],
-})
-export class IntegrationComponent {
-
-    @Input() integration: LegacyIntegration;
-    @Output() selected: EventEmitter<any> = new EventEmitter<any>();
-
-    constructor(private sanitizer: DomSanitizer) {
-    }
-
-    public getSafeUrl(url: string): SafeResourceUrl {
-        return this.sanitizer.bypassSecurityTrustResourceUrl(url);
-    }
-}
diff --git a/web/app/shared/models/legacyintegration.ts b/web/app/shared/models/legacyintegration.ts
deleted file mode 100644
index e8cce38..0000000
--- a/web/app/shared/models/legacyintegration.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-export interface LegacyIntegration {
-    // These are from the server
-    type: string;
-    integrationType: string;
-    userId: string;
-    name: string;
-    avatar: string;
-    about: string; // nullable
-    supportsEncryptedRooms: boolean;
-    requirements: any; // nullable
-
-    // These are set in the UI
-    isSupported: boolean;
-    notSupportedReason: string;
-    hasAdditionalConfig: boolean;
-    isEnabled: boolean; // for the flip-a-bit integrations
-    isUpdating: boolean;
-}
-
-export interface RSSIntegration extends LegacyIntegration {
-    feeds: string[];
-    immutableFeeds: { url: string, ownerId: string }[];
-}
-
-export interface TravisCiIntegration extends LegacyIntegration {
-    repoTemplates: { repoKey: string, template: string, newTemplate: string }[]; // newTemplate is local
-    immutableRepoTemplates: { repoKey: string, template: string, ownerId: string }[];
-    webhookUrl: string; // immutable
-}
-
-export interface CircleCiIntegration extends LegacyIntegration {
-    repoTemplates: { repoKey: string, template: string, newTemplate: string }[]; // newTemplate is local
-    immutableRepoTemplates: { repoKey: string, template: string, ownerId: string }[];
-    webhookUrl: string; // immutable
-}
-
-export interface IRCIntegration extends LegacyIntegration {
-    availableNetworks: { name: string, id: string }[];
-    channels: { [networkId: string]: string[] };
-}
-
-export interface EtherpadWidgetIntegration extends LegacyIntegration {
-    defaultUrl: string;
-}
-
-export interface JitsiWidgetIntegration extends LegacyIntegration {
-    jitsiDomain: string;
-    scriptUrl: string
-}
\ No newline at end of file
diff --git a/web/app/shared/services/dimension-api.service.ts b/web/app/shared/services/dimension-api.service.ts
index ffa7738..6cc2da7 100644
--- a/web/app/shared/services/dimension-api.service.ts
+++ b/web/app/shared/services/dimension-api.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
 import { AuthedApi } from "./AuthedApi";
 import { DimensionIntegrationsResponse } from "../models/dimension_responses";
+import { Widget } from "../models/integration";
 
 @Injectable()
 export class DimensionApiService extends AuthedApi {
@@ -12,4 +13,13 @@ export class DimensionApiService extends AuthedApi {
     public getIntegrations(roomId: string): Promise<DimensionIntegrationsResponse> {
         return this.authedGet("/api/v1/dimension/integrations/room/" + roomId).map(r => r.json()).toPromise();
     }
+
+    public getWidget(type: string): Promise<Widget> {
+        return this.http.get("/api/v1/dimension/widget/" + type).map(r => r.json()).toPromise();
+    }
+
+    public isEmbeddable(url: string): Promise<any> { // 200 = success, anything else = error
+        return this.http.get("/api/v1/dimension/widgets/embeddable", {params: {url: url}})
+            .map(r => r.json()).toPromise();
+    }
 }
diff --git a/web/app/shared/services/legacy/api.service.ts b/web/app/shared/services/legacy/api.service.ts
deleted file mode 100644
index 5ca30da..0000000
--- a/web/app/shared/services/legacy/api.service.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { Injectable } from "@angular/core";
-import { Http } from "@angular/http";
-import { LegacyIntegration } from "../../models/legacyintegration";
-
-@Injectable()
-export class ApiService {
-    constructor(private http: Http) {
-    }
-
-    checkScalarToken(scalarToken: string): Promise<boolean> {
-        return this.http.get("/api/v1/scalar/checkToken", {params: {scalar_token: scalarToken}})
-            .map(res => res.status === 200).toPromise();
-    }
-
-    getTokenOwner(scalarToken: String): Promise<string> {
-        return this.http.get("/api/v1/dimension/whoami", {params: {scalar_token: scalarToken}})
-            .map(res => res.status === 200 ? res.json()["userId"] : null).toPromise();
-    }
-
-    getIntegrations(roomId: string, scalarToken: string): Promise<LegacyIntegration[]> {
-        return this.http.get("/api/v1/dimension/integrations/" + roomId, {params: {scalar_token: scalarToken}})
-            .map(res => res.json()).toPromise();
-    }
-
-    removeIntegration(roomId: string, type: string, integrationType: string, scalarToken: string): Promise<any> {
-        const url = "/api/v1/dimension/integrations/" + roomId + "/" + type + "/" + integrationType;
-        return this.http.delete(url, {params: {scalar_token: scalarToken}})
-            .map(res => res.json()).toPromise();
-    }
-
-    updateIntegrationState(roomId: string, type: string, integrationType: string, scalarToken: string, newState: any): Promise<any> {
-        const url = "/api/v1/dimension/integrations/" + roomId + "/" + type + "/" + integrationType + "/state";
-        return this.http.put(url, {scalar_token: scalarToken, state: newState})
-            .map(res => res.json()).toPromise();
-    }
-
-    getIntegrationState(roomId: string, type: string, integrationType: string, scalarToken: string): Promise<any> {
-        const url = "/api/v1/dimension/integrations/" + roomId + "/" + type + "/" + integrationType + "/state";
-        return this.http.get(url, {params: {scalar_token: scalarToken}})
-            .map(res => res.json()).toPromise();
-    }
-
-    isEmbeddable(checkUrl: string): Promise<any> {
-        const url = "/api/v1/dimension/widgets/embeddable";
-        return this.http.get(url, {params: {url: checkUrl}})
-            .map(res => res.json()).toPromise();
-    }
-
-    getIntegration(type: string, integrationType: string): Promise<LegacyIntegration> {
-        const url = "/api/v1/dimension/integration/" + type + "/" + integrationType;
-        return this.http.get(url).map(res => res.json()).toPromise();
-    }
-}
diff --git a/web/app/shared/services/legacy/integration.service.ts b/web/app/shared/services/legacy/integration.service.ts
deleted file mode 100644
index f181cbd..0000000
--- a/web/app/shared/services/legacy/integration.service.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import { Injectable } from "@angular/core";
-import { LegacyIntegration } from "../../models/legacyintegration";
-import { RssConfigComponent } from "../../../configs-old/rss/rss-config.component";
-import { ContainerContent } from "ngx-modialog";
-import { IrcConfigComponent } from "../../../configs-old/irc/irc-config.component";
-import { TravisCiConfigComponent } from "../../../configs-old/travisci/travisci-config.component";
-import { CustomWidgetConfigComponent } from "../../../configs-old/widget/custom_widget/custom_widget-config.component";
-import { YoutubeWidgetConfigComponent } from "../../../configs-old/widget/youtube/youtube-config.component";
-import { TwitchWidgetConfigComponent } from "../../../configs-old/widget/twitch/twitch-config.component";
-import { EtherpadWidgetConfigComponent } from "../../../configs-old/widget/etherpad/etherpad-config.component";
-import { JitsiWidgetConfigComponent } from "../../../configs-old/widget/jitsi/jitsi-config.component";
-import {
-    WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
-    WIDGET_YOUTUBE
-} from "../../models/widget";
-import { GoogleDocsWidgetConfigComponent } from "../../../configs-old/widget/googledocs/googledocs-config.component";
-import { GoogleCalendarWidgetConfigComponent } from "../../../configs-old/widget/googlecalendar/googlecalendar-config.component";
-import { CircleCiConfigComponent } from "../../../configs-old/circleci/circleci-config.component";
-
-@Injectable()
-export class LegacyIntegrationService {
-
-    private static supportedIntegrationsMap = {
-        "bot": {}, // empty == supported
-        "complex-bot": {
-            "rss": {
-                component: RssConfigComponent,
-            },
-            "travisci": {
-                component: TravisCiConfigComponent,
-            },
-            "circleci": {
-                component: CircleCiConfigComponent,
-            },
-        },
-        "bridge": {
-            "irc": {
-                component: IrcConfigComponent,
-            },
-        },
-        "widget": {
-            "customwidget": {
-                component: CustomWidgetConfigComponent,
-                types: WIDGET_CUSTOM,
-            },
-            "youtube": {
-                component: YoutubeWidgetConfigComponent,
-                types: WIDGET_YOUTUBE
-            },
-            "etherpad": {
-                component: EtherpadWidgetConfigComponent,
-                types: WIDGET_ETHERPAD,
-            },
-            "twitch": {
-                component: TwitchWidgetConfigComponent,
-                types: WIDGET_TWITCH,
-            },
-            "jitsi": {
-                component: JitsiWidgetConfigComponent,
-                types: WIDGET_JITSI,
-            },
-            "googledocs": {
-                component: GoogleDocsWidgetConfigComponent,
-                types: WIDGET_GOOGLE_DOCS,
-            },
-            "googlecalendar": {
-                component: GoogleCalendarWidgetConfigComponent,
-                types: WIDGET_GOOGLE_CALENDAR,
-            },
-        },
-    };
-
-    static getAllConfigComponents(): ContainerContent[] {
-        const components = [];
-
-        for (const iType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap)) {
-            for (const iiType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap[iType])) {
-                const component = LegacyIntegrationService.supportedIntegrationsMap[iType][iiType].component;
-                if (component) components.push(component);
-            }
-        }
-
-        return components;
-    }
-
-    static isSupported(integration: LegacyIntegration): boolean {
-        const forType = LegacyIntegrationService.supportedIntegrationsMap[integration.type];
-        if (!forType) return false;
-
-        if (Object.keys(forType).length === 0) return true;
-
-        return forType[integration.integrationType]; // has sub type
-    }
-
-    static hasConfig(integration: LegacyIntegration): boolean {
-        return integration.type !== "bot";
-    }
-
-    static getConfigComponent(integration: LegacyIntegration): ContainerContent {
-        return LegacyIntegrationService.supportedIntegrationsMap[integration.type][integration.integrationType].component;
-    }
-
-    static getIntegrationForScreen(screen: string): { type: string, integrationType: string } {
-        for (const iType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap)) {
-            for (const iiType of Object.keys(LegacyIntegrationService.supportedIntegrationsMap[iType])) {
-                const integrationTypes = LegacyIntegrationService.supportedIntegrationsMap[iType][iiType].types;
-                const integrationScreens = integrationTypes.map(t => "type_" + t);
-                if (integrationScreens.includes(screen)) return {type: iType, integrationType: iiType};
-            }
-        }
-
-        return null;
-    }
-
-    constructor() {
-    }
-}
diff --git a/web/app/shared/services/legacy/irc-api.service.ts b/web/app/shared/services/legacy/irc-api.service.ts
deleted file mode 100644
index 0d633af..0000000
--- a/web/app/shared/services/legacy/irc-api.service.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Injectable } from "@angular/core";
-import { Http } from "@angular/http";
-
-@Injectable()
-export class IrcApiService {
-    constructor(private http: Http) {
-    }
-
-    getChannelOps(roomId: string, networkId: string, channel: string, scalarToken: string): Promise<string[]> {
-        return this.http.get("/api/v1/irc/" + roomId + "/ops/" + networkId + "/" + channel, {params: {scalar_token: scalarToken}})
-            .map(res => res.json()).toPromise();
-    }
-
-    linkChannel(roomId: string, networkId: string, channel: string, op: string, scalarToken: string): Promise<any> {
-        return this.http.put("/api/v1/irc/" + roomId + "/channels/" + networkId + "/" + channel, {}, {
-            params: {
-                scalar_token: scalarToken,
-                op: op
-            }
-        }).map(res => res.json()).toPromise();
-    }
-
-    unlinkChannel(roomId: string, networkId: string, channel: string, scalarToken: string): Promise<any> {
-        return this.http.delete("/api/v1/irc/" + roomId + "/channels/" + networkId + "/" + channel, {params: {scalar_token: scalarToken}})
-            .map(res => res.json()).toPromise();
-    }
-}
diff --git a/web/app/widget_wrappers/generic/generic.component.ts b/web/app/widget_wrappers/generic/generic.component.ts
index 1fda647..50a6d99 100644
--- a/web/app/widget_wrappers/generic/generic.component.ts
+++ b/web/app/widget_wrappers/generic/generic.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
-import { ApiService } from "../../shared/services/legacy/api.service";
 import { ActivatedRoute } from "@angular/router";
 import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
+import { DimensionApiService } from "../../shared/services/dimension-api.service";
 
 @Component({
     selector: "my-generic-widget-wrapper",
@@ -14,7 +14,7 @@ export class GenericWidgetWrapperComponent {
     public canEmbed = false;
     public embedUrl: SafeUrl = null;
 
-    constructor(api: ApiService, activatedRoute: ActivatedRoute, sanitizer: DomSanitizer) {
+    constructor(api: DimensionApiService, activatedRoute: ActivatedRoute, sanitizer: DomSanitizer) {
         let params: any = activatedRoute.snapshot.queryParams;
 
         api.isEmbeddable(params.url).then(result => {
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.ts b/web/app/widget_wrappers/jitsi/jitsi.component.ts
index c5e81f6..8b9edc0 100644
--- a/web/app/widget_wrappers/jitsi/jitsi.component.ts
+++ b/web/app/widget_wrappers/jitsi/jitsi.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import * as $ from "jquery";
-import { ApiService } from "../../shared/services/legacy/api.service";
-import { JitsiWidgetIntegration } from "../../shared/models/legacyintegration";
+import { DimensionApiService } from "../../shared/services/dimension-api.service";
+import { JitsiWidget } from "../../shared/models/integration";
 
 declare var JitsiMeetExternalAPI: any;
 
@@ -22,7 +22,7 @@ export class JitsiWidgetWrapperComponent implements OnInit {
     private userId: string;
     private jitsiApiObj: any;
 
-    constructor(activatedRoute: ActivatedRoute, private api: ApiService) {
+    constructor(activatedRoute: ActivatedRoute, private api: DimensionApiService) {
         let params: any = activatedRoute.snapshot.queryParams;
 
         this.domain = params.domain;
@@ -33,9 +33,9 @@ export class JitsiWidgetWrapperComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.api.getIntegration("widget", "jitsi").then(integration => {
-            const widget = <JitsiWidgetIntegration>integration;
-            $.getScript(widget.scriptUrl);
+        this.api.getWidget("jitsi").then(integration => {
+            const widget = <JitsiWidget>integration;
+            $.getScript(widget.options.scriptUrl);
         });
     }
 

From fce6f2174a5cb47038659c5e3182583b1e1eebe4 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 13:16:05 -0700
Subject: [PATCH 031/111] Add etherpad widget configuration

---
 web/app/app.module.ts                         |   4 +
 web/app/app.routing.ts                        |   6 +
 .../etherpad/etherpad.widget.component.html   |  18 +++
 .../etherpad/etherpad.widget.component.scss   |   0
 .../etherpad/etherpad.widget.component.ts     |  34 +++++
 web/app/configs/widget/widget.component.ts    | 129 ++++++++++++++----
 web/app/shared/services/name.service.ts       |  18 +++
 7 files changed, 183 insertions(+), 26 deletions(-)
 create mode 100644 web/app/configs/widget/etherpad/etherpad.widget.component.html
 create mode 100644 web/app/configs/widget/etherpad/etherpad.widget.component.scss
 create mode 100644 web/app/configs/widget/etherpad/etherpad.widget.component.ts
 create mode 100644 web/app/shared/services/name.service.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 94e1b46..413525d 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -33,6 +33,8 @@ import { ServiceLocator } from "./shared/services/locator.service";
 import { IboxComponent } from "./elements/ibox/ibox.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/config_screen.widget.component";
+import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
+import { NameService } from "./shared/services/name.service";
 
 @NgModule({
     imports: [
@@ -66,6 +68,7 @@ import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/conf
         IboxComponent,
         ConfigScreenWidgetComponent,
         CustomWidgetConfigComponent,
+        EtherpadWidgetConfigComponent,
 
         // Vendor
     ],
@@ -74,6 +77,7 @@ import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/conf
         ScalarServerApiService,
         DimensionApiService,
         AdminApiService,
+        NameService,
         {provide: Window, useValue: window},
 
         // Vendor
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index df889b8..34c2e03 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -7,6 +7,7 @@ import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.compo
 import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
+import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -28,6 +29,11 @@ const routes: Routes = [
                         component: CustomWidgetConfigComponent,
                         data: {breadcrumb: "Custom Widgets", name: "Custom Widgets"}
                     },
+                    {
+                        path: "etherpad",
+                        component: EtherpadWidgetConfigComponent,
+                        data: {breadcrumb: "Etherpad Widgets", name: "Etherpad Widgets"}
+                    },
                 ],
             },
         ],
diff --git a/web/app/configs/widget/etherpad/etherpad.widget.component.html b/web/app/configs/widget/etherpad/etherpad.widget.component.html
new file mode 100644
index 0000000..abc5fa3
--- /dev/null
+++ b/web/app/configs/widget/etherpad/etherpad.widget.component.html
@@ -0,0 +1,18 @@
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Pad Name
+            <input type="text" class="form-control"
+                   placeholder="{{ defaultName }}"
+                   [(ngModel)]="widget.dimension.newName" name="widget-name-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+        <label class="label-block">
+            Pad URL
+            <input type="text" class="form-control"
+                   placeholder="https://demo.riot.im/etherpad/p/MyCoolPadName"
+                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file
diff --git a/web/app/configs/widget/etherpad/etherpad.widget.component.scss b/web/app/configs/widget/etherpad/etherpad.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/etherpad/etherpad.widget.component.ts b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
new file mode 100644
index 0000000..5e795b6
--- /dev/null
+++ b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
@@ -0,0 +1,34 @@
+import { NewWidgetComponent } from "../widget.component";
+import { EditableWidget, WIDGET_ETHERPAD } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+import { EtherpadWidget } from "../../../shared/models/integration";
+import { SessionStorage } from "../../../shared/SessionStorage";
+import { NameService } from "../../../shared/services/name.service";
+
+@Component({
+    templateUrl: "etherpad.widget.component.html",
+    styleUrls: ["etherpad.widget.component.scss"],
+})
+export class EtherpadWidgetConfigComponent extends NewWidgetComponent {
+
+    private etherpadWidget: EtherpadWidget = <EtherpadWidget>SessionStorage.editIntegration;
+
+    constructor(private nameService: NameService) {
+        super(WIDGET_ETHERPAD, "Etherpad Widget", "generic", "etherpad");
+    }
+
+    protected OnNewWidgetPrepared(widget: EditableWidget): void {
+        const name = this.nameService.getHumanReadableName();
+
+        let template = "https://demo.riot.im/etherpad/p/$roomId_$padName";
+        if (this.etherpadWidget.options && this.etherpadWidget.options.defaultUrl) {
+            template = this.etherpadWidget.options.defaultUrl;
+        }
+
+        template = template.replace("$roomId", encodeURIComponent(SessionStorage.roomId));
+        template = template.replace("$padName", encodeURIComponent(name));
+
+        widget.dimension.newUrl = template;
+        widget.dimension.newName = name;
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 3e2254d..518bd32 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,9 +1,9 @@
-import { EventEmitter } from "@angular/core";
 import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
 import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
 import { ServiceLocator } from "../../shared/services/locator.service";
 import { SessionStorage } from "../../shared/SessionStorage";
+import { OnInit } from "@angular/core";
 
 const SCALAR_WIDGET_LINKS = [
     "https://scalar-staging.riot.im/scalar/api/widgets/__TYPE__.html?url=",
@@ -12,7 +12,7 @@ const SCALAR_WIDGET_LINKS = [
     "https://demo.riot.im/scalar/api/widgets/__TYPE__.html?url=",
 ];
 
-export class NewWidgetComponent {
+export class NewWidgetComponent implements OnInit {
 
     public isLoading = true;
     public isUpdating = false;
@@ -27,40 +27,32 @@ export class NewWidgetComponent {
     private window = ServiceLocator.injector.get(Window);
     private scalarApi = ServiceLocator.injector.get(ScalarClientApiService);
 
-    protected OnNewWidgetPrepared = new EventEmitter<EditableWidget>();
-    protected OnWidgetsDiscovered = new EventEmitter<EditableWidget[]>();
-    protected OnWidgetBeforeAdd = new EventEmitter<EditableWidget>();
-    protected OnWidgetAfterAdd = new EventEmitter<EditableWidget>();
-    protected OnWidgetPreparedForEdit = new EventEmitter<EditableWidget>();
-    protected OnWidgetBeforeEdit = new EventEmitter<EditableWidget>();
-    protected OnWidgetAfterEdit = new EventEmitter<EditableWidget>();
-    protected OnWidgetBeforeDelete = new EventEmitter<EditableWidget>();
-    protected OnWidgetAfterDelete = new EventEmitter<EditableWidget>();
-
     constructor(private widgetTypes: string[],
                 public defaultName: string,
                 private wrapperId = "generic",
                 private scalarWrapperId = null) {
         this.isLoading = true;
         this.isUpdating = false;
+    }
 
-        if (wrapperId) {
-            this.wrapperUrl = this.window.location.origin + "/widgets/" + wrapperId + "?url=";
+    public ngOnInit(): void {
+        if (this.wrapperId) {
+            this.wrapperUrl = this.window.location.origin + "/widgets/" + this.wrapperId + "?url=";
 
-            if (!scalarWrapperId) scalarWrapperId = wrapperId;
+            if (!this.scalarWrapperId) this.scalarWrapperId = this.wrapperId;
             for (let widgetLink of SCALAR_WIDGET_LINKS) {
-                this.scalarWrapperUrls.push(widgetLink.replace("__TYPE__", scalarWrapperId));
+                this.scalarWrapperUrls.push(widgetLink.replace("__TYPE__", this.scalarWrapperId));
             }
         }
 
         this.prepareNewWidget();
-        this.getWidgetsOfType(widgetTypes).then(widgets => {
+        this.getWidgetsOfType(this.widgetTypes).then(widgets => {
             this.widgets = widgets;
             for (let widget of this.widgets) {
                 this.unpackWidget(widget);
             }
 
-            this.OnWidgetsDiscovered.emit(this.widgets);
+            this.OnWidgetsDiscovered(this.widgets);
             this.isLoading = false;
             this.isUpdating = false;
 
@@ -155,7 +147,8 @@ export class NewWidgetComponent {
                 newData: {},
             },
         };
-        this.OnNewWidgetPrepared.emit(this.newWidget);
+        console.log("Emitting new widget prepared event");
+        this.OnNewWidgetPrepared(this.newWidget);
     }
 
     /**
@@ -238,12 +231,12 @@ export class NewWidgetComponent {
         this.packWidget(this.newWidget);
 
         this.isUpdating = true;
-        this.OnWidgetBeforeAdd.emit(this.newWidget);
+        this.OnWidgetBeforeAdd(this.newWidget);
         return this.scalarApi.setWidget(SessionStorage.roomId, this.newWidget)
             .then(() => this.widgets.push(this.newWidget))
             .then(() => {
                 this.isUpdating = false;
-                this.OnWidgetAfterAdd.emit(this.newWidget);
+                this.OnWidgetAfterAdd(this.newWidget);
                 this.prepareNewWidget();
                 this.toaster.pop("success", "Widget added!");
             })
@@ -268,11 +261,11 @@ export class NewWidgetComponent {
         this.packWidget(widget);
 
         this.isUpdating = true;
-        this.OnWidgetBeforeEdit.emit(widget);
+        this.OnWidgetBeforeEdit(widget);
         return this.scalarApi.setWidget(SessionStorage.roomId, widget)
             .then(() => {
                 this.isUpdating = false;
-                this.OnWidgetAfterEdit.emit(widget);
+                this.OnWidgetAfterEdit(widget);
                 this.toaster.pop("success", "Widget updated!");
             })
             .catch(err => {
@@ -289,12 +282,12 @@ export class NewWidgetComponent {
      */
     public removeWidget(widget: EditableWidget): Promise<any> {
         this.isUpdating = true;
-        this.OnWidgetBeforeDelete.emit(widget);
+        this.OnWidgetBeforeDelete(widget);
         return this.scalarApi.deleteWidget(SessionStorage.roomId, widget)
             .then(() => this.widgets.splice(this.widgets.indexOf(widget), 1))
             .then(() => {
                 this.isUpdating = false;
-                this.OnWidgetAfterDelete.emit(widget);
+                this.OnWidgetAfterDelete(widget);
                 this.toaster.pop("success", "Widget deleted!");
             })
             .catch(err => {
@@ -310,6 +303,90 @@ export class NewWidgetComponent {
      */
     public resetWidget(widget: EditableWidget) {
         this.unpackWidget(widget);
-        this.OnWidgetPreparedForEdit.emit(widget);
+        this.OnWidgetPreparedForEdit(widget);
+    }
+
+    // Component hooks below here
+    // ------------------------------------------------------------------
+
+    /**
+     * Called when a new widget has been created in the newWidget field
+     * @param {EditableWidget} _widget The widget that has been prepared
+     */
+    protected OnNewWidgetPrepared(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called after all the widgets have been discovered and unpacked for the room.
+     * @param {EditableWidget[]} _widgets The widgets that were discovered
+     */
+    protected OnWidgetsDiscovered(_widgets: EditableWidget[]): void {
+        // Component hook
+    }
+
+    /**
+     * Called before the widget is added to the room, but after the Dimension-specific
+     * settings have been copied over to the primary fields.
+     * @param {EditableWidget} _widget The widget that is about to be added
+     */
+    protected OnWidgetBeforeAdd(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called after the widget has been added to the room, but before the newWidget field
+     * has been set to a new widget.
+     * @param {EditableWidget} _widget The widget that has been added.
+     */
+    protected OnWidgetAfterAdd(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called when the given widget has been asked to be prepared for editing. At this point
+     * the widget is not being persisted to the room, it is just updating the EditingWidget's
+     * properties for the user's ability to edit it.
+     * @param {EditableWidget} _widget The widget that has been prepared for editing
+     */
+    protected OnWidgetPreparedForEdit(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called before the given widget has been updated in the room, but after the
+     * Dimension-specific settings have been copied over to the primary fields.
+     * This is not called for widgets being deleted.
+     * @param {EditableWidget} _widget The widget about to be edited
+     */
+    protected OnWidgetBeforeEdit(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called after a given widget has been updated in the room. This is not called for
+     * widgets being deleted.
+     * @param {EditableWidget} _widget The widget that has been updated.
+     */
+    protected OnWidgetAfterEdit(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called before the given widget has been removed from the room. No changes to the
+     * widget have been made at this point.
+     * @param {EditableWidget} _widget The widget about to be deleted.
+     */
+    protected OnWidgetBeforeDelete(_widget: EditableWidget): void {
+        // Component hook
+    }
+
+    /**
+     * Called after a given widget has been deleted from the room. The widget will be in
+     * the deleted state and will no longer be tracked anywhere on the component.
+     * @param {EditableWidget} _widget The widget that has been deleted.
+     */
+    protected OnWidgetAfterDelete(_widget: EditableWidget): void {
+        // Component hook
     }
 }
\ No newline at end of file
diff --git a/web/app/shared/services/name.service.ts b/web/app/shared/services/name.service.ts
new file mode 100644
index 0000000..8abc0df
--- /dev/null
+++ b/web/app/shared/services/name.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from "@angular/core";
+import * as gobyInit from "goby";
+
+const goby = gobyInit.init({
+    // Converts words to a url-safe name
+    // Ie: "hello world how-are you" becomes "HelloWorldHowAreYou"
+    decorator: parts => parts.map(p => p ? p.split('-').map(p2 => p2 ? p2[0].toUpperCase() + p2.substring(1).toLowerCase() : '').join('') : '').join(''),
+});
+
+@Injectable()
+export class NameService {
+    constructor() {
+    }
+
+    public getHumanReadableName(): string {
+        return goby.generate(["adj", "pre", "suf"]);
+    }
+}

From 00b7ddcc1a1eeb2c892c2492efc3ba26d537e757 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 13:17:29 -0700
Subject: [PATCH 032/111] Fix auto-expanding the edit screen for widgets

---
 .../configs/widget/config_screen/config_screen.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/configs/widget/config_screen/config_screen.component.html b/web/app/configs/widget/config_screen/config_screen.component.html
index f8ec86d..6787e79 100644
--- a/web/app/configs/widget/config_screen/config_screen.component.html
+++ b/web/app/configs/widget/config_screen/config_screen.component.html
@@ -1,7 +1,7 @@
-<div *ngIf="isLoading">
+<div *ngIf="widgetComponent.isLoading">
     <my-spinner></my-spinner>
 </div>
-<div *ngIf="!isLoading">
+<div *ngIf="!widgetComponent.isLoading">
     <my-ibox [isCollapsible]="true" [defaultCollapsed]="widgetComponent.defaultExpandedWidgetId">
         <h5 class="my-ibox-title">
             <i class="far fa-plus-square"></i> Add {{ widgetComponent.defaultName }}

From 2fbd655c461d034930fa5797f0ebb0e61e557819 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 13:32:07 -0700
Subject: [PATCH 033/111] Add google calendar configuration

---
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        |  6 +++
 .../config_screen.widget.component.ts         |  4 +-
 .../widget/custom/custom.widget.component.ts  |  4 +-
 .../etherpad/etherpad.widget.component.ts     |  4 +-
 .../gcal.widget.component.html                | 11 ++++++
 .../gcal.widget.component.scss                |  0
 .../google_calendar/gcal.widget.component.ts  | 39 +++++++++++++++++++
 web/app/configs/widget/widget.component.ts    | 30 ++++++++++----
 9 files changed, 87 insertions(+), 13 deletions(-)
 create mode 100644 web/app/configs/widget/google_calendar/gcal.widget.component.html
 create mode 100644 web/app/configs/widget/google_calendar/gcal.widget.component.scss
 create mode 100644 web/app/configs/widget/google_calendar/gcal.widget.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 413525d..e3e6f85 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -35,6 +35,7 @@ import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widg
 import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/config_screen.widget.component";
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
 import { NameService } from "./shared/services/name.service";
+import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
 
 @NgModule({
     imports: [
@@ -69,6 +70,7 @@ import { NameService } from "./shared/services/name.service";
         ConfigScreenWidgetComponent,
         CustomWidgetConfigComponent,
         EtherpadWidgetConfigComponent,
+        GoogleCalendarWidgetConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 34c2e03..9797839 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -8,6 +8,7 @@ import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.componen
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
+import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -34,6 +35,11 @@ const routes: Routes = [
                         component: EtherpadWidgetConfigComponent,
                         data: {breadcrumb: "Etherpad Widgets", name: "Etherpad Widgets"}
                     },
+                    {
+                        path: "googlecalendar",
+                        component: GoogleCalendarWidgetConfigComponent,
+                        data: {breadcrumb: "Google Calendar Widgets", name: "Google Calendar Widgets"}
+                    },
                 ],
             },
         ],
diff --git a/web/app/configs/widget/config_screen/config_screen.widget.component.ts b/web/app/configs/widget/config_screen/config_screen.widget.component.ts
index 591351c..4f0b67b 100644
--- a/web/app/configs/widget/config_screen/config_screen.widget.component.ts
+++ b/web/app/configs/widget/config_screen/config_screen.widget.component.ts
@@ -1,4 +1,4 @@
-import { NewWidgetComponent } from "../widget.component";
+import { WidgetComponent } from "../widget.component";
 import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
 
 @Component({
@@ -8,7 +8,7 @@ import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
 })
 export class ConfigScreenWidgetComponent {
 
-    @Input() widgetComponent: NewWidgetComponent;
+    @Input() widgetComponent: WidgetComponent;
     @ContentChild(TemplateRef) widgetParamsTemplate: TemplateRef<any>;
 
     constructor() {
diff --git a/web/app/configs/widget/custom/custom.widget.component.ts b/web/app/configs/widget/custom/custom.widget.component.ts
index 50d4687..15951f1 100644
--- a/web/app/configs/widget/custom/custom.widget.component.ts
+++ b/web/app/configs/widget/custom/custom.widget.component.ts
@@ -1,4 +1,4 @@
-import { NewWidgetComponent } from "../widget.component";
+import { WidgetComponent } from "../widget.component";
 import { WIDGET_CUSTOM } from "../../../shared/models/widget";
 import { Component } from "@angular/core";
 
@@ -6,7 +6,7 @@ import { Component } from "@angular/core";
     templateUrl: "custom.widget.component.html",
     styleUrls: ["custom.widget.component.scss"],
 })
-export class CustomWidgetConfigComponent extends NewWidgetComponent {
+export class CustomWidgetConfigComponent extends WidgetComponent {
     constructor() {
         super(WIDGET_CUSTOM, "Custom Widget", "generic");
     }
diff --git a/web/app/configs/widget/etherpad/etherpad.widget.component.ts b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
index 5e795b6..fed4143 100644
--- a/web/app/configs/widget/etherpad/etherpad.widget.component.ts
+++ b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
@@ -1,4 +1,4 @@
-import { NewWidgetComponent } from "../widget.component";
+import { WidgetComponent } from "../widget.component";
 import { EditableWidget, WIDGET_ETHERPAD } from "../../../shared/models/widget";
 import { Component } from "@angular/core";
 import { EtherpadWidget } from "../../../shared/models/integration";
@@ -9,7 +9,7 @@ import { NameService } from "../../../shared/services/name.service";
     templateUrl: "etherpad.widget.component.html",
     styleUrls: ["etherpad.widget.component.scss"],
 })
-export class EtherpadWidgetConfigComponent extends NewWidgetComponent {
+export class EtherpadWidgetConfigComponent extends WidgetComponent {
 
     private etherpadWidget: EtherpadWidget = <EtherpadWidget>SessionStorage.editIntegration;
 
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.html b/web/app/configs/widget/google_calendar/gcal.widget.component.html
new file mode 100644
index 0000000..ae67f6b
--- /dev/null
+++ b/web/app/configs/widget/google_calendar/gcal.widget.component.html
@@ -0,0 +1,11 @@
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Shared Calendar ID
+            <input type="text" class="form-control"
+                   placeholder="en.uk#holiday@group.v.calendar.google.com"
+                   [(ngModel)]="widget.dimension.newData.src" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.scss b/web/app/configs/widget/google_calendar/gcal.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.ts b/web/app/configs/widget/google_calendar/gcal.widget.component.ts
new file mode 100644
index 0000000..0ce705a
--- /dev/null
+++ b/web/app/configs/widget/google_calendar/gcal.widget.component.ts
@@ -0,0 +1,39 @@
+import { DISABLE_AUTOMATIC_WRAPPING, WidgetComponent } from "../widget.component";
+import { EditableWidget, WIDGET_GOOGLE_CALENDAR } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "gcal.widget.component.html",
+    styleUrls: ["gcal.widget.component.scss"],
+})
+export class GoogleCalendarWidgetConfigComponent extends WidgetComponent {
+    constructor() {
+        super(WIDGET_GOOGLE_CALENDAR, "Google Calendar Widget", DISABLE_AUTOMATIC_WRAPPING, "googleCalendar");
+    }
+
+    protected OnWidgetsDiscovered(widgets: EditableWidget[]) {
+        for (const widget of widgets) {
+            if (widget.data.dimSrc && !widget.data.src) {
+                // Convert legacy Dimension widgets to new source
+                widget.data.src = widget.data.dimSrc;
+            }
+        }
+    }
+
+    protected OnWidgetBeforeAdd(widget: EditableWidget) {
+        this.setCalendarUrl(widget);
+    }
+
+    protected OnWidgetBeforeEdit(widget: EditableWidget) {
+        this.setCalendarUrl(widget);
+    }
+
+    private setCalendarUrl(widget: EditableWidget) {
+        if (!widget.dimension.newData.src || widget.dimension.newData.src.trim().length === 0) {
+            throw new Error("Please enter a shared calendar ID");
+        }
+
+        const encodedId = encodeURIComponent(widget.dimension.newData.src);
+        widget.dimension.newUrl = window.location.origin + "/widget/gcal?calendarId=" + encodedId;
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 518bd32..191a7e0 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -12,7 +12,9 @@ const SCALAR_WIDGET_LINKS = [
     "https://demo.riot.im/scalar/api/widgets/__TYPE__.html?url=",
 ];
 
-export class NewWidgetComponent implements OnInit {
+export const DISABLE_AUTOMATIC_WRAPPING = "";
+
+export class WidgetComponent implements OnInit {
 
     public isLoading = true;
     public isUpdating = false;
@@ -223,6 +225,14 @@ export class NewWidgetComponent implements OnInit {
      * with a new widget.
      */
     public addWidget(): Promise<any> {
+        // Make sure we call "before add" before validating the URL
+        try {
+            this.OnWidgetBeforeAdd(this.newWidget);
+        } catch (error) {
+            this.toaster.pop("warning", error.message);
+            return;
+        }
+
         if (!this.newWidget.dimension.newUrl || this.newWidget.dimension.newUrl.trim().length === 0) {
             this.toaster.pop("warning", "Please enter a URL for the widget");
             return;
@@ -231,7 +241,6 @@ export class NewWidgetComponent implements OnInit {
         this.packWidget(this.newWidget);
 
         this.isUpdating = true;
-        this.OnWidgetBeforeAdd(this.newWidget);
         return this.scalarApi.setWidget(SessionStorage.roomId, this.newWidget)
             .then(() => this.widgets.push(this.newWidget))
             .then(() => {
@@ -253,6 +262,14 @@ export class NewWidgetComponent implements OnInit {
      * @returns {Promise<any>} Resolves when the widget has been updated in the room.
      */
     public saveWidget(widget: EditableWidget): Promise<any> {
+        // Make sure we call "before add" before validating the URL
+        try {
+            this.OnWidgetBeforeEdit(this.newWidget);
+        } catch (error) {
+            this.toaster.pop("warning", error.message);
+            return;
+        }
+
         if (!widget.dimension.newUrl || widget.dimension.newUrl.trim().length === 0) {
             this.toaster.pop("warning", "Please enter a URL for the widget");
             return;
@@ -261,7 +278,6 @@ export class NewWidgetComponent implements OnInit {
         this.packWidget(widget);
 
         this.isUpdating = true;
-        this.OnWidgetBeforeEdit(widget);
         return this.scalarApi.setWidget(SessionStorage.roomId, widget)
             .then(() => {
                 this.isUpdating = false;
@@ -326,8 +342,8 @@ export class NewWidgetComponent implements OnInit {
     }
 
     /**
-     * Called before the widget is added to the room, but after the Dimension-specific
-     * settings have been copied over to the primary fields.
+     * Called before the widget is added to the room, and before the Dimension properties
+     * have been copied over. This is a good time to do validation.
      * @param {EditableWidget} _widget The widget that is about to be added
      */
     protected OnWidgetBeforeAdd(_widget: EditableWidget): void {
@@ -354,8 +370,8 @@ export class NewWidgetComponent implements OnInit {
     }
 
     /**
-     * Called before the given widget has been updated in the room, but after the
-     * Dimension-specific settings have been copied over to the primary fields.
+     * Called before the given widget has been updated in the room, and before the Dimension
+     * properties have been copied over. This is a good time to do validation.
      * This is not called for widgets being deleted.
      * @param {EditableWidget} _widget The widget about to be edited
      */

From 41c887f3907738956647e124adebb5880f5809f6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 13:44:19 -0700
Subject: [PATCH 034/111] Add google docs configuration

---
 web/app/app.module.ts                               |  2 ++
 web/app/app.routing.ts                              |  6 ++++++
 .../widget/google_docs/gdoc.widget.component.html   | 11 +++++++++++
 .../widget/google_docs/gdoc.widget.component.scss   |  0
 .../widget/google_docs/gdoc.widget.component.ts     | 13 +++++++++++++
 web/app/riot/riot-home/home.component.ts            |  3 +--
 6 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 web/app/configs/widget/google_docs/gdoc.widget.component.html
 create mode 100644 web/app/configs/widget/google_docs/gdoc.widget.component.scss
 create mode 100644 web/app/configs/widget/google_docs/gdoc.widget.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index e3e6f85..67f9ee8 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -36,6 +36,7 @@ import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/conf
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
 import { NameService } from "./shared/services/name.service";
 import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
+import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
 
 @NgModule({
     imports: [
@@ -71,6 +72,7 @@ import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_cal
         CustomWidgetConfigComponent,
         EtherpadWidgetConfigComponent,
         GoogleCalendarWidgetConfigComponent,
+        GoogleDocsWidgetConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 9797839..660be2b 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -9,6 +9,7 @@ import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
 import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
+import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -40,6 +41,11 @@ const routes: Routes = [
                         component: GoogleCalendarWidgetConfigComponent,
                         data: {breadcrumb: "Google Calendar Widgets", name: "Google Calendar Widgets"}
                     },
+                    {
+                        path: "googledocs",
+                        component: GoogleDocsWidgetConfigComponent,
+                        data: {breadcrumb: "Google Doc Widgets", name: "Google Doc Widgets"}
+                    },
                 ],
             },
         ],
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.html b/web/app/configs/widget/google_docs/gdoc.widget.component.html
new file mode 100644
index 0000000..9551b14
--- /dev/null
+++ b/web/app/configs/widget/google_docs/gdoc.widget.component.html
@@ -0,0 +1,11 @@
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Document URL
+            <input type="text" class="form-control"
+                   placeholder="https://docs.google.com/document/d/1V0olL42WJ84LNYn0kFBJaPmlRxQ4Trx97a5wfVMuJC8/edit"
+                   [(ngModel)]="widget.dimension.newUrl" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.scss b/web/app/configs/widget/google_docs/gdoc.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.ts b/web/app/configs/widget/google_docs/gdoc.widget.component.ts
new file mode 100644
index 0000000..8d4078b
--- /dev/null
+++ b/web/app/configs/widget/google_docs/gdoc.widget.component.ts
@@ -0,0 +1,13 @@
+import { WidgetComponent } from "../widget.component";
+import { WIDGET_GOOGLE_DOCS } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "gdoc.widget.component.html",
+    styleUrls: ["gdoc.widget.component.scss"],
+})
+export class GoogleDocsWidgetConfigComponent extends WidgetComponent {
+    constructor() {
+        super(WIDGET_GOOGLE_DOCS, "Google Docs Widget", "generic", "googleDocs");
+    }
+}
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index a686d32..9e149ef 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -147,8 +147,7 @@ export class RiotHomeComponent {
                 this.toaster.pop("error", errorMessage);
             });
         } else {
-            // TODO: Navigate to edit screen
-            console.log("EDIT SCREEN FOR " + integration.displayName);
+            console.log("Navigating to edit screen for " + integration.category + " " + integration.type);
             this.router.navigate(['riot-app', integration.category, integration.type]);
         }
     }

From a72177b53045ca5e43426ecad02c8ac979b10643 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 14:16:22 -0700
Subject: [PATCH 035/111] Add jitsi widgets

---
 .../dimension/DimensionIntegrationsService.ts | 18 ++++
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        |  6 ++
 .../widget/jitsi/jitsi.widget.component.html  | 11 +++
 .../widget/jitsi/jitsi.widget.component.scss  |  0
 .../widget/jitsi/jitsi.widget.component.ts    | 89 +++++++++++++++++++
 web/app/configs/widget/widget.component.ts    | 25 +++++-
 .../shared/services/dimension-api.service.ts  |  2 +-
 8 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 web/app/configs/widget/jitsi/jitsi.widget.component.html
 create mode 100644 web/app/configs/widget/jitsi/jitsi.widget.component.scss
 create mode 100644 web/app/configs/widget/jitsi/jitsi.widget.component.ts

diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
index f37200b..1ca5b57 100644
--- a/src-ts/api/dimension/DimensionIntegrationsService.ts
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -5,6 +5,8 @@ import { DimensionStore } from "../../db/DimensionStore";
 import { DimensionAdminService } from "./DimensionAdminService";
 import { Widget } from "../../integrations/Widget";
 import { MemoryCache } from "../../MemoryCache";
+import { Integration } from "../../integrations/Integration";
+import { ApiError } from "../ApiError";
 
 interface IntegrationsResponse {
     widgets: Widget[],
@@ -42,6 +44,22 @@ export class DimensionIntegrationsService {
         return this.getEnabledIntegrations(scalarToken);
     }
 
+    @GET
+    @Path(":category/:type")
+    public getIntegration(@PathParam("category") category: string, @PathParam("type") type: string): Promise<Integration> {
+        return this.getIntegrations(true).then(response => {
+            for (const key of Object.keys(response)) {
+                for (const integration of <Integration[]>response[key]) {
+                    if (integration.category === category && integration.type === type) {
+                        return integration;
+                    }
+                }
+            }
+
+            throw new ApiError(404, "Integration not found");
+        });
+    }
+
     private getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
         const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
         if (cachedResponse) {
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 67f9ee8..7b35226 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -37,6 +37,7 @@ import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpa
 import { NameService } from "./shared/services/name.service";
 import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
 import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
+import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 
 @NgModule({
     imports: [
@@ -73,6 +74,7 @@ import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gd
         EtherpadWidgetConfigComponent,
         GoogleCalendarWidgetConfigComponent,
         GoogleDocsWidgetConfigComponent,
+        JitsiWidgetConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 660be2b..8ff83fb 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -10,6 +10,7 @@ import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widg
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
 import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
 import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
+import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -46,6 +47,11 @@ const routes: Routes = [
                         component: GoogleDocsWidgetConfigComponent,
                         data: {breadcrumb: "Google Doc Widgets", name: "Google Doc Widgets"}
                     },
+                    {
+                        path: "jitsi",
+                        component: JitsiWidgetConfigComponent,
+                        data: {breadcrumb: "Jitsi Widgets", name: "Jitsi Widgets"}
+                    },
                 ],
             },
         ],
diff --git a/web/app/configs/widget/jitsi/jitsi.widget.component.html b/web/app/configs/widget/jitsi/jitsi.widget.component.html
new file mode 100644
index 0000000..81675bb
--- /dev/null
+++ b/web/app/configs/widget/jitsi/jitsi.widget.component.html
@@ -0,0 +1,11 @@
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Conference URL
+            <input type="text" class="form-control"
+                   placeholder="https://jitsi.riot.im/MyCoolConference"
+                   [(ngModel)]="widget.dimension.newData.conferenceUrl" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file
diff --git a/web/app/configs/widget/jitsi/jitsi.widget.component.scss b/web/app/configs/widget/jitsi/jitsi.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/jitsi/jitsi.widget.component.ts b/web/app/configs/widget/jitsi/jitsi.widget.component.ts
new file mode 100644
index 0000000..56966ef
--- /dev/null
+++ b/web/app/configs/widget/jitsi/jitsi.widget.component.ts
@@ -0,0 +1,89 @@
+import { DISABLE_AUTOMATIC_WRAPPING, WidgetComponent } from "../widget.component";
+import { EditableWidget, WIDGET_JITSI } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+import { JitsiWidget } from "../../../shared/models/integration";
+import { SessionStorage } from "../../../shared/SessionStorage";
+import { NameService } from "../../../shared/services/name.service";
+import * as url from "url";
+
+@Component({
+    templateUrl: "jitsi.widget.component.html",
+    styleUrls: ["jitsi.widget.component.scss"],
+})
+export class JitsiWidgetConfigComponent extends WidgetComponent {
+
+    private jitsiWidget: JitsiWidget = <JitsiWidget>SessionStorage.editIntegration;
+
+    constructor(private nameService: NameService) {
+        super(WIDGET_JITSI, "Jitsi Video Conference", DISABLE_AUTOMATIC_WRAPPING);
+    }
+
+    protected OnWidgetsDiscovered(widgets: EditableWidget[]) {
+        for (const widget of widgets) {
+            const templatedUrl = this.templateUrl(widget.url, widget.data);
+            const parsedUrl = url.parse(templatedUrl, true);
+            const conferenceId = parsedUrl.query["conferenceId"];
+            const confId = parsedUrl.query["confId"];
+            const domain = parsedUrl.query["domain"];
+            let isAudioConf = parsedUrl.query["isAudioConf"];
+
+            // Convert isAudioConf to boolean
+            if (isAudioConf === "true") isAudioConf = true;
+            else if (isAudioConf === "false") isAudioConf = false;
+            else if (isAudioConf && isAudioConf[0] === '$') isAudioConf = widget.data[isAudioConf];
+            else isAudioConf = false; // default
+
+            if (conferenceId) {
+                // It's a legacy Dimension widget
+                widget.data.confId = conferenceId;
+            } else widget.data.confId = confId;
+
+            if (domain) widget.data.domain = domain;
+            else widget.data.domain = "jitsi.riot.im";
+
+            widget.data.isAudioConf = isAudioConf;
+            widget.data.conferenceUrl = "https://" + widget.data.domain + "/" + widget.data.confId;
+        }
+    }
+
+    protected OnNewWidgetPrepared(widget: EditableWidget): void {
+        const name = this.nameService.getHumanReadableName();
+
+        let rootUrl = "https://jitsi.riot.im/";
+        if (this.jitsiWidget.options && this.jitsiWidget.options.jitsiDomain) {
+            rootUrl = "https://" + this.jitsiWidget.options.jitsiDomain + "/";
+        }
+
+        widget.dimension.newData["conferenceUrl"] = rootUrl + name;
+    }
+
+    protected OnWidgetBeforeAdd(widget: EditableWidget) {
+        this.setJitsiUrl(widget);
+    }
+
+    protected OnWidgetBeforeEdit(widget: EditableWidget) {
+        this.setJitsiUrl(widget);
+    }
+
+    private setJitsiUrl(widget: EditableWidget) {
+        const jitsiUrl = url.parse(widget.dimension.newData.conferenceUrl);
+        widget.dimension.newData.domain = jitsiUrl.host;
+        widget.dimension.newData.confId = jitsiUrl.path.substring(1);
+        widget.dimension.newData.isAudioConf = false;
+
+        let widgetQueryString = url.format({
+            query: {
+                // TODO: Use templating when mobile riot supports it
+                "confId": widget.dimension.newData.confId,
+                "domain": widget.dimension.newData.domain,
+                "isAudioConf": widget.dimension.newData.isAudioConf,
+                "displayName": "$matrix_display_name",
+                "avatarUrl": "$matrix_avatar_url",
+                "userId": "$matrix_user_id",
+            },
+        });
+        widgetQueryString = this.decodeParams(widgetQueryString, Object.keys(widget.dimension.newData).map(k => "$" + k));
+
+        widget.dimension.newUrl = window.location.origin + "/widgets/jitsi" + widgetQueryString;
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 191a7e0..1cce8f1 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -219,6 +219,29 @@ export class WidgetComponent implements OnInit {
         return encodedURL;
     }
 
+    /**
+     * Performs the templating calculation on a URL as best as it can. Variables that cannot be converted
+     * will be left unchanged, such as the $matrix_display_name and $matrix_avatar_url. This is intended to
+     * be used for Scalar compatibility operations.
+     * @param {string} urlTemplate The URL with variables to template
+     * @param {*} data The data to consider while templating
+     * @returns {string} The URL with the variables replaced
+     */
+    protected templateUrl(urlTemplate: string, data: any): string {
+        let result = urlTemplate;
+
+        result = result.replace("$matrix_room_id", SessionStorage.roomId);
+        result = result.replace("$matrix_user_id", SessionStorage.userId);
+        // result = result.replace("$matrix_display_name", "NOT SUPPORTED");
+        // result = result.replace("$matrix_avatar_url", "NOT SUPPORTED");
+
+        for (const key of Object.keys(data)) {
+            result = result.replace("$" + key, data[key]);
+        }
+
+        return result;
+    }
+
     /**
      * Adds the widget stored in newWidget to the room.
      * @returns {Promise<*>} Resolves when the widget has been added and newWidget is populated
@@ -264,7 +287,7 @@ export class WidgetComponent implements OnInit {
     public saveWidget(widget: EditableWidget): Promise<any> {
         // Make sure we call "before add" before validating the URL
         try {
-            this.OnWidgetBeforeEdit(this.newWidget);
+            this.OnWidgetBeforeEdit(widget);
         } catch (error) {
             this.toaster.pop("warning", error.message);
             return;
diff --git a/web/app/shared/services/dimension-api.service.ts b/web/app/shared/services/dimension-api.service.ts
index 6cc2da7..4c2174a 100644
--- a/web/app/shared/services/dimension-api.service.ts
+++ b/web/app/shared/services/dimension-api.service.ts
@@ -15,7 +15,7 @@ export class DimensionApiService extends AuthedApi {
     }
 
     public getWidget(type: string): Promise<Widget> {
-        return this.http.get("/api/v1/dimension/widget/" + type).map(r => r.json()).toPromise();
+        return this.http.get("/api/v1/dimension/integrations/widget/" + type).map(r => r.json()).toPromise();
     }
 
     public isEmbeddable(url: string): Promise<any> { // 200 = success, anything else = error

From 2bf78412901345697952d87ec5898714ea26fb84 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 15:03:24 -0700
Subject: [PATCH 036/111] Add twitch livestreams

---
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        |  6 +++
 .../config_screen.component.html              |  1 +
 .../etherpad/etherpad.widget.component.ts     |  2 +-
 .../google_calendar/gcal.widget.component.ts  |  6 ++-
 .../google_docs/gdoc.widget.component.ts      |  2 +-
 .../twitch/twitch.widget.component.html       | 11 +++++
 .../twitch/twitch.widget.component.scss       |  0
 .../widget/twitch/twitch.widget.component.ts  | 43 +++++++++++++++++++
 9 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 web/app/configs/widget/twitch/twitch.widget.component.html
 create mode 100644 web/app/configs/widget/twitch/twitch.widget.component.scss
 create mode 100644 web/app/configs/widget/twitch/twitch.widget.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 7b35226..7c52e09 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -38,6 +38,7 @@ import { NameService } from "./shared/services/name.service";
 import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
 import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
+import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
 
 @NgModule({
     imports: [
@@ -75,6 +76,7 @@ import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.
         GoogleCalendarWidgetConfigComponent,
         GoogleDocsWidgetConfigComponent,
         JitsiWidgetConfigComponent,
+        TwitchWidgetConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 8ff83fb..0f884a5 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -11,6 +11,7 @@ import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpa
 import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
 import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
+import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -52,6 +53,11 @@ const routes: Routes = [
                         component: JitsiWidgetConfigComponent,
                         data: {breadcrumb: "Jitsi Widgets", name: "Jitsi Widgets"}
                     },
+                    {
+                        path: "twitch",
+                        component: TwitchWidgetConfigComponent,
+                        data: {breadcrumb: "Twitch Livestream Widgets", name: "Twitch Livestream Widgets"}
+                    },
                 ],
             },
         ],
diff --git a/web/app/configs/widget/config_screen/config_screen.component.html b/web/app/configs/widget/config_screen/config_screen.component.html
index 6787e79..67db24a 100644
--- a/web/app/configs/widget/config_screen/config_screen.component.html
+++ b/web/app/configs/widget/config_screen/config_screen.component.html
@@ -22,6 +22,7 @@
     <my-ibox *ngFor="let widget of widgetComponent.widgets trackById" [isCollapsible]="true" [defaultCollapsed]="widget.id !== widgetComponent.defaultExpandedWidgetId">
         <h5 class="my-ibox-title">
             <i class="far fa-edit"></i> {{ widget.name || widget.url || widgetComponent.defaultName }}
+            <span *ngIf="widget.data.title">- {{ widget.data.title }}</span>
         </h5>
         <div class="my-ibox-content">
             <form (submit)="widgetComponent.saveWidget(widget)" novalidate name="editForm">
diff --git a/web/app/configs/widget/etherpad/etherpad.widget.component.ts b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
index fed4143..2f8f764 100644
--- a/web/app/configs/widget/etherpad/etherpad.widget.component.ts
+++ b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
@@ -14,7 +14,7 @@ export class EtherpadWidgetConfigComponent extends WidgetComponent {
     private etherpadWidget: EtherpadWidget = <EtherpadWidget>SessionStorage.editIntegration;
 
     constructor(private nameService: NameService) {
-        super(WIDGET_ETHERPAD, "Etherpad Widget", "generic", "etherpad");
+        super(WIDGET_ETHERPAD, "Etherpad", "generic", "etherpad");
     }
 
     protected OnNewWidgetPrepared(widget: EditableWidget): void {
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.ts b/web/app/configs/widget/google_calendar/gcal.widget.component.ts
index 0ce705a..3b1e370 100644
--- a/web/app/configs/widget/google_calendar/gcal.widget.component.ts
+++ b/web/app/configs/widget/google_calendar/gcal.widget.component.ts
@@ -8,7 +8,11 @@ import { Component } from "@angular/core";
 })
 export class GoogleCalendarWidgetConfigComponent extends WidgetComponent {
     constructor() {
-        super(WIDGET_GOOGLE_CALENDAR, "Google Calendar Widget", DISABLE_AUTOMATIC_WRAPPING, "googleCalendar");
+        super(WIDGET_GOOGLE_CALENDAR, "Google Calendar", DISABLE_AUTOMATIC_WRAPPING, "googleCalendar");
+    }
+
+    protected  OnNewWidgetPrepared(widget: EditableWidget) {
+        widget.dimension.newData.src = "";
     }
 
     protected OnWidgetsDiscovered(widgets: EditableWidget[]) {
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.ts b/web/app/configs/widget/google_docs/gdoc.widget.component.ts
index 8d4078b..a52ef53 100644
--- a/web/app/configs/widget/google_docs/gdoc.widget.component.ts
+++ b/web/app/configs/widget/google_docs/gdoc.widget.component.ts
@@ -8,6 +8,6 @@ import { Component } from "@angular/core";
 })
 export class GoogleDocsWidgetConfigComponent extends WidgetComponent {
     constructor() {
-        super(WIDGET_GOOGLE_DOCS, "Google Docs Widget", "generic", "googleDocs");
+        super(WIDGET_GOOGLE_DOCS, "Google Doc", "generic", "googleDocs");
     }
 }
\ No newline at end of file
diff --git a/web/app/configs/widget/twitch/twitch.widget.component.html b/web/app/configs/widget/twitch/twitch.widget.component.html
new file mode 100644
index 0000000..d3d9e0b
--- /dev/null
+++ b/web/app/configs/widget/twitch/twitch.widget.component.html
@@ -0,0 +1,11 @@
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Channel Name
+            <input type="text" class="form-control"
+                   placeholder="TwitchUsername"
+                   [(ngModel)]="widget.dimension.newData.channelName" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file
diff --git a/web/app/configs/widget/twitch/twitch.widget.component.scss b/web/app/configs/widget/twitch/twitch.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/twitch/twitch.widget.component.ts b/web/app/configs/widget/twitch/twitch.widget.component.ts
new file mode 100644
index 0000000..7514478
--- /dev/null
+++ b/web/app/configs/widget/twitch/twitch.widget.component.ts
@@ -0,0 +1,43 @@
+import { WidgetComponent } from "../widget.component";
+import { EditableWidget, WIDGET_TWITCH } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "twitch.widget.component.html",
+    styleUrls: ["twitch.widget.component.scss"],
+})
+export class TwitchWidgetConfigComponent extends WidgetComponent {
+    constructor() {
+        super(WIDGET_TWITCH, "Twitch Livestream", "video", "twitch");
+    }
+
+    protected OnNewWidgetPrepared(widget: EditableWidget) {
+        widget.dimension.newData.channelName = "";
+    }
+
+    protected OnWidgetsDiscovered(widgets: EditableWidget[]) {
+        for (const widget of widgets) {
+            if (!widget.data.channelName) {
+                // Convert legacy Dimension widgets to new format
+                widget.data.channelName = widget.data.dimChannelName;
+            }
+        }
+    }
+
+    protected OnWidgetBeforeAdd(widget: EditableWidget) {
+        this.setTwitchUrl(widget);
+    }
+
+    protected OnWidgetBeforeEdit(widget: EditableWidget) {
+        this.setTwitchUrl(widget);
+    }
+
+    private setTwitchUrl(widget: EditableWidget) {
+        if (!widget.dimension.newData.channelName || widget.dimension.newData.channelName.trim().length === 0) {
+            throw new Error("Please enter a shared calendar ID");
+        }
+
+        widget.dimension.newUrl = "https://player.twitch.tv/?channel=$channelName";
+        widget.dimension.newTitle = widget.dimension.newData.channelName;
+    }
+}
\ No newline at end of file

From 941524f43cff15b6ba5bfd58e34d4dabbe02f666 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 15:28:42 -0700
Subject: [PATCH 037/111] Add video widgets

---
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        |  6 ++
 .../widget/twitch/twitch.widget.component.ts  |  2 +-
 .../youtube/youtube.widget.component.html     | 11 +++
 .../youtube/youtube.widget.component.scss     |  0
 .../youtube/youtube.widget.component.ts       | 86 +++++++++++++++++++
 6 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 web/app/configs/widget/youtube/youtube.widget.component.html
 create mode 100644 web/app/configs/widget/youtube/youtube.widget.component.scss
 create mode 100644 web/app/configs/widget/youtube/youtube.widget.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 7c52e09..c23d34e 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -39,6 +39,7 @@ import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_cal
 import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
+import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
 
 @NgModule({
     imports: [
@@ -77,6 +78,7 @@ import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widg
         GoogleDocsWidgetConfigComponent,
         JitsiWidgetConfigComponent,
         TwitchWidgetConfigComponent,
+        YoutubeWidgetConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 0f884a5..cbf414c 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -12,6 +12,7 @@ import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_cal
 import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
+import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -58,6 +59,11 @@ const routes: Routes = [
                         component: TwitchWidgetConfigComponent,
                         data: {breadcrumb: "Twitch Livestream Widgets", name: "Twitch Livestream Widgets"}
                     },
+                    {
+                        path: "youtube",
+                        component: YoutubeWidgetConfigComponent,
+                        data: {breadcrumb: "Youtube Video Widgets", name: "Youtube Video Widgets"}
+                    },
                 ],
             },
         ],
diff --git a/web/app/configs/widget/twitch/twitch.widget.component.ts b/web/app/configs/widget/twitch/twitch.widget.component.ts
index 7514478..29908dd 100644
--- a/web/app/configs/widget/twitch/twitch.widget.component.ts
+++ b/web/app/configs/widget/twitch/twitch.widget.component.ts
@@ -34,7 +34,7 @@ export class TwitchWidgetConfigComponent extends WidgetComponent {
 
     private setTwitchUrl(widget: EditableWidget) {
         if (!widget.dimension.newData.channelName || widget.dimension.newData.channelName.trim().length === 0) {
-            throw new Error("Please enter a shared calendar ID");
+            throw new Error("Please enter a channel name");
         }
 
         widget.dimension.newUrl = "https://player.twitch.tv/?channel=$channelName";
diff --git a/web/app/configs/widget/youtube/youtube.widget.component.html b/web/app/configs/widget/youtube/youtube.widget.component.html
new file mode 100644
index 0000000..5dc53b7
--- /dev/null
+++ b/web/app/configs/widget/youtube/youtube.widget.component.html
@@ -0,0 +1,11 @@
+<my-widget-config [widgetComponent]="this">
+    <ng-template #widgetParamsTemplate let-widget="widget">
+        <label class="label-block">
+            Video URL
+            <input type="text" class="form-control"
+                   placeholder="https://www.youtube.com/watch?v=jr2mXSKq3B4"
+                   [(ngModel)]="widget.dimension.newData.videoUrl" name="widget-url-{{widget.id}}"
+                   [disabled]="isUpdating"/>
+        </label>
+    </ng-template>
+</my-widget-config>
\ No newline at end of file
diff --git a/web/app/configs/widget/youtube/youtube.widget.component.scss b/web/app/configs/widget/youtube/youtube.widget.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/widget/youtube/youtube.widget.component.ts b/web/app/configs/widget/youtube/youtube.widget.component.ts
new file mode 100644
index 0000000..8cce0cb
--- /dev/null
+++ b/web/app/configs/widget/youtube/youtube.widget.component.ts
@@ -0,0 +1,86 @@
+import { WidgetComponent } from "../widget.component";
+import { EditableWidget, WIDGET_YOUTUBE } from "../../../shared/models/widget";
+import { Component } from "@angular/core";
+import * as embed from "embed-video";
+import * as $ from "jquery";
+import * as url from "url";
+
+@Component({
+    templateUrl: "youtube.widget.component.html",
+    styleUrls: ["youtube.widget.component.scss"],
+})
+export class YoutubeWidgetConfigComponent extends WidgetComponent {
+    constructor() {
+        super(WIDGET_YOUTUBE, "Video", "video", "youtube");
+    }
+
+    protected OnNewWidgetPrepared(widget: EditableWidget) {
+        widget.dimension.newData.videoUrl = "";
+    }
+
+    protected OnWidgetsDiscovered(widgets: EditableWidget[]) {
+        for (const widget of widgets) {
+            if (widget.data.videoUrl) continue; // Dimension widget
+
+            if (widget.data.cUrl) {
+                // Scalar widget
+                widget.data.videoUrl = this.parseVideoUrl(widget.data.cUrl);
+            } else {
+                // Older Dimension widget - infer link
+                const parsedUrl = url.parse(widget.url, true);
+                if (parsedUrl.query["url"]) {
+                    widget.data.videoUrl = this.parseVideoUrl(decodeURIComponent(parsedUrl.query["url"]));
+                } else console.warn("Cannot parse URL for " + widget.id);
+            }
+        }
+    }
+
+    protected OnWidgetBeforeAdd(widget: EditableWidget) {
+        this.setVideoUrl(widget);
+    }
+
+    protected OnWidgetBeforeEdit(widget: EditableWidget) {
+        this.setVideoUrl(widget);
+    }
+
+    private setVideoUrl(widget: EditableWidget) {
+        if (!widget.dimension.newData.videoUrl || widget.dimension.newData.videoUrl.trim().length === 0) {
+            throw new Error("Please enter a video URL");
+        }
+
+        const videoUrl = this.getRealVideoUrl(widget.dimension.newData.videoUrl);
+        if (!videoUrl) {
+            throw new Error("Please enter a YouTube, Vimeo, or DailyMotion video URL");
+        }
+
+        widget.dimension.newUrl = videoUrl;
+    }
+
+    private getRealVideoUrl(videoUrl): string {
+        const embedCode = embed(videoUrl);
+        if (!embedCode) {
+            return null;
+        }
+
+        // HACK: Grab the video URL from the iframe embed code
+        videoUrl = $(embedCode).attr("src");
+        if (videoUrl.startsWith("//")) videoUrl = "https:" + videoUrl;
+
+        return videoUrl;
+    }
+
+    private parseVideoUrl(videoUrl: string): string {
+        const parsed = url.parse(videoUrl);
+
+        const realPath = parsed.path.split("?")[0];
+        if (parsed.host.indexOf("youtube.com") !== -1) {
+            return "https://youtube.com/watch?v=" + realPath.substring("/embed/".length);
+        } else if (parsed.host.indexOf("vimeo.com") !== -1) {
+            return "https://vimeo.com/" + realPath.substring("/video/".length);
+        } else if (parsed.host.indexOf("dailymotion.com") !== -1) {
+            return "https://dailymotion.com/" + realPath.substring("/embed/".length);
+        }
+
+        return videoUrl;
+    }
+}
\ No newline at end of file

From ffdb09d0284081ae5813f894e9e33add3beebfa7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 16:20:59 -0700
Subject: [PATCH 038/111] Update homepage and branding

---
 README.md                                     |   5 ++-
 web/app/home/home.component.html              |  18 +++-----
 web/app/home/home.component.scss              |   5 ++-
 web/app/home/home.component.ts                |   7 +++
 web/public/img/avatar.png                     | Bin 4132 -> 0 bytes
 web/public/img/favicon.ico                    | Bin 1150 -> 0 bytes
 web/public/img/favicon.png                    | Bin 2165 -> 0 bytes
 web/public/img/logo.png                       | Bin 13683 -> 0 bytes
 web/public/img/logo/banner-sm.png             | Bin 0 -> 6473 bytes
 .../img/logo/favicon/android-icon-144x144.png | Bin 0 -> 10125 bytes
 .../img/logo/favicon/android-icon-192x192.png | Bin 0 -> 11930 bytes
 .../img/logo/favicon/android-icon-36x36.png   | Bin 0 -> 2342 bytes
 .../img/logo/favicon/android-icon-48x48.png   | Bin 0 -> 3223 bytes
 .../img/logo/favicon/android-icon-72x72.png   | Bin 0 -> 4631 bytes
 .../img/logo/favicon/android-icon-96x96.png   | Bin 0 -> 6344 bytes
 .../img/logo/favicon/apple-icon-114x114.png   | Bin 0 -> 7758 bytes
 .../img/logo/favicon/apple-icon-120x120.png   | Bin 0 -> 8238 bytes
 .../img/logo/favicon/apple-icon-144x144.png   | Bin 0 -> 10125 bytes
 .../img/logo/favicon/apple-icon-152x152.png   | Bin 0 -> 10676 bytes
 .../img/logo/favicon/apple-icon-180x180.png   | Bin 0 -> 13164 bytes
 .../img/logo/favicon/apple-icon-57x57.png     | Bin 0 -> 3595 bytes
 .../img/logo/favicon/apple-icon-60x60.png     | Bin 0 -> 3854 bytes
 .../img/logo/favicon/apple-icon-72x72.png     | Bin 0 -> 4631 bytes
 .../img/logo/favicon/apple-icon-76x76.png     | Bin 0 -> 4962 bytes
 .../logo/favicon/apple-icon-precomposed.png   | Bin 0 -> 12504 bytes
 web/public/img/logo/favicon/apple-icon.png    | Bin 0 -> 12504 bytes
 web/public/img/logo/favicon/browserconfig.xml |   2 +
 web/public/img/logo/favicon/favicon-16x16.png | Bin 0 -> 1306 bytes
 web/public/img/logo/favicon/favicon-32x32.png | Bin 0 -> 2220 bytes
 web/public/img/logo/favicon/favicon-96x96.png | Bin 0 -> 6344 bytes
 web/public/img/logo/favicon/favicon.ico       | Bin 0 -> 1150 bytes
 web/public/img/logo/favicon/manifest.json     |  41 ++++++++++++++++++
 .../img/logo/favicon/ms-icon-144x144.png      | Bin 0 -> 10125 bytes
 .../img/logo/favicon/ms-icon-150x150.png      | Bin 0 -> 10640 bytes
 .../img/logo/favicon/ms-icon-310x310.png      | Bin 0 -> 28700 bytes
 web/public/img/logo/favicon/ms-icon-70x70.png | Bin 0 -> 4416 bytes
 web/public/img/screenshot.png                 | Bin 6631 -> 0 bytes
 web/public/img/screenshot_bordered.png        | Bin 43769 -> 0 bytes
 web/public/index.html                         |  20 ++++++++-
 39 files changed, 81 insertions(+), 17 deletions(-)
 delete mode 100644 web/public/img/avatar.png
 delete mode 100644 web/public/img/favicon.ico
 delete mode 100644 web/public/img/favicon.png
 delete mode 100644 web/public/img/logo.png
 create mode 100644 web/public/img/logo/banner-sm.png
 create mode 100644 web/public/img/logo/favicon/android-icon-144x144.png
 create mode 100644 web/public/img/logo/favicon/android-icon-192x192.png
 create mode 100644 web/public/img/logo/favicon/android-icon-36x36.png
 create mode 100644 web/public/img/logo/favicon/android-icon-48x48.png
 create mode 100644 web/public/img/logo/favicon/android-icon-72x72.png
 create mode 100644 web/public/img/logo/favicon/android-icon-96x96.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-114x114.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-120x120.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-144x144.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-152x152.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-180x180.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-57x57.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-60x60.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-72x72.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-76x76.png
 create mode 100644 web/public/img/logo/favicon/apple-icon-precomposed.png
 create mode 100644 web/public/img/logo/favicon/apple-icon.png
 create mode 100644 web/public/img/logo/favicon/browserconfig.xml
 create mode 100644 web/public/img/logo/favicon/favicon-16x16.png
 create mode 100644 web/public/img/logo/favicon/favicon-32x32.png
 create mode 100644 web/public/img/logo/favicon/favicon-96x96.png
 create mode 100644 web/public/img/logo/favicon/favicon.ico
 create mode 100644 web/public/img/logo/favicon/manifest.json
 create mode 100644 web/public/img/logo/favicon/ms-icon-144x144.png
 create mode 100644 web/public/img/logo/favicon/ms-icon-150x150.png
 create mode 100644 web/public/img/logo/favicon/ms-icon-310x310.png
 create mode 100644 web/public/img/logo/favicon/ms-icon-70x70.png
 delete mode 100644 web/public/img/screenshot.png
 delete mode 100644 web/public/img/screenshot_bordered.png

diff --git a/README.md b/README.md
index 642340e..443ef20 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
-![dimension](https://t2bot.io/_matrix/media/v1/download/t2l.io/CceFARjXLjomNdUbKjXbGrDF)
- 
+![dimension](https://t2bot.io/_matrix/media/v1/download/t2l.io/GJYlwewrUhDpoBchfmBhxzZe)
+
+
 [![TravisCI badge](https://travis-ci.org/turt2live/matrix-dimension.svg?branch=master)](https://travis-ci.org/turt2live/matrix-dimension)
 [![#dimension:t2bot.io](https://img.shields.io/badge/matrix-%23dimension:t2bot.io-brightgreen.svg)](https://matrix.to/#/#dimension:t2bot.io)
 
diff --git a/web/app/home/home.component.html b/web/app/home/home.component.html
index 0d08561..17c4e9a 100644
--- a/web/app/home/home.component.html
+++ b/web/app/home/home.component.html
@@ -1,22 +1,16 @@
 <div class="header">
-    <img src="/img/logo.png">
+    <img src="/img/logo/banner-sm.png">
 </div>
 <div class="wrapper">
     <div class="center">
-        <h3>An alternative integrations manager for Riot</h3>
-        <p>Dimension is a way for people hosting Riot to expand their integrations offering to their users.</p>
-        <img src="/img/screenshot_bordered.png">
-        <br/>
+        <h3>A self-hosted integrations manager for Riot</h3>
+        <p>Dimension gives rooms the option of using self-hosted bots, bridges, and widgets.</p>
         <br/>
         <p>Point your Riot <code>config.json</code> to Dimension to start using it:</p>
-        <pre>
-        "integrations_ui_url": "https://dimension.t2bot.io/riot",
-        "integrations_rest_url": "https://dimension.t2bot.io/api/v1/scalar",
-        "integrations_widgets_urls": ["https://dimension.t2bot.io/widgets"],
-        </pre>
+        <pre>{{ integrationsConfig }}</pre>
         <br/>
         <br/>
-        <p>Learn more on <a href="https://github.com/turt2live/matrix-dimension">Github</a>. Talk about it in <a
-                href="https://matrix.to/#/#dimension:t2l.io">#dimension:t2l.io</a></p>
+        <p>Learn more on <a href="https://github.com/turt2live/matrix-dimension">Github</a> or on [matrix] at <a
+                href="https://matrix.to/#/#dimension:t2bot.io">#dimension:t2bot.io</a></p>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/home/home.component.scss b/web/app/home/home.component.scss
index a8e6aa9..7eedcc5 100644
--- a/web/app/home/home.component.scss
+++ b/web/app/home/home.component.scss
@@ -2,10 +2,13 @@
 .header {
   text-align: center;
   background-color: #fff;
+  margin-top: 30px;
+  border-top: 1px solid #e7eaec;
+  border-bottom: 1px solid #e7eaec;
 }
 
 .header img {
-  height: 125px;
+  padding: 20px;
 }
 
 .wrapper {
diff --git a/web/app/home/home.component.ts b/web/app/home/home.component.ts
index 35ddfbd..f75ca23 100644
--- a/web/app/home/home.component.ts
+++ b/web/app/home/home.component.ts
@@ -7,6 +7,13 @@ import { Component } from "@angular/core";
 })
 export class HomeComponent {
 
+    public hostname: string = window.location.origin;
+    public integrationsConfig: string = `
+    "integrations_ui_url": "${this.hostname}/riot",
+    "integrations_rest_url": "${this.hostname}/api/v1/scalar",
+    "integrations_widgets_urls": ["${this.hostname}/widgets"],
+    `;
+
     constructor() {
         // Do stuff
     }
diff --git a/web/public/img/avatar.png b/web/public/img/avatar.png
deleted file mode 100644
index a45afca8a15f7204bc0f8e5a4134578a9a322f67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4132
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
JD>ZFU{{h3O;3WV6

diff --git a/web/public/img/favicon.ico b/web/public/img/favicon.ico
deleted file mode 100644
index 22ba9cbeb85b6df969e81bfcd162717c2f6b7a5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmbVMOG^S#6uv>bHbKz3Wxu3Wty;PX+GO+}3?e9qUi30(6=fy8FcL*0qmn{0h@?Pz
zXIVPqYpi+QuR9ZtGL3?r;oNh+Gv_<!p39vfq=7xn&4jIOq_2^XRzgTSQx;;8-#9ab
zuy-v@zp7)lz$Da!>w%dfh4)%Px=>#gEj#x`@tjgI>n<R{t5w@d3Xn3@|HxC!1w{CR
z1<XvPa1<)w^hB`KKuExBP(+6HD@joT!f^%nj}lf_GI)EF!EqEE4_$f9GMr8;cugv}
zd{Q7=Y*7$YY;R>DiWGN|J%n8joVkZ^<#U32i2=0Sv(&rNmia(n-j2Y69XCfVoNta`
zceo3;$Lp2pfBZ`RfwLd6!(}5UaT~_wU<b0vdn0CcYVlP?#{Res@v~hs&A_$zl+Es&
z?qM@*82M(W7C-m-#P;8b<XzNEGjJt8$j&aZGX_2p$3xTy?}QEEH3zggs!5qoap9SS
zXS5ssnO+<$4(Mkui^XbGJ^s$ASaRpVv-_wj5~Obd8i!Jg%VJUKJxj42m7#q{{}r`P
KYUw}lU;6_ITEgc5

diff --git a/web/public/img/favicon.png b/web/public/img/favicon.png
deleted file mode 100644
index 714ac2caeaa3b548fab2e158311cbcbe89db5a7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2165
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

diff --git a/web/public/img/logo.png b/web/public/img/logo.png
deleted file mode 100644
index 901aa19966faf25fc25fb227abba6c4c52baa880..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13683
zcmZvDV|3n2_jc5%L1Q~<Y&N!S+qP}nw%yoiW7|$++sS+PJf}VX5ARyDva;r$-^`w^
znZ5TlVY1R9u+W&$KtMpSVxofbKtLd>fd6YC!2y2>taBBCfbfCD1o;$QfzPraJdx+`
z2YrqR2m*n~!62!@_%FaNfy4FrkYfo$IY+<0pFQ^-D9B9@em7VwQT+mp0$fCfk8>ns
z4jG8c4@m+B0#)`gi2?IfkJZ7&#o2}Br9EfT+u3A)tn<M8Vr(MKW0GsJq_D6MOp=%v
z<ZlZ`xMZdxH5UA@hd37@*RTJxADF1`zYXRqFX*Ul?pXAHU8cHMnE1eme_8<4R1X6>
z*>|G<x-eBc!2ix5+M^4?R0{(>a{6DFFF0z=f5Q>!Qh{Kp0{j>_{!WSrAj9Gh4S?_d
zKV)$J=%JY4h{(S^i?#Xs--mP@z>{>f@o2fW(-~ya+Pco!b20zXzGY($?q(tz+W{m*
z9<c?QOSi|Gm<t9R_U5~VS*)Bj5(fko`%iPF1-`l0O=7Nwwr@neCLfxQq^56+bs6x`
zh+-!FLpmKZumh$lYGj3cI8(j2*k#6_g?cK%#!PgT^fi<C3*(f;{Wt&e+?ZIG9khbZ
zjUc>v((fYYr~g83SR9Ex;pG33f-#{kF6l!(mkN+LGWqnC76NkrU)E^~_h56W8bwiN
zWmkk7vT3TuK{kv1Vbq#b&l`9$=ztPAC#G5v@uSoq$?AfGoHN(L&{c~Q%nVVG^xFL8
zmkW|@g<sL}R5f&1^hJ3gnaH0{wj@EgNk~Y_-+xWa{WRY&D-hP;RQ9<hj(BNJ__Ix4
zFu;mcT&m~QoTGo4f)8x+CD(5crhM%0xSk4tj$9w_o9z81HIvU5JejeSLFO+dHNQ2j
zA|og1?@YGfz?iBNxg(r^zv@T_C`ygBw{rF$5_&MeOm)8nP}~sz5z3`GK;1gpp48m_
zPHpn#(nYv<Y_=UTb97vUPp;0o$U+%@At~=4QMZHxeY9%|t#FK9xr3gZ!=r939o@h+
zch%IugS>ho9A3Cwacu2er04OKDser|kTP^&rVEA;eI-QZ=H`Y=u?U6<?q-H}V8xkI
zDl!}}Xk$SB$23$BwtP}5L_JKtY1`;huehT_$YeUXov3`ioQ0_>rr$oCB8KMD=p!U2
z0M{enqgf346#qy0&?S0KV5to3$`6t?WCL-`N*X37vF<HM!v!=mf}L!o+Sy>F!$st8
z+LVe@B(h*g{^d{4&2Lkb!wN^6O%5P!n9Sg@;kOio40f~$_NX=sSb#lA6;&wb|07{p
z4B!dE%E;)9m?D#`L64iJ-0|In=^LHd%d>hzWK`5vHA+;OKZA2c0P?~mNWj)fiuaSd
zm=M_^O1Qk+!6B1RZ8SlgF9ZK$H#h*9;V%3t!&q+F4G1#5J0zxBu^;-`P}26V4Q$~6
zB<5zyQBs&QFi$()Gt_*rt-A0HzUtHb*Z;}TuUrhUSV;59TvGe={nfB)tr`zpQiw{@
zal-#N<U9Cfi;6#}SiDpN32PJEOsO8=+JyQ^$Y{v<y!8;SuOnhrWJ6CKp4c){ViHVl
zY&kj5j?}&_C3s_&VU)zV-!j?LAghnhCWEG#*xRkQq`4Z~qIEFTLwI_bv9A7zssEQ$
zT_(V0pan^`-0#f&pyQjuu-U!AC7MgLUQgK~-_q_OIH~>M2PT(%6N%Iw@2^h2V5941
zFu;k%;LRh+tgj9GVY^cN=1WWVZw;GV%MdU0+Z$Mjj;QpTR%x2!&KJJkPDt&rMEgoB
zF_4$=&Do5_;7t1#=Y?qh-2-2<@m?oGIL`TKB;mLD_hf-RZth7xD|K5&lcbeKAz{r8
zR1~=DZ<4xfzmVGS%6~_1Z%BxRW9?x0Tpvr0^shi-eNO;dVbA5Tj`;TKN#9@sqTKCF
zX&lvx5OzoCI9Wzk>+S+>jrqYy^9yVDK#AVR`d=mkL8+1gERr2d0lT$TgR`lF5t<fO
zhCjC3YP`|a0~7bzGK~C~kK|v^)RO_Zbl-RXmEmi-g>N^WHhOkoW6gSa@iepL%;}8~
z$K}%xE0!z)y}vd&2nnDnGDl+4dXWtpYXd#3VwI`3O!KIJCCPcF*nv#)kLKy}0EBS=
z-C;D1fzkHdfz?1%zQg_r4LZW^A>^~1re>ul+^4?|;`BGk-p<w>jC4JC3OOyfZyYT0
z3w*|?-mfRhMsCo5O>9X9pki;QYwpF}-FV)QCO(d4m_?O?5}Q@M%Qt9=d*q^j*T?(4
zz8zz~+Ppsq6H$e-X>2_A;N<>xRSqlpuzcuWPvi~oJEtZl;fz?qLAwbrFBB)&6Q@$A
z{qluLDLTH42Q<73=}Zy~1=17xL{3~;2?uv|Yke;A)dELeG!*5S-ic2u>Q!z-!{e;;
zZ+n#%%gayV9RjT?zq0k(M0;Q!U{glQKvW9ANILC~q{o(Bd7D{G>_1=L#T#<Yb$3=*
zHbY`ha>uw~Js9k6NLsF>gsmT`4RPnhyz<}~U!x-8VurdmmKQj9GPU)I>;^|iO_Q;&
znT0ac+h2|rgQj!mD;!T-8s>BZrPbmOPeO#2;zllo$~u}N21QHdGj+C+^trC-Z;D7~
z_t)c?sitK{YniDnIWT?3D48s%eWd-Ve2k@0!Hy|1&wJ9semI>^^W0D!<KFl)a{;`1
zq9wOhR3pXFX+-X|?t`rfmos`7V0g-rUmi8(OPufU`{v91SYRy*Bs^iN&Co*j?<};~
zt&8zUCx4k+Q97--Uj{Y}y-im-3{jJ{6&Aybf5Aldtu^-p5E&S_1WCM56NGwao~IPB
zV!FwOi0HYznt(22;bNluG(ogvcSwA1Y-r$9{7U;v$GHY_G&qj=iw-OHxPirXc%SO6
zB|-#dcmYm!-^$oSluTHf_9S(K`AX?D>OIIEsZ4##=0aA~c~)ouDTR(<tDB|N>GKwx
z#&_p3Pjh!vM7%V`bK&pByb()~r=C7co`xtEpfj)I5OfYw=0)H77puZbz@4iVh4*yN
zgFran`xz?ocZKhH4P8U$cZ(njNp)97kUd*nL+)iMpHI}ZDddluIgzU^*MZ=*7vY+3
zO_j?kk9&XoAe2;#^B0qF(I0MNTAEcsz(9@MRw3TXJ6X-R&!gmIkjeSkJnEu1a*b@c
zlu{O6nwi<a*KF)WU$5e@=B7khLN%ma-NS$-tQ8W!cdT`^0+zUpb-#V<_LAHjKaU&O
z>-DzM@<!m!UBjy(qg1_z!V$CNgp<M-g*gv0Rifl|YlRhJvC7JH+vdFIqq59i_KsR$
ze*gUTXspJ7`f7JM^EvtW$!PBvNs&l|YUJ@e$WQmLEtXX)_3W;zUIL&M;pnRN2%B%c
zAf9!uCd((w#}~}IAq5&YZOSpL_FLUN)jzwtw3Lp>xiS{}N3MQSCdqvxTi-$`;Hjfv
ze=B=$1D{-saM4|Zx2Stq!l-y!vd@*NaDUv&rktjzj;1cricfOMG^3Qi{LwHkIzH6Z
zuo;JU-Q{DlnT*bJ3{4U+8&_}n?LpU=MLVYzL5FI^uj5CzJH6%b&v?u6SYA$d1BghB
zIgFi*!&AdPrxw=}f{w>^%t}#dR>}3yDc(q&<iL=ZW*0Y^VouJ@XEUTe*zLJ*2U5jH
zOKgbE4`O|xl<7q5gmVPW)vp)zLer-XZmu@xc&T(A-xX9x%JE$utfEZ7U4#QfSN&C1
z<zvF@H=H+XHyd|Qwt80qr-Yc=%TdJx*{FN`)<t_IPvyN)rtl_O@oqFcDyFd}R7Md;
zbndKz0-c*#{dnn&bY}m&fluEMR5#$qFvOV`X1i(W2Jc&}*EX~6ad!+a|Hsgd*LBPW
zS5rjp^zM1tU2(^x?3|P?oe1R^X@7K@bLk|l5C&qemq4AVhklG;OcnWqN{1)c)6u<_
z>!+hwd(EU|YmUgi5Yp`@vx+SJFNsxy#czXGk13<m*9Zo}^dtLc=bJmMx9@A?rjDCv
zu6iq&C3VOupsnz`c(2ehUai<OC#J!Q^XFKYs>UtlFf#;od{(#OkxC<HgUm{^J?csN
z%RT9x*0d`;SJZ}H!Y0H|Kil3qpIq%$%=b=Bs+R+rVtjU)vIOJC7+ViNMr0lxyI%Bj
z&o~_sak5`g4Z1Z9TJ)3<?%&70A3n^$bZ{GZ^$XCfH#y@}FU1A3#CQb^k1AxAPhS6W
zbo6qkfWu}i7HMEG8kErq=`!${b80N5g7=6<NxGW;e&G2%D<R$)n(O0^3pcH0>^x6j
z<Am6|*k*jgFdZ$S+<9}Vr~WRSsr7ZU#<Hw1k2CbX(1d*0J$|aVGc9Gj(9K~19Om`H
zGSjJ7BmFjC)XiPY(Av!_dSN%0^yJX)XuR!Xwm-GSw!J`Y+4CK~`$D*xULnr2&uKCJ
zaW*RLl_R^fPi1mHe96_n=;YGprrA7rsP0q~%i+7sYtPm9mi;0O>9b*X&mDPA4x^->
z-pcp$wa1yvCU4x1IE*M3_l7M+^7d6j5yPuIR*n)+MM27qFTvo-W~0h+7r<KSyp3{3
z`^riZpZZBuyAPI%%!gO+cu1=pk3hGM#3=EDgBov_`ijz}jZA{o5}55jKyzsPZ*yBH
z#A=o=oA(J1`12~lsZ=I799VYK#3)D39Oi}lPi%jjO0`_f_Q$?eOYY1*JUr}kkRboC
zU|cZxvBsmRmPMhq0O9b_Bem<}KX&PC5|5TZ+O6&9!J~edcp_9}t#sBU=Y?8Pn->WM
zIRw*IJ+7a~q}H_?8lPDLl@z@@Dj>B{Z6yZW#T{BM2P>6t&WjyvRGeNV22=9F{RDeN
z>OjMxg!_20@+f=#aOXD$hnz)RTG`23_3E~M^$wCb+Gta}Vw6;7I2dyCKIJ}s%1rpv
zDBUfKu4=;Rhd(8G*|k8;_)4f5rLz*vufl?&#XL^lev_dEWW>Xe=SF^Jxa-x8+tK}i
z$DL-J`)up0j?ILat<BAM>#Nie>DFj0q2N3zO)E!J<g$4=<IgJ&-DQa;%4sp)PoVHJ
zn(8z#AysX{Au0l+&j^QW#Nsc}a;ZXEY8W|hO`!0e^+Q&|%1UiE=nxh4l;Z+1Vq-{2
z)%#H|@5e`1Q|0Q49!h}Yv4I6ehJtg>@P7F+8>*#V3Y3_nj~AplSqgE2ZwCPoMyP&1
zskPg@st>7pM>W~?;C_a6$iZ_J6Mpso<yVvPi;uBEgz?r22_np5p19b!RiO_-d1s4i
z#Tk9`qYJCTr2?Mvbd)nd#YZ#bBeE@DGh5htY`qpf#<Od#n5sWF{u1$xgIV}t--$Nk
ziOi3M^^`048zA)1qmte)os>@qn%FBUAQZ_!ZV*td{+Y9Q)?a`$uR0`PZyE!3YpSg>
ztAgrGn?X!=F!GB?wPo*1mwLzSSBS%d;>sUYD#Z8=>blERXV28zf`Mh!c~a{0HAO+Q
zqT;0ya8U(c^!iPcU(R^<G0w7Aoi7XTscHS|p@ozrHftn%1#+l?NBY<l$_xTl=IM8A
z#;0qv1RSGd_+3q(P6V%Ga~lvBZF-XfQrieWF@Tv$JUebX3kIwFY>DHt`ZoS$x!iG+
zPEr5`dRErmDdOgKYw;l2TKz3~Bi&&Zm*2Ph&1NvZm9m8WMCt~`OMLTw@<0O~6u*;*
zHs&x|k1K<KP1Z}jo0Bf*(LU{(s&8`uPI%MV?$K!1`_{)vxyYvcdhluIlK5<LHdz+*
zGYejifew|zy#pe*2TvCgJ;HpIHr74vQj#;GR!(;D=>_WPMF`+p(8n0iM#l4MG%)*F
zLB-%lrql@hlf`QP_F`SYS=EBk0frNfc+7Y$F4W^e&%_}zo|oFU1?M5A_eEpt9t%bm
zGI*bE7Z)4OweEmMs-y>>*HKi?QVj6t649EGc9#b}`2JzmWcx(AuNe<U=D|f^o77QN
zB*ITeHh2w=;n&<M?=DG7<}bZSqVC3+6U%g-G{VO%aqD&ti^VKKTVK2#SWgFU6jZij
zKuJf+<&JDxSxllad^6hnRVYkG`E1&4PI0VigUF4vBy*$mIlp2sh}-4e)K$=h>KTo<
zAQoIFA*{z;_ioZZk0i5TsN{c0X=Uh-``8FQfHmqZ)y*nfFt!RyJ<gZgk+63%af;0z
zRaa=NVh@(-gb1rLd$UzrD(OJg)jl1f?V6y7U;I3DIiSQ+d0XixczT;&(Ws~9q9o`A
zcD<R<R=ruN`cj}sGQMdK`Q6cfyZo0ygrw18-mlqaDKASm59DI5`OUAp;uA^QpO1nP
zKW+AlDv4dJvN2ha%ebjZWKt&Go^H{ozC2gKVW`MQg9)B5F<}~jyY$Ye1n*p$eDtik
zyuxZ_lwlQ8JhzDp^C!c&8AR9Hp&TAWTs7bIEI<{|k(H%M0g^7=SnW)`#m&|~Ib81L
zyR;2meQrH&2q>vr7?g?temR-41{*DDo{b&bUZK2juAoGzuRJjFk?xJ#o9&&e0m~oc
z3=gLU3D-Z!0D>sb`YDe?BGy~xTX|=h`sa=%HVPO@ZJc1VVA5qv)g)?}-~?|sZ~T>k
zd7Ads<BOV<(?A$z%rw9a2l(WnT*#>VA$=kBVU0H=8S5AuFF=TP9YiSy35v!d7#Z_d
z4E)7WKoISQKT8xLj=Y)egK_HXl9RaG>G04%ac6Yvr^+=qu=p5lcXwUV4)*er@d01$
zE_==<XD3c?1yU;4D^wJ_+2M}YH}%58inoiAdQk~&Tz?bmqhmS=dPO{}DFn(7Mwp%E
zqWHe6_Z_<8@CFAX&Z{mt4`_}QEC<$9-^$f_Hg#%tn}H(-@D%Hb(>CUafwo1F+=v}8
zpiXtsn9;<+nvh%WBNB_*>xA@v-M14W*oabE;oUh>Ygu;zE=L9kEO{J{rR1uIX@zgD
zMs4Z9H*2vpkGFmmuxdKhYL;N$9%gjqpAH{(M193wAheS5%#MJ)E}!p%sg+11m|?}_
zu?Er_oo$wlzdt>^^1vNu&r*HG-W7ISOu7;F`}LFbDwrP~O^*l(IJui)Y#X;HJkyBG
zeXrtJc%jni1z(SNEsgW8E6;ClqGBM-NQ8WXI4($~!aY8(w4WB1?+nx2#;Tn2SB!Y3
z)S1{05^*Q3@W~uQHOu+&s<>E@5%>gQ5{XVF>}ax*vFu{8tD9g<eLMC$wFEL3PeX=0
zcTOt-s%n{jR=S}6nMHHHlfX-|BE|UN%)`ykxnmu6fl+x}iWkKRpF$r9Fz}^Kfy(@l
zl9A9+U-42nH@l3t)A87sWejp|7XFhfWjFe`>wX`J;E?q=&ZplLM^g@bG7_f5R86CS
zc0cr|(4gXXukMpmcy-Q<GpsYwP>9*5Pko9+a%$_UiWjd?h^81mf)Z=6Rnw5A6`LGT
zfq!7EJSetwlYu=AT!1xCS~t3C9^>b98({Y19;LwFhD43TIlWwQGrFOAX}2m6wMzG1
z_Dc319b*u|O>CdJ1s#ApoLQ2e*6y}B@!OTv%0J~PaL3$mP^trFX9^owb-6EZS>0)3
z8~pgCdr{IK>E!JG3<x45O8mI)Y+XxN98cFgAHe(^KP^6{+K#<F@Rk6~7DA1VqfR@}
z-YI=>p)b<}g8i3GkxJ_Ap`%i2TylEeK19CCMo70MUmicuIF!qSaMToj=jkas4Wk|&
z-jv*frW&SUa75O6|D<*A5??8bu_e5D|H#IY+Gg$W#JEUsR_DUgr=X!JwM|)1o?Xor
zS6d-)<BjBDU<$i!!~MMkmP*PK(X5N^Y8?0G%96zXb_Z6<VGI&Ql;4+NVJ+CNqohMR
zRS{j~n5qol&7XN*u(-iY%F=4gXM1MONAJa41CKsBrp;k;N2P6bMK+tB+0R&Yv)G~1
z=<MR&5jlM%BKu*p(%EE*-V{i()l&Io_5eD2Xkr{I7~5U5us;DACMVZlxbH-HUf+^s
zOaN3Z)C<kwfSjBjUW)rG5qAW-+;y$E&n_X=i9$?Uu#aF}=}3!Qh9I}T^0jVJC?UUm
z1i;}@C6&5}Q7C!aXOyJta#Q#P4wpOr_5nGXyp6896-l}<h+i-tSQ1H=HFO+O$+dA?
zNzsKlix*1jGSev1lMGi|$>+}#8xhSo!GVdkLh%IXQ1n~jbM;;CU&;>kYBu+RKu+xT
z#7|1}1CvJFXCLO0$i=zC5zUKC^3`MF<z9dJ*z=marQjWTy_kn}QTigdD<%E*ng}WZ
zP&Z`qnf@0C8qBnQl$wvEC^`f)ZH=RRgs1HkBz@(u8rcemNu`npY0%ync8wJUDf*Gs
zBO~(PoP|EWg(L_rZ@N7eiaW!N-kO)8W{hq71I^VSfvYKt(Jrs<6YxEE?jW+wDs^JJ
z-!aWzrG@{Tky$I`89R$~FN3L(X#Ku;;UavMvZtnWo>Bhf*jd@yVG}a4S}Y6YtQ*C6
zQDELWFwHDLg=f2~t&}yf`bDfw--%c^UvObT;-4^hNFaGxPD}&7T%<vHcoK$zp;A$#
zcXCv_`F93G96Xb1{KqXCu-c15*$={#dhlZ>9L#s8{Lemj)>=9m@bWc7)DSYNng&W2
zoQ!xb`@iKhMt$LH?FPO66z|0h0b<RbtDVHIgv)6xQO>@Hb`1ZbTCv*3g&{7t3W3ow
z7tE|B{y@r7>SR_{IOCPvRgv#Uat8yuaA8DI>)<-KxQHf|KUy<y7IuckW5p}JLM{=~
zVZT|QW!55F%0tXm=)w3%DZIyuS%{8NZ<#9oY;{6_LLU=vxA2>i0vb>!BN;MjAr-GL
z6)C4)@#XK<)x-tm3Ss^Z70jKBlwcGn2g}Y;kufiZQlxIObIOPP%URWU);;PN#v3&=
z=h1;?hq+reWYgU>SgZ;fgd<~>nnkP6T;{-DFO4w{N#dxZM~m8350(W16~L-gYvUYQ
zPJp1y-r*;E#iL}_(Ol8qLKGzR+prA>)S*Y`Qd%8oNh?1o3TTC#BJ7?}CQhk!s{#=+
zKi|^Hp;k3MlJ#RxE47c;ps;u&x9uy{3Ku;F5}LKkav%sv{~CS+UoU<fS{!$k)<KO4
zRKR0sd8K5XS<Z^RYVru(3Af2Q>+{>NF$sSs1xfBRP@bO>xiD^JU{5mWAmumrE7>S>
zJ{mxdNLJ5(a9Tmh=M(7qK%D?@um@gN3k;%+1g)6N0uT4Qlm`D%9@dH;;Kp1N8P|B{
z+tr-|(>VgNaW2{G2W%?WjoO4$?g=u~6p)1HVuCZK%mPdGy)hK{S=2J0sKnk7$9;WG
z-=Ype0uAvK6(XDCPG$d_kxRJ3Y3|}d;<{1z<{+|%t5jZPSYj-1UCgabjNR-axdln5
znv7Sc{EMR{cGw1Dc&-pt;UIBa_(QG)TWrKff6}fw&Ow{r?Ff_EYHf72AIU&t-<`ek
z)Yi!DO@jebEoW6f@-4~-Vp3>tyi&gYDRz)P`Hm2nbk=x~<nY5BvGm~eWkS$&nkCWY
zDc~ITp0_S6T<t>irD~zhaoN|5gr=#W4$ULkW`18_K!v)S(|21gu6rq*mD$S`)q~=}
z5N8!IFGUa1@t<!}L=R^b$XY7{g{5+tagkrnc&Lbq3sLzj*tw!7J>$QuYy@&I49bdx
z1XWMjD+X8*UqGzB%jChNO97LjlImeD(sJmaf@C;dRnip_kWGZJYw2nd5D=uOE>l;-
zIOj~RW<$oYh|lJnM}W2Cvs>VwJGZ1Q7~Ma~m==_Z%{eCQs@f@ESj~r;@`!?7KA>^+
z)KU^ibM+L;lJ)BYuXnw}pJQl26Ift>HGZO5d*AS!Yky&cdA^uT?X<2LWFM&zZi<0%
zIcHBQPvOnNG<VNzm(5KtQW>4@Dfb`m);DRBuZl;U^Jkzi5+<l2)U~M<XXK-3V8l&K
zJKmDkYWq6ZAIvJ8@4+9bFh@p4(+jw6*v|Tx6rAmD>Q19hMsz!BPk(`eqZ`zfuiZhk
zD8I8G3EJjMo9VgE9gvq}X6E|bj%@IHE3YY}RiruMiso0YtJ`YJwNBw-#}o}Uc(EH|
zFk-OC_ga>j<XmjDeVk&fdwAjy>%=mt){mZDV@_Kpj{Ws#()ZXr^R1%}&lgZ+4YH<@
z^L#(0{`C8UyO%_BVmp<0VNi)Mlpq??+&1LdJ(F}38Q+{7x5O)5DdLusP;Khi*9}ui
z_d>kqrZRXFF4f{1F`<-_5?9GD3OqrL1Vu*?;V7KjTDDQ8fourOuiw52mNAb_)0P!d
z1Svv#b{dw1qZ_)`CiC}M6pfMnaspG_Y=LmL@?X(AkGe3ZvQtbRtaYY&(2?d%c5CgF
zkvMa>RfO}_%nI*cg)?}XV9Fe$pD?kxsAFs~KXt71vI;!P+Dh^WgdU?OVtw#epG-9G
zr0Ev#uz-iHq?p?{amMRc&ce4Vnon}7NfqtU1|i@B7B7hgqy)vr4U!DW6`dgGs+4fx
z?`&$k49&8wAY^op?wQUE0(%>IZm6ttE-AfnIF{z76k+2sH67TZ4t^a$#G-5w@G;>i
z(s0Vl=lvpJuo+t^tvuQ)bTv|gj^`BuDTj}~!NsPm(9deEE3Z=q0z#qrjRmm61IFOD
zTqTo#;j}k^Kt@9|xaryj#L@VM+gpH41mR?~(BOg1w?LZ|lHI0_uzT`-|L=+(HnZP}
z=^9=Vj-l}Z>fjT#Rsjr4^>EEvd5aSwy*0?}k(l4CGvCIIDa0{JFkdT9Pc(~ITE@o3
zGuo3!F#97{p9SIa?oO!W(e&(Qj9M!WP_0-#dDyM!=eQc(e;eV8FPi!tz=w7-hx{@d
zP}HHH*osToS8WqxwpIyXkIX5x?@YTXSDemd*n{MJ+Oyx|DgJ2h(rR^R<pXI#G(|7F
zhw#{PZK_gJ*cgQr-I~ecLZW+k@>_acuxcr`0yP4uhneh%f=JxcqDDtRjg$@AZur%p
zP^~<!@5V8EyNHqaDX+jHSd}w}V-zXZPboV@#9B(H5o<=PIv#VbIy$4BMG2t@21=FW
z3o2q@sO%frp$DU>u3FF#XbOTUpt^K32scnc)J{1m_-eMkF?vlu8~vD?-ga!s;|Q`-
zv437zAM4<`o?d)L@5tI6zBk)bF536AX;x-`t5*h%(&B9`wp!CiDh>4$CD9a{xKFCv
z*?Hth{T4l9OQi3kB^O5_mNxG6TfITDGu3*Wv01a(y^|?oS%t(z5Wgjtt)|LE8VI5Q
z{f%U`H9}Up@X?6u7UAzAsV51b$hzGG)xFiCzr_Uw=Bl!(jH_u-Zv7R60zR4=B6|1K
zZMXO^qwIaIzZEPSX9k5U<D`bAj+O}P=_{0jZkXucS99<%w%2yXvgFM&vj&d&+tPY7
zT{lICB$fLv8C1QaXretA<$7jsMH$gb%&&-a{=5%hZ<n8iNP13T&3kR4ro!A5aX@Ag
z?xtX$-}C!{;0&|rt@=Hhrn+SWpK=yjAGqbHb0~dFb<CM+=hV`~?Z*mH9`)<gW#!~N
zc@GBAXNY<gopKqnrE=T(FZ|~&Gm6?d+w<o(tiY@fmsHD6PjAexG7=dWRZ9gD$oc|L
zID%><x%~su&ac$QIK8Alr{$^KEros&^-7%slmq2=4Kc~X2yQM-BCgtC>1%%YgI-Q|
zs-zXeDHfW45w(>442x21G5N6z)P%<=$4oJ<-jc`*xXBNFq-e9Jm_+ktCEq4yx16xE
zG&q*7bs;`(?dmiquO5^~O`=+h<o&Sc(!Uh{yA*WU>^C>`%j3z%EwokZACq_;n0F|+
zfyJf7Ntfs#*CHI1CGX)t*ITYv?en+_v=rtvAPCU(iy%_x&$cHh<4L*R3_e)(ldaD5
z7GVPS?;Sjex9wFbpGm$!YY_vAkOI|#MXPWHy9%578^){pU7X$q5HJcItz2NA=9v(H
zp{`5gy*0n1-LSMR4hjm%jHE{R2GX!471-DYD$QQ(*_(_5&aRTV)r_o+7`x3Hhq7{;
ziIqTu<>&7ZNXH9;IV{KYBbw?^38=!LqlK^v<;jszn-5nuD?7#Y@5$6hE6#SVUbiSs
znfz*qwPCy=U#AbVzZ5u5bmCF}sH1WatW=gy<+moSeGx?^4)oIwSAg-XNQwC#Em8Oc
zzzS3)zIiyXwo@7Y?24R4=MfmsZU0zd5r0-Vqy-c?-}Uv%bpW-woqn?lgpVzi$ITyS
zBXTPelmxRGCXpCDY5_&Ok7rCEADC-G<QGJ02Xu#x%R`;I+CCUX;j%+UU|la>&DLs8
z7Qy(OOsXmq>mUq7^~Ryzwj2ICh%i15xD$Kqi+0_)wUEtS%<u;{5suS>Au2xsMXKWw
zxm-?w?d-X=cv(n^w=EdVZ)Hzj%{*AxEx;X&(?}K2J+x*Z<Zodg-$N?^$B^0@q<l5q
zERB}uQofkzX{4R(OLK^fDgqme2#U_+jBq)yTp-yZ*8}Z?^xP?qZo5P9(>hW^f8N&&
zMfep-EKuXp(F}C*U`%23F}6kHnN1c)K`RJa!3m#Ylf|A9k!EqfH9eVv|L#XS^`^6F
z!KK{#>3&^x(Zw{BgcklPl$AZ@r?H<j0sh1}-i8B;XKvHnU^t*Gfx|d&^b=pYjET{S
z0vHOL{WhwVtw=ZY;i3|Cq_+&3()hj4H`=t2E%OPGiblWR*Zk?>Ny2-_!>t)gPN|UC
zV6Daj0<S%|K}n*D68K7K=`afgW+?jWF-@~DYlzQ$z^o9LD~d}*#$a$eVQL}QpMF;R
zqO+KpyW>C{?lXHHY?{#?m^<-+c?FoHW+7?@HOU)O8#kAdM}g0Ma&@V;l+R(IJ?w4F
zh{j8LVnJ*XHwftCVu?&;N8d(4iCtbUB=xR&3XksP0wDK-{=UE|YEz;ee@AB{Hj^`4
zo)S|L9isfXkM!Z8-)YyF9OawEI`^&jIfSIgH8_);>Z~lS!j)gg+qzDj?TH?j+*!+Q
zkK}8&g=;t2bem@A2SW;DtL0?guF3R4D;~|Nj<blJ7*u$8M4XOnWQRZhuYI%~OKaeX
z%t;aLqV<kwES33y*Q+ZpFZyyBeYK>=3@}actuqdH10#F(K391$08W73djR~^rk91&
zRf}V7wI*tNThI{t`C?dv-av}NxJp9EeZkF8sx1c|CJDS8|2sD`DAC3f3J#`_zTyQc
z`bq%?rr<&;zR^c<!+hVS^Y1cbl5wM$nEkqII%QuY4(7I>#p>4X(`usbFr9Y$AgRIW
zB{6lqmu>DD<JXAr@T<G{EZ6;vq!EdVFnd5=QCQxgQS??k>572>04{;0`RO$3Tuv(n
z;Ikf~*tq`X{Li<k4sYt8*M`Exy70hI(BB-!fT~QyjrLW{FaY%r-L+dMSEFZjQOCy<
z4kqCm<-4goJK`Vw{^I?P-TgX7A9a?6*uy`{6AM)9ZXg#*a0R^MsEU6WBKwU)L<?}s
zcz1#@csgo@2)8tO2@GL6HCiZsFGDwDG%Eol`VB_HwMK%IkO?QwcCdbhnf=h}Bsg)b
z7N5Q-N_ZZAyPXuHq}RJQwqn^S-3T*PZ!Wf;FJiR?6tP7;tJX#4wLQfdlhh7tB2VSo
z03jK`r`Lm~V@Ss>lhrqEc`Y^>8EP>yK{`!A60?*>rA@;0NPRqEG(97T^UAwzC3+q9
z%~wYY%Q4Hc5+XAT1bji>g3!Uk16-he9o&Le9+uZUPbbHMZ<$6{LL{q+Y8k0NU%PqS
z3z;~kSuK?FSrPXM<L9>t>cI=DHu5TdzFl;`bGW{4%zpD4tgky6A|FR@x?_)92?NAi
zTCMt~%NR^Xq0fUQHi9)iAHG}|$D_MLl51$)Iu%~&g7ds7kETpDXnyR><pjiZyjWbr
zBdxw%BHwGxbiOv>aT}#PpJ6Wa0`if*fhoH6IRISR%W~`9m^rX_%g0I+08nHiI1l3#
z0Y{YxMnPoj)E>M-wEzs*?E$hrx>E8Y0PPbCpJ4JO);DReezw-tBV7T-+s@TRb92}s
zbCtR`G^{k5WH&f>@@6*9JRnXfeX(ndF*atp%u3UW%KZpcFffhhHfY+3m7OQOL>S3Q
z-g|o<gg|cj!ONa>qpN~7ijvgMxM|=EpoE0&{V_?`HyDVOK;S^&#{<RrEtd#@&ru|C
zovXkJ-m8I8f?GH_6@Rc&&|!SG#5s0q(#}rjfu%}l)?9ov^?dJ{7tL{vF;*ScfJcII
z1@Uu^DyZF#LO{0@@+U2oz>$*f*<6IU*j$IO*;pR^mA+D}y{<lA=eYJ|tpxpOy=iT}
z&}c{rX7Py@M!1S@_4RO0{8E}64k5jAy?;l_95;Y(eTSZnd?U83^=k#;{1qVxqNd#l
z66@APh5GjPWD40N-7TSDWjTl+i(TW@p1|7_Ik!6B%8g(j=}7`a^}_qj#fKw;r55UV
z9A<N9RL=+QVMKRh`GqJ8=OPH;tU%3eu~!kz&0%@j2f#gsN<?l{=PD=aY*d<nNA0=&
zELK?iqFqER7}I~}&Nbk(9KG{U#7mJ-BVV2y`JAe4W&I*ojAKyi(B~S-z15r1s?$@{
zx|PYY@m8cF>h>=#N{UM%B<@b8AXiBv2Ow_Vdo%#ByM2r|q13Y~YXJOi0OmM<9f{A6
z>C@?+>ats*ItC6_v>2L&Zw?;Fs}}%XSn&o2cR6d!Eu;u9Ty@;LQkj03PGE|ug(PM0
z13{<x>+yW`gqkmlZE@)V;^oavzf~tv<7D|SM@g;L&$B8;ghVeLvlL40?q8l8Z9?_9
z5N!oYgd=_SfR0**FjKF_fUwz;tNIn60WrB1cpj*lI;T=F2q5za^wHAB4DM_Z4n#{=
zIpQDNqAde|?jK@pT4VQaJ}g}+!KJL+m$%84K4{7{()=I|21^+tdz^i$K)4+xl{q6E
z)l{nWHk?3pejp71bxjiB`|zy7XZOqi&_RtSWKB4negFVc>?a#5sW`pf6^V#I$ip=z
z^@y_hJTc;u^i}8?@TY*ZWz~i|I^`1V{@~8RQ|R_DfT9ZO9U(rKVSROO-~0|t({)ts
z%Mkh4sw2>-3wAG{s>t%`b5gbj2F}rJIk)xcnjpEi^3zPK5iLN{_wl=K0OTIvyzM0=
zDV~p0_{Ns*1XnV#Z+7Knn1&kWhk}XiJC*AjvDy2s9$5*90a!kfIEC+wA?wrO0g!!W
zqz<uhPPn8K`-HUJvKsm&wJqp=@7|Dbmm*cQ_<eIQLYi50Own*5x7G}0NNjFjRW$6+
zdaf8(%n1<DXdd|UP)VhOdn^LM^7Ra1nJP4poPG$*F%}o*0RWE};R$Jf!NsvaJ&WMl
zpZ-M|0ub4{bO7?fL5-aM>*58CSp0(r1waVVB>{M~UfwjEKd?R^D7N_?if>Jy`_tOR
z(*A(Ze8D=xeP=<UP;*3uwpYY1%P>A~l2r@sE2*GRN`T-B@@j*4iHC0^t^WvUC@u%A
zW=y)3h+7$tR7SQ$2TQVi)bm93oiW!N@Qb!&uIVBOa%C2n8@VCjZ)9cxB)YY(7DIKk
z&g*xID?4@4G&z`5c&J!kRwTBZqD~ld+90O-jwf;5b+H~<kYG&JezlOs?24V;vP*KM
z*@Kyy8LroVAf7j09&bo$e?8`KT`<*;&9ck|f^nw$>VYeZ-6J4dr~2=VF$^U6(m%+D
z;I26;W&yB|kRT*JU0@>>xgFTzGRYlO48M8lO9Tc(U&|D7ucVVpY=E|;w<qdwsR<x7
z1&Qniu@plst!!m9zk}(2gFC^nS!%_-s>5YY6V53-?zVpG3b8IU$aOp!ZA4H-SMF{*
zxq6^@tgi{8?NAQ|b9JAK-$0UyHqcx;nCO;02sfEu2h+^en?1{#00?oeaE~?UXud$Z
zdRpQ?+)+SkSwhnRVeiUlODn~ON=^5b5fj6J00UI88<zbQWIdVG77r*s6rt)D9S&s?
zsDER+H6`&oBH%$R)N;<KKD4{yt}ZX`T^@y*Z0nq<0Eqh@1*oO90400w&p{_&3y1|a
zTdoz!=KevMi$f(kcpjYokf-|1(kTMn?|vjtbv)uB6z~B2rXo2A8qQ{d96oJ|W>&s<
zBQ>P}$OIu^%pMY=pKo=+7E;2{7nKQflzj;R3&cSdAP}X>Xp#W?uq6V{fTfzAC(Q?b
z<%kKiQRMXazP98_1z<rBGgzO3k~YQL-W~(-59XkHWB{vUzUrnVc$h^={A5bhz%04l
z%Gu<W8%J<G>!vtW+LXj%Udgxp&r2ZI2JybXUXcw;*11DxtySf31N6#I9CB$sKq);(
zCd(Dfu?vMe?rNsyZt*#w2;_h20{>OkTyyvX+vJP8t$@4}qAe(J2n^M9^W4yN)hrkZ
zQ{CEBAXPkoz;9rl4JjgLB=yl9g8vgbJ8%dr75PZBH0P_w+NYdUR7X!06B#i8;j@UB
zzs1?YU<E2ik4VP_EC54QRwU!fH5z@P`L+y5$)f-u<&P0PLLv94D-s1Aod27V3k-&_
zw$S!UZpssd@FQL8(7+?t)#JF=;UA1HH;9oo2y;$Fsq2}MoHl0KKb_jYZ6RN<OlCo7
z&?QV<-L%G<^Pe{fnKE0GDZK0r9C*wU_`o)Vx-EVrmoyk^+jT$&1Fo}oeQoi+g9w*T
zHzcy!&_@n?cH<&JVm%FDuUSQDk2GM8SW$?0B}=vw@)=J6V5=*ZUo7Nf;NTA({)wrB
zkyZ7aI}+d$1lx2!63iFDX5B6D5@sAmfVR;2`|3n^Uy_p-+ZlmL?(=~V+lKinz*b5W
zT|)eJFR6*XHj4gY%mwNI3(1!B-F3-cbDsm4;s4$l^dtiOSz5hXDe@m*<V%WVYg%VQ
zM4{dCB!X;}V<o7pj?0aR0phE30(^O48=?2aKm_3VzfG28%NdXAqt8Ot9}&5T%3p@B
zx_m=<FC4VIx5iCJwCn#oQrUt7ImaV}srK{j^G=sjM3fyT0JrZ#SBb~-w_r;|lld1h
z{(EK*sFuwh#Bo@<dQ;7152#DdzY7*XrT*-RSO2DKINieVT(A4vyZx_4f3a;(XeZfI
z!r45UvJS(2`0JuuGJIFF)~JDHojgkf+DY8k{(Bf<4YH3xNF~9q*An~F-^lNZ^)DOJ
zAX8_15c!kP)tIWs9HHdU{*d4o4mM_?8&-@ONrkC`k`cT5mjYuVU2#$uiCA%*O^m#C
zM4a=#&uHk7fMe)u!*3??f6ehd&Y44QZqYH)7t;Lwlvp;}cMx55uVMcW`2M%-Qhi&!
zY9(Q!%l~dA)|VL&v{%M$d;cK^7_l}1aAD=>y<+-5UBZA9hM8gQFXW#W#2N4m$B2|I
zTlfzanipi@_nlri_~kF+TC_*{H|`m1aQ0vI_zhLZ1RQ4zL$*ABI0FQ=^c&KjwdIQW
zUzaKoAWedaasKzc2R<+d0IFV(ge~)z3HZPk0A*7n`uX<XwslGUJ|Jim*L<WfRWJaL
Pser_Uqy?+_b^ZSzisG(*

diff --git a/web/public/img/logo/banner-sm.png b/web/public/img/logo/banner-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe4b3764cd8a0378886bd9da4daf3f8ffbe2fbc1
GIT binary patch
literal 6473
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
TR|@`F0ssgtgZmZtY@`1VmqeKp

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-144x144.png b/web/public/img/logo/favicon/android-icon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..b61c2bbed57e32c1ba364dc9e23cf6fa17603b80
GIT binary patch
literal 10125
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
YgA2}|gf?<3oB{wUqb&VX(j@qQ0Z(=~(*OVf

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-192x192.png b/web/public/img/logo/favicon/android-icon-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee495aaa16077acb912c4fe6abd7f9e137fef3fd
GIT binary patch
literal 11930
zcmZu%V{}|$yPcWXNn@)~W81dv#<uOoMuWyp(%5b$P8-{5Y&2>xx$}K@-GBGT(K=^6
z>#Y4gdiS$q)l_8Bkcp51005f2oRkLi3jWW52oF7LY&aqS04(P6QsP>^YZnDRzDA2*
z-$jqM7>Mre$KBJr52D%OQTxp-3@B1yz0)UYG1Jb!<MU*a_r3BQtWKth$u&_@l7>qn
z!on2u@}jo&8@FjYu4Xyur!9`-Ol~~9>`kmRseeti<{~-?{wAADW_P&7|2Xj|d?bA3
zH_Z>qqugbJ5d(6BI#Q6+184!#U>q|ZHsRNH1XmaqFjD328Bhrf;G%$q4Fk-ek|5ZJ
zc3p2Pi!si?djdtk3!l=BsjFh;ynz~F4J*L8u(a!GPcx(jRC;*#)RCRT8t|U{kXX3f
ztPda&>|8`*M}NOdE*k2D6JbFtMt=7pkW3AE0{A=Sb06mFS^(dAI2|$esznPhAVo$U
zi3Hw0%)0@tgw+uS5gV_UnBfTytg-XSjD2p{?PGTWdkM91*&Eo}j8!d+>r0UnYMPr9
zz<joP3=iUN=JjL)noA^9v>m${9J!v>vBWS>u(2TUfuC`>Hb6E)GXmD2z6%=|<w{vl
z1%xw$4Z+dZ+k4Jz!Yrso*{WAS9Y8zfuxR!ZhK?p03|}NyxEI)a-}kdo0^vvtFfxiY
zMLpLr3<H2qJ($UJRgSv?>;VWRCUEFmtYVIo0q<@v6vL8%<iJBpi))?;Y|xJ|y0FpI
z%h?<f#smf!M3n6?oR^~%W(b!fuT3QZ7|AmE+OSOh*y0!FNF?y?10-;V5u6C#Z@djG
z1)%W3^}xP<sQjEjAfbR#mR-#W(}Df;vF#dLeh3qSDg+{-9yTt`z)`5LoPyo)-ccM|
zh`jkQqQpbXasNjbY_R_-p&*l}F~y4>FACEEd_uauf_{;~b%-NPF)y`5F)t|)s%ejv
zyP9@hG7O<$5U<ziL+wC$;+w;COiRY_MSbGuKwz-)kH|O%4*Z#xc>ae$VHhG<#_#V6
z#HXB>^V~@>kfO)+k5G34cr0bOA9yiJPsR?8hXsVa188ZwjUvpWLX=Q2oAR{b_+a@4
z`$$1JK#9oh^|QAW3FE(=IKX9~M-*l&@3y~3L@IH~g`RBF_#$g*+c%qf1{zjD(LLXw
ziwc2W(rq^7X0BDM)8sFqa62DTiorN^6Uq@t=wsTHhH%M%3aV`zU@j66r3c=VV5U-1
z8B--1>>x3gcBM%$Y^o(nAE%L*{`F=4gr*#$-KX`R{n9dRw_Fg%>FIs6s`2<kkRbz0
zKG&nC!`>rEI1GdM`>woq=M>%C?`p9uWGg$@Fa+zaq7@`*^f7g-adPHpIAi#hW3~GJ
zM$B_GF>MS_BAZ0Vg&@1PqEGhV^g}=E&*C>2M21A@wH-U|CVo%%miT8I9JJklUi}-@
zasAG~%t{dhzaS68c^8;|aO-!gq}-PMFUN3A(xy4^<l`}dx4V*^u66<$UBzNiTn8Ht
zCI5ha#$l3MHdP2)*+|(|V3Kw&%swP>MIx94XNv}=@v4)xKVqt8R?a%k7m2!?fm|5}
z6?G*dtI~pll~sLy%TpgW(^I!*jNYSIT$XvcjTu$Ezf$FdT8Vdo=8YNz6yt*8P@1N&
z{d-O}|GX%za-L&=pPl(WqzOk1A72sXquW?`TR*&|$0?BAA_PKCmy@CJf$6K7<+Jfq
z3sQxPTT2hfT);1WgKQhWSTrp$&oJkbO^?GIn#^KlpYM=kv4cYH@H&?x*HXA5je{%a
z!8T*!_qGLSTH4$>C%;~m#hrJPy8?}s(G2s_jm!4C#CU@b{n0P#c8mK&`1;CA4=POh
z9#!VK(!1_vq~Zh&!#FTDa#0FdBlFzNvR;gqX$hqgrfAGcU|6O?tDDQhK8YpMAS`v!
zB${irxTZE4W>J?#u`J%rOq@@g-?o*KG7FxzdH7DJmSr;7-Fs}(Enlw{E^Bt#|BhQq
z%G!pL>>tj`B+<WjzMvB{*B3C#L-W{7Axv7!8SM1C+76<edLgAw{U+XABp>4w*kn_Q
zF7ZfzjvI;DVSM=p*BMn<yQ$SKToP55K|@IHzbb01WbRztRPDYzX=3`A3|;ab%M9v2
z>qnJrtjf>#)lHT-qy3o1`CIr5$O<wnRGb*Y=@G6r6h>rfS`A7yY8W~*@r1_%w{7On
z0${fNR!PrOYKh0(hEWWc=OQ717v(DB(1%O~F0%Ft0Z!^OLHtbPyFf+R_|A(eQfiZE
ztokHI5r4vJR()#7-NcpX+SclWhw?IQ(*BXGK>*Fh8mnq{#M-c(dx{{_EDGkyDxbn{
z*Nh3t0zQP%1?ft^^zv(MI*C}RduFD2Sjo{jP!4J0G2QqqF?untR%zi6@U0J;UnFto
z5P*n#<vgmr*R=rwWbOOG`6J^`@_h88lb-z7Zjra$kdV)N-DkD!-&S}^3Pnr28qTv&
z^aS1|ZsxL%uFh}0x2sQzk*M!iv34sM-6;a(;cF0Mn6;znUtP^iez6Sk|NTHR&kE+h
z0Fk8QQwZr(3`klr3Y9J%(Me?xe8uBw1Z^JQXCBl2o>e)Q7VN@qE|uT1AsCsl1789h
z|Mqu_@ZZ4y@=4A|*VXj4UfSfX>-m@3s~u3YIekIgI8DY5({Y_Od=8Q2AI`?znmst{
zGF@&hNqyQF+gA@m&bAr&jjET+viFq54ZAJ!nL!0V>DOO3)=uDZ{<s<)s~F$>067t%
z0tPNnK`+Z6vv(JBZI(3h6K^r;dKB*Uw*so9i#mFVE(vb&mD8w16F$6*fbSnUGfrLk
z@|roD`c^w?4`!{%jRw9QJtU7EC5`<xx!twe@V<~8f=S-;323iBql@(ppd#`@$vKMV
z)^`=}$}jg~Y@#F3aHyxJ_Z#lOuj}W2S0K^MF4~W-U{s=Z!@%**V+x`3m&9FbG>-gj
zn(nMY&-d{_W}u_Oi@&~M7-c<Z#_C&8P??)Renm4!Q{UUY;Lld?%`;VlE0Jcw-NLV~
zFnVt{jH}n#lb`1fqI|slyMyz`vbLpy-QdtWIIvl!L;u;SReqaXj*V@|{L+G&->kc1
z;)ymzIIbSA(7y{mp0YV6M>#~;{`=fsM$|7<?H*48!DQ67IveJgAdzy8@kzPzGK@5M
zWdUtelB3q6EC4QMa5X>u>svu|EpxKbTWobrVsh`-l~2n1le!yi`N<(W-Zy)qkmFLP
zf{Q-6$Z2xBi+NZjuYNE61}Yfq4$D9K6SYD6(dY>F&g^wf+8x<jUo1{PN75lMX+k~{
zQ;JoZMY0*F6p^l~OizUr6$;QBe<Vnw%)#TbZJ-0xd&-wy=h_fwr-Dyhxet!^gDwOM
zJC9;VP4pa`Oxro#7IP|zO?{4tOad&0)3<qdBQA_D`eJ?TC8ZYr{YY3hEo9y-kQl|>
zd&sImPyH6<vG!qOT$IW1rRRfd$H0K<(%muzB7^eycI=j(@-dhg_OUm7)&!%A%!88*
z%fB6oPQv}WUr>9#AG!gx1)@q!Gdru`)!&LO=Vw_dMWm`Osf|0BcW)Th*Iir%U1j~*
zrP*h>p1oH*4uqpM#||2V@7-X|jU|x~jw$}^RPUQwK83>=!vF`*mWSC7ZmFnfrM=%~
z`tM=KO~vc$M{a$Ff(6S~l#3=)A`a;Uc5GcO$wv1cw2qGOHuSrzoCBmZ-Rhfsw`ZD|
zXpME`y6A#}Jp%q>3-^DcaqAV;I5+(iiE;QFsk&IkUCN&)i2=oxwHIkQe6g}~xJW?O
z$3c{yBm84zIN@D!;fn0e#VF!skeeRN{TDSNF5eC`lgkVb)L1g|vd;P6@wagzrx;Jw
zL~X4UQh}oEmj{L3R!C&+HWHfaC#El;pX+}Lw#@W6^8b~7IC&fm^eHaF%lwnyNb)%M
zxCgzYX3>}`mM{HGK9Zo<qZE~ySHHtPi2T7*O6rF{zm3&SpBe6%7`zRd_Wqq>FF~$|
z$RR{{M!T>2`k8{jR^Y}uP_t?;*H_1T(~)D2bIw6^acd9d$yr&;S+z>Bt}afyZlFMX
zt(?5S`E<VWpJw^ESyGz#h1wU?$a@MI545#kZ_p?&CEbc!-J~sKo-!xF{z`t|De?8&
z+h^U+qp(?4yHIOR7q(T51xEg=BVH$v-^=!Yyx%*lB23)RIGhc<;#Ybs_Lia5Z(Bu6
zry|P8&&zH^O#@Gf&5KPr@>J^AST@WCr;iF;<OIzJP;+;t+OQ1BML6#2pb%^0AL>Ze
zr<xS<p&9GM(qU#x$re^Xt;~QiWijz{6eaV*TRrb~BXiElk(QODkuwQCOvkR~a+BZ7
zdcLiYzhr>!OR|^bw6d16-k4T&F=1%bsvFV8%z7kxoos#m&}}>AoQIka|L(_Dsm#C}
zL^vEc#$!prTXf;|LW=7VN!T`_IFoMt>QP1q8~Tzf2RnoP_T%@oz?ccKpylkR(RQZs
z;<M*8YC3fC%1RL}kHMJwa_g&W{KcVR*9v2O34ep<jpswn5R^Mu79~q*0=z&f@}C-9
z2{=~At(Cgs1$-#b<O<EPWTSWGh(7*L_aD1uY)S<D`F{M3_H;|S7`XKre?(n;KfZq*
zNKY*Fg}Pz9dK0p^cH?V7B)XGyy&z)rR)q%aOwHitz1l1%$F90+u8pev?0(42;}gcP
zg%Fz~jGp^EXik{$WO4LU$Pvnu$hYHsNC%;q3zd5Dgi*dG{%*bp|K;#<F`kO*6p5H`
z+w!f?2Z5eUXe8OT2C(HOW7xGl<{!aE&L^gc!Y#jM@_lFSXLmzafLLZE^l*A0>)~1J
zV)qBJ?u8uS=WMl!h-w0Zw~<2}NeN*PG2+PccuUWlA)(Wzkk7-{m%RD$HpapQ)Wk`g
zyK}FsK7N8%oJ!Qpv$&X<K-9S)&KWPfBKpdIG<?=ZQft!WL+lqI26P&s)f7Zg`7uW|
z#)XJg|Fj*5E)uC;@|IfEA~wO#V`Dq|&f$(j<1mN*#mZq1^}n=Xe==N7$H$^TS+Vbl
zG1tAfoU7RRG2u#$kOu~SUA7N)*gr}hENu=0t4|8r5U7br+*>g!DC*!qVI2hh*x&7@
z2*Pa0R{%_yC;A<~b&3mxLT7ala(S5g^vcRh@g~9A-ZYme&Qb+z*t_UgV|<SI3_XHb
zc4pq~C5w&~Hp`+jXXs|$Jmd6JYPpMBCDV-k+TOU(Y~55o&4T=BudZ^76n5fN`nSDM
zLevEE?H19J>zKI0tUhEPZ-YM09W_4LKu=HtSJEXVnxx7tE6hq?A8%>7kpSyPHp10k
zuJ4kO{!*!BF97k<kL+R$UCAZD(Y*iq1sWx9`{H++xOa{rAg{T=4aK_jTHDLA;!Zh<
z)Y_nA{L&jXVZlQ2>ecAkKoH}CM_WSUmv^PyHf-*8f}@^HcO^|B-8d7kZ@58B9-yqK
zw6DnyyY_eK2SLF#vSIQne&}a%SkA6}=z&Z6GLLGHRHSLZyS2&(i?QZ*8C(f<_1lV_
zslo(@e*1(&gYXv<Dy>e!(vut|y!dimH2~AZCC@}%t*z{q^yU+S5sJ><&z-l*^uuDy
zLq+pP#yZ!ezGCwhC?Y?zzmckzl5fYKT%`QbBFH_~#-(XTl$9rhLO#SF5S71pxjBbn
zL#0IDaajAY;Y3w0?DBCTFKz>o327rv==R=cs;Ss%Ofdg5E8ypE+l?}w+j2wNfs=lA
zD_~OEzcSN%!j>)=SRauHZ%;ZIhs_j!I3?23)+BIN>)p9ti~$$SV^f~nq;V`X-uQ%V
znq{atTf|xYgK+zAbrCcBK4CBVciS{}pqo!im)Y#nLqVG5hBhbSzX}svqj_hE>yD?Z
zRcQjK2GVKJc3$nVQm6%6Q%9l}b_~ZP!4|aEFo^At6Yz3q6g6aw-69I1j)KG8ZL;sf
z@;NSnlNYplNelL%z3m6{dl1EA4qi2f2j5{M%$|Khw0r~Vu72v&vwn`M^rIoT@H!s#
z#uB;~DE`6hUf}Z4MD!#6XjG{sZPJ{Td(gl{{Iv3coZRt}1m7ly&;|w>ja~IGJgU|w
z@+pqj#s`q(1+Y&1a=Oq!FUx4Cq_R?)Q?BpuuO6dltci~pk>owz-N>NXP>uwqTWXiV
z@hSud>N?T|Y%oU?2gj`e`@;8>(X7;rElsy>Q(dsj1J!PswP`p0(xjbQ=+e^kQ_b;r
zviRf(Ca~Y)?+0>FDK?%}#mJ<x*J3pFzB_&?u;a5aPVhK%PiWJ$joFf^UX?k%=9x&E
zZ>;UTxS--D8L1Q%ngG_K*ql)1|JC`E>l0;^v3HwK>PhELXl<Vwwy^JQL#W(%2T~^%
ztCy^BLC~RjiQOC3$CsZh4EJB{OM$ir$M@Qi=)F<izJ|V(U98^tcJ#Hqn3YkQZc_o|
zb^KR@{5Eh3I=;A7b}J=Uh1zmXB0Eg+5Z5a`<DykCevGTJJ?15@nik1C-d;`{>{;CU
zY|`aNt<Kn)Fy8$gZXJ9(@N|agz`+2!7yD&7@1OhtxTHV)Has&;(&V`4Wjuv2=%enl
zMRx*8cj;{YpCL%Y8NsctRyzg_M9V#y1XnMxYd6A?pLjm}2xiPrwm_T2R1!nG;%MCW
zH}a@Y;hb8PzCkihQnjYweipXT_Z)2>nM-2@T$*vAhka03S;hl-{c&9Q(+TYWBTY<|
zD?h_PQ?Nzbx1qU#GuUBpI|$Pm!~TY3E^9l^;qsso+dAyDL0U8rR-;rEpzg%PRSCQk
zh<Y0bFIbA2Yn*Vm@8mb49^Ii_8$s%!n+#YVQPty_^_<Pgw<%;seYg%h<M@D81lNp=
zVoSV8gvqw+y)msaoxXi0;#aO0+knu2;Ft6_%hH%;ECQN#0$mfNIzL7vZI@z)3uBHY
z)~$e8o5c$GzURL-hA(3|gS1;c<W;LM5xs8U9ixtW-Oy={EyH)nmq=<-mW&N~#PWA;
znSpc|^oqcc-z;6KNZ+ZrtM3%nPtt8m<~c+2(%z&P`pvL4VsU!aEEnX|r$4S2{3|4=
zVy>0J<;9W)e>cTH?ul%lvlLBKCYO?OCL*Y%V<W;SEv)N5cZ3y=bhRnMo9^d-;aGTO
z_+`4w)09Eg`eF)0^Bau^o*oGKx_?#V<PqI0D4Vwl%~w7}q<%4K2ee-|Dq^ODr!>@E
zm5ikh5w80A1BQJ$KyX!?qQJMhg7bNRe=DS&YOs*!7wyKHp*Z>TO;9Adi*)sBQgF%Z
z25HGQr?^cCIqPWmWq@VSA0Tv-mqbUc7rJmA@pcb_xd)Jyk#qCd1Zlz*kKK0`R3MRV
zh&6nMf$p;Owp9N4b2%X5%&2N(`@XO@Ilui(kVwQJkwbgOLcDv7hUfu}^3UlAmJ#9h
z?#w~!kZA8?r@ImAB8Nu0Wgz0d4jVMAE#`V|7Ep{57H&s=ngptHKe&fD!yu;_KfA@N
z&Dgii-yhXuu3XFBb$w#v{+Ebm#bOeA;xueqMe3qn3@XbyVf?sesyqSGq3hn?BUHrr
z;QJTrE?v8kHS-+9c=TKWvb!K}#;q}bB~G{#F8&?U@k2DG9t6EJh1OtKHVKRc<AY`6
zokDDyF{>I8taAU5`!9%mkLARPi&AX4p#=<f5v2CVrSYMvgVRk5p2Xh=1yx@?V)#!t
z#){cL3v&(zp@km-b!oeYcp}Wg<i>~C{Y2`b99&s@;LFWEWwmGSOxYmxIOn_5XsjQ>
zO1^M}juW!-zgNY<CC!yv8okiuH?yL##$}VXS?TM+RBbE}R_L(7R9$$W?j)e#ToM_9
zwO1~uk4HeuHHxmxo#Jt#S*7_@oWpw<VGC{5?ZloCOb1%;J38(!mc?uO<&6zQRX3dZ
zE&wYr35>?JMtLf1e%7ukFh4e|BG9Hu(as{BB3~}Ca5nIYi~{3?dUYkis!qb5ly4cJ
z5H|dar65r`TwkgFp1Bvz3_T_Nd~S8+V-88#QkaL$$nP(ERjE8Yr8t?_Vk`RIZ3uD*
zSv1|2JU8Mi^L!DFs8#<s;nhGN?>uGmQo(8QJEYzeE|@G*_7D=7F;(v>$3J3E4Z?ZA
zUq?bPInhQSJ5Ia?x)_APh=td$_tJ`uKEVxyqV#f;C~#v#5ARMR<oKYk$SG(zblqG$
zJk(0;DYX;`u${kH5)&s8(^2*r$F%=e1#M*~DxX^d;E-=;1bvzmEi5<(I>L~U)glW(
zPMi=|kTfzIoFKxO^=mOm6KDTdG7ryQ>MAmu@M?KOqx^??Y6}2y-i=&pcma$hXYdXE
z3Z+`!O}wGFbF`HOCz%_=iU)va55FQ@7{QD)SbfjyE<92BQ_0GocEV-)F={+V#}Vr9
zAc9{kQHjcFY&c?y-VBb8X_4On#g^FvBee37I21YO8Y?RwV~Zq2WyjW65@0~cY%HoO
zZH>TO+#TO0MRSYvk4cPT%Kv+3k5hymz+$#xCLNG}x-tqlrLq7(pM}hTxuka}rC4Mz
zT;?$nqgZ$k53`{Qf$5+Y&`-<kkrC_28(=LmbUN@6id8Ae_z;KJ$jpf%saPJ!6PO5v
zY?6MI3q11@#BW)iZ?TBz$q<Ua0$tpd1Z$}kz;kkDq=wR)+++Z5+3w}A2|k;Q+ytR{
z)>1_IV*#(7J|^426;8jD{Z?EJqF`77HW!bYcH|(gX^0eJO%aCTm7tz25VBw|0wXtB
zsE=WkOoF;zCKN7}prvdoXe%7FwFcW$Wd(48zO?{6@R?0u+L#VC%@CvCpMg&BJiqI(
z^pj0-0z?}GSIe7XVZMi1-C@_^M2;e`KVW8s&H5suR!<v7Q^BVQP|j`2O_thb+CcPU
z3$Qbu_26^fVi?`ZhJ7W&%Hi18PM?EfmQ&zUsGfOK3}mZ?d{m1D#h^}a!%0%6$6Q<S
z?!&j)$e@kL6oOzKAX&J~07{B3V)jBU!mjethnTP~fL_v#1@g=(V6AmIbyP*aGJ`Vi
zj6SFRz$BP#&DmsrGx6p_6ydZ&H51i119!sDpgXE~pEyQ`S$+87k6m5S?ZW*DS-~5N
zU4D@ZQO9xM^ycATlXHKpn!+T|QO4d_2T9J9e!}E@;dnuc9%>I-Wgi5~8H`To{nBFv
z6h6Z0sPaBH76h44h3b&nha-IrP=qDY*t6jZfh>K=1fN)D&(Z3@5)g&8FO@9o-uJFo
z!`Z7d*za<E@m5bzn^7efcM({te>Yu(8I@#c?mxF1fZ5@kcHJUQ0uiShE94Pif|StS
zzl&n7+*LrZmzZ3cjUv*7Dg8r+XAm!aiN=>_D}Z`<T5yy(0+-V=Wh2wBBY**83B(iX
z@+s;>8yvX#<)p``m+QXgqPzJQcWEZITSZsaE?R$6Y5M;ZXAI}#7ptPd&|XLeR(#Zg
zcV+f?a%nQJGh7moGu`-e9uO1Md;q(3bVbwgX!W&rwXlsDN?u@%W<;6EoIrBmp}X55
z$Lg#3K6Ti06ftSl-z02qsL)h+JP!B~#@mQyc1I;vy(w9FND3tyLKpj<lwFk!Baec}
z5sIab-Wflw?K(l*)QiWTU2y9`94K1KiNNbTIj6#x%HDTGA2ix)9)|hmL`hg^?JObR
z9t|~3hf`3&I^hjO^BPDv9%6;H_CbN%_w}FKo(5c_ker4&iL7Fm0q`{Dzw7v2qP(GP
z@w#u>u3ER4qmfLti<KRvx$W_~vKnERpHYLkkb3^H75|=m`yq*7auGeUpiikUFWO%K
zLES<0=A!pv7ynftcNlX?c`+9fw<{6<&G?<7!OE#Gl}cMo8enpvKzI|eaGUzm#5Wmu
zcS^NH>66ePPs8M@^i6h2_C2OW@m>G<ZI%K@0)clY;L?OC#HR2RZ)~W&La<oa%RR&(
z)j;NKu!6ACyA4J#&DcMWz7c?9gi=p?mSnnP;OljF6D&>RdCc51{fgOKZ6{{cH;YEx
zt!e!Sr7XJr@v+1r6a@wx59W^OnWkOUqnK-w>pm|nGkxRF$S*k#3RVgaFdcdv2qIvn
zd&cbxSMoPpr=|O;F$C}|i+(Y_T(4+oRdCG$UUOYvfzvESW0ghqitv<Z-rjst+s^US
z3T9(X5!pQby=w*^Usc(<*Ppe$Ea%QJYSk*r6P|#dQiv|+-@^J0AN+T&z*HKiotmU5
zS_lKXWY^5}pDt1AsNdFD|Kv2$_net?{n2fBC4Jg{;ts1#wt(wGzzIpF8Gg^=EtfK*
zYBdy{$$RDwHR%QKfh!v5Mr6=YBI$@*&4^_78Xr|!4T>xecRO!Ygcz^HEceI1?$}}?
zLwTz})-BnFSFcY08uE5oifmQkMf7PO1?loJFuvu~``%2*8OH3thtZVa1zl*5w}*hT
zt1#Mp>wOn(Kk;Bf{8;q~O8lj{4I1+)vcfK66+A_yoWY^jjY9F_aPSO0=m+tych|u{
zHfWdMzNb8i+dr(Bxe(0&26{u0UeTX0*|=9#xt$x7jI64E{rszY*VBvFTTHb3Yozxa
zZzH}w8^utGx=Suuts&e5WJpHSaFU#}Sqt++ACL=|+^%?opkdRh8<{RQnY%_Y-#IJe
z^CL7nY?}7vSBZrB0dLmnFA|BJd^fDAs(7{t5h$-!X7zjdvzy=A>2=?OqQAEgjK8fI
zH{+OaFk}fm#3@4TwDpyu)c|*r7=d&?l35OcOv+%Xas>H#*8VZnyljG_JdAt{b}=?B
zHOAHEH=gJZ9aHDjO42Qb<w4UTo0oJmRHk5D+u7Zayg}v=`?&Xy8r9EcwW32jmGuBJ
zE3WoxPz@RDmQ8Tzd!p%h6o~@zFf;r>+^!i)v00S=@#-_5adHs$+Y>~*UOOe;FxZpG
z<TwKof*iLkVc$ZvhEk#-yOM^wGcCp5AomHxWJ>olJ4EFX`yHY8r$Lw09-Q>>UE804
z8<8H>cR+J*FxZ8k>XzB$$ppsnzTo8@XOBRmRE7)sJ0gRIFt0=%K8VXBiPpvj7Ja5^
z0H%nYEnPN)r1ao7-2;32#Z--T{Go)BqUFo}$LEMhbVtBM<?CC8z|PghjD49_{(GQj
z8IOg)J=f_GnqdZ94IB^683Qgb0CZi)8aKdLw5&b%*4};7`^wqbKB?yx>rcH8dFwBj
zo@;$zkvMQ+TXB9wc9*Pv$=ktTcDJa;ssE}h=VUP32Ep93=V^vppb8w@Y;^`2QNLw?
zI*~N3FmU+HyBtzjRR9K<7b`3YBa(b^N57+XZ^(Wl!ZlaRvru8&_r^Cl>@M<EuqFoU
zM$?NfBYW<Jyy-rfJbzWPjvqK!-Hmxs85D$gycd={g<b)=EwDsU&G{<~V8>FukzCa|
zzUcr+Y0q!Rk#hO%QfT2*S^y1fx%RV3KjYI<<1PN2KRv+zVgpEvi)x2Go{-P{z3d8Z
zXT35;6Gwq;0sHL3u&XkcIWdy~7{J`s59?9v#9|%zGb!teH6YrLd$H8~pI!oX^boB(
zDNRYsjPcF9+OY(Ba2byW`TZydGF6QHBT~6SU441A8j-Fv-!W<rjZ1DG*HNF0QC?d~
zyC&GFArWBSuxCBP5Q0D95Lecj1QK5((S;Y(>@g!<C&Y&*%4y(yiC3(>Pbsg~pBz2}
z8k^4~$ea@J6gV|Sh2X=O8{v10gsk+4E+J$!ve3f(=t+}*<%w7~F`-v5^`VaW7FKct
zXpbO3Oz7&E<7^paO6@v&A=eiT{4z%ME-CJHb@w<mlnQDsI>}2knE}8+bJx#oatdfn
zx?{`$GioS|htN!(^s%)Nu)Ttn=AHzvMf2O2Rhdvb4|oj0?BbC)#rc?V9V1OOJ(f#S
zLw%cPF}au%o|64$VFtjg`T{7&Tq6b@aiLiL=vR{{kL3bTz6e~533|R?I73tam<Isf
z&CdX>GxWfxmVx|F;MHG--|S&e@ZlDcxT2`dD&O%`srAe+$9_!&iD@r<+udL!8@pF_
z?@qc}8jN=KtBfVsr(!&&YdA6QdcXC$OGg+uvz3(>WWZr!mNOeS=z_dz-(k;Ap6Vd%
zzMx&}@qKk-iZz8A%AeRk2**84sv4e;_Nm`B+6b;mr{QHbljt9UDcDL{&8<s}%d|+P
zpGEIG$F=UDq$bL)Jb*Qr)cG1OYHsbwqE6)xkRCp_1;4McBGrT-j&F0@W{gTroo;Qz
zA_R=&k4IpJd#XNTdwidMGlwJ?)t<KI9QJMvHXzhjVDOgWlpI(ckwW!0y2o8246B*2
zHq&)$_@SlZ{46<`nTiWxI<0VwGqD!GK~e@f3k;)f+yH6m>di!-&5#cp_XD9Qx?*kD
z!PsOj5vJ{6yCBEbXDlJRZ^G%wia+O;R+oH_6H5nwni`$j_SZydk=F5NWM}#$&+j^t
zKuGr_rC8TruLos(s~F>=NI^9z2~D1&5at%@EA$JqPD*@%CY?vS|Df4&>O=wW<44up
zh0!klNZ{c|#YZ|d(o@qD@B@9B#DLAg+~|@p``T)9tJKK-o<qcQ(n<DH5(!0FR9zF3
z!@~JTH(G`L?ArZ}7TXdjv-~<5PhUm_fAl1I4+NDT@v<0D7Z$^Z@RAL@-%hg$mKHAd
zzPFIP+(F*;B(xXJRCK07LT(2O^@$hW9D`pko;G+*;DoeS#ZVG)4skE<5nlNznLQaw
zkGsFrxC^XM8;;w}c1eXfw+ybcy<I>@&zRqWOQZ&&z=_u<2kYpHC%G(nfg^VHH*r?W
zc&sBab#(lf>c1=Jdb{{7nmBEvAnbWxb*PxNlGqKhi!U~DdU!kd+kXG<fFje=22W9v
zj7@a@Ael>rFow=PChd>-=F9KD8N3jFQu#04FIgbQ9<YmP)9}jOqZ)+KYmG2Famr(R
zt%f4R-e&E!4fO_8)scB=KkUoPJ8y52Rac?9$K(L09wjht>N4qj&w0;Pm+|E-R&^Bt
z`Ewb(s7tsh_qY=TzCd_Hta?jkd98l7`Tpkm^oO}lp<07~542%G+oHSduN38~9H&lc
z?%H<A5aceKq1BcgxNy%tvN{TCZ|*KVc{<c|>kHX9Q$g&%mB#n*-23$-d}CnRZ{yqP
z?lw1sevBsMOkhWp*ivP-NYWT?qRqc&8p6BzpRTIZ{5akT2d?xV{if<h;#H=png2R`
z!Qvv5Z=L4I<0IUN$(O%@Le8pQP|d|rlCzM0YvAng7g#1YWjXZe;!SQN=!DZ-xVyg2
zRR{7b1<$}L*V=l(fk}pH(N7`0Q;Pow2{9kSIMX6GG-_v5Nu`)`V{;8jB2YXjbE5MX
zgKoQRwOyozt6#Eto-`R-63w&e!l52K@#}Zz*?v~^{qkmKboTq5zk~>#xxAz71DVCJ
z)A+wXeS!aGF5?QkD3!bCxDpd07gyLY#VQ!^S3QZ?*3tA&chsqxTa(o8^XM-<NofAE
z1(Cw~)SN8?Hsb60)j5*ES+dt6Z;}azYvOs=V>OpS6}y=%ep5#)_<hw3qIB<d-R~Fg
zBAb`Cv4%qxtRHfR^>y`CRlgSov62Wq?W~!$*mebX+U1rmA#&|Y<gH;Uc}t{H$MHvm
z;$K|rOnh_3QROLyseg0=K*a~+h}w=H8zAlOf&=2#UT7#=xBaSlJ79wR#S4`GonHq%
zR<-Amb-zGd3|)j9nTrc~sqX!L#bmp!w~}LF2>EYcZ2qh(wC%!+dEFZ_2MwclGz03U
z;gbm*!ze?;4cG{qn~@YT9{!=HX2s&7%4OSt1%FN27M_OEjrwL(@T$c8_0*AhXzvRi
zZC|Pjc#}WdwDG2U<&>=v@BIHX4A1AqW<VAouk~OBvRR2{+gOAN*94I^90}5Zi{ZX?
z3qu?EQHmR1{^Tm*>bB#?((Q2*28;Q$$BXQ~hir>;_NF^f@yL|kWbO8~z<BF2fLk~t
zW6^T<!|cng=aVOp=|2DE-S>mMWxzTkLYH>`&FpE!-M?ne=F6XM2b0O?wQCj^!Oq)X
zf*!uq?b}z1D39P^v>U&q25FCeQi*Pv`8`WO8i#q)c_!ih)~GlJbnme-!ri}}su0+(
zagMv_7iIcC5eej?ZCbdk`g6?v)V!eV-Cx;2hP~JbFWXh1wenZ(*{#jsF^)+TFG*IC
z6ZfHTD$DRylfDfBS8pOqhMN;497}?S<w^I(E|>hL7mB^tRegTb?#lBL8}x<q_BO~{
z0T!#I#?tMQ_JU@YZ&&N%KbXbzL;S0SyP5K6yM)s)w~q>1xEVJ4Dqj7tM>9cVa#!v}
zvUQ6=<Gf?mrWS~luy&U%|5g9+cb1z6o%}gjIvm|rP|#0nv)M@v8tu5@T>g7G-+cyo
zdfay5LbXWy?qHSh8BI#cuzvi_lf*pR7986ge2Lw(v#RnWjZK2|ODAMO#Fqq1LXYrU
zLIuiS<UUu=!Ps7?bm{N!!Pu|+aX*B9)nSJIKN_sTK8MfjsR3BV*~|!I!%4Oh<r>Eo
zUcP18Dvod?zAUOPTH0vV{v08iDTYs_ET+1egG+~&_zZr+VlF*&Z#YxG|Kc9v_Ew!4
zWY?W3%KY6S7$C$NOUK55-5=6#Yz|?U^-umm#^2a#?&ze-LBG2Y{hll2_B)wdctJfc
zbf~SE?Gq}X=-yVaJify2J#cWeZJ9*0#gz9>I@%6Oq#40rortKOaU>2<?gLi6zA56!
zTN;v^R1+h)CB<Fx&U$@>g^vGS#GU)IMT6FD-rakC^3?r%9kf~?0F3p!`N!r_(>Ww5
zefqRYFed>QZ9dV)H2(Fx2`v)vnzhl=ZXCnFGNx&DCx<ojd2C*1<j=!LnBq_N6r1Ug
zM|o))Q|Aj?KV2;3JV<VSzjH{!nvCs3uEuTCU(TfE<=`Ll>o;igT#D(&-)$R030XR5
z6{pC2h}^TIZ^2Jr7va=!%6aHGA1me+708{h?Efy-)GK?ZK3i&qkV6HKO|B20p>igC
zmL{gNys?O9jnAQ|P36h?XB;L5K@^BWjFBDhBbnqYUJcfLUcMP|<T9N=Da1nEe7Hc=
zCnB~VSq5wQ#h@p++rX{M-SZV5jf5ZUVj+=_RA|8N(8N&e9Mum~(54BS+&%ub9;Tin
zp;tgQ7pl$l$G$}42(1pQ2UW{sNs>hnjKQCTgrSA9YDbb&9-soI2!LbFNX`g9VU=u*
zI@jcfVUu9`B*+vOU~Q6S6&N(;0927^;&9dgA5bCe^Gfp&t%@F)VP8HWnL^bn;aO^A
zb}R=|VFi<9%&lKHl(-R%@|#rT`-f}AeTH*&QYqmzLQT+#72@B}X&^b^yLmEJbQ~}r
zU;+q6(c+YeBsW(g6pJ*eQ)l4te8wtMUr{eTMx-2ueB>z8SB&cxcw?tUqmWp^gjGY`
zh&#t(frrxWZR!e)4KS;JMA5iD>~(fmjpXozBKDTZkeR``5_2R7;I9jFq}cR20hWO4
zVSqAgEjpc%DBvBfBP#Noa2HVrNRJQ_&=aYyTxQq|=ZnGsF#wZblw3`AaE5N(5iw2x
zS!7jy)XGe;CY+)!P!>_{-4hRr8ioxfsBeoHjI{pOlC!0113(Yi2#yK9DRs77O9G)Q
z^uMBG4&4eo#3Y;9#}S@Tkz;P_F-f8!k|I<+cq7Dp>QU^{VJnW*-~i$VgcUR`D#Is(
zBGQo<RdU8Qpp-akgdBpxfarV}ja=z}gwp&9&Sft+SN*MFo)+O_`_1T<8P>dNNlMC<
z81GO0c!69i@N824Xx}+gSTsa9dIW&<pzna@)M$;!bM}p~&M#lWr2H|{n?V?q(qw?#
v)PXwS=|BiC<zS|h9RBDiA4$(h{5yuZj+un5VLA;|a}JP~R*|ZcFbn@5o&)-U

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-36x36.png b/web/public/img/logo/favicon/android-icon-36x36.png
new file mode 100644
index 0000000000000000000000000000000000000000..efa2d020393f9b476cc07fdc4ffbdee719d07799
GIT binary patch
literal 2342
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
PpaVcOw<T2JDT)6EC0Oiq

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-48x48.png b/web/public/img/logo/favicon/android-icon-48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..712035bc565413a529f497619525f3214997629a
GIT binary patch
literal 3223
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
SuW&ox0dR3RVP9{Hz3@++(VO@H

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-72x72.png b/web/public/img/logo/favicon/android-icon-72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..7afde54d5f6ac1f6d0044bce0af14d9b52bec9f3
GIT binary patch
literal 4631
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
ac}j#lWq!JLv~MXH0Jy%nUM0*W>c0Siw`Yz3

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-96x96.png b/web/public/img/logo/favicon/android-icon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c866fb8f69121a545016a37f5bb8a409f69e504
GIT binary patch
literal 6344
zcmZ{IbyQT*xBsQPQ@U#;h8h@B1nEvG2S#A%lm>@JK#-7<Qc#A{0YN|zknS!;>5>NN
zeB)ccwSM3C)_Q;JyVp7U^Vy$s&t3PNz4i+OJ#{i-CSm{p$TT%njW8be&j|4`&*kg@
z8H~eqdZ7CN0IE|+uI=zJV=P}Ibrs;_Fv}mzfCH{!qzeGSd;oxq27pV<6mk;)o{0g#
z77PHO*#N-cmG{+99uvT~*H%{r`T%_Za711SU}lKCG#>i`fC%?L!wP(_<PQM!a+<0S
zOag!I<_CFA%{=Q-I;(G1Yl^0{RIbGT%!sZgdQ%NgOPXlV+|t`}-1^||nCtyPVz{$P
zuCKPQ!JF?HGk;lr!^#T<y>uCWmLBhBe%nYgMmV7~Ou3hXo@jS2{dju8|EeeKjWV|I
zzNYf|Fap^#u^;e!!FQx_<JW@h2C)cbw)VtxDWo`z98GCKK8WXngci{Y;OZ#r-zJmH
zD&rz>EF=6EX}t&$*p^7jMPQa};--_>9_m@ZV*_-xVZ(U6SiN}BgaYcRRr;_>YTj(Z
zQ3@8EWFQ2I)8-8$d^I7MB*>sVts@F#V$a}MA*b4O+6p%~d5|73_5*x0D*|{Yc9IKr
z!0yf6HEknnb23<+DH<I1YkQDWzT4*8W~IzvjG_x-P^LdTX%lYSKuRf(P0BB4Q{kUt
z>*I)G59vg39PuIV8yl1SA`Zo}z&k&>(nycR+aU<Yzs9daZ461SSp$zd8L$d*Z;33_
zZ{0&arUL$06j+~%BzZO>d&_{dRo6DtwtQ616X_q@{gq1ZO^Wr%toiPYd6WjCwBihM
z4>%667T1gjW$%5;psrRHbMn{K)JJXnO@=SLIP&5P4bzMbY(-MDmXo2x-)i6(BMCYc
z2pdNo9~R<J>0cDc(#PU5k#>ZlYbuZWGADMUjv7?s`xflR=X>4>`%<YGoTMJ9-Qa{h
z@wM5I=BsY|5PwF3lCpE4{7Bv|uQVuGWPoEMAeD~f|DHLzuhK*ow{l=ho6MU5^Wh=I
zx{o2<-bS=+mzVeN)2Ogm)jEju%*#lXk!+`5tX)8cm$pFWiF!Y!)mO#{+<I<nRg>qY
zOEnnUNLi=p+c!Xqo}k5*E;JAD8Xs3mtVZW0Ac>`j^&UESDj4B@KYE)OmRWW^7*9Zy
z)7Zna_*dSuZUs6+JHsGdW!3mm)|Qsn&&R8sA@3k?OWMrP!obb{)c@L{Jz-(x>t5Om
zYIa(58^t#95;q=t^phi0K*BdOLy}e1h(KQdrlf#RTbWHuf@v8I!VcjYT^D$nQ)#yO
zb$;^<Z!brx_%cVsuh%22$#o0Y;9E-?jDvBL>?CxorqZ*az)Hb(TnZM8RS|_Qqcmd>
zpec3;<F6wmd;(Ne(uYlRCFO!fwaO_Sfs!}|=Jsvb7ZbOf9y3JE2tw<#`*yR`dUI%g
zV!3uLfrpxn&NOt99|F!pTSA;NOcm)9dzM-Ek5``n5;K`AXBRg(OQWor?qL&un-dNx
z*(t?lN(VbHxhyuLuy;wvd0~v3YjxR)(@RZ9!AW1&5br-zwiJyck7IZnq;1`R`fc3P
zzB4p)z+#?aGy{>~?x?t`Hmoh?q4zAk8TOxA{uVPt?(~L4*n*I-P>75jFZJ)HtH1on
z+>_U|bo3W;!O(qlWhX=-DE#Q#s;(m=T1aXxs{hTHY{(ba7zf6aiUZ*$s=o<jn-Uwm
zPE9(Oc|NPmL~jSvj$e&Y>V<Gmr|w$3l=GTXQsuLEa#mAm7u3!vt>^ZV#2O<)#PHQB
z7LMFiZS_B<h~r*Ty^@i%8^lKawonW5Zu~L+<2r>1<h_64*rM8);2YNe#ZxF6bnWt`
z6gNF*m+x}0@toeXz5cp5`=o*r@4ZXl23Oc*sTOgE?*aZ-bjtpB=rKX%hk!%;rZ(RR
zib6}!CCe;>aeJUBKI`c@y}Rzj<+b7+WPPywdC7Csf(P?TuGoj|8TU&2wdL3L8@KuO
zywoq)^G4RSX~*hcca&-sT@L;zXs#p7giU{HueT>@;e9jeG#Ryo^T&a!vQK3~d9zm)
z_v)O@-cvDlszF#d+KtP|(whrwgtW~yYHI;b7y0oIYk2Ej1+$rZ;8t54!KwxQ`d{0t
zgp{F`&29d&hA)A>l597J7R{{Y<!UD_mZ;I!VXTTqG<OLpG!_BO>&+EZ-_uG~oB!Gb
z?@($@J>^Q83u3AGW3yA-<Yh^|7!xu~?`0M(Y(R3XAH4MERd7MI%FIc3r1JNy%UhXR
z;jZ7Zt<OK+HJ^PC30fN3$gVDOGn8ZtYxB-`?G`6|VQH;o`|kSma~~BVf~)o&u__vu
zO5hP=%WAQ{{W{58dc@54UD=qE?-iZ52ZUo)DKOSRy86#V&T0}-gW?hGq~%v3B1QsE
zb`k7M)I$Ai74#Z{p!XSx{To>x`&-*vO&iP$_S+yUb@ro1k<8;jEtQ8i3-xZ>iAMe4
zmmROsZz)@B-W+<3H-CV51G?&<{FufA==Fd{yEPiWsutf5&f=(nLg;8Ud$H^N4X=!?
zM>8#SZ@WMGY368I3MYynq<=eN84nJ@Ti>BWyf+PeOTN6X_%h6eons8SL9iHN1AEy)
zOT<|+a;#uxW*u(cu0>ifAi;E!+v0!?5>i9YUZ-tC&$I=5n!kyq0kua^pxK~DOi4j4
z;ecSwNw~9qH8@lo0-qF7I8(VVNr~;O=G~MGXZ;Z|b-*|LC#rXL^hY~BX3vU)IoBiW
zvdt?yP&Tn<CRnkWF3P8eze#U*K!IUZ2<%+ph9=!0?Ulo%Xi7U9$Stq*)4N%7j*@4A
zt9_EowyzpZ+|fA?%=jSFd}l|hk<X`wa6f*dtMHbaUaFFDC+kIsN6#q#1m~?s$&^x1
zEu7GH=h2;KdVUY+!msVWOaci3BOT0}or)K1(*&RFA-mnInrJq{=fF1~wspGg1L1EE
zx@goSVqG5#r9FZTHWK?TSyF!+;lj&c78^jO6LqiEY6~W^^t4Qn)@W-rE?7g4%uXAn
zR}u`Y`Um*b!nei-0gNK!=Pau8-VLu@3K(lJ&i1TGbHRP%2yx!&C3g$<mMB}p#72a|
zEuEFvR_2P@)$13s=TJQ>ZgDD2?<`K+iLw3)@P<v4=Y?)I$wxKODz-hlpgqFk48o2$
zMc?q?uWwX#Tl6Rg(pbV{R<EM}5_4?F^z$2DT{K4U+>BZp;<c<nmaLko>RaiyJMy(a
zxo0b6Cqiksi$5BEmwGknrv~1s9rri(&H^6KuX-KtTO=7akuHog9|-?WvaJJ_KpOK4
z%rVEGKlF>manvnAh<*`YlLrR#2s7&9Y#Dgg^!xB3?b=^)*o=}L=lmra&eMktl}e1c
zcD!j|RZo3^NT7KtpETivI5$J7+7#PMV-A7?;Z`E}u$IG&l<uynesA5-AJ_aEo-8@T
z3$0=j4%gE=ye%pF+f*J6+ypTO>p0ncrpWC(rmIQC%BW9p$hV4}rVY{+HQEf=pl!rm
zx&ES6Ggg%kTl;YeY(|u@QrqXUSfUQbLzYc)&1!r@4tY<9G&758ZKhwSNm)M4<Eh?v
z_;>0gfh1feg^LeH_S&<blUdryI_v+j=Hoj#6*8wfJzrG!zQh)?5`B4mlqPlM`M?3C
z%bs>>$rz5gHE=&(_}2Q>l3rHEWNUjWgDN$MhvA)o2wk@33mw(hfPyG@QdyT4ZT%1H
z!uMEHZBM+vmm~{Ry>j|_IO#U?$Y}8?Y&|G&$u=)D%0hkN`>q@IOgG9#3pTO4N%zdS
zicFEVegt4Gqab7COC3U$l#!6Y*E9)B^4oT05->l|bSkUNE?MuUL9W|&uYdC_pjLQu
zRuU)qUd1A6`P{s$jw6Ja4k&!Y+hH3@iT$bd<>od;y38^Dyz+*ZxfCm1h(+8&=Wjo`
z?wz%M<6J21JDKp*ry?%?@zu1v`H8fVoo^xWyP?#dT6Kjt1<g%2i<~OUlPJmp;lXJg
zkm3e><pFV}GSwf6v_`49YabI};PteZwDUfY2vdkt*wjPlv>#b5ewWnxcoKd_kx^$U
zNLzM;@~h_eOgVv@xHy4XAA;bi_DWhg*>04KsF;CumhvNj#NgtBL8=p7<$(jA=29Ia
zJsEpkFj<T5Qel`^iif5)W%1U0pe4%6t&_5?B;=TuR419CRk^l2V9UnvfgfO_3#Z+P
zjs1C_DZp&5E7qE4e4SAnDNbhkvH|f`Jv{(%DVfDn5Tn+{LRQC^p?`+B#Wf_qKZ>NY
zt{mI%dZ_}7iTxSg^7Q&Hkq}?ZeC1toxM=Vs0yUG81y(>!7&w&t^HUAYfIdI5l*vr$
zKsH-8Q~LeMrX<Y=g@MB}4y(9K+$H-@x--5{8RUNufd|7}QOQOaRy=}duG+f0wn!Hq
z9X+Pa=JQUoNmjig*5$_uf9zi(Sifyyoh$08q0?8v#-hc>l4!9Ap|$FEEIsG82O<|S
z7D?Qk=3Kj~xzF??U$eW?VUfF_ZgW;#y}ZCG5{wganj>o6D$ZC9%JND=m_mNWfYl*I
z7orr@gRYG?{OLm&QET7ut#pE&SDvsbs1KopUyDE$AYM)k>4$Ts>V*bI$%d^?`rl*j
z-1gMH)jna~8X2*Dz)d-BkoeuhB&$uEqAcU2V13Y~oEZ_ZOx3#WSJ=k7sUylP{KdsH
z9ge3_Bokot#+$%kH&hf%7(MEhdj@9@fegJflf<d2yxegU9_jM<8I?qi1k}sB^$xvF
z`ckNV3k*+`z34IgmLV!@q1*JL`QV9=gF@fCMnr!3uMv9Ws7c?>QWb}3&=!(}03PK1
z@a(OOzSBd}cTA5L2H(Hp<TQw3WWQ!BJrUEhf`2tr27Ti8`d#%W)5%$b!gT>8Q$<$Z
zPb5Pf_d#{osWoajm{NH_DCgHOFD;#R4_C|Ch23gmq!IC#P$J*?sgAxGzn%1bnz;+y
z25Ibgtw6X&T~%K-U^LWT%^YjqD+$bfc+>Ff0eMB*Sbw?T^`sJ}xR~>z(3tR&dlTP$
z9rkN4{ZGMzeKk9$@b(FJfsYYO>wLuW6rq`k$7(l^?~PKM;3U)0&R^4o4tVHfRblt<
z1xQnc-zrt7?CHEI&?6|=G2e4aesb@T0gJjZJ7bXv=i~BPvZ?kPu1Y$Zc)Q=UrcK&+
z{cniEcLo@x65}9+_&YSud5*?!`X6eY#>596sIu=QuIGgs{PKv>sk_c0@gO(=nK<9z
z8G+>e89$r4YI~xY!yFa9Z?_iF|B9?h8e(7?PloS4kLj&YGCJwd{7jQouJ(f@Dn~j~
zHacec3-?t=El^XtsJ6Ht;p!XmJjVl+!=ORod&rk?x8BrX!!Ne+={w4%JlFqe>OR>s
znz_^Go%6SN;?!Di^3eqPC!h(Mftz-c{{83Ru4lyDjd`WW!grRV`VB7Yg9PZ5Z;8G~
z3Q3I>rtvv(X>@kk=b3J?APE1^%Pg?0%3>`W-{lp7CQC35OGx(6T@ZV-<g2VA5|h;{
z<KayjET`<o`+f3>&}P_jK*nR2`)!KVS>O5h_*ym|m(XbkNDaz9t;zBWo+de9!CV#K
z<JH!***m#47rw`eEOB>x(F?Ihj}$dU3KgQ@u;XVR=$`qgBDex3a9KW^EDSa1%&Qj3
zCofzRq-M3mF}MsAQW{Y*i9?nBwu?y>PCR9V2_{bG(++-8hBiHHd{ai=8l)`Hw-)~?
ze560&Z?LlYN!n1G{Nk3k5=09}F&;DrT`2t-u8B2El($adC8wxbXqaMa=DYXJmh&Js
zSaT<g{GR#Hc~WlIxp_GD+k9>W1Cz&@H<##d{m`C~)ar=ZKBC6{X{BkBT|L|8d^dTl
zYf5zYoP<ac^b4GoW|Ns8$!RX^#!r3Fbq{_2mG~XGS%+1_w;|floq_XDEoxH3y<OPC
zCZ)97n{%p9F4%WyLMDVqalL*Skv(1@u1MYr;=A)o>o`C>VFZg#ZetZ|!Fo222z1r8
zg1BkCw2iBnEZwHEWCe=mKapF%!hXsV9p=U$PTh{O&D$voaSZAAMj%IDy%0FGY2`U;
z4{LB&S4J_}Q3T47QuuZ3A#8Q^d}g`a7}vkOh(D`YqA6y(m2k2DI7cSIkY#Lb5jyF=
z^P^zHMqvz0lJRpt@p}=$-y4HGX-#^)0Rl{}QIKPC)(kmB6Hce>1Ch9FB8YbnqrJDs
zx^92VhpV(VbbL1`aWU?6$@WR0?7Tn;#ut0q_2_0#R_b7QZvS0Vt1Ftrz^m{rvmBoU
zik7N%FK*wj?bagq$tw}F74q1E<~Or)tt^FEJVu7Qw(YIgxkvjnsgf7M((<!pDW}Q-
zx4Q~JtjCT3A?>f3-wRTK8@mDdf15URbQdoB&FCw0wFgd<Tb3`|`DT0}n9`jeiq6o4
zx_3k{o=c(59Nv^*?R@y%tDzKpqEZ`KQ-Xh-REhQVMJ)}_siOL7<NjjaPyKS?2vv8K
z!YtWbhYLlZQ18sMZ(v5k@H(fFwkr~|p|u$b1vzgl;Fy)du)aD$YG7Kj{;c*au%O;q
z-aSd3MzuHU48HZgCsZk;L?^9SCv9RHX=@l~3uYD_S6@zP9U?692j7}PxVghRZJ%dv
zx>A&7_VztyKQl2nF-U=CaO!U)=IefNd2)Ah0-9-M0g?J1RsH2>O)isxqj*(n#Re-A
z9=}Wtl-UWI4;FOrs!>5ZtiM;UD+^aG5ApCM!Bpv6*V&Oq)K^dR&Z4DV=!?xKslpDM
zIs=q&%=|1&uF@6H)s&9c!y&#VJQQ9HPQ#U#J^Eh?eR_hC9oZG|SW7NOi5PQ3OK*<M
zcy;*^D^N}|B?mk$R5N{5Kc@sGuIb_FTSF7<18t%|U8<VZ4FMqE9NCjPQofo3h_!{T
z!B>T{?W?H~Z?P)EHfEoEN~w?+4234x3jS(`Eh+ZYaTgp<>zUCQMKWsSmb|LKuBTR5
z;cfiQpQ_iL*^AJ4*3+Nh@`OE--M?bdvs{OqhvM+C>|rR^n8v%mzgxU-ZX32c-c@-M
zZ((~ld;bX^_@XkN?#kE1r`*jW)&2UnUJj4Dq;xu8>4NFinbIHQbtfU$kAAxQ2Upi;
zCYd9llQmVUGctW~MD&|6`s#v}Br<gGUtcYoHUCJTH%&iGHqto!wJrdWdPex_2`R;h
zk+^Iw@@_YlfnbXMC?oCD_RH|+i`!GLrBZrU#=LX#?PhW|0nC<VOfm#9n|sPk{+tR{
z)@sxU_92%Y4UZt6J?)zO^XTvO7D~l{M~?c7x`{~>B=ZjCe?A-S#I&9a<2auZcJ&Ny
ztouCWKCgIa9jo~o6{|;XpVjRg*0gPMaXr3Uut66zZlyy$|KYvPcpTA*u|xUi-dOoS
zKHQXJRF~X>;Vv3XM0J|e(nCT*yubHD;-JNbY2$o)T~leJBsFElEzXAh+2B$Qay+S{
z`jA!hbus7an#^3D;=>klKRxhbUo+b;c_tO>O#-OX%2De2%ENg+qf8DL!`uTr7#&0S
zmzaM|z}Vai_g5jy#=T8^{CJ$mV3WJ+k+)yt^`ZW~;C57VeyQOPk|E?E!=a!~j^Gfr
zDxDY3!9DSt@=_4zEN6Pf1<L{bXcsMIVS5I|XHZ-hPeA`qu!-o}6e_vq!WKl0y1ouW
z-Cx^9Sq}-Uj!Y)SI`5X`yr=6zo#ucdwviyiFsT8<pz=%HZXv@QFqO%JU*JVTG{I}0
zXDp2N#7<Wl4KT|bN9WiGADaz;Bw`IUoGgX9^{*3noBb49lVQq_C(=^V%J9S5zZR?t
z9e1q8w5mS;pC9MXjWlw0^A_h%F}-D8KQ#-#r*?i0P`Hl+#sT7DV2ChSTv%MfL|g(Y
z27yX~L1JQ1F)`2f;m7}j;O_a<*)iz<Ca@LyuVDy}{wer+I{F3J`8WWY?siTNx^_;^
za90j#5r~M4uq+2gQc_q<3Zu$l2$tqR`1yH3MMVPw0z{nup)rO*i+K7t{fgbiBm@}$
zWi&xNbGL^=RXyR)+#Njppil!0)E5Ak-ZhE-FU)^yLZJu;XD5Uo0G1V}0DNLF7>57I
z^ZzjB&QJXi{~!~UoP-$2z5jsdI=egg1$j9D|Gg?vFApcB8Z*8Bl}FbEg95-(U`a8E
zn4~l~izfOE1EKhjJjTw!4uF`7O2#|I9ZbmVKSHKPnt-FTn*-+cMcqC8+&rB`9qs&`
z;hrA8qW}NHh=L`h9pDlU(qM?AELhwTA|okbFD7FzCjIm&_^Ft*gb0Qqf?3}KbG)w@
P1wd0xPxYe;Eb_kq2UE!Y

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-114x114.png b/web/public/img/logo/favicon/apple-icon-114x114.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece1d37c5a991e8a0f0d8a3cca99ac8abcaa311c
GIT binary patch
literal 7758
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
Sgf=JxKu$_ovP#_K^M3*T>7D`r

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-120x120.png b/web/public/img/logo/favicon/apple-icon-120x120.png
new file mode 100644
index 0000000000000000000000000000000000000000..eac0d7188a2d030c8a603d47dceaa351d8a39e7a
GIT binary patch
literal 8238
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
X3Ll@CHgY>$13*?vNwQkpIQYK+*WhIw

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-144x144.png b/web/public/img/logo/favicon/apple-icon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..b61c2bbed57e32c1ba364dc9e23cf6fa17603b80
GIT binary patch
literal 10125
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
YgA2}|gf?<3oB{wUqb&VX(j@qQ0Z(=~(*OVf

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-152x152.png b/web/public/img/logo/favicon/apple-icon-152x152.png
new file mode 100644
index 0000000000000000000000000000000000000000..f870d582cfade5550a37957f8ad981fad5bfd800
GIT binary patch
literal 10676
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-180x180.png b/web/public/img/logo/favicon/apple-icon-180x180.png
new file mode 100644
index 0000000000000000000000000000000000000000..d28a3884cac29f6ac5d2315af93d5fb9c943c123
GIT binary patch
literal 13164
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-57x57.png b/web/public/img/logo/favicon/apple-icon-57x57.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb91931c282f2729fde88210f2a51f293f8bfbb8
GIT binary patch
literal 3595
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
ZF*9Jy{&elZt;`C5iQz?qT0Pf<e*uCRR`UP=

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-60x60.png b/web/public/img/logo/favicon/apple-icon-60x60.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a716207a181fcb808b9394b509b9291320dc21e
GIT binary patch
literal 3854
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
bkdr1?NR!v6VMYC(>;UNBFw(Blbcp;H_XYT6

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-72x72.png b/web/public/img/logo/favicon/apple-icon-72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..7afde54d5f6ac1f6d0044bce0af14d9b52bec9f3
GIT binary patch
literal 4631
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
ac}j#lWq!JLv~MXH0Jy%nUM0*W>c0Siw`Yz3

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-76x76.png b/web/public/img/logo/favicon/apple-icon-76x76.png
new file mode 100644
index 0000000000000000000000000000000000000000..38193e23e9bd9f84a72357d15fdc030f353d0ced
GIT binary patch
literal 4962
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon-precomposed.png b/web/public/img/logo/favicon/apple-icon-precomposed.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c9cef55b9690029608e71c8184f77dba62cf643
GIT binary patch
literal 12504
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/apple-icon.png b/web/public/img/logo/favicon/apple-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c9cef55b9690029608e71c8184f77dba62cf643
GIT binary patch
literal 12504
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/browserconfig.xml b/web/public/img/logo/favicon/browserconfig.xml
new file mode 100644
index 0000000..c554148
--- /dev/null
+++ b/web/public/img/logo/favicon/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
diff --git a/web/public/img/logo/favicon/favicon-16x16.png b/web/public/img/logo/favicon/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3c044134354261b4f2fb252ff78c9e7cc5ee6cc
GIT binary patch
literal 1306
zcmZ{hdrVt(6vxknme*V;vcWK$!E8=iXnXH%xrI9;gMiRTd6bTa@sGZ4OJ!}Lz0fg}
z$u^jSEn@)`+#`Ufor}Zq3S&ewkf^Z9vlQgvU=*gt&H0!bCDC8eC@wMiz0UW1&f}L;
zot2TgHRy>T0N5%|OID(r=iLFm=!_Bu=b(#YOjINSbkuHH*Km=I*_EkD&_25JYh*;~
z(v%8-!+QZLDgk~&QpHyQr8vMhY5=+kAiVg(_3UR+9GjJ{N<jdZ58El8zre>o+84di
z^5p{-1wI>#!-v2a4u_8+5h+|g#uZ?Q@k5Ud_@C2HfCa>G{?ZYQ0+A~$8d4}<ODa#B
zw1ptxF#&9g0mDA*av?eCtp4)TzWILV&=Eyln!jA;6C?m1K2RhKm&m5iXxz?|v)vb6
z=Sp3T*10QZhbr@gxVJad#%S}ai|z^cd#A^bWq#3rX|}g@ae8dLtumhU7NrQdeP?z4
z=78&hW2U`+tUPh1y<x1aDvm_DXMW@(*ZDHHvwEtQnXJ{joi&qZbTe1#KW{!FC1A9r
zV!G}4m?L4nx3$ZWwll{2kz4gex0jaYM{c;zv2!;*n7vdpP*tFyxx8qwrUu_^v@HyF
zEDUs9w(O%Nm_Hxnah%SV$y-*k=D@B<A^1jtKn$4_@B}cN33<!Y2Jfs`Wrla40RCxC
z&$`DMQGfq_eWzcY{GM~=_fBLX@#5GXG)KU+FQg{Fk~!J4j*P(Kv;sSTXt#G`hu%pj
zL*kk|IZ?G^N~cz<^^ETBlE-t$pkwsN)UGYB=47dqx!J4XOB#b#y&R&-nHhIYx+kWm
z!aW)d?{Ny3k`xgu>Al+B85XAHh4c{JJzb7s)>c;16S7^yvv-yBK78=g4?lnZ@W<Yg
zP#w=dki+rgzINz1XDDKi+NV{G1*T(7Z(MzF^0TP3VJ)pECiWj~n!WaGWpYdF{-U<J
zx*X-yq=Z~tsBi}bK4W0+dfr`I4Zqgchwb`gaQB<}`Kp(cFB(?X_6D+aXjembdU*=-
zde8aO-P^|P>hDes+eU^@9sMvE!rzv*u6#V_LO*_*P045V8kV7THU?cl;)F~{kU~<T
zA|*5~qoqVNj?*}99ULwAPk`B~HyO(RKj6vcvQ-rDytjhgYG5528v}B)#>gl%Mw6~6
zk`l>8al-gWR8lI$V^P(}Y=Vj`WZ7a`EOs~?B9oU!8_^=G&A4#l9!dy1yct!6rDiQn
zCtG!;X2!zObQVJGKsf*C7eB&m)THS`#$+sHfruxA!B&Ns@J)ICX7WsWw$O`Az5i4I
zLLxRH3X_>(%ZnM<=t^8{F(!28W;~Kdp+Xc8v4j+t;Zlld46XbHA;FvS<d_aKfF~t2
zy!G6-$d$XvbwDWxgXtiHzArXg*n?K1*q|vh>8uvJ_}{^Z2`R<sBn(B!4DkeMki|(Q
jT0BmRQ+hq2$0>;jMTk&;iFw@Xr~=4SGLqYq)W`k=4f4Z)

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/favicon-32x32.png b/web/public/img/logo/favicon/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a9d182980bdea10ec0201b9fe45f1678a2061ea
GIT binary patch
literal 2220
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/favicon-96x96.png b/web/public/img/logo/favicon/favicon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c866fb8f69121a545016a37f5bb8a409f69e504
GIT binary patch
literal 6344
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
P1wd0xPxYe;Eb_kq2UE!Y

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/favicon.ico b/web/public/img/logo/favicon/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6fbfd3670598bd587c118e5ac70d210d28477ae5
GIT binary patch
literal 1150
zcmbu8&1(~35XNV-y9s_EIcTAXQ1FsXLbXv7+a44_njESp5s!XS6dL>@o@x~WTBJ&I
zC@Nz8z|=w&Q$eJlDHNnun_7}IHr7^+$L1gK@Hn%ZZWE|_kTAQO_nqIo^Ulmer0~z}
zCVn<hhelLKL>@L?;uUM1UqrmOwb3&3fAz!Ai45Jv7G_J5p_a(w_(g`srkAWWb5DG1
za#Kq^IlL~?{A=nJuQS1WW%8(?ZC+6DAjs<m$70jP%Hkuw!U(JSY&OMbv5yPd?g#>>
zM-Yg9#Fj%nAb$fmm*p7X7%7P%EXQ<O=Q8VaV?$dM=lUn{V(bgf-_Dxv*3Ka)J6ddB
za;fC%<nIXEk{Q2gC(a~3;M?K?-o7v50`t$)bLbf?;7EK7dUJbqjHL?8wc@);et{6W
z2QnyqU%;D*A}-#^;_Aa3_QW!H@T!P#Y=rN!nPbR3&3Xv?qnhu!KUKqDOXhLBcLsgK
zvyeS%+ErZ(VWmIz`K$3KZd!c&@igbyT+Ivnzx?0xf0D<^Kc6pbP5mVQpIpE6WD&8u
zS@Yg|FJ+K;Hj7pA7j~t8T>r}hQ}~ph$Bn0X9Jn%#!O_oL`vNk#dBh*d{do?oSz7L2
zWqzc8L4?ju;An3SQuli=3uX_a{aM@^p2OkzIB0t#_fECvXJvl%6!|woX+4EN#}KY3
zXYl&nS0qP^Xzv<_Gu#J9D8hPJ%dBqCZ;gHojrF6J$yWz8xF7DePORH^jC<b1+<M8o
xtQdNYerzGu=vPgWN3rxP8umC?znauawC!TEu|<|pS|#dM?4^Hxh_5ih{suy^pgRBn

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/manifest.json b/web/public/img/logo/favicon/manifest.json
new file mode 100644
index 0000000..013d4a6
--- /dev/null
+++ b/web/public/img/logo/favicon/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/web/public/img/logo/favicon/ms-icon-144x144.png b/web/public/img/logo/favicon/ms-icon-144x144.png
new file mode 100644
index 0000000000000000000000000000000000000000..b61c2bbed57e32c1ba364dc9e23cf6fa17603b80
GIT binary patch
literal 10125
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
YgA2}|gf?<3oB{wUqb&VX(j@qQ0Z(=~(*OVf

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/ms-icon-150x150.png b/web/public/img/logo/favicon/ms-icon-150x150.png
new file mode 100644
index 0000000000000000000000000000000000000000..71053bc909ddfe4bf5b60cd75e7536f6abda18ee
GIT binary patch
literal 10640
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
XaKh&&sfXMF9|52!t0q$`WfJl~GdwF6

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/ms-icon-310x310.png b/web/public/img/logo/favicon/ms-icon-310x310.png
new file mode 100644
index 0000000000000000000000000000000000000000..02cf9992481df126149b075f1cb76ecc037384b3
GIT binary patch
literal 28700
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
Zj^G8(@6{X3R$vAcC3$tZDw(&T{|mjw2zdYi

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/ms-icon-70x70.png b/web/public/img/logo/favicon/ms-icon-70x70.png
new file mode 100644
index 0000000000000000000000000000000000000000..45d91c09e4ccc3c4abdf63536fee98d8d8396a45
GIT binary patch
literal 4416
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
K)2Y>Ri~Bcx9PQ-*

literal 0
HcmV?d00001

diff --git a/web/public/img/screenshot.png b/web/public/img/screenshot.png
deleted file mode 100644
index 4daa2e4ef71b9d5d04fd39b59ccc3dac1d7207c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6631
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

diff --git a/web/public/img/screenshot_bordered.png b/web/public/img/screenshot_bordered.png
deleted file mode 100644
index 92eeb3e1dc8ec7f5868a1f218bccf22740737c04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43769
zcmZr%bzGHOv!=USy4li5$EF*kMY_AYyOAydX%GPg>F(}Ex;r)?-Eg;hzVn@P@BN1#
z@UAs8Yu2oqXP!tU1u0Y{LL>+X2viwqaTN#%Xm9ZE8whaVpN{jT+7J-r5HjK-Y95fF
zEMyP0ovfGkMpg<QyqH2sD@i6QCaUk)CD60$G--(gZw96zw3)xfTZyB*HhAVV)0SRJ
zYm(MLV3Z6Q5H$*Pd~L`!C<$exW58&pWl+p>_C}fb6Co^IBC*q*&}pOm*z%jyW!j`Q
z0Y#@(=P~c6miCM63*f2uDtG?3Z{LtFsi4FI5HKJqg<&EfFv)-a5m-Tq@k+fguj}9c
z{?kS=pojDo)L$+C+l?FrF@7GoTegrA^S}T6ORzL30rmfi>WYVmY-KG~qsRKc!WM~w
z6b0{kmP#rFNpW#|Q(5@5gt0L(1INY`p37TXfu+L=q5s=(gMG}~PISL@wrRcIY^k;G
zbpt6Wczsz*29`I7BD|<h*#FBej3F3l5Udh^B1CfCc`h}~4#&XT|N7u};|>FC^2#|W
zPI5$HONO|QA-S1wjgkNH(qG~T5TK~9;R33tAqvX`WUzvq2)AjW{_WD-a)kK#BZfqg
zKC0h>!v0@D2q9p92wR|5=*vLJYI~mlzZL~BKw^1+7Y`d~`>k&&5yM2g&IN{vjG{=)
z?w@lANy#bz){5Ni^${kwCIvs?|IsOYi$z|E-{yK$Y4XbnPKy7Z$}ldlMzQASdybpm
zo*Ixr7_yAd_;<*J2!b2s=}S>0i2XMHOADgNZuk~Y<NN>Pc2;4q+fgz09TX(70;Xnb
zOXX3jgzik(M$i#O-mBCo{(B1UW5G^oGnQfVr05VQM-*Xk*k}EBxa`w`{eO?hC~-sv
zi52whNU8sC=aVaezeCYTKEp>tAa+8Ey+!<2fQC?jEjQFC>CTf5L=fpKsIE?G!z4xv
z6EUU!=PWv4kXP;ri^Mum2#d1nSS1dL{L{_}BCrlGvA8ZYUMOmqaGez8uz!U~5Vf!o
zi?jm{<0C>m21+|$A=W=^FyH|P8F!|2&d>=rcm#e0lyUzW0flHlk6wftjH&TH7C8lv
z%TcV8!he+qI?#e;XIiHYaqYuMBcOTVD#87|kikJ<174Oyb?+2m$!x%;!8gMJeE$(9
zAz+Q(8@lakO%$>LA?p}rJVRXnaIa{DunEGB#K?zNG_PMvJ3cZ=NEEy@){qQ*3>_6S
zO?ojLG-pA`WOj65;a!RHXo0QOR%&cRsO_#5G~F>5jo;#_sjbbcbtF@NoAn`_)C(cn
zTTKlI2MN~5$cWWxTlzWfcslN%fn;!ti6BzBr-g{8mR-|CdRb*3T-gWOAtoWMf)Qjl
zICv}scs*Fxpe~4BQf@&eugM_P)#caLrr?J$x?%;j7DFS+{=+jA(gxBfTQxIj2EID5
zDJ&f^l4{vkJCS4PyinKWhL*3K8c&*0Zj|pVEiBgFA@+*@qidcpc}?#s3@V5DC~MBQ
zkP>C|ccSCcWpoUNkh!GgVLQamlW_<kyn$?%fMS^=R|*+~YeEVM;eSYor@~n5<~dc6
z_!`T0VGbz5{X(dBNWmmQ<dpkbOx&OtD>pAstacZ$_V-+OIM87%0=*khlgMTuC8-$0
z_%uj!&}-`nt&6)?ogrvHixfQ%Ww7)+o&>!L|9V|;orbs@X6EqtibgHTMcT^*&kXog
zL?^ksdEMfx`067iK|(AlXZplEQ?YL~iZ?ouq2*@4JWuiI+rCT*<ahyv11ya??@6Ss
z$*1DdH=QnHNc{e?fens))T7efrBW_RR~RjKpCM_y84LwphrFYurf{8vV)Rf#J;@Rn
z@$N+!Sqb=5#8D+KVIEHMvB0~szG)0ok4+MF6gbUl?nm!}2&4v)X823ZZ!<BV1lZBI
z;eV$1J_yr&{YK5tAn1xRV3OYARIWRS=3pW=LE>PYiG)4h!Vl>K#D4Z#OwfVj6r$mh
ziD+-egR-YiDLNpJusl>j2;N!XN09)>cp-{uv$f&&u}EM;q)b{hEA~Osrorl`AQ15T
z0aw8rd(scl!uR)tjOuCzD_>M*vTMcIB!fTqvnO!AhlZaNK3d5+AAYP5Fi}Xxmvvbx
zV{Ow7Ypq?W`!25}=G{)}OsW_xIi`a|s+8p_otIgse68qstLW|U^QWVa1#X$oNY=!%
zGuf2cxX8H&{Hr2|8nORQJS61=H;kwb2-5L}Rs^0Z8lT?KCJp_HXB@VkfWZ(tS7wre
z^a1F-8Rt~dk{%2?Hd9_7Y+W=2YDS$W)v|&z;%blZ#jqKK){g6P7^JQ*3R#ESX{;^7
zc6_0c*2+8b_UiKtynNgtCQbRZLR!||b@>jxLK{VOEuPm1|3D%$u+l;}$lVNcT9J2M
zSO^fH7vPaIKaO!_ZBYyV@S#^Dg_`85!j>z4yVr++5XO?>Zv7J@YiswjY@TKnq_zKd
zN&nF`3!qjA@!Yw7P1mIYqWq~ErSB7-i2@3TE7~k{=)kH59g=y8iJQjwkIs8p5|rlY
ziY5n|M4j|E<xFPD-v>k*vGLJHi>#H;MVaV}$|al7b-S_{d#7}FV!d`gjj%c+g-;y4
zYnAIoG+MG@6j?n*wObQdBw{MIW)xi^g`U!5>==?-wtXkdoW{4MkV^T`>s0U3_$AKJ
zEBq;?;8CB;c&XZ*ik31+@oRPUG+TOfGMDYYH(NT4b0c(PTB^v?<?6gCi_S+!()(*Z
zMpn}8Leej9Kfr%#g{~yir9%S3av&qe^S_VsP@Z6$bheP9`0%xCop7k~q=UmI<H%Ag
z4QX3wJn+Geuu6SQ>M+CukPmUvf?3#(+mn2jBC59B3VB~y)xwd?AChf#FT2g04(FOl
zZo|`zx?7KwP(O@vVni}~TpE0GM;)#K!IM_M7b&V3`MC%w{;mP;3@O06ZhgY-<EaXc
zm-cmTZ*=0`g@M7aM)a(a;|cv|>rkJ9Ubt!Pqxkl2n2T$h?S4<ZuT_aKdjhqHo|0&3
zJY=v8dkC!&B=XzpdAGerGrBchKaCJ+iK=o<H9ntCe%7Piuc&H)uw(`**B$yWu2{gp
z!_LG3!`~@J=-f4+Z^Y!kEw(8Z_d9W&ui%~5>~Nn~x=RFH8vT&gPl$p=|C+mfG#ye^
z>j@|y+w;curg!Q6?gXG6>tDpjzi3TbhDElalF&x2TYX||ulI2*l8a9=UxzI=(&1Cz
z85NnD=b2Q0%W5+sbs)n)uRqi=N5ZfCvsg~?brjD8pRpkiwyb#Gp4HySY&8FQ!ple4
zoEJw}E~^^~>%{5?^XjlFeV3XE0SR&OfDrPykmrA#mgMA6c~7IH`pG=<zH0m5t4KJ`
zu`3!<Dmo*EkZo-A=@Yj%heiufYs0kKq!ihlIcEhYnJ&}bb7is}-$9wY#emX!aq5e*
z+wKsF3mRp}%K;$K;`x=LrMC};uzE~IW1BS|ZX0~1$M*80H8H&Uz!5&NHLcz!_Ryn+
zBf$Kj{g6FYk5Z5u6|Qut`yLv10@x1wZ4XH_4xOm~ycL#607*5E@uN@~c8Fdn8UuHE
z@1xAhourLG4f34P@C6^Bqw`i4(Q4u6P}_5@!#Y^QFhf*xc$DO83~s%+Wu4ZEjCqyN
z`!EQsHjVJ9QTctyuZ`A~B4a6W{HP3b<q~`u%SDp`UG<rCCzb8`AKv!gO-TD&Lcbxy
z3?Us3G%Cf5(q9NmQO)d)*ju)YPp3iv3W7$hiY3|KvmC8B8@0u`X&3;oLP%XS=j(W}
z2N8oNwl28UqwZj}d#W5+?HGfVSLK)rG32wd_ydsynSpOo`ImUBIak=fCGZBKR=(?W
z%WnPb_$-suTj2_GR|}*2G0wm!zKjY`Mk9TMz;{sq{Kwrw8YV1Y9y<9(0hZ<FHZN0U
zwz+-^W9+k3QJ2`7c)e6JZjO6#9%(^{U^*g^V!MaM34VA@R@Ir981Vkylh7qQ%p>-P
z(V_=M$bsBla4G7nB<>8N?7kVb$j&{GoJ<_@YGsN?p26l#nFTK`+7od*L3*4Qp;J+S
z*$Gr&l64p_HvJk7T&z|0km#qPyl99`GF=Fu{ue%CK4!UP&Ne*|T@jr(WAo<8p!Ckx
zj=|m3OO376P5wv3C=Fm$_JqgxX${ofkuCH4K-+POG?JXO1w)_r7%yqrk-gbragx1M
zwv$jElqVsEj~o`jHj91TR{lcFfw2WKfN^U>ME@q;WyFn%eW{IHZz?tuZn40LfPjW9
z^DSTX#*zJJjqN3meeRR)x>0Q<)@jx8#^v(rjF4P*^u>R?YJ?SG!b0Y|El9oy4t$_M
z*>R!AAnMZW6@Q2IW%X#Qo4ycDGo#)>?oMzVTQdT)zc&&+muYORZgBcX%*A#5*PaL>
zn4C;i2i!~l`5>mHn?^-O$|#Ljb4>4-i1T}pF4#nP`sgfyA7}(WO!CQli{qtl+i*m+
za-F4>9*ES5mn7U4V+?pqfzF>Ya5U}ftd?EFQ~6W?&7q$PmfNPPx}Am?Jw7EO)S6$7
z<-|?P<I&z&mINQLv+0dRvrECcSB*s}nH2ROwIG?W(XQLs9|>Q7StY522UTdvcX5|g
z%1n6Ofdkv66s=@)yVjMA_r?n;5>DA1(ftDpNi;y~V@wyYwj#4W_@Y@4nwgm_AjH67
z8G!Tm?G&R8M)V~EnB9ui^qG3yf&?65Lhs$jhX%b^=P}0Mi$wd;GmtB)_;}`zi9z^`
z6@FGCtp~uFHWs7^(tMTZLlMnOjIk>m_erz|8irCl<U_?D1t%6+-|!*ae0t3YO~r6c
zjV4wKupF7!s@a6DS%mPt0k!~NTG+x9$dx#qMvx&Ck-L2$No03KLSX3rLOrT_$yc;J
z<LixVUu1LJ21eBPEw{A=dtA(8Q3yNGy&HW?5Ul(c*HK6#q>ta+?IZ65?d-8amsaS<
zTfJfdn~uoX!L(c>R}36tM^pTy;#n~YlDik-20pzAC;6{xwHL^ad`+u=&{7=daqN>S
zU94sBRZWhg(ZVb!E)FFX*#G<e8iE~2L3#Z-FVnTyIXz|Cr!)wkW)S_rBq{w;N8(zN
z%IfCb(3kzw1^=9E+cyR0$4|w+a|o&hdxp+-2b{hqk5Abd;o0a8OnzUcojE8xK6dY9
z!=#lH>sNH`4=d_tp?_I@ptmJEs~8NuzsDD9g=qd!3-B(0!R_xYe0#fK#h~=)2Ma;N
z!CoET%(xIvaD0^6*iZNC@q4rJ7NH8!cyVcIM{n>S@9n^NDpr#oQlg>3Fu*Ly$I+p|
zbccNiB8GI3H$qXws(My9%Ip^TH>A2<jTTwxmCwzrn%_dtXZTD?PrYAtm`Uk0iDq($
z$>+R9Do`oOZG9glZcAB{dSl#&45xWAUz%JWh)RgcClwp+N#f*=Pu}SLx!9Rc%t5iU
zjm-uU2bp_)9h-C(7gQq8{jH;I8~Ky9qT}!wtnO(Q&;9g*em6tPR${_kvx$k*Xhk-A
zr<yxdc<gNF$n573l3nnnsDh#5LE^5o`bl%DW9#>WyI)vTNg;Uo@7ujF0E>Xn2wm19
zDKW6SHa0KwtLkaq2h_m~Ueu;+$qkw91)SUb301+g$RHFThw)1In&#p1`_80%1h3(b
zsveUU9Jl8@$5Ozz3i&-uHdCq20fT*QD;Hm8K^At2{j?2RZR4|}#!z!eL>a8z+736l
z6n@mC^()ZpJRQCZBmTzwaj$rgIPYoudl=NYh{nY24L+TX?!_tv@_M~H4WyyDDI@Ow
z=vx6%R9fK*;fU7Ba?`u4uAvy&k7aj2Hm%en!pWBYGA#t{fIq@&GbD20h_<{TOOPW&
zn8-p-4GFN_G5KG40Rl!SG2<Y-1hkA4_VmWPyiDSe{%^OWd`~#GH`}DZc#~>3q&Li{
zjpIe$I9{dwomL6s`3qtpkeO94J3zx(>Eg;;*geaiJCpOoWO;*eUvqcyv!QtkdLQBy
z#-hCx*UDm=<uVVZ!iJ2qX*c4FIFpwhl@zh&s`z~n`h-)Xl#284Xb(arZ5$7eUGpa_
z`n*NZ@Q=Zp^bTb%Ns3kr?R*Fakjd0>HAHOlCbx;d<t-nM^b|3pJwBzmCY;%YHCa>m
zyXDf(M^CS_5Y*As<tLOYDtU-1p}8HZ`3XhvvdcL-$DC>k5^Dt|`~Q9Hk-H$Eysm^V
z#8bUnptbclO@lmr=lq!bpejMJjm*$5(`rTq!2%>%K6sNH$<A^AfhGQec<yN>bI$%V
zvs%7OoOxb}j9v%&PER9NvYPjKcV|lh49FT#pCcMovU%@YM^aeKbGj?WGhrk;*o8Bq
zSB0}+|EV>KjHMHPt3o!F_PaIs;=uj3!aMzJ^4g75<?^D!MU%pcq>BknwTKRx1qm%V
z_p-*vp<IKoZvWnzCVS5PvY?~2%v~t)C&;vmgVDemxhrgn1lQ*@J3~snj)`V{uOafS
z<RXqeFvE_*n<qD*svB;amjMKSy%ir^>x|)@WYTTb<3D$&({P%AfpSCm<@`U_H3SkU
zF*%S3;!1&NTtH|f-gVjRWywTCT+gMn29WI?2(naouuoRwQ#08~BP~O8vlHw1P6l5b
zCah!p+b0$uWit^O<=66irj|>#tYm<$siF@8EH<N4M5(dw9`g@uCNBhVNLagRB^)O|
zEWWQ!=w@j;dF_m3ky?s3H^H8Nn_dX`TGyfch=x`-jSD_dpu1r^Rtdsqwn;xy{!AA4
zCyi>=Bet^){jtdO>5jVpu+l1Bc=lQy4R0rfzuLC0tAR@U7OuMR)phf9JhisD(p`s<
zKtIbTyU+~@u9}HMjOa&)?$nR@5&AB`2B_<%Rn013%9?gv{*1JKI&%v-D;|}xCZZKl
z2FWm)!`@rKc+$|90J{YvYFPG+vhd61Ictu5Ks^F(k!`F?=Yk=>=7*N6uF~o=XY)I5
zm?bg34UdQr1D;v>l*qqQBpvIR1fpvo#CV*=!HEJ<P^SvH>xY+o@w}|ycj&YEKZ{9b
z4=EYTn4PG~2~uN&B#>~*Ux%Zr`>euP2r!zj<4w#3R+bFtXhde};yDxzCtQd(dPhvk
z3}|IV+~a>xhQ}@~eczK%2la^tcA%C?VndmMp4+UzslXX$2!2n@zl0c$E2iy;MLoQ<
z?3*JKH(5#yo?2TKPD*)$mr<8!aBq3(b?f)c@Z2XifJirsf&QdX@J8r@!Svh!oryBA
z4NqIkDZX_D<zY}|TVTV}5%I_64}iyz=>Uti#$#`7McIIeXYi|?_OSrxQ9!O<S}ec&
zE2UTRklwnd5I)IZ$KqhKSJpucJhVc7go8#(ZIFNLhF7Dsyo1|TI5m8dut)UZC;cY2
zD|cb&S4sS_PZp=VSiBOxeF(l<sbb>gXif~L`w#;=2t;SQ6I%4Y&P(uRHFG{#G-{AN
z@B_4b+CJOpI7OyUV8Ld><EBD!;<b^zD@in6Sy$Ia!Mlmo)R660)$x6_2kY_^y&ntm
zdl9xQ`KL$`Ef&!u%ZAk<N3pdloQ+_I(A4rz#E?HNY`>XWG%l%*_sKyT0uZr67V{71
zjhTq-il1e0;AN!wyUOAYJ*&Om)&HG;8P^VgMeo~aUE`6%Es|f(3`x<x5%HfXd{h$U
z)I+vCWE@HVPBL*do_W4!E0rfP`>nBK5lbx#@5|X9BNvAll>#6?;C_#&f@LA(>&ipc
z#~Fj_EUS}A3fpU9>bM(~IQezE)yTn9Q17a5Eh|?AN3zn}DGFN!+9|pPrK;g1rSp%5
zcV~jd?m0WDMSGywX;ULPPr_*XR73lBH%??jFibA!g@$8WgGx8baoGZ<y*<72DuQpN
z>t|uu$JNYE+4sob5uulhecDM#SfYdcoezfiS6-a81wq`!)z#IL{+uqyXY+uS1lba5
zw0I;VoRTV6uMSn4^fU^QTePVII+>SUR;B8WRKmAY#N^<Sm|H-&vA`rkxB{H&gp-Ty
z`g^Bgf)WBJ{{_q}_OC#mjFPux9H(jFuHYxbU{t~td(0l}HZL;cX1?RshPE^ts^vzm
zf@^oV%DFFrW`49)q(9#zS5871n%D@~HARN#HE8!b(C5rxgHJV6ItoCM$lsZDv7`=+
zj9gO-(UT~hZzmJy$f|Q~TCnUy&j%ak-sbJMOvYHWYg?uR`QZ-TH%i26R<MkFhf2zN
z@Zb8=1$fiYPH@e(TEHj%QaB3}{oPN>4jA%>f*q=`_pPdyf07vFE#Ry@5#?1$i#dIw
zv8EYA!b|>zO|}K5*~N%9i_1|7-q=BPI&L^Zc5ZdaY$5N*ngRXOH)0GzN#<zht46~x
zfL!l4xK=E3ZZKJpNZ_z0hx8B070p|p!y@K&qE5@0#Uu{GeXIEgqX?u>3}{;*5`8z2
z#Vo;<u`wYxPKr%^*zZ*7<%zW^lYFaNUFUvYdAY-9SVbC_mpma@iwEocV{?jx6gVjY
zKJ|Ps;={tKY{kW4Ugj1S5U>03GK<Lmdq*dRv|j@y%p=F{t%p`=ubA;%TK5fh4xdd(
zHx5P*2^~xHvSBmEbZPkw!En|ra*TXRMLHh6EL)u@mLA$sq7fE#D4r$W`3r0i4FqEW
zO2x24(0>%b$b;Vm9Rq;B02vf^sMQ|Q(LUZ0l)w*izcO+JRxqCzM8UAk%W4SuMYm(-
zGQ;2S4GKRvWgn)Sq8j+y?;B#mztISj-)IDP(7(}$4QX%+{vTVh2b4TaA_lcF`EQ6I
za6>krXVsz1lb-vRVFqc~;57XRYQTrzSOx*yFT5jI_6sEz<gaUju)(j`?ThmHgGUKl
z{K8;9U5PeQ{t<>jgAsvYB4KcZFvT52p_QJ@^t%^WXeItGu6*yG2V!6#71%lJ8mh8?
zZkX#C5Rt&O=mGe@d>^O>He%j71PAgjU;P?EK*s?8f4;ZT3X4{hN2>Vz>E8j4Ix7A@
z<AJ2a=mOgq=CGqQ`x{E2Q22#FyvH#8PqIFM8;m8iCgg4Xzn#N=bv7(iN%-9v5-S2_
z!oS^%+y1SHtn9eI=a12+PvH*H%d1L}`Sl~Q`JC_fC}_&DfC-oVaa3It`wq-Gzu*P{
zFB48ky%?F#eg43hCx%f?4x@-$lLM*=S;dva8^6Adk&bfVx3tOjWyh1Tj~|N41zhJ1
zOPGT;N^uO?=`U0!UTh^XK%W_>+}05@nZc?No3zFCH3<Ox=PBqA_-_H4g4zv=%r8`K
zH(hP%7$(Cazrl*yl$WHB;SnD`1c~Me%gduk#u5*{RQl?-8=P>qZK52uSd-kiYVY8*
zNBQz(UBr9q?*U=*#3&)@9?CnU`~-$ksGB=0{qY}&2B6SYw7zGqRBc={uJ3l2Lw_H)
z5S+eZnC(2nQ2}~?DzZ|#NQMb|^-}<6r45o((eiU}4QiS&`|6Tj$j}nEfhmOH)))L-
zGcO3pu$uR%Z>+6Eb7An*O1T3vnqfJee?VvEbi7J?Ne-SGSEqCha6aU0+`Un{m!(lV
zqLGUe(-J|QYJtne?oRCJkq_zFA%*c7UOF<^*9c&Gcc3IyiSP`25fst?K7QQ`#@6oU
zlSp%1!;E82{X6EfhfSHihp>R=rz5d_-rgroYXgvf!^++=Z?k6VQguKEdOI4=Tn^d6
zJ?_!E2h!_GZXN`{J4y_C7#^KAh@O~O<P;QTLGauoP(Wp_z%4tFY<lEz^SnAzMv#Pv
zh~D*vp`x5eV*&{A)Z%29gati?(`nMbYrsY*G0c4Kay!=A={^&qI#*igxel>APOP_9
z=JAJ9Q86pn=75jrraK%XjBghwKw|fn5k%Q*$WA)32(x@I_~v%Qm7UdIf`Wc*(bTZV
zQ0FwmP$MaD!3JRE1$Ta<F=0HyxC#s%*u6*#!g&(dwk->-mH40q$`&#ZJ?^s^nMU@j
z;-2lCrMRsGX@w;3;5rcgoHG=;>%zey1x6+&djj4-%_kkdaXCO@{LyQ)SSsIJ+)Q4G
z%)@?N?z3#30>BF=IMZ2UBbVY5sN#3)G!@E>!|`R4SBM7{Kj|XjwOV4fI#=+Wr$gb{
z4?22U0#Wm@8wzcD2qv2UQwwnAp8K(g$E2}UDN^7GWxJJ0?xqEkrae3Sm5T1^n>@`@
zY)$ExthXrxa)V)z0cR<m%&t4cs5hESvef)?GM%8EP}a02_#GtI_mI<ur&mYBR7=ig
z6VAj?Yak$FwM1GfrLH>!$V{yzlSv2q-V>b3e_d@(@lM~ZtLVv!#!4USc5KxO?|T6r
zgH^rk97S_qm2!jB_SpC1I|+j?b{Yv#c_+O`Qi7Mw3n5OCB*SaNxU9o0I|fS#>Kt5Z
z@*kF_uhvwbH9d;lBx|m^XGxbZvUiXs(eBO($k|~b{PcuQhYy*6(4p|973}KyG2>}D
zF<8d+F=w2wdN?O+=-q2teTZJ$pWa%Nqo;h~lj474>_<A3g}j{_!}~*G$i}4f_319<
zY-NG#&jmDOx1}wAzxjBV*1~`@`tKj-vR<y%??^YjMk@{XNI}iLABJK!ulkn^m{549
zt|0n>6UuJtfNbv@R<~!tbaUYyW{T`rENVzMsieoLwPY6+*DwJ>%-zB0c0J)`WjyWv
zxTHf1<LFnr;bD>sj=OQ~-7KHI55A^mofft>K5yf07aPB~tEwB?&~MToB7_=?*u-%|
zPa&}e^yeoV5iC3nVYX8x29R(q)UF@!e(raBCLWIR)@(@XO`~Wpf^&??@AtY^8PQv6
zw;0yTan(6eu6Vz<hZC^VD)r#rIF49|x#=drQqgo}@&c^G4ti=9v~JuPFNrz*W-gPE
z^(aW!j^9}4Upn#RM23??;RA$spEnd#0{DHW6!2E}n|;Et@a9K<eJ?tr3##Kh%Bku#
z&gON0z$t%QZw|TJ{hkPfgWNu?>+kpZh*aQnEQ(C!9*ao#xA0uw9dfH{+wRP>sT(*r
zoR16@23vwNYRBD&4`l$)wjK$G0o96vlO2fxeos1e+ixOoM@4MXi+Y}S7J>qjJvm!+
z;Ck~>=ijRa`@Vb$cD3e`Rd6G!9AU8c*wy77xEszI@H!^9va)h;u*Tb5V-jE0PMp9L
zCE&)}inil)dq0!A`-3jehmI^X|EJPgPS|aAxPbsm)Dt@uJqxw*VQW&nW;GFmE5xpy
z@Y}bv#Lz}DG=NI^zQZhdWz||#Mfz{?`s<X0rpj;3<93>rA|H!TIv#C(G~M=&l-es{
zXj6H%n};60P&5`Ion|GnRb@DAS_n+Jbg@bfXUHW~J`kF<w#3D`o9j`QvY3*WYtgoB
zCtTNNAhs59bv|F9YCLJQVDR%_%L|q!AyqVgh2yl}raUVUVDxH4tC9-taC$?F3d>0p
zk0yNcXt&pt*gvBd^|({Gt}=V>)@S2!EasNHjZ>gL%hRP1ZRBil#h@7G?j0jWz*S|)
zJPeWreSa;yNZ?k$SzzMHb<KcpK(tk5kBle&D!#Im7*7V_!J5wAwu|Bzj<|F&+*U|c
zEYNJGtp=x%X}ZFVyBW>8;<T`&!hTeQ&70h~`|HsApmeW$FD~L`!-JLHCXMhex(kQR
z@NX5WLpe@DRjH{RAdk+j7WhR;1Q~+a)6l7-t5d2M2u5$Gc;goAZ>tzX_3V2JY5GIK
z8#?ZonL7AK6?S*D^H<sq6_V>f<iddkoudjd|8g=nTdLN8`jRZUP33wvqA0ym@yBWY
zyN3EF9mMX_HQ_9i^-djV)SZDr-avk5xAUv_7k%{0o<p^*?1s~)4364$>*jms9>ha~
zA_tn4F+cnJG=S#Y8_`_vi}$`}4YWR>IB5WfKM@Af!22&5(p@w2e*`XQG!bc3h*%8Y
zl;uE!MugjLA@HPu9&O<bdd{2!nfr;6Xhih>Ignz>9#1LdVJ9<u$(J(-&EgyLoF6+T
zs?zrAoqwqHJTyIbgavvx&P61+x#)-=pYCqFWD$g?Otrd<0iN}mu57}8#^eT}a=pp@
z8CURg`x|I=dmOl!V2zIU-p)vSXImBZEtZlsmOg!@^WLE{Z0_u`FH2pv7kZr(R$c-r
zP39(oOMif?{p(ht@LQ|B{)2e8YD`zMA^i>q)>eH;`5gLfwlwP*bD%e~x&A`?jXBAj
z7qP{|%@2j!I{)1EY#QCep7#%PYd4*wIl;VX_2yLGIatVb(&N(s8zqGRdyFAWAt1J9
z{an67xU$EjXC4+!2Ga!7xcHQX5RbPf-p_hex4hRU_X*$k0w|n0N_$C3vqCM6Apu($
zdltDr27I*8Yq5lrv9x^oYM9;?<D-t2nGw<}IcbFUE?nfjV#<ukNDN)3;~~)d=5(m6
z$}$+@M;t|<WMxjFJDhjuax>cX+HNdFthsbz9P0u~*wGp53lL_0%nu}R&^sb;qJSBG
z9rLz3vmc^*lJRzf$d?^03xp?xXG~)gCm*Ul@Ikd|h2P6Wun;>8TB4Wg*xYL!^h)D%
zc%xk$+Iz(v_V+eHj$ZD9xQLbmx(V9|N0WIoMu$|yUt`_ZOpeLg!WT29bBX%BA`dIv
zn{h1_g~GRC@}N?-E(dh;f*mhbNnx7$XP^WJIEj=qn-NEaw4-W;%!7iTc+yZZ3|j1Q
zoygvc4Th<{{xKocj?~mmQ~c9R3bN>gH{j~2m6dj+vlL$3J3>YD$pFixxVt~*oHhIK
z24>{k9J<jx?xbV0qE!_Nx}KnMT-ps6euceJV<g4s^dZRb&YrF$?aD&HKc=rTs=gA<
zJMJ5+xm%(!LWYyin?x7ktlmSmoA2;U_NlpChHUDiKM=0)Xm-W}65X51$;dmnMCAvj
zuM7p~c1O*hGtSN|8FD9usr2fH5HBk8%;<LG+?gU9);!>9nFuX76PbD_?%u;IUmThI
zREBYQ>KWGsSu}5w$%|oul#cNEzc=5$mYJv}#<FE>u+Cj@f>XE1eZ_*S6nsZyUE!Sf
z_@IV%NLNMdX=r==wUI0Nl>HoPmW-&Hlv(WfIDH`TyP{jnV<`k@^P3g28EDJ!RyAlI
zD*F1RT>X!TB;E%Ubvv5PR!Xcu=3KXtBvjAV@P^$zke|()FBHy^9#5~;q`m!ceQLVC
zS4KQojmZ8upOaZ8FwN2N-`~({G9MPvSTJGJ;lDjP#gE(Ig6-FTNg~aO>iI~YX@z1_
zMZf}k;h|9`1GmZxePCzH`wo63Sf=AOLkL5|D|5jLVQv{J9c@x$#O>T7u0Dk7`LG9@
zy@HvE!oF^gOYxg(DD$pJXr#{ylfsxF-yw7UoxEsYi<kWa&3>^dh4B07=ZE~P{my6a
zE5-vD$e%x+QTu!+Cd0DIMF&aIqVxxxYEq^yTn_BcOg)p4?lT#S(QyhcKf|UFMHzgm
zLi$E}+`GpFxs0sq5H@P35e2NJ*YgoholAu~;~u`I>g0~joVg(9@68;|$qq!-vaoX(
z%*#&Orj6w=?#(7!{T3vFGIsp7iXcujyz~>H$<qYf#h{iN2q3b7{A$2hY)i-Q`;HQ8
z;N$}By^0t&73uEQl~I9x;8`x}pv+>nz3i5~Sc@2hT$IDS<3dSzH!s!duzBEtE?QGF
zjR<v!s+G$GpVUTGQ3%)TS2|aSm3#eYs=7>@=KCE&&zyeIeEY11nF0k6WcG45F_Sb?
zZ3|CzXuacmd6ZUc>P#lwiU;N*zMSx7M{oUW2qU*_d5jUI-^wK1x4r|mfe$y;JRb9)
z%Ef@Gm^+P6t&wDH`#6#P_ppmC^Np$+mUOv1pYHH6q^BaVr6Ll<OLAu+Yso65zCeI_
zIFDg~bu%_1U%Q~D&twVQaHw9=3+H?KZ11nE!+zL6*ANzOuklMD+Fy+pF~+X4l2>qv
z%C3UfLUj~s!1!ao;W-r_V0B1ptPhERC}X4SZQ@k-ZAn^=LD!cbp@1^3?p?2AIESa=
zz5%<>pdAA5ZS}z=_K);*yRRFp$xl`-Cwd9vbKXaP*iz^4wjuhF_Qh4<y{{s@LmHxl
zzfI|@k4bm{+L8_8sNhf4Q~_@Dyty{z8z^6Mdv)Di>anV-g(0ri2g6!c#WJxV(}Xu%
zuybQmvIxoozwb$E>}sC4G{X5TmJ5`c*T3AT?A7p3L}IQx)E1tap}LOdIR)W0;ZZTR
z%vWt}p}(6L%?aCfrt9E7aATL3BuP9;(WU#I08?|SBl&Zjf~)^&F2_x;Oirw&63KP5
znDpUHtT^Ir?@V(#37mTjWt!KC*u&|aW|4Wvlhupwgu<=;i}26mfbwg5hm&9xqFEb3
zNcO~BLzW9up&uSu^L<h9*p~xZ`2icDg#f<7Zs&2DiyLaq_>N4-n$AE80T-X}D;Orn
z%Iu~(93`(tI`2}hYll+RMj@V`+v1MYv;_pX(mli@{8b6n!(q2FeETOqC~X&r<@tHg
zJr#f)0eem^d+J#n@L-6AXEHggMy?BEY{VOw(#nrwM=)7UknEX~xjIZI&q#UaY;#AH
zW;|XX#%oG=$#my&YD3FWpYd~b!{hTP_S&Vp!+LI)?dFn`6bv)BWdB*4OD2047ZA0n
zpb!AejD}j!ruh!bTBaY8e075ORa*mHT_1?i&>x3fJD{(QP#}uBf<uCJsu%F%UK~g0
z9SFo5aqk)nfiNSv$OqYy5}aJWYy@St*eNooD7@u1o0QeC+uq%WzQy<`40+WmGx4?w
z8QG5=IWmKNUB#(>zYv<ypN|_7`X`Ixcb$*EMBv*P1?~FNy}{bn-I)J!0qne|F)TP^
z8}>-kyKc0VYi!?yPb)^_ACQXldBWhVkE!9ftaZMflW3<LVhC|iqk<ayV38-6tUM?8
zdm!5&U>-001NTins1OCG9)Q6u5jPUuE8V7R#lOXB^jS^VkYVp|sSjdTis&?T20Lu}
zVF8VQPqvQEDfY%~0bU9HylP10=kTDS-o~z~$HBha{2pYgbqD&x)vH3G8x=vU)Ee)I
zhN3~E00i;s9V$x7jySZK=stuxpODM#*KzJ6x@iJ!2y`Q(6KfWM2Ztt%1Vvr7XOccP
zu!#*`GqE|*u-|VeJ&7S3eUm41+_K4js1C&)PR6}EXOYF7p5yZ>4{nkSF4+^T@z)>c
z15%v4e+YjWx7NGZk9&d#@2Q#jzryh}n6Vsg`*YO-qK?1U&r``>?La<WlEq^QR$zQs
z$vGO~oWU~)egf_RdqwFId)BC2kv`-KilFS#;cbyOFOhAK$1*kAF$xdUY*y<q+SB67
zz>F+9-~Jg9cey3CMFLk_8d<x)IXh8T`hhV*(Og=PKwigHHgliCEdKgd(S*^tJlb9V
zh{gmX%EmHf>s6$RFeI{|Jru`z1|wNHVLi<7s?^8Z=`Hq3F9|-JPvw;s#)yX}!xD*%
zz?E`0enesad{8SHmyaFEp<e?Qzkf!UM@jf$SAQGtji6(@krLx_K(M06tzIm;E#jgA
z&$M1C|JTkTU07-7`A?{14;&RIHvQsNa_OjZE=`G{t6wwhk#2XS+(+7UpLd1q5=k{d
z<=tpU@VEfKLJYY^9+38zlq=@pDb=qDkK)WP{kp6LUt0)hc<+=z^ANs5`a&YQ(8e_r
zEav_Jt&<TSMneHQV-#cYG_g?Y5Z6<}*VWwBtLG<tM+<!+*{(^Wt=Xo^Zu}3WBz0Z0
zDAH6`&DaJx$SCssUzEJC8ZyaZDpc)&C%4w^q|kEkPmQTVw1`PTu<gg9{6vI9)WBwa
z_qwf5fXjIkHc;Fs0sROeAL)$%PTXc3W5t?A9N#g=wkT|~LSU;oQ<_z|sLvE!anQIt
z1jUoh-h$HDt200uTi3NT@hX3*@FCfDfl`2Q`Q-W$Z_6>6@1(-5@e8DejG~^m)eGE(
z;J_ZQn;@4O<4Lwqm$3+_c&QHY3k<H>DNg=ng73hTs}P+x%G7ixq*bu@P?tdtQByaM
z1SBnF4fkMsV?yk;ACY^%ZbUfZ?s(=_RpxhS+GV(R71wi*xFgcyo9L#PE*b{kofZ1q
zfw(RuganEwy?J~>VGj5BmJn@f6U*fRXH<I&QpaWmWSj3GkD<NRS8kNd5>YoyO6Zm&
zsR<nGI`1O0<G9tKQ?~NRD*Rp(2`)@V+Y6$TKV-M8I*`1y%06E9YCNuJCAU~&!KNU&
z1EJDJ#!MxmFnjM`0j~Kd;)=wffM)&g_jrp>TEA)UpJ5x^ck@ovKwXiA^V9VO^IHbK
z6I83|{_tVvH3nV;`l<rxr6RByi0M9fNQ^(qdJnu4CszC9q3+0hhy9&*l!SiVh+YXr
z?-4%p1wf;wx@-Ico6upeJrR}dDiPu(D-G^`CtW)9m44+gMZi(NcWL(6<tS&a{Dk52
zdGAEc{Ld6)CkpInh3NvP$DiUO@*#xJ^BVPJ?I#GnlW1#x_=$#H>55rPui+d0zQIc&
zwFIMvst_<$3{-EN5muhFOc3X_-$_0)k2>~@Vpcpg^+H@Owa$oXwV`=xDLr$&#lktA
zDQIa!vWyhkPK|4DehjWiU+W4i5T05&x0mxRoXEI%uD^Ix8mp#L@?Hnd@P#>4)dV+7
z27le7Fn<vdV7V0GXJfrS{q{t({9urI&)id=*0V9SGKV0v^u<Qq^I_5mhjiA+bc1V~
zIZ~>(PbE!9NOd3WWQkMQw&FAzB|DDd_4TG-8UpU2!@lnZWR7)duXS_G(?tcBLfnW{
zDPTnjt@>7Y%BO`OlpjahpYMmSM^U@$Aki8HNQhA|(SeIVpGo|+clF&J_X?Tr!z=yA
z&z2L!TpbRvqg@9AAxW)+hGI<<U11W}{fdyb_s$coszHfc`TJIH@?Gduzqfg><G3qI
z9MV9ez&Dw1Y&)08cV*JhtF_f3*2ajA9i!p`bnHXy7Kjl@^68g3bs@JVwG5qJah08B
zV}V*{q;{fJsC-TNeyXz#-M)fMk^Yp5_=BHjUd=Wz3o#?sjG#U>ck^0)B=KtMS{cn`
zvS(uq@vMThG(;v-y5BGM3}Y38gZqZHIhOIGp!2y{K13{P!aBs2ak@0Wevs?b8yp+H
z6KER1oqQauO%*PTJ>6r>d9|#XENr`lNH4=tM`}xnCWe?Yo9N^s<oDi{Db43ZBDqSt
zxW?wydCnqfDcYQNL8>jhgww|;x!4NRcb`l3ISgL}**R3POrNx>ihB>{Q1^PgP7PG$
zP9@%zk|r&DX7<w+s=9r2gL6myDObj5BG(cD3##aLaS$58rlnGzb=I%H;OxIz^=X0W
z^;e;?u8Xx_^Ib|a2p`O;beOst?7a44!#lW88fF=#VzAJ!=@!`YP_tnUR0iYTuwgAY
zCLq?}qk6CSlwe)mMP3g(SzOsV!cbEKjpmwf(e08mHi@{`%}>mqdkK}@)l8fxqtB1M
zeOK*$mdY`F<8D4ZH>D!U+&r!omYwf=`cSH9qs&`N2VF}kTUc9nM`+Ut`#zGiI4j4M
zV0YZWRgrcQ_~}^S;IOeN0VF-5nQwz3Yc4iRGYglj^Wx1mwz1Jp2(Rk1vxc~mK{=7@
z2HE(JHguw$&vy?x=*MdYtMHwR0SD^II4ND!bt$0q?<UQ#_o15?E>W0;<ujtKj7em@
z1<wogBku_+?7}a*NcI!h*%ju@0|l*ueZL&J7>3M_#p8H407+n34h<GsBJ{=V54eaD
zt8*^cUP)K1r%2!bP{5JDCpdbe5})`cILC<p=?CgSCg3Oqnd5$Pa6qdWVm>7>IT>ff
zqY5Lu4_tg2WvQfdOQ7DLVJAdI`mMVL5n|bFBU)^#rFWtwDH!L8kKjQLeK|Ai2hnt(
zQ=UMzzdO`n5qn<n12>Nyjfw@UYZDZB;K`m!FFwe1qeOvE?O3xCI%-OB&FZJ(oi3IG
ziC8k@r4qXlvfCpHozW7WJUFSL%js3pUI%LOIsqe6Hh?u1noFb@x&E*iWCvYc(%r%@
z<fhju$*!M`mxk|828BLzc7G0U*V`3A8Z*PyDdD8@=c?{q7+`)unw~B1-Gu2FL03-p
zxqeYkYC;;+x9iHEK_QrT|5A`tab620Uz<W1>?orfB08-L@SsBGJIJUuI5zR&L&~1(
zdh~Ym9l<rdrT2uMWmc{XLOxRHqcQBnCRE$`Y|!Urcr8hXRFD+^APGt9UxOB9a#d$)
zOv|D2oC$Tg5j+0KkkDd;ylX6UzFXb&wlli0&?37P5_T$)?EAtiAu^(82mCP{Q-mYn
zmoc$6<<KAHW|1tS5NmUB)}Q@O9-L7d#0z~KaO)VMuJ@{3sTW+60;hI0=YJ-y9u#UW
zMkDf6tN%<=M*D29i|iXjkS@g4cj&1NdGZDq=_->C-IEiEakYVP@Qw0d|Gd<3h1Ut3
zO*(wCX|=1a<_hlCmiMet8Be2X`;XvEwv2aoy-d=l0POGWo_9QXW8z;Fu2<^cAS$+J
zBKCF?k0@jXdRn7x^qD*5rS@+P9#8velI!1mYHLdUaO9bFovb|Gzr0AVxQataEeIw2
z4cF|*%nxfubm_{1Qs^xCGA5VR+5*0zj>}=0Q?M>#z(NlNNtBiFLju*^4z&Qy&QaRS
zaSLm5QmZsJI8u6vdpMEW4>doA?GwMbjw8>(f3%{58+u;3<0m--zr=Ta<InUfQDJYE
zl$z8U#?QuG+E-qqO>Y}4e~SBX$}Bl6?>JE-8VozU!?Nt_X!bVYp<4KK$pHP}dfGW#
z)%SW*LHzyu_o+n<f_K~4is1(u16T&g-Dcf&F5K#Z>&w;L7Mf;J6M`3<RcK~;dmFQE
zGp!s%g@?BDT<!*K9|$;TlPmZk+mCyI01`whC{Q17JHpp1(%A{50wXjV<#}Jj*KK-!
z74B;-C^lbwi_GXnWL&;HXa%>4p?yG~B^vOXob2L21o3x*d5R9%v{A2;iNmb(4Xs`_
zv~<<J>tX-lC&uP2RPR*+x-WBYeUqQIDb(okgoR95LrAf$UrP_NcTiqQR~fq5CyP`%
zd@4xoEDQT=-#j*#f9~-HPmwNfuMbd)24hKQ*c*T(26G=C@MJ-uqH;a~ES*Ce&XHCA
zk``zA#Mjc|KePo@NBgoh`<#_K?7b<H<#>ruS9{hirmd|_BC7a_k(QP=>_x%BgvARc
zct|G=hEVXDj22h2mp}<>rkXpq;en!ZS8IEeA;ePt%^Q6!*j8ht3qR>^MSx>7@D|+r
zj4uC(q1H=)nn<c2J(6Qd5@pZ~&t0IF6XO&Lckp7*`NnmH{iN}skjhYm9Keqlm8eSL
zgPEHR)DQ6z9B+H?*Gy3O5Y5WD7&y;kL7Eoat5_IZ)`Q8_j)sh)Z7c0dTcU41feNd)
z>II`&Zs5%?MB@Q4Vdpq!)d2}{Sg10KCI{4K1F^g*v<&}1<bRa`cu)$9PGIBmNy3D2
zL)sg~%`OnFx``Ch{YKY+A@E@YkX#(ePoK*K9{%P#MgpsTgY$pM2toW)wo)nmhwF%f
z{;OC(3aI+}Z>CA0p~A0<0rlA6Kg3GmTQEZqU(i*ChT?Bc5yDC^ziT5C;xUq^$+<BJ
zw0_kBl-=hq|EUG|t<FFgQ5s5VaR~dbQWFd>aHCMYET!1r`1v1*os}BlcO&+<f67V?
z9DbFF5T7K|{{`s(GQaCnz%N#4OT}N~x{m`FOgtOQvHgqs>OuaS&Uz#IM^dgkSlv}D
zS?Ir5tNUV5zuBI}e^qtff?0;++*IfPqCH|j{TZHSVhH(?q`3G`|E#Pm1OMaWW2bU3
z3AQ^7tlm)dhnf=Dw*QPJgyoNGWqu3x=E3~MeYDCL`X_PEQ2LK+1Ae=<I|eMq;hQo&
z`agym5wP}0H{>5V0B{urH;#48x%}UnFu+u-(?5+6y|BR*9sQ2K%?g$TS8L?v6@~mg
zm%pQe{<mFoPONML&)Z48tU}Z<x-ye~{$Rm#IWDjNE&=*AAAyE40g=L3LETk{VqYhy
zuSLJ|0oeac)L$drPypAaG|V~dC&%^Z?a#pOg#3%=_*aQYZd{b2QF&aTip#$`i{}a<
zz)-?y-rI<H-b+>pSsCs3$Qar0&*1JP|5Ho=f(JD?*r`4m`p5UIR&YZ?{iXenG>oxd
zg&5Aq*E(ES-oT5z>VGRC2U9~aP?o;#AWIstv>c_%O8wJy!Z1PLg~ST5p}>vk(UX1$
zZyNS*)xRjeL14-+W4M?osJ6bops+ABM>%4YUR;P00}wbcAT20uW5bApBq7{6_zcx0
zkqyKkf4G1MMMEWktZM&7#Jv*<08OGxZx^m1T=qTRGpRliI}StvuX9&sXT!AZTXDHp
zTvUa&a`(GaATr!;&v%9^7HkZ-a7m7H4w9Zize%9jG!8t&edI3Ol@9=or^6qkGDBAN
zckT!+tD?_7hrQv>Yo-d3bJ!WeUG{r8roI$yhz%2+)vzb^*34BYxlM(C-c1LM>#J;+
z(?OZ|11IyGpWX(5%G(iD9|JMSy-`B&?vAaYIv4fz_l(K6kUcB=4SITdP^htG8KMzc
zwT)U`10OZIg@q_5@L_@~g{)rgg9Lgz5#pZ`NJ6jz4L}Je{dsD^V*D(f^J_{>zsD9s
zs=F-qqeYZuZR8`=-AU42VfgXHxBk3O1qK!>mR0|$1pvh@w&!Ur<)zwJwNHFY+Q=;U
zEv<XO=)MjVxTwGOMX;js?q*}EV>eReADofDHn2;Ez~W*+MSDa9!gCx=pWbD){X^G|
zlo8ASp)P|X2E3HQy3aAGuOGSK&!ztz1Q8t$<QUAN;P7&&P^YK*=L-C#%2(6?fGC3H
z?W?kbgZRHcc4r9}|N7XyLRs?o@7N1Kxa5b_7mYV1=hKQex0y<7OJfY{$qu)A0#%PY
zY!6^o9Pj1$$0`av&1{$<x465yZp8ARtmAu|canMSQwZE`Cy^TEi;0sHK<Ns<$G11P
zK}L9J;inXhW`$Z`!HkG7If>VopdrA(`A^h#tYhzk#P@zM>_7GkP2Ale@7p}XQ_d4k
zBqT(%u%Tf(u1RdWOH!$nY{#Mcg}sIsOMv)ODr#!L4yL2Af?bd;oru`Xz3Ksd+V;TA
za=9I_W49akl!lP($Ef4yC&==g?Xig{@c6SEjRJ6&$Ar0`E{xyA$G_myE^OWmP6yoC
z)~{n5uU};YuG0pL{S&(M#Z8jMV6HPsvuL1JV3_sWqMi4~I?bv#9`7z55w9f^p5}*{
z6ou~Yj>_9fL8oK<r#(#d%U#XD&^+T`LkEps|M<qV4*~_Kl!#MXpZ1VdkAM8AK3}fW
z8L<zDCgl7uE19xB!Q}y^s|z0X+N4)0+A*15z_qivXW-lqzftc@<;jSa4M~8X04$Zu
zjhJIOTEd)vf3rWI7!1^(V*;HXQRI%T(R)4$D6`F0Ih#Qi75-F7+PP%c9CLbL-0E9O
z7w;$D!4E02ea0O>hL&3mt-JZLG5vN+f}9VtlkZkT97G{NiG`Wpar7ZtRNSNnaGM_h
z*fr~)hfbKm-Uq_FnB8I-u#^oA4gH*wW4U?-lOh`$ii~g683gO2J#UVwDsCthfXI1J
zD54npa6Zi9c&r7_$G14Sx*9lH&>sBpBi{V6n~(PyRy(P>wKb8Jw)WjsmEF^`hR^Bl
zDTUkiKz4qivv^00@Ej+atrU7e*}cERG04)TR>$#T>q=OPpRe6c)cOkYnZ?M2(a1$e
z1oTLU`4r4w(m&3?!#Al7l?{_CFlNYb4W@Vw8p_&TL-h7+#gg!Mc-_yIYEot8Ght#N
zMgTpJiJLU)efv3GTx+0@ZH6P4toN<#rRa_hj`lIUG;YyarNt{?g$pFfDZOCYk2mX)
z5SA<gTyLaeFeGv&t`zqp1H=Pr{Y!lhkL8$O3*KGZ`#%spAFn;5YS-KC=zEpvwQBi&
zS{8?}wY9adwCzPLkb3ys3A2%^pWPqB-IrJW4SUV!0+o5`xS`LnWuSR+s>`0Azxg&#
z5tO&L+>fV0MC7?~lk`w@D<3R?0qIt5TP7GW`{X@&c1PFs)R3ytq@_LKb%~*M6l>4}
zOv)Ycz?&4Bx_qOKqyPg&$I94CdgSZ9ogf8Oglm9sE!<1`Wu8@Wc33K(ML1yNFv~a2
zy$n@XzK6}RABJpcPiu0pHn-r4{(G&Cg!b?|hmn=pFt=SrVg>wHxS{))NC3%L@sR;#
zrRXL!D#=(;H84bgQyE}HjX?q}?oLigPpFGFIS0Iatuv|8=z~o#a2;3cS^89vs@Ha8
z+Hl+8vk;5^mR4Y0EW|NC&D!36FWju^RISbKnQ-pAZubv{_jemz^7EAxSvCl&;xG?m
zjo2h4;JO*2MbFC>_p_4?ss<@<bW(3d+XnJ4PH@uei~2{7rv2(V>@T<teXs<J=%-mE
z4eIti^$hY#kJ}VFH<!*4O?P-gP>J}z_}yVE(`4Sa1PFO_<)pLI{j2#mwe!s;--S1(
z($k!7c%q58(Y8*qgVN=Yl?~gd6-nQQp=>-R0xg{Qwv7Ah;9oJWI=-4WzSu}rc#sG{
zoiquG#do)5+PA4Jn0`iGY`5+D(aybjG%gr+Wnc6^0EIw$zfgO)7O$4=#cww4z;kO~
z!;*q6SeU;F|N6Vlc)IXaJYV!W{_xr^yt%IefBoPDzWUgVZ@>H$tzUnIj!R#o>*_^x
zwO&Cd*NU$8HlXvGFg(<+T>9t9U;FbfHu5zP1O}u1lX?;Rru}Qeo+UziSNP|FAVz8Q
zB>^V%KKb-hj2IE^m}J0P{7lrbp_*5&T*XZ{-GtWG7M%a$3$$Fl3d^~3{KQo3`%)(M
zqS?rXhzP!C@7gtvKgN!;???aM^mm**`61qWug+Uiejc}A=i`FyW$csRNt;mdv~&+H
zM7=P-f)HoJPR!)*p=)rYtsaHEdmJR&_2=GP{|7PdKh*n~&)#}-&*#ABp|@r5Gkiw}
zuI${7OTW*<wZES1AE7793L7HY`fd#_{WcfZPX9%ArkBo+CLG(k0t<hdC_L+p8;8W7
zF2sth$Iv9V$6h8AZ1AwPpJ0IuLbzeov&Tdpd#gPdKdG0GrQQ37o;K94Psf5yX0*u*
zbF~TP|9u@R{&y$#zg&%N=?U_)<Q`-K?7KYHiwD+|$3$4$6|`Tygw~7AxcHC1<Ku=;
z@b)nij+q<qjlBht5fO-uj({R6648+n7!@gevv;lK8osz<N5lCGsQK_LfFl_H{V_;R
zoPcSQwHR~rSX>u328!!%K;%dz&>72r`xg=2iLPh`_(@!P#e(dwSNH}gaQL);g9MP0
z?G*v*=Z%Ppj>6xYnlRx<KlB+F>#bvh8Q3?=UFhPcAHQ<t3KCQ*T)g-#F9fZhe~w!d
zZsp^;c8xW2oxJFajEvv~-#GQ1u-U#sRCF|~jbFlS{u?x!ANfq%vj;UMPKg0dwc&`_
z0?ZyGcxyX@4-bhUu2$p!KFUR+I8yJ@M<2q>PCcZ-T`|Bh&k@tnK_Jj+zYP0^f5)}s
z@1e8h>VV~deMR5?kr@|X{3Wjc)f&V+@KEp4{-OfUKE49g-#ABeso@wZ{%{Nxdw&7L
zpK_5n%K1F)4KD)2re|+3A9Um<#fEjVWgB|)yY%)8qR>-g?#l;If35)y4Gl2Ay9>*H
z90Q;YNAmv@)nW(VnDlM@`G)OtA>N*PlRSkDf&ee{uC)QzTG82h1szwuL0j_$G+RHx
zU;g|7e)n1#mKT?!`p;(&(QyrT+z^8weRm{OqhoO6$S91AjzCmI1frP$91)3|Vn^_P
zCVV#*3Evrk3r%0+)&Dt)r(WKQo&S9RUw&+c-DXAmrGKES<r2F1-b79qGTPoAL<zcs
z1ZscXA;~pZ1cGh<*s>lYMn*z;;|Sb%OAP<V-0T>?<VS!7>WlU-z$D3g2oU(@n{N?4
zA{tk&UPWhD7slS=dk7ornPa_s?2k>n!g}|{jvb2|Z@dw=+%gueEiJhIJJ&mU@mS9u
zn~9Un))~Pjuww0HbQE-x@5eZ`8rLb6IQzGcaPaM_poxt8r|Cl24=k`qv79=FJ(3%Z
zIQG{@$KILx3f`S?-$aZ-B61sqdv)%Q9bSAo5?>I)G`x`L({F!y2!%ZKW!X9}ev3=L
z%R^h;;Q<wTPGyLUM0@?8(Z$|U1pDhSWAhS0=*9ea8FsyE7M}Ia)#Jd+bD?JOHoT4(
z${f}jY)TYvh!YqVVlUVSo&Ks@*2}ke@!}w(Z^ZuX6?~80!!PebVY&w25$E5Cx%Gam
z{P#6@c-k+pzC0Jx#TkFyhl<FCX&g9)%}-B(X52Vv9!STU1Kl?&rwm@QV9#&Tktq2y
zSol0#I`FJ8Y#^%wPJ>6K;VXB$3~O<Uba?CtJ$h~E5`|u;y%{Y{U*W4yKEjUw{vTu)
zm*M?0pWw!rNc`}ok%)_p#$~PppM2AXv;Szprx!VVarqj~+l9ZzOV`lwt#IzMZ`;t?
z-i0yOjlihrNPKH=!M3XRvEn~UapJ@YG=KRixNn=#d6fyitNbvPu3io4><jy2^)9nP
z*>JqJQ#-LDoef3NV9L|4!+g%uP~tY2%T^%$$HLI%jICx^<U^Ieslc=RaH(fe;q<ms
z8iu8D45Jzj7TBBiFM31-?)azCNPZ##|MKhc{2z0(W9(cozuvWf?kPIjw}NVz4Qrh2
zq77}Z7;-U_4RybJ3Ye`pjfUuG#F0N_2t(n2oQ^ebH{zJfusKKkPQ&2c?bk6>={KA4
z`V-8C6OsO3^pMru{0**Ny~>NSOP4M|CHBP0YmyDu{Kr530oHTJeyoR%4cGkYtMh1W
zYemb|7JeqqA5ECRPwsN}J^zIGTW;ZJdu5`K{f&%?0h^?Si9G2T+cJ@P{q;(I85=f3
zF%z4|jUUL9_uKuQAKnYT)9%!VXb^9B<`1fQo6;{>1U8oD*m1LXFSNiSCiAdnoYywb
zDe;a*?0H(l-&3dmp`MS|VOP>HPTA)buOHfjHGF%?hV4Cz*Xy0`!hr1<HZPsd-?y3l
zr~hUTT)y%EK0ks&$1^|%HXnC?25`#*%k)*@nLzrCMDxH*Ji940h7CF~b=m2%U&f{1
z{~Ox>`eDBh+jL3Vu^VyycQEp&|BO*jXCY$52*>e29c{<<U~>b2TYrJF|5}OrZ)Gq0
z0YrTVn)EeT^Hd`AFYLnW|H{igNA$uc7@}Q_OT_f0n{mv;r#ek_uVckL;rY<3{e01F
zKZ)sUQ2oU*x8cf;gyjx4^mNm+n9lCw?0!FQ4fePhr#t|;dqW`XhjFqYlSh0E-HeWk
zLPEkA{AfIT+t}%oCqMl?^Y-~AbhLHi&lha?wyjN=7T;%R!2_GLfGyDw@Q_a1F&yEC
z?k~cknI8J-Zkvm3ulbn?0I&aYVYg>nJ$C+bIxa>X$NI<QYr`~P+jDwY8pOvW=I>X(
zK+Nsc$o=VDEJ8JQzFmbQztuy3qY$0t{XP8fm4wV$NF2tKL9%c3_@SF@0+!aRe2?Ch
zrmygs<s-aO{y+H8@`bQAI_r<^=)&jUa=3Dh4Mh?-vIiGWKjCNuTH3qN(%z20U%AFV
z<Vb!$z0iyoUfYYO9<xC|Z7Od1eg_m?U5G@4xEMnOx}w>F>;b;->0|qo^2=`<c4EQf
zYao4@(sZa0>7S|bJtt3q<-ZnSX1>E0j{G4VUyPIax^X(@E&!^_s!>&U3Hq6$EjJv)
zo>T0`xD2xf?<KiQY5I59pZ3pN4ivFbxbwanFzv|%-1PmCh*k);5<l)b-2PAB!J#)A
z@$m=Wf@=x<qmZE6KW~|3$G1O=nU3>Kyj?u|*ZXno?IWVV6OOI9?Kld5%4~v-fS8Vq
zGO=B|T92JszrZo}T;7{sSrH1w@Co0Q*=29y9HL>_(g@AX&3tbg8<xo?S-Ec1C|tUH
z*)bC*n`GtKv16#Js=`lx@)M+{rh<t=w(g_VY8Ai3yM~|sbUH8MZn)tF#EcvX_HAC=
zO>w+1WTLJsvJ0`XvABB0j!3rrj3^q}@(XPohlq%FzU^a6G@L*G6-<BmE426gQ($Dr
zO~fOk0Q1#qoM`~2Ct7f_nu#L~?p-(w-`lqnuOB#u4_}^+hua$PA!~2&Fz(fe58*wf
z#)RI|>Bv3QhL~xEcs(Z(J%?fs+1;O|TxzIBVR{4F4pd_qQ>3;EWTdRX5ov_t)h5)J
z<znXXFJL&Z5{WGGZ>q84pPxmA<i~adMGLy)^q$=&RQyuU=T-94W;3ID{X(?GAIG+I
z56>o&$3fh(88<Jz@_V$O`3u<hbHV>y?#pb~%X*})X+(~`K@fV2pFxB|;d(lteRJJT
zzHQTF%n|C-DRd0(f5CwJosI!*e=fwFd9Qc(Oyd$P|67EGbswUzavSCfqoUDh$iVbp
zNo^++_mcfIbPo%?dIW3IGO$y$pSJp)cy`G#p-0grUFY2<R4jc6D-KDo-rCUg=bgx%
zc?@3|DzK6_PUjG`*E<3MKI!!?v4IZFM4mrWi;qx5;U`nZA^$fsv4;KqT95qS=#ekq
zGPn50`}x&BW6cBiAvZA*w~V?jsG_k+Ti8QSK)){<AT-4>7~S)oz^`c8O{Lo0fQEC&
zv5kNG(}s%I_RAUq7EL3NyiFJ`YCeEm{z17B)gLqfG52Hozp{)757t7W799I;_N9Ub
z8EN9j3x4G$%sh2<@)NP3y$zkb(EAqlrmygk`80B0-HrN&ZlT9Y&P3kT_HLmU2n|o7
zkZbS2=87ZOzVB@`eIfSnwOr<V7=?BH*y8QJUv4<%qmS*cJMK0d+f^tCy@zsfpkA=a
z|9pVAKAE>;*tJ#=dJpG`Lzv(HPu$OJ)bWeK{XbpAKPXlI?-56jv-AQ&lQA8dVekUN
z-}cXe&Bby3O$wweNx&`Y>kxZ=G)BZk@_)?Dj<IvhPq07M_66Mj^_bYhSo6PTzAan-
z81vYMBX0vM57eXK+z}M=pT@Ld&xh<)ID1*Q2b*}Imw-iEj`PEx>JKc$tzQYJgZ@A2
zVHCd0?6)5I56fSg1s&s%49G;4-F^lC_x}65Fk@}h_rL#r#3*9$*Hfn*W%~5fPqA;`
zKEC&_wzd{*sSft{$3Om&7l};dJ@(iPexY<02b-lcMlk}TVn^}o=rI8q#d`OmgrS>V
zh~Q^0Rwzbb<j7cbu<!WLg%Kl0@ZUkl#3;bEaX9vW$MLa6v;{|Qd^yJ9u4&9q8$SG~
z5wLxTBm4`bR7@JL!Tqz@xji_>jy0S?HQT-WVQ746pG!Er_7{TC(=0>Tf6PUKA8nNS
zsa?W-x&8pwOk?+93yS_IJfPRV@d7XO9{z1L%<NN-bM@G^BmrpHj7<lG31%AK-YN*a
zTNmL!-)DZzs4jTehsb1QtHM_Hpq`kEYBBErOc&T4v3wyoLh%2UH(tZF`VY{>Ng~7F
zOhzE;yWd01!#{;G>sPp;s04BU_20N@_d&$%+=m<f<8@rW>em=KeI}yfzwdQ@Tejf(
z$W%S9Te7s*LJw%d$LECne{YoUB}{mq9cH|~N)UR9D-43|NY8#(k0AG#JB2&xHx(%4
zg<b;muZZ>|*;vEtSg`gOFEShVZ4!i@!+z><VBxJ!cVmx)|NJ^$VD|IS8sYh~p#k;V
ze}M#8u(^1DU=s;?On?r$5(sOt$A&NY^J5=#fA4!rOq!&^q<a%^-y{|8yI1ABWyi!n
z-MzO#r%k}5o4<?1o8k}`6N6FF(HI#Og{VlEH$FXNfDLB~xM$Bxe2!rj;%r}Rc1~%=
zFE2p=Bw*Pu=R(cy5m96Ca7M=eZ|_~;<EqN_;b-oX+ayhzG`*xPO?n}1Y12|@xHT<G
zxkxJl^+GEO=n*O^oa52z|I^}8I2Vt2E}$Gi#kT6fst8B4Aew?o1=<3IQhINbwz)J-
zGP%uUZr|@&d-i0KxhIoklD@0I-Mwe+wbx$zS#Q=_&wAhWE^QWQUoG~BI~zka?p$B3
znTy&gu{5~epst+_rVUH3Ue|wMt!q%K)}dyov*fW0pYeCp%psk!xLxq~IMIEs5l7#9
z7hikgmpIwn&%SV2zvbtDdL2Lc&GTqEeG(q$Ipw939y*nIDfjqGLl~U=g}=BChxck7
z@P^wrpps)`%H-eOiJI_a^@p)r%_45VhTDQB%%wHh`00MBU|Y5t>$o7D8fOKyJ^@jM
zbu0Rtw1j6rp01N^|6+af1s6GxUt&Wv<uBuSk7))Q^!-Q&`+UT6H?G6la+{Ky%4NYx
zrmNRtErrQch9x!qC!XBLk7$z%3-84GYqZh0qjCd2d)p9a(Qev+wVWL{Ip8>tog)0~
zr$5EtcI`rOaj_y@+(N<aa-rqiIpuVP^~bpIi7IOOXv(QHbpef_k+fN@R+WxvdCy|8
zs_hkwMw8O0czxV(U2Dr6jyy%|m^Zg#Fsk)?+8R?5LZ+kH=pX;^0$xqooYR5I<(jU9
zj<lNhyrL#wZP#6fO7?}z*C-;m<F);$dvA{#5Mx<IVok@+hp_1fH2E#YhOcf+(wW8@
z+<#B7Uv^Yt!yOy6KZ#${Da?NS^><o(TKl!tsGL)d@;Ozw^M~4`SnXTyzzrw%zot!`
zRo{IlR+my{ZK$~Qv)GVGZp$~|S^5e1UJW{)+k%I_bO*lvT*O~wMn&|#whQjxKZ8J5
zXVT^3+E2^e`N+HfD=7HhPvH1}-$d5hn_;<VF-%jY!dNsBrpZ%anZFSB>uyBe7ymyL
zeD6s(Hhlw@1&aYg-w@k4p%C`#KZu-9{2ed^)6Im151IJ}y|{8rsGFd__b2><Ts-?O
zeD&@sZA{00_H!GdR-^8%#olJX`O2TPiHa5X;43#(z{ZIO%GkXdm8r6O`zxS9{E_!G
z`Ki2feNcWJsJtz){OG37*tr?2E46Y~-SN0a5_j&$JE?N<grG=*acjnzj7Cqdes&T2
z;K%n2ei+)i;oEfrzC(>_Uo#RxhJG6QfB|-&0qZ)lkYzOBj(Ky@&^;ZeT|IdA_;H-*
z=os*T{-($?2RvNA_oE;EDDq~sm>Kic;I|e{Xrg)k;Ky13%28Yx_L6C{F`sJ=0J!>b
z0PfiqmTthMt$H0cPTPX-1Wh?Bo_|7_aIU_6t!fwsBtI{Ha)a~$H%j+VtJev4dkY#*
z9>YUheuMh6ZAoLmz4eN+%qYvZBHwO?$pCcq`q9woL7lTVDbryNkbd^3*HBX6z}jo=
zm|(HOVzMA$<la;?f8szWiD_h(I<4{-4nqg(mB|xe%LyB7m(ErLrI2A!YrT>!PBMgR
zwu@(yz=cvNjq|#{E5nwDgQlG2JMaYazy9M`J0twP<MaBVhjc^2!GB+Nz8OXeT#Ueb
zOf!_g39rw5<}>*I_rE`sY_w-fOG3?Iem2b~_XD%aLQbhdaltn^n}gcmLL0*8#ivzp
zFdrsMsg^7|Ke1*c)jY>o`lhC4%wI4c2i`q^E3Uj!^`+G2H8nM&;mjFD#!ehRrifiz
zTU%%kQJwhdXPSX(*V<Y<!az+P*YQ~`8UZ8`H2QpsIFiV5y`R}+1~rRJ%jdNN>P&|(
zH22KS%fpewhf%xpWz?*=GHHa%<}QH^ufV<Y6+8~j0n55-Z6d+3q#8AN2DN|wD|VD?
zzBkuYu~$ttG~@AaKZW(%we^4TpDIB~c>h1MTpJs7bENEsGoFI2z6nma(H>mlXEWRT
zUS*nw@?`*a_C-Zpb??XHci)DG{ybofU_`>qh@cact{;6L{*Lyf3uG*uh^!BN1omrg
zfU&SB`RDQ+uwA_xmL<#Jdf_?r{9+quKTM*RecK&rBznb|z0d~ibmK@fXXg{DkAZHd
zMyQsRV_JBZKcOr%R^!;u-5spgIkWrcT3igy-`6P_bD}9IWBoLXNyv}8J=_v!AhdO8
z;sh-xA0(s=fuZ%(X)8whGfG8cMqfy;83TBmuIW3vfZyzf>sPzu6v}{Nn;q9)a~%q@
z?N~p1Ht8Vtw6$S(b2CmjJK{VWd5h*&9Q4ebIWzL+z?kAH)Kmerd!NA%p5BPn!G*WV
zTh^DExEW8~u^gM?HPoRzU%?UnvFd+R^@s3I@SdFwK|jJ5dMNV3REd?hmf<@O@4#<f
z+<_%O=O6MKtX&b_6Gc8Yu4A~p0=0U*J@9t5qpk52e*El<c(<-Gsn0I7n{eaY0<4;u
zk12T;Me6hckXkbu2q?49U3H!KzeBBfyQwEQD2ko^WB<1k6=jpLG&>hYs~sjY37;7T
zlL?yoCicKSlxw==&*utdsa@FMpf;o)aCdRA5+r;Lhx(foXFF7<RL6lzShD8hk&ZAb
zSKNxShrfdzzy3XTEc=D(<knnQ6Cwly3NWsIKKS5+L;jx5RuB9>I=xq8m45j#j`x^m
zsNv<8Uq*9tv(f+!HLp~jw`B+0r*m#_2&fO0>JKO3AU{HWQ+f0FPs{amQ)sejvmrm<
zfpe{GIB;M;PSw{db4|8oG^?ccZJ>599Gx>~&L~Zumd*pO*QbbKz^__Cb&qQSN$}{g
zlP02GzYpErUGRE5N+W1A2Df9NR?uKXhqFVql^4!mfTo5sXlQ6uYX}{AdEu{)eO<W(
z>i}%2--0c_X0kP?*4G%7E<w#gpmx_*Y*ho{N-UY1Og~tGySDu^rhWSsY~K42p4hn#
zn^%NQdPObGVH|1zs`UQ*cyNhFHlOQjPw)EQBZ%(((~Xkg`mCnzu)hFbJ&wE<^@X9x
zx?g`yBYNfQu=#6u;@bITIQ&>8*8d=sB%>~Re*M4joje94WyxZIdCrB%z2k0}7cCjI
z0~KoWvOc&D=J|`@uREa#;82{gL<6*P8Lg_epzhJ9P<#7k)KDW^x(-hqp@af>{UMZp
z`0>6+_5Sm<BdGTQ#X8|@tqYl6a_kps8xI~rGpa&uBbu9`44;ECmLC-DROQE(Pgh2D
zz^ArjG`-CB0W<!u`gF|W=v!0ubjfamL(g+Y1J1$#r@I&J&h9uz7dpFol!*x4U63*J
z$TgWT%i+Mh!U>pQ3!5oRfGvq$@|wspth-lRkF@uJjo7q(Kbm!wcXu83Zhst4C1|Mo
zisQzX|JkB>=khu6%GM{eeSoTJP^FK2`Vz;zs$6xe8idzAa33D22W%f-hx2v0il)``
zDo<bBW}&<7EOx*7HlE!TR9(eE(qc5=6N@I|CpVR2{YAx?;;?c$x*w4vCF5Wz*J{H1
z%JcEvYiHt{E2p72JO12_%j3m=|LO&_G}Ob>*{<#NN9`lEkp5)X?hQiz^bX~<S2T}b
zJ}35XdmLN(;ZTkxtF*z*mM3+YY)0*4PxRNZlrPabG;G0^ZTsQmghWFv9{HarnwW(v
zaVrNiJ2&ILN9%y>4On+|G6S!E1siie9((LxU&!nL03ZNKL_t)sw3PYS8%~@%?SekA
z4$qWvyvH;{4Rpfst6%+UsM)0aykq_nsO87|p1{`UHM@1^{w=|Ed|}xoCBI?m&-2T+
zHcfj%5;k?}G)2g$y(6LT=;#O$Gm<lE;`B)@!bVF5{^k}6lO|14XSdrON~hN6nM{f(
z^7%8TPouuB4lOM$ICk`?+76_*ml{0_Y<8QLx31Zvdn#^SlVw+X?=_w|quN$(2l2PR
zCEaNPwsKT1XKCGV)1-VwHI{^$l?p6ftqo-BNcOT<VnH%X8CKkhyOvjB-Iuv;$&D@F
zdK~)`PPW$KiN|WSO|#vH@zf8s7S(o3H7XI-p8n5MsAFEfI&8T^Gnu>RS^nMHP(D}l
zRJH$!t=K_tj6OFG|01{!D~=qWtqVHHs;a@->IxKN4{HAy=YdhY74UY#gzv(b=M1;1
zj9DVff<?%==YFM`8!9=Y0~RYyJg@!0ph;uQg0cpy*K0l$y0_q-PkslloCppEeQq=#
zsm0?@4Coj2{<HgWeCvCAwf@uBjN1QvL^InAj{QPy<IYF%;I9wEP5E)|$Cm$kM3F*G
z#vG_zHc)=pw<ngL@`b^5q1*l&Po2=dux{I((LKAz13>O2jlj4hd+A;DpDdOJl-g|g
z<eWM9`^AefzbM>3GI1W%?(s+_*j8-9_J5$KuETihOE+S9(B_$cK(~D9aqR5|Y?XH<
zwO-Es;%3}frP=eZS8E0;aMzdDg;e^<lt-nhT!TCLci&BC=QeD(p<36?B%Q^$Nl2|8
z36zIgJttZl&)|p8y{ue*$NR=9xfVQf{Y-pp;Y8TXsr_j#FU!OCZ<vXNC0X%afdh37
zc>b@iqpS6-+V79fW7KS?-<P!MajNoHyrf1ORChmv`!3gH?ZyYfynLw=+fcoJla_Ah
zLqVBbj(hgyX|B%oud-ER{TH<kruJJmqKa!#F24tFJNmE3(vnwV&8L}G8<g2@TZ`&M
zljZt*#_;*2mtIOs>ATuJ*ztptsDHN;-R&Oqy8P<kHRE`XY0?q)@87TXQ%gr)N#`+R
zU2uI~9k$%PTn#j;Zu||}2kiHqoct#J)^VRuBWHe?!c4<S%xFHz^>z&USqFn8jC<%U
zT(}U+msjJet5)F3E3d@j#fz23j^^ehdR)IpE#IC!d(hq0g?;<>;n>k*N@Lg6*{K|`
zkU-kAveY_3l1HDnzo+8d+&tvu<S3$7I(dpJ%b7C`XlzW*>Vj+C7hFL?r-jOzC4HI?
zx+Pn-y07oMdcHDy)6*t8bFZ{bH`;(B-@$)Bmv|!O@K5f<a<+k$nio%G*I@IV?0apf
zzEjimxL@3a8ntGx2AgT|Q+_`_8}znacGFjJ7s+V-7TlxS=1Q#o>cF-+vee~Ev~~K}
zevj4$U%Vb$&IB9ROw)Qd`~;?w!^r#SAy{TRVK8f2;mEH7%rnc8^U2S^TDc%-?Gi0j
z2E~~wu;IIpVqH1CY(9eZtF&!9%I8#K`89Xqq33Dw;=t-_mS`3&wrXsAaJ9PL`|vGV
z-OX8!JGn&+9ZP*TXg)k+9lm-WSE1J7nSThb`K-DTo9R@g{4Q+!qBg!OyD7LnFC;%z
zxbd0x{(W{7xNOyTY7T|y6lRq+0a5ccj(;m~|J`fO3+tOGuncQdY9q>FElPSaA1R{8
zy?R>Qy=Zj1(dcri!xu1NabYR0ES-T#*-4s&1V5YFy=2KAXXGmH-i}?*K8%ewRiRj4
zOg*6j)i-U#L;qWgy-#mKb#NPmc*x%Mz3td^b+PK4Y^620f7@1UQX8|!dn($!GSu9p
z4Z_bS*Y*)e&;uv6WI+?o9_KmyWzRkwJk=DDG(2Kffert8-3(kXfwR%!ceHB`S}c=h
zA$##P$X>7l#+=B?b=b{#@ai%wh(q`|sM=opI$E0>;8mVEN%pAO)6AnH-yAI_Mfsbt
z0pHtpKWa)f^P=L5*I@JZM{(D{tjjmxhub#=(>YLe+oRa=-E|RLFI3$2Lu~(YjVAXK
zs<7d|cHrTUM0astcEwtaK++k}4MF)F_}+2!n}h0f1#YQubZ<MJd-OPVJ>7t#d)m~&
zYsT^3V76U|RzB{rMlXva8*Hfg`VKsNTa_AIu>ITg^fr8T;D*=9%J0Y)J|o}8{q#u2
zOeSsbI}$INUecU%+O%nyGiMGKELec5sw&K%KVPk#<A>zs<>87euE6`=_dZ;I{q<P2
zY85WN_+reRJ6GkWt-Uj<wevo&S84H%96183#e!3(PQj7yfFnO&Y3{g&k0zW9E?1B8
z#>w_mvykA)fa%j`;G#u~FsZaukv+=Z@e?PL#<aXrcL-&}%7p_QJ}s<PW}eKfdU<7v
z16K!D->Xe}?fCX12>PswQLY+ne)3^#sM6Gmj;alK=$DU%T<2rjIz0NzhjG_66~Qt%
zP<7L0Y~Q}I&l_=e6*g_#iu;3O07v<1+`sMN$hLVv2^`mK?rVdyi&1mmR_uJ?pEYM%
z&+kb>D>)#;Vfz_?@ANjn?}j0#7ddN>!+v=a3|Udsrdc^^O`T=l{INmwbj+r$#zVi`
zg{|M%fYs%?irI$Z%GKELjVG|<^}TrXBNd?uh~gU`#m;B@%SFXC_hah|ecLW@j9K;B
zXR-6iO;~fWHa<jlF{*BR2+wZc)aO8mlMDZ+%b*R#S8u|zKlv(_>Sc>{HkD!Bcb~z-
zpIVKI;84a<#c{zev~5FTJty&lM!*nItzhKyM~@zjj2wlS*49=mU7ApILM0o_2ExW1
z8!Vr?5`pjB3g6+guzvj+^!)5^p**8qI4l-?a{heeTj+W`pv+J5ER&IMo(7j6`1z5Y
z*wyeZ??ih%YTSwyD^ehQQL{)gk{bfw0$Os%w&zbWD?J&_K>zJlP&-)m56`0Z?r548
zJ@M$CckkYf2@@j8QnXT~Du49A8E|*Q-_rqaTO-aK-j9F$k00ah6S4id(*X-LdPOnJ
zFb&o$6t2AwSrr$n0Sn8?^?>a=x1nR#)0(MLSmE1UUfliL<7n>ohQ;<>@=yLtAGr=|
zuD=$JDKlZrn*f6?2L?JkFb#f#*S<Fl?us5gZ{eDcX?J1kvzt)u0GvA?!Ww$%%HD|W
z`|d}T+KgS3-LgBj;+Zd3!vQC1|9Oq_G-vzlcI>~ekJLGLJ%n3tdmM+S-H&H?ZcI4i
zIJlCh_SA67AI;@9Zrq4xo_PjzZZXtAXL4qX5mvhi7P~e#=usLzAG{t;Yz*}cQ112D
ztXYFc9(e@ZLv6$Yz1Cg6Ntp@Pe4`dm+*Ss-4`a*StCa?%=G(jQ#7!yMvyWKe2mhks
zls}U8j*d=bXJ=`|%;!~P%IWNY&+k)v>`|-6^?FRZW$RX)ZEnWo$&+#S-FGXqO}0<^
z!A;Veo10KnRHWkgo9pwMnws$3Z-1*u;nTl<8kb#uIlMlvB8R;m57=(gQ)hd7yOJ-G
zK57SjJ}-JbK6rY2)#L)bavDu0rFC>Ta<T4~n+Ff<NIe;n+ZsIdmnX1JU$Zw-?@#l4
zhEpB`-G|_N^-{nW-WD3rd&B|Pi&NllwFTQSgIZsgy>2~>C6m(ph2uB7=IwW4`Io4X
ztHI_!K7kE00QZqCxaXS9s6`DP-t`35WOx&riu{d*nw&LjR@7p~U*r?@k<5-vUOP6l
z@96M&@E>oy8Qh>+(LI!9FU5@PnXniwIN6~u^ho|a)b5SF;KYtERN<ay^^#ZN&g(Om
z=;@^#wzFT;lF>Y}x4RQ3>rcfcdMw93UN$)<(c_?}@B{ZEYc}1Z^#z03f`V1I!`E>R
z-S51Fg7@8lwikb-<dI%G|Gv5uUw$#@Dy#1?SWR4IYQP`&?#I=aUy9s`B`|vP088>_
zoMG9e^|JDc4Y2)S3*7aOV|`WFqH-E{+_5r9)GAT)aT^~0i5qo4T#u?Bh8Lj%cLm++
zJD<A`RrhM1@|dFP(`zz<=!KVdIId|bm(E}`m|!*AQIua4njqmoy2aZ9zt;s{(q5br
zmx_b<5e=o)L1$M$?bm8h{<W~TXLBu5hL2Lhikm5yBx7#33l_5(S=rgaz3~9Xb4vtj
z)p*d1^GrhnI-E|GhHLq_`8wC?F;F9@6F#y=KBIZW<~5WvpGz;j6ff<33Ck|M1iN1O
zE3UliD&<LtX>)UO(e89AnPpxK^sMdk(QG0Bzt0D&&5G`xZbcsXuJ-oS9IL5J<-d$Z
zAkg$Hz(3GpAOLH5JIqCHbiXha-s8D2<d?v<;%XQt%HMn{6<WNEOEhY+7q!^DsvMic
z9=2V*7Se=<0W!*$<I0Sao0N}K(DZfvwRSdBHu5cn$hQ{3Y_z7N)nmE24Z}#0)%4-y
zKuLvWI-r?>eoxKrq%Z$5l#}1Doc4f(&(jNcR|j6%r|o(gYYE=vWw}@~B`4-bT8gG3
zYwmJ2@Y%L)8}7K{4%F8NNu0reyvshMo;Bu9K+dA~h4NWCB^Q@X%MJb3FLEtLOwP67
z&7-H#daeatmkR-3uQKBV2iyJj7}1{^nX~PR&Di<m{a9TYG#lXp^wKJ<`SMn5{T$b*
zGT2c4|8`>QeXCKa%tEy|nuaQKq@Y(k$K;^tQqaWcdmrgrV>2>eGd|uz4NP@)HNN@H
zZ{n$^o>B*|8OM9+4Emrvoq5L3s|*`{_$(f}tvX~%#Pux|*W87NfB7iZjB$-g{BKYH
zU7A92U%NfK_oy{>Bv2$)Dk#%*eG3H5PJLogk@7&zb$RR8ug8oTGeTAh&UPo-THDmo
zHwmEkw^}}P=gmW5;RLn*?xve>M#-c}q1Vwl483dWYXhm}BjMyfYW1vkoBGY|8<hEQ
zAOLE`+uAkfGU-Q0avTi=0&OqHbSrKwa4EA++p=b4z5jBUCQTk&=9{Ad=)iZ**nl5C
z`w%u<p_>W=m{5V$pL!V2e0NR1wX6dlmER+az_`-vjRsK)H`6T1sz6oITG&iksO#B-
z6J7DPZ-`#e{DztueLX<*G((TA!lolfuxaQSsT`_4yB9}3o2Jaha5fz1D8j_Op1f}K
zbai6iv3g`%jF^^Z!Fw&P&|rq2$-&UN%05Rv#@s?h*sP_q)S#)i{yhXdeb40Q=d1k~
zX@dIi|Nid^Da*v^YL7hUOFu)&?f(LAYXf>uzOC-vI=>Kqsngty>#%nA`cax|fzQ{A
zcaEIEjM?*G^LkaeRr!On=z98*J{MoH5szN6G5%{!#i;)5qj)x+%vEi~-XjU}iT{@K
z{w~Q}Sy>sr@r`ewva&L?zKUKFD=I2*`|Y=@Eo0KHO&n3+9hF%3jjdSsjS+q8xO^G+
zwexv>%Av~XQ>QS0!2%Q(2HQ8Cr>QR|*)u3|_lZw@LT!$2GHF8*YUQ}@lw>Wxpg^^Q
znubq<j9R_$`KVRz(<Zo>hNO)fvb)@FSgp2@$vg8jTP$$4x2v^;++(k|SJQx-EoRs(
z7PZkk-*C41EDG|&cU{cDstR|lpMk~8m?HUm5$Jjs@odcvRv)rz&calAAq+*S)w|CR
z>^|njtB3vY4ueqwx0}7A#sX7tujh=xbwEKJmFuwi$#wm-dIOTk&kR6dT#>!e#?t~j
zvJ3^V8SO9`xRx*VFdBq4^-{_c(Gdu!kqDig_&pxDy1Q`fObfEj2K0FQHU-w7oswt8
zg~gipO#7TmP`Ks`Fk1V(X=cx>4sD6R!3;GkoT;XlIz5mKlBD@s&!Bt%%P9WH*Wmo~
zQ|R3N9Of4XFe%r9rmnuVdv2fBF=d;LI9S(!_qlqM=TJi+XvV1)VT~(=zYdk0Q$)aS
zx8tK9{it%LK?fTgG&7I{(!mDrJ^b*)Bkx5s#qW^hBZC0tgCs3CH&;1dF&T|&s|B0Q
zs^T@Z8?|y859{pg0==-ZO*?$>5U#u7dK45)fUBnm**Q5udDCQ$?Vq;WqsAJw-`WQ2
z)ChBZD&uT6J1kbK(g@nK>?)4y^5`_i9@OU1VT>M_ZI8>PwuQ(q$j9k3XHZd*%w7q4
z4sy;^1Onc6z;muoyBwpShV1D;?o7ax{B~K)iiR+U8vJ<fO%L3CU2KfEq#m7RG2oU<
zEtnA7@F(?5<%#nafpIme8|^i3TnmMOwkAsJqRv~nIzK;LnL$#!=Y!ANi;m7toa^j{
z-E4$A%GBTD(rh)LF&9rq(FgxQ5j_rAxF417RnZW1RnCFbfBxrx;@GicSi5#@2;ZIq
zuc&o;23t0=FT4y~%jdZ2qbRxK-(j@pVCm%kJq7b|dHt}N4LE(a6`o!<0)9=i*Kf)^
z^ai;&UlHK?DSAcZ0A440#6lm`^PaxO>U_mWzPk?rIzJ(kqesqz@4W|-EfP74#j4ij
zF(unKWlk9Ye*UwcVb%q+lv9<dQ>S9<maS@FZnfD!f<|)abUML(`)GQp2c78Yzv+C1
zd*{&$C%u4j4@j?1(=c*#cgFMZ`L)f}`5a9{c`z>$Map=u+bvC?4(fO~_cqXzS;8+d
zWX}amkxL#DJ~+$?d;y@XtDj1InBOSbk7opg>}6Q(juv5Mrx$)?7%XF?I2wjD8wq%Q
zXlc_H{98;0^s?n15V+j}L*8Y#D3Zo&?)AjIrs#oopm`iU6;7W%Jv8v9x6k(4t*YJ%
zuK5&9IhrTKuDv_Z@aSihSJ2sok+YQ^zaK19YeyHn^d1`8V^7me4k+e`{0x^pUP~B#
z1nBObUJ_#k-ea0f3nELSQzJf~MxH$GUPaPqnyG2=v^92pr3!!~Z2vp^Q8cj#G*4e}
z(L(Hd>n+umQHxA7OM22|9@NNbTRM2u{qTHvO-&uw<dLwk<zW5WtX8FgW*iA84^G4C
z>;E`mVO9&NHH!;s2fZGz((?7?Ke#KAzro>__NNrtOTxa=J{2%V_LFHZPl_3Gd#|&d
zqth3P45wIGV<36v_0&TEZM2Be5Q?0(M`@<Q8A@t|c+DeG82AUx-`ajg2Gvn=?;{@J
zv-*khJg@I_y_-IJ9q^;erLDI!84U16Au!x(ftcH8EC|6iapFWZz~*MbTz{gwqW3z_
z!qa#h)+w{qI=-GmuPbv+e|I|^SFBTe?=chCiMP@I;*UdhR+1CxM1yM$NcMVqJ<2Pc
zHl0nP7b-@|7b1TtLzeLmXanNdU4-6NWWtAVVuT(YsS)C}K2gGN7<j}huTEZhra2-H
z3CSVg_xlv?<rU?iMFMfB7SF>yNBw?eW$7EjGCz98)U<EZ4jY4;s<Ylm@EFJZxb}|u
zkkFCv<>ct~!HG4kTqK9=_qZ;PZ5Y#2lgGib(cptW=rNYWk7XeNrHLu`;$vEF0<TQr
zecFD2$$f4AR3d-<@yLi@?&jo*Va$cW7`vTIE|cL&)#Dyqr!4*P@YKgx&NVY7d@Lh6
z#In;PXR1MY5o>G1ORX=dN8jpr6YaEDj}?>xhwi8SSTk#_GJCnQ>`F|`o*3HLm_&o*
zk$WL==9LTW*)d8;7J<a%$rg0cX)yP#?>v0?Fv`oz@wv}^PT{V<&EM6AmS21;G_$Sh
z!eqvT)t^T0((6>RuDAY(*57>}@b$UhrwQr6!0sb<O{U(ti2MyiSbmQb0-P+N%l?*@
z7UgE2B(1o(STo!6`GQ2j8~VH9eWm4z(U$3xWF!wfDBC1_`lQQ9eb-og54CH=ue_oH
zrl7`Gk>>yu3AEd_mPe5-lSx@Gy!F;wxagvb@b=qpqp+wD?;SXRO10U#J!tMpbISm@
zezdc*BaG~62q{xcZly55lQ5mM965Xl)5@l+2}}}0t^ZQfamp*FzIM-QwWzHk;<t;@
zYeeKPIxd+In|e={38fA%g8`kc)W1Ud<8Tb+T1Q}9k-eESXDaV-`p1pMGu=-o8`!au
zjJ?|YH%0W~61-rh?3@C=0IEx>@xeJC#Ki3W`^s=el!0e@eWZsol0IrpxvoOLpKKY=
zt90B8iXW`B2}am$RyD}<2cTxI2V&u+X{W&ePtyt5rfYi>&YL$6+qZ8Ym=wKD+9ZG)
zuoz5gI|j#!kHS1*GF->rg!8Yzg!{z42tv;Fc>@ETd$CM53kSX?RR%@>6a$P+0|(|a
zboskUO)!M#tIL<jUpOjq9Ss4tO*DHZd1KqJ%Z{Fwnj8i_UYY87z3Oj7Cw+Qa{jA6d
zw2j_L@+jjZecbM(w6ruM%~tiYkM@~3vo5G<(?URD&o+zNGtG2>rk>ga)U5Jy?Ag6r
zdFAYIcA#`pDcakeL6WC0E6~>0vF=FdX#Pp^$H3qEL8n1<_`?2>{T4NCFYkN_+>#+j
zX=gP}AWb>Bo{zG_wSCOjk)IEDFZ1=Ipg`M3DEI+!Pa=PD;TiRt23tu|WuPOMfZr2m
z0yL>?h9OY^xpwJ~hXL60GD{(Q8CLBav?LQa2;l&P+Ps&88ofl%k?8q7e%v_oM%*+{
z+n+7bGwi^r)nmt2S68Q8vFn4UM9-do_cfET05=UbnNgIVry%h91BjwvL#xZHI+)Hq
zzlXK#!U&?K<3|&tu01;xaV)s@GsvEM3B1l0wV66MRQH}cqn_1fuJxz1b5mEJmQTN9
zHfn1K^K-LdvRIVKm9lMOX<}$R^k?<+NXs7wZz6v>`f_G_L}x{`Iv@#4CXoE`ps6PZ
z_BuI<_bkbuPWl=e8ier00n2RG@MRL!*Z2c48Z~0ZHjHsv-~^NbEoaZ7sIW*yEnRjo
zxaS==VkZIP!KR4BPW$au*Idh|<)b-zVVg&C$t@qa#;^8|f5Z(pen64(?yfFn`bp28
ze6!kRFQDbe_Jn4hJaerf^Po)V<p~xv=1Jr)CN!CI!&(X$j0u+~7<x~`5a47)=7oZs
zNXwjPrIh|S8Y&VOj=;Dgd*L58R<DyKdz`@}$s10h7mgtZRA<hdQ3LJ^F1SF=;D+Ci
zd3~-O`<q>Or^}0Om@uOt3sqC|k*`nw#(Z!r-UyN<It#E^knhMtUX~5q?m#oy>~s0e
zuj9UZHvs6_|1!E}UWA-QS4R*&4s6<Mx50Dfkh<sm<CAEA;c;!dgdj1CM)Gv@4z|#%
zU0>jMi>95Oy&g<1%!h?*Vz^#`UO!cS$;~8E{)T&^p|8{c_jV%|Bzz)&;mDkS*Bq3y
zEpj*<NfW(rl(^3t*MD)qo($pRv$`243E#A7)55che|;Xcf7I&n;NK|^))PnCY@c{d
zQpF~Qzj<7H{dF)H_>9)(kk~OD>xF|?re%9Y51XtfYVWv~k9m^->hIt)yym3jdk5ad
z+M7Oz`V%KmF=vjN5Ga~BQQc=69weG(vjuK?A`ZqeKdu$zChds=-zV~y2&D|TZz%>0
zT(cgZ$oV_pg~990Jk4GJNpHI_8vQZ<4pQomy&g25a^jtK7fyJAY^x26C+1^zX{29)
z43M62SA=mz_ExM|f%9RXI@)Bv*ZN*)jb1{j<nl3J02O(&lh)`(%ah*sPM<!lOs7cx
z;*ktE+wsDIR{XRlfPT8Ajvk<{70ZeW@TqwP$R1A;s0fo0Fq&XATVcz}#>`1YIC-WK
zbd<t@ML1@=>O0}{2h^siZO=V|-ueT`U3LR3#WU1Ku)U`bDf3L%;nzdYabG=#@O+}x
z72`N_{p#tiez#2qz((gR-T*45mBMPzf`J<v8-nijli+%~{3Sclz-je#$RA}+<gZ_K
zo_9a^H^lXMBm=3KyblD5q=D;_nGZ=sGJj7x;p4!Hj+Ekt^RWFRA!Gf}u?k6?X1b}h
zRc?1LjK(f)K8b!Y73m|1vxLk(xhcEb?NaOWSU)6+B!J<BjCtz{LdG+2(8+BTOlA`%
zPnm*Kr%t1*vlDaY&Bd-=yRc;G(oh~u%RGGC3pMzh?wlnjCnw=nB77(7U*s>Y^k>FR
zOCew>0(|TPb**w_(R}XH=<PfPTlR%8nfms*jZ8T(CV*_K0Tc5K=uPYoFZ3`Sq;<N1
zUT^F&F|pZXKwc7NoTJqrCqEwaqy6w1{M+eX9PjtZz4%Q_2P{Xe_<Thv7MEyd_aUI<
zBCQCFr=d1hu3U)+9(Z5~0MVPGHXAvZOlT$oLqBOwIh&fAnuO2rkNer?XA-8<6R?Bw
z_4@Fs%Ri+@4f<SERHWALm6Vhylc=Z}wYA{MeNMa(wp^^3ECWE7FMw_Y@LEeN4(|3~
z^U`7zj}s}R2fBd4s5E5;nk41qp>pOFynFHttR@4jCL=t-^(Mrkwa157>N|18bj{qe
z`>hwz_2wTm^2HfvHE7ai!K30F7O4+_lyWW@|F`;1v~+80l=P%IRwHOu%B6e@D`voA
z&jQT4DW~Q^Pfr``Eb<o%8Hpcm1UNu%YHCtWjE4Fyn(oo0Q#bESCO?{VQo9#7oUiR4
z&DV_vy!po4O2c>2qKkqgTJyX~jjB%aNUnL!^^nx4Q6tE@WjjW#8?QM)=Wm_tF}?nq
z_q|?^GT)?C0=<3mm_B1BcD?dfT(zPGHoF}sPn=L|&h7Rrb)U~E5^69iO{1S%E_l64
zb2xR%l!T<8&vPHtii(Q3B9P2Yk-ub68hjdq(E>y6d<0zeK+q%Wz}%bx8y@SNi=0!Z
zaI2#OlXH?Mdls_+H!ZWMV_?4VejjP{<DZ^(p{^x%D$07U4amz%Jo}p2{jm?H_npF5
z&-p@={uZMF1^g`TDeR~7re1ve-FjT#U5by*9G50vu`7B6?~IdSwuV@;CXf;M1`IHI
zvS8>ahSzI`VNxZm7bW;3Q^FdaQvhzqG&B{MVGH=s(=s^H_lZw@B0STGYdT9w=xsCn
zsQ~x*_T#e2m!UYPzcZHbWXWE$gJQ?b*-a9@h#7Hj2VQu$kLVTW<l!p|C!$#Y8+JQU
z`^Gsu?h2sY)ro(5$BKV4ed+c903ZNKL_t(tl%MSDGdvv!Fh&G8crn{x&&kE|`LprA
zwXdVw<43;DgtI+iQ-B6w+rG27tSmR=z(wK7eeaUg-syn6QrCe_j}O<B6H9~A>TP}N
zY()L!+f8V9`*2~|B&D4&+p__aMQJ0oky!jS0-F5272n&dUMQZ2LH>x5$X__f=f^b%
z{T$ekaM3&CPy^TF(R`1CeYR;4ZCR8T@EIN~hpy@Cm+ZW5{{U*oh!5+kv9U>+UvuC}
zZJHMJewA7~sQvU<m(;HDxz3Ib1afl}sf#3g2DQeH>AJc)Ro&@%YGg5h=`&{FowxTv
z-<bV|8$JM%OltnL!>879b$4|tT@T3{Wx(U{qI}k@epNZ}N4Wg49~^4ncZmEA6~zS4
z7hDCLdy#{nh=hlI`FOZ<KK6MEkyrmFE-PD!lB^<_=(KE@g2x9mv<1)@$5}dG&A*aq
zg+`d-cgJcXW3<PE@%rQLBMtbLPV@{Wd~9YhuAi<GYCpP<HQ>RMZXAan&z)$(?7}iE
zOWsG)FxArd%ywLnJ(~4UGnTq3rxCu+sX*No@VUM4U3(b<%eyoiZhbm&Ah}~agRW8m
zaKJnfr%Z*gcD3VNmjQ;8@r(x|1?u+OZ;y-|5W|_!6Rza9XHbjMeF4lZoHrn+!T&T)
zFru@)Q@J=FI6(3oYsXJ}gLzxB@s*1wLQ%|)9(0>*$j)}4W`P$c_OvU_-|4n?)VAcK
zMq8&p_(EmElavW=B+SiyEml}_@-S!C3|vrJgx0opl;oKElRW^3&$;p3p*DPAPU5v9
zu|Dy@*&h7MU(TS*<3sK74qP@Z7l+TeaPVCJwF-0+lV>&IXsa6^T09TA1%)u#XvRsh
zr<tF|dWRmb$=`APXTtMv$RF45(UgyaFOk3gRX~%(u^JK)IMz2O8#s7RSKvEI_L4Q_
z<a<f-NcN(I^Sb>5lo{mIY144%;6c3p>Z`c;l1qZ?Z8dXCYW@NN&02wfyCgiC!yNuC
zLwU|*J?k1gVyyiRsJuHmI#oJ)5w_X5J%e9q2bqr77OMq|tCpy(6#P~zrj|`pgo-BZ
zyw5{v0fPf-ug|MAb#|K_bLY;ER;8ghk-rcWW9GtGaua;V9|Zh;eIf0)Ug({sG<s+J
zSzJ|$R<{$+pZp7^<W9nroaDTC4hDqQPCs5h>P=|E$z`k`yg2djJQK!)vHN2uY8!f?
z@md4kKXo#$pKbxX9&~pEkUhbQ><gyg^Ia!!Ukf$)Ui{!lE0$Faek?SYIyqmSNic6P
z_FzbcFhzV7T|xV^5%5lg-#7*S(s>A6xD<XK^Ogk9!QY|yuzSI{_SrK~cR?0TO*f%C
zSD(R*cw5YfWK1~KA9qg*WRHv9y?$I+d|}M@rh20wt3Y+I>^S>}9=vwW6H?d1(}SPx
zccT5sDQw)+fKR`62K)IyP5~B$#%n(8Z0NtPtbd+k>z7*pW;B6&=b7v|a7-w|b(btu
z+BAMifh}^@@Uh)ZIMJr9#f$c}Ve<+7ZgV}$Zx6QOi_f1#x0lWj40!Ey7yjebM*Q}0
z<kaEBEDO3ke%Ng`tX#GT_Pl%;EH-5}YG9d3_!0!l-^ren2~zdlrh9YBUuChjwM5^Y
z!C!G!o#hbui^MPyVTybrb7B$^Rn|Aj9v!o!E6{{fd1j1g%VNKQ1cd}KGD!PJZ0I31
zFE0;0E|(&5BuQM)M^eYOjAoR?kMXQ?61O9V4{H`9&CPH+oodaUPV)4#M(}JZFTO{Q
zr&dsrxqx47yD(?&To{bn#_A-5d>_p<>9Nzt_XgK*@tKZ}4%D4Ii8*s-ht>{8)~gmH
z@)rx4%#Al>&4eL$Apou4bp_1$ug*&RTgO72=9n+&mW49$yAv;APt!Z-_VjmZmaebk
zTD`h+0la)LQp-5-9cB|Se_G^NVPLw!jt57iKR(fkr$fzT0JROx*niH67hbE!r{6k-
z2j0=feZ>>)(0$N%JG-?p;=m7;-$O<q@zlYPUoo;7Btw`6mMGx$0PpUGY1_jv1dK!Q
z%A}cY8eLuR9z8JdH3@$wQ+9Te$?T`6UdG~Z&4WLHlHByoR<V<%`H9}y_GwpoaHt<=
z3E;Kn7Q6<)Vlw0Q>4i{3es4#=bcbA=b<0VJ&zMMHG=Rh@V79<$%|dp5A>LoT1i$|C
z9yE7#qa@b?XRlA~bEkig%Nw<Qby!s0yS9XcbV+xMG}7H89pWe{Al+Tkf=G;n(%ni)
zcS?764oFJJ3^APT`<?3?eShcQZ~mF<npt~4bwAHqd#!t|-Tv|(3^^*v$fj!8Ik|?H
z_HZd|{CqqgYx^v_YBoHClj}fyJcvL2ZfSJ~A}`V8=bz>ZKUx2rm{ae@S2B-F_S7Rk
zT9@nVZh@#w)@_Y<uI)1h8l3pHjiu~V{C#-j?XI$X1`$C)A1fa#i_!c=ZCD1yB*@Ba
zaKgkX_7YOG_46m)==y_aej}G2(;A=BV%?mb1`xqNAnM@r){uQ3(85TDeMbVjPD1i!
z{$OJGHCYRSoiQOuIuKV+;7l`4`cmoq5;R`{E|K9Yvp%bCf$z|%EM^(*Hx-#2=d_fn
zU0jiJ8xlTIsZN<)<vu0FNmq^GZ`W+3LE1K&^2LVDmUVmOdLoN|IM_F6H4;A=@lYK~
z35-;E+^)(!ZH-;1f9K^<M_Oulk_gjO<KdkR#1x4jK?|YAi;)jlS^?o5yz79vLp$E3
zgt=Q}pj_!%nYA8X8lBHS@^=18P?R=xm1dBS9(4ZP)n`B;&!FA`vcKYg3#DaE*JxkF
zIzlY-%utUXaKVLo+Io*&tC!FUFcEqgt)dGdXW`>CQBh{e=q*2a_?rBA0a_V0kt^#)
z-c{b-hxmb6tB!5%l(6o!PmZ=-SVuMMLJ_QWaRZ`fgyavZNYFA#D;D1L5BL6<V28n;
zC9WF>Abe|n1x1wgp%?8_G&RFIk2FkNhjoXzs;?-$#%#AQJ@vzHi|x5+Sx7~XJ3deM
zaXt;><)EwpKMUtM?-Nm_Up`ghm$WexexULsP3crgZTiJa!}pdMpp_sUZ8BU}hA+u)
zA*AO>p3MTqE4e)p6sdV{0otdj&82Dcop_uSL%X}LfIGALk_se<C56f6wkh8tBShEX
zok`Wg*!+C<%-%)gvX!l4_~Mp!hIa0>Pz1%<SgkEj*n-v!JzjaErS?TJfplgiSo13Q
z=IUfwmlv2xBmt#KwGmcX7~<!iUgzX~E<8G1E0af{h3h}jAXkwJdl`eEx}PwW%N<1v
zNZY-=E>jdgoe}i&AMe$Ap^X_&@1L4rCo<xJdfX(`3>(b;^p)dh?qhx@rRW!T!#`97
zLMa)iX|H;AGA&8ff6S6ju&3h<hf^HW;zaP0cWw{l%Ahh73iTif7~fyd>fAh9IP>)E
zT=IWRgzT_cFS;h>OEDAUTH#jRzA}v#UP#$+s18d}@7S=@y7C(?{4~9ctN)Ut(l?E#
zTCmfpjNnz7deU7nrc>ox3-lC6_2q1kj*^Z|(htzP+B3VTpk&O4;|o0{PosCTaoXl)
zKe8I$q3_OvlJI)i)q9q;Sz-;EEWdYJjmjK`nwA)}5+@FGE6F7mW-5&wcM5s>o;0kc
zx8ENCr{O>>e*RD!51{R4;=gS$FONn;IYg{Yvn9Vqv*l6~zPRuK-p+g~k<f<hDpOgG
zov%`OtHsgoB99g;W$JP^ETkkGzs^g0Jr*AKgdUTAU&=5jB}EsdKe*4>ZVIf#%-lVY
zR%JfHq|kXTajpz28fNULk73d@G+eg9;ezh?g};^r*r~|Rg7XPPdcGev9MMp}IjLiC
z78pI(n(XBy+4<02I3(E8;pKCarw3t*y-?FpFPnxse%app_OiQZw9k<k=v$beW~#4*
zC3gLVafmhuCGNy<t7*F04!x<kGySO@jQ4(pWI+5KT+ogq+b%W|%e}8(o$p+AjoK`K
zoemt_R@`6h)UlaO=Ant2rX>aEj$<)?Awh3}&<aNfY<ghdNe+IXvTehF$FiWt#TN;*
z*yUAbhuNL|9NtsDOrI>&=zTV8kSl2CU}yIu^ZwRy%P85G*I6SUezyG$cMD)SJ}M=L
z-5mu$fE~c`b4{MyUpV!{UK)8Tco&(6UjU~ZK{xw1X9Qz+n7>WuCO<-71f{yT=uKNm
z>sS&!Kb<fe@UDb2xm3B_SZ4~PooOadJ`%o(7ddxZKat=9ul0(dB*KxvX=3WC!tQU(
zBJFFR;F+M=3Jx_qOwxQE7A;iX^F7R7*mb11FiQ9aS@U(XF|Ad18iSa6?bTOz4+2b`
zsI@HX<$*}8mg+|$3d}qfTOB4f;no*~sZqzD6WaV#{7(zgWZ<@kcIv6O>0+MhpXG#*
z_CsVhA>fLZ>w%Z8IWdxUXr2lU5hNSSkr%4fFtt=cc1w-%!}q=4TZ^Z+)))-cU(dC&
z?nmfwW2q73rpA4|-6eA#HnO$-))^5R<*sxJj2H?Iz?=)Mey`4ZFpHk~1M>q4`wgx(
z+%J8W^3Tvy=67y>#g>pqd%#c-bk>Z(;W;D@FNiev?_sSyJ!t3W^(Nn6cW{!4w=5NO
zU_lbiN6|gY(V0TJi6Sf9cC}mPoJW7pW%lo+3cWB0+1^J4*NsvK3w^X433@N}Q~Z6v
z^<pke6Ml1&{n3`k8(&>t+@E{JS~R4z>Gg3B!UZ)aDF)ZCyc_lQ4o7e-`8D603TQ{{
z4un%dP&eZQ7aX$PYpjtWduH7ZJzR{TKQFbwviKPA1)plSSy?-80zMGi&oTZOZ9RYO
zV5OVXI4ael5ybh_xWWYKG3V>Nq3kc*#$}gBP)84W06*K#-6StfmK)sx0^Vl^UnU!I
z*hn;`kSW00vzg(!r9LSGsm9~nLR(!rU-UC?!_re{DRAZxGu&~$ED^f)zwEOw9^aua
zDGp_r_a+2+n{RKFG3z+r#8C~=dW~9j-EfmN(V(LH#~@N^M0QKMO=>zmeU2;%W*B12
zj4m%}BZxWp;Q$3)uK*))!g1Ho;gad6DIqwtUQ&;q7j~xUJP3KQXpE;=_1df`QEc41
z;`Ay~V1SldcuY5{lJ%6drN^P^SM83F_J{o1P;l>~fB5T61rfnUvj*Glw_f)RYx1K#
zO&Z9u_R$#u&DGZ}bLJWgQq+ta{UCHgYnx-`b}}|@CZFa}-{z6wL7mV@mZUVcntA)L
zv_JDWCS5scMl;s@z1+TbihHvaav-uMNous3WUP-6x2J=!E?T4Z#hVpv+cR+^$i&ZB
z0iWg+b~YimwyiIzX5iu-<D7JNI6izIG6;sh6-=pcUbknf5JfvD|K8TVyW1I$p3$@I
z;ZLN|dc%=+XoD?s6>&$rcG~#8&RVJ!zL#5n#BJO?Xn6n7bG`h58SGJQAC<6@IQ?Sa
z-uyVg1D)h&$-RN*V0r~yw!2V%H%03W*7+{T?Go(moXzNRE6jrhmtaGUWAHt|_IA>X
z=_FYWeXDsyTN_@F(*^NA&&@k!ormT)d2EbIT&1PNripnv^bLhllNj3T=*-d>I7xb+
znwNmT%a*F`93J*)1YGM3Wk~3|8%^yoFL?=pE2ZvsH9()WG~{owp2C4561PJ>teEDS
zDHrd$Q;>G6r=K`OUR4!?q4WH>n}O(hT&Rt9xm04u;Uc$fRjm=q*>m7rY%JJrQd=x>
zP$a|ubCc0?!`z_SilEj1hGLUd2F6gK#ur=_%zs*%lwgZwC~Pd*Ms>A%DFbvap_~CZ
ze4IGm>jGEbibEYWPc6B~LT_vG)DT7U&@9bOZV&fyZTk63ZauE4tQN%ees++LmuPLo
zZ+u`DR|k|h+C;$|YUSi`n0&<N5K5o(*|_OCvXnFt)bcnJi1#Mzq1fp)PVe~CSVY3I
z`U}(%V92$WXag~+o}TIJSL9r;tI33x{rI17aC}yTxaXxB$5F+>oRgG$pR!buD~5mw
zMC+Pf_A{Pwr+`aX4D}ZmWLZ)T(+!<2&a>)fOIMomY<OXwad!A{mB+<Hs&)07vVLBd
zHGR**4T4yovOOE=6;p@C*7<+L5knAM%^-+q0&du+X6|v0s;N3-FXM&Bd{CPxR@yJS
z+Fqg_LAh@k4~ySD7)|%WOkZ(;4gYc?J&@Ko!Nac*{NZOAGaYyj^NR9d?$HUM{XKBB
z>!@sid))`VF|A8A>!5MNsW`0!yE@&xCph5gNmOzBijgGPtI08rDu-uha-pc_STyf6
z*<*CXHva%mi4KX8fKnCQ?DgHpZhIu%nRdH`y2e9bn=ZSws7TW?1y+%p&0#&F9d}?q
zU#YNc*>w+Wm4^c7@4aA2EpNU4I&uDMz6w16NS>)cx<eJDF+YA19Huj<uWM<;anr5v
z+&i9e4wFEcVMX_brZM1U7tH)zAed@1s$=s>SZ7XAk#elR>8uplCmqw?+gh&MY3jgh
z-^=rj`5txg#kt5vO;g6QOkQ$IE;4VFU%-wmCVMnNVz>@R2@cB(lxD%CsJ)}NrmZMg
zgDe}va;#(HlXdqR7%4JF6)YbsRoPtU)&Nq^_CYuL7vs>;06R{WVYcv=3RD)Kwd%Lu
zE<y)lRRua}w(o%Y-VQpQQSLXc{AJv1>N@d}Wv_8QPu&BTM*IUhtsnly#f8l=4L1aQ
zg*J)!-a;>vHB*>pZe_7+H!5P??g&M-FxP+l%B74I%0G21j|X55Dw~!z^~1aR!dsy2
z{Og5#O0D|j5}X(@b<D12%r$$CI<?6W5I;5kOcIzMGmqcD7)iGc>MyZRm0>8RP0%pX
zFuynd&Nl1@>d*71kZpBUoEI?gT;9tAwIbAj<tV~kF^H~jAEB{;Gfj+Vn(RAE#%A{G
z7fv@4!qd|qmWPkl-Z!>w?B;Tt-mFu@E@GvM>?sj07I-VRVqt=w=(i}#XXJhuV9NDD
zA3ViXR5FSDl=&C<ir>g#;dpa#3l8*D@Ten*{VTBDSx#9gY2oz8zz3Ig&QIqeq{841
zeRbO#`lN|jUJrP&?`PH<)fEt7->`RwJUc^oJSsr3EmjXPSp)3EK?pW4QKU`&gM@H^
zN->8v#j^iYPQ0`C)U_Zf9oG3CYg*d0H-`Fos^{JmdyUC0d^@w3NJAV6!Ez$zyn#xl
zWCA)CX4_bUj%Ca3(Sf2!>xX5Z(8zV2F^mvlzqi4W?ZlZ0Dd4p8jY*e4(}1936}qe@
zPjv;MpzA6<FD-7pWbom#ApR`s6y1$yT!`NLZcLe$h!VSKsJ~;IgB3b3F;)G1eD$-B
z-IIVNxzAEHp6RXmLE{)^PH}lWQh3v@gJTm5VbEyK;sE($Oa%37H8kRd;iR7xY>t^r
zG1;>w9WAtt6toS9J2tMSEU9s*k8G8Ke!0*Gq5ad|plQ&{U<q0U1Oq+|2yQ0Ug=7Pq
z$S5yDs8HcwtdKv?gg$or?)uzXlk#fL4Dtpzk1%BB0H@#%>baxj>Levt+Z}?*RE#}E
z+~YWS?NaED&Z~T@Zhh}I1vWl-iPw6S5y!0L-#Sso9!<rX0xs<MvBVH0uTHDK6GNLY
z`I%0JX&&lWu)pK<#FDdw=<e7nc-Fry?nRu}4DYZ+vJ`a<F)7KL;S{`37M}A;7Sa96
z-ZRZD2oxjiObdawAs+XOe*dttU&Sfwf{mhaw3C#KhPk`lampWkO{k_T@q!Cmkz19^
zC-7N^IjRHLyeIq{y3k4b$(^$U?iY<p6Qe|Qr6qs2(4csGLFn}agWpLGW*_;(oZg%~
zhJZH;qjQ5`^HF@0K?-In2_J#yb~ai}f!9&&5vwNRnOa>*2grNie5lF$7+pdfFR<R%
zZV&>PRi=%l!H8EkA|F)@*@a<`Hjf_RXcS6`9S;SmKl!PGlDX~Z;cztF7QS5CbmFqF
zG9Gu{{cwllNBM`0uA}xX9j;y_?mO`69TPBIS}hl~O{vqK1VwZ4Ds#cstbe`lwNvmg
zI=$TK-%9uSy4>W+5tlI(zxzpQL>qm_djzW34wY?R#sPL3m0dor7EJ5pXj*NL7efS_
z;cyZprC@9N?t3?gcpqzgHhRXXh;m?oQd!C}r-tU{TOXc5x@=@Jz0m*;Sbj8ApGDO`
z#M%)jB*VX4ZBabD@+?P4Ag8o{73siwIV4d#Rw@%EQG)~?IZcO`&=0Jyu@+d#d@8!5
zggGEAQhNloW&?R+LYz|gDx=L86K%+z-}GL7{t^H4+}+*XCdB=<X&xbriWO>=F0IpL
zzQ9K);qPi~U2Jov<4tQAmAU$hR`*>C{HK1_tF4Cs8RC{*=RnTO37=3iz6-4sFCT3T
zss-N95TCz4&0<v(eM#?aX1w$*tu&NCGENFYdg0FcW^_bvQLLgR2mUj(Q`T?o+BTl<
zVB8k`n|dJ^K@CTc?VP$nDa$2;+cLaSxQuTj;MsoqC6+iy98Z@cW8WR-)|XYHUKu+^
zeikT($z1j3^3oi5<SycXPwmzOiE^p6W822LZ268de-pyZfuv9vwwGq2RK!JN`yh^|
zcq61c{3!B=L;$eNRy=ZoCN4_<)|(uRIF`E?mxyU|M<&ZK(jfgMo)Dz&<$tjG$Q4VA
ziY=@wDZFPzvHp&ig43lkD=fcvHpFwJIb_mO0~(xz^~rV=XH;+_1tqO+)n7lk%fM^>
zz0Fu*>Y*Z24EdW-_Ce&xQiyo3swlFMc5*)`{FcBkf1N*NN>wn5g-p#NsZ`K>Yt!U<
z6O@JWd6$UV$-_Ojp~dlV&_d8eJBFMHI51%C4L{?kO=!2>gY<ggWk~@ypEcej=PiY^
z<M(*R;grDaNAbrUwXkG)NQMr{c-6yaK5~pcB@6&13u_OcAS_DNii!7DIeoZPu-jKI
zvzk!v><XEUg0|>(X)a2oQ#r*&>oEy*=glhGD8s~z=s?WlW;g1UYD8V~_T-b=O`t(M
z(UqK~LYk4QOAS{hnP|3?ql2B$X$u_+(My%I54!SPb`2QAg6u|ALObCOoVkvr?XXWQ
z+<D7p*I9C8A%d?u&Y8jtEZb~esEu`5?$z|M{xdVuT&UP6Vg9Ow1xru01=Z4!v*^f9
zx_p(W{KIaW<#C6VZBKM$)$!G{1()3HW^>hx-pBk;Us>djQw<0e?$7IPavL5|jrf_W
zG2wB{Q^I6KL8gqu>IpdFm{|_jprEam<4+kKwTdv|F%xC?b|RyUYy;Qm0TVT$+?GTy
z=XO33+ea2j7N&7E#2)cDTx}e|uwwNA<%w(&JCS)0<ffQg93=|e+^Qxbky<K+Tjj%|
zp!{T_dkp1sVdc#Ok=5=-ilso-1=1*W1E2%gjcdbShf+w|$VZ>gSO<-phH!FFip2OO
zB&v0P>^`e-8MjMN@00s7jSU%vgyE8o2>XsNZOORSp>G@bqpCgz3Tlqc$isT~EoRtI
zxSrYcR-&m7+)ns;LFa28f}R6EvIB!m%UJ=RYqUM<;Fh-A;dZ8dra86Cyse|pj7{<g
z!YPHuO$}B*zh$uFJ?u(uo>7ajpD{wr;~<Hzl+h^4QcNMZ$3Kk4lc`uhX6sr!eMiA|
z@Z3LQ^mL6vqSjZ=kTxkR1(?9xsSeO|m!(RjNKGITh_<36o}W~Ew(A{F(Ex1K{U*u+
zIvfAmv8@x2jruV)yUGDPJ2m5M(BZQ$Cfs`5zU2|l!fav4L-b9rOdjNX^6C3yI3-``
z9UmE|w*a|Xz27O}Cb-gR>J@}*bSzEn;-&~y3O0hy)k0cl=w%q3(7zgU0MVhudmfM`
zK9iir_jsOCkAI}&f$V8-R%$>cJ=s_C?RFQ<CMC61<%bS~(xYCY^HeccmAPiyN|gnk
zKI1EL!D_N<vc1XLxCvfARa?}nMKCt9`qrJ;s+d!poei<}%}a<ROyfQ-NK#w45nQyB
z+oiZp+$N^hx^QBuiTnDlxw>~j_kx?g5tSWs)%!NCzmaG#v~grhadI(!G7~;+5iY@s
zUVC6LSLtd}x!rC)h*rNGlB~44AWo>V#lw=rvl{^n<Y{`xzqFl9Aii_vE`7f<ZR%}%
zL1Q<0&Wv)Pq5K4P)hVcUw+t?&=ZLqe>G6mOKXrSliO<=e6hmnbH+u&>qd2_%B|S_v
zywu<V*@p=O&%97q%h8SC(??0eEHx`J?rQe5ti#H;Rs$f@zH7^X{Ojf{Z`Kx<MxVy<
znUykCchaHqAEzqZTJD)6A1T=a(loOk110uZf|5SXtA!Bz-s6zE%+7CWH)Fq?^DmLu
z^8_iPzy<<%tIY>kY$H!p*ZZg9euu!QxX<{sA;xF`Y>`H8!n;UIobI%<jqsd2i_DAM
zhbgzyc&!DUn^Q27+MJmRi$|aQSj!O+UZ=pIi9oiLy@>f39jty%)+;Srh!=Mrga=Jf
ze4_Q!MT!^MpwP4i<^1XPvnQO?b+Q;^Qxh3jRduA7$aqvMMz9td*gK<WvWYTKGIU}*
zl3WotW=L=A)npb`+0Nz&vJ*rqC7Lf|`wcEbKo_<XMU~}^lG<FnhNK9?FWSZSbqu?B
z<xRJJe0BA4SN<DZ>%lOTlk-hb=ezm0(>Bzr9dhB>N2yBXsU?%ax5(#>%R74qy5^9p
z2K&zH-N|*2rUVwqFC0!AfSmS@tX~2%>s#;pvO|ZYC`HwDKJp{q)#;?z&dW!|es2We
zxy40&#!uKR6c<DulCBwZ-RCT5uUn!AM0)B&I)@|X1Rkne5HFm4hfj=}dhd=63lfp2
zTtnqC(gUveV-BKqNyc)SKxEXUW7T}id5(F?D<;Pb*3bu_qmnuJ9!u>I<jP%#<j#lZ
zDAsa=zP*%8HIO|LOXoqk5~GDAC9*#)wtpkfMaSlqbqp5rdWO9<n$3YedXb=_(39Z8
z4ID<L(~Wm;N_-gtzJDTb@On*I5uF45TB=|7)t-0)?%|M-F=VkT_pY#SLX&_hefyQ8
z0B5V$E@5@`4)%w;2M->Fg5+g%tJnI*bFCbYH1md)EcJpOsAr14FFAPnjC_9mpq&ZA
zDzM&%IWQKQKN@26vOEPNcZOR?jPj*%%cCmG!k_h)Jj%ebIa<w-U)bxq7jLJ*yuS#W
z7hsPOM_^7P+oi%<?Xl{C;>1N80W+T!Vn6HM!isuW=M+C#5UYHc(t}NGuWoOZOSc1&
z9r|5pRyYlx$RhP<L?ptXnjcu-y<Ak1k0<?gSKM;~Nka$Gip?IkdtovLJpg4UXP}y7
zc^4+iLqe#fmM6zmK7A}K)-lHLSz3?TEn!8eDO0S$)np9nD(~Ot7+fm{IwXi;W5#B|
z1k>9q;2`POxxTRDH#IHTXS0ieLG~et!=S4Me}~J1d26Aj*;Ue`r<KHb=|e5Ot%U%c
zHCbOf#Pb}6sc>3E5AE6cIOZ+RmaO}+tW5ov+<7ZV#OdTK%UH(Sm+&!jU=M6DBcg*L
zfDsp7(K2SvligVToO)zMT>)lf?}g=<DHf`e9=&tf7|har7b#6%K{muT@TC3VcDLU2
zRNH{}V&l!T*#qO?>^nko8Vdhp#JRV|<@uwW0?2Dg8Uudm&cb-f6u&)mOlp)-aTryX
za+1wgQk=<vTe(D@6b!2$!zS5vQvBHdKDk&nXT$`vAB<NU#q1$Z?yi8AxU8Z;PDMCu
zG=rwRhLZVNoj0&G=qnS}Nr>~k09NQkq0P8Ly;X-_b)A^=^^kS`w5_9SPHq*EJFCXm
zpIoD{kjmY+Nt&8jxMihJIZ_`p&yGhB!YQej!l9+Owp?Xg-}KN~Tg3e#6X)sfH97f(
zBo?{k79p7MT5;8iZN||!l+=ET6gJ8jzG(RjhAzgS)4o=@J|p60&{|P8lwJm(%p29J
z0K{?MQSVI)pBSKgh$JJ8uS|+;V5$igmZ82oYi_;QfHPx6(IGQQ>&25W&nxVab-Wz>
zh8jfANSE7BFULlXfgBu2M~Cs}*C%fbjQPQ4(O5#v|NN8393c1OkjwT<<Kv^E{ucPZ
zUqM51(tSohry~-S|M>O4+x!-3?%0R_9PK{@(qWj>Aj@9zm8<8;{~v#1lOxgl%7tn2
z{ja3|kxO@mk6)SS?ashV_-}2HWK8-1Lx3JPF6dtt{<b$cygiA|x22^eIXo@FYKXx^
zpn&Dlq0V>6{~NLR8NTuhMBW|X1gb%1AZCL#LWqHkuj0=G#1ZBu0&Q$B;FQCaxLeD`
z(LUj)1u~MhHLvLdmO@Z9Xd<Pv^79{BREaQ1>Y;9Fpe=qMi-qYDkVV~sZW5mi#7RCz
z{#}A%VdK&!Jg01TCstEaFh9$$r$S$}`n)PFtLB|fH$fHJOc=-^3W3z}N=oQ4v{JYO
zx|K4U+^_PO48>995gXZzS7DS$v2E*$;8Tr<NU^=TV{z5HiY67OiH9yx=Kf*Qbod`G
zJ9CvFijg#*h0A9nGcst7p8}Y{MsEBn3Gn)uhiO)sPld>SY$ZDZckCShv>&S|z3G@o
zka*QCC%wr_BkJN<PeAtZ7RPfwEakrBRaK4!FH4`%RGf<WbBrWa76lh<G?ZKawj`E<
z&<v)>|MEW{X%N_)8{Vywd}FU&$%KCl_gl+GkCQ?xGiF4}yL>KCC@Sjm?~8gQ0UY%B
zQ{(Poxos3?CP$Rr5ryN21nbiLJG^|408o&>pw87#3R-9z=ZtPP{14291xxq%La7FN
z`>XyBSf!N%=nyluHEPxWk1KngA)EGylzsDblT<gpVa<?ILJ#o%_AeAk1DOy(l}8;E
zWPAVP%yNPL3-&)5_`fg>3I#-{V8k+!Jwa~l)wmnFl?R@=bho_!N*g2@y5DARKp8#5
zF_Fd*I7Ah3rT>zJFE8Df@j+IRF3a}roF9vMp)IP2f<5%FR_$a8(tRsrrS)gob2)cn
zv^K9=wf?fqq#j5XA%ni>t=3A?v)8+pt<u#2*5R-Ci2sTm8SC$~VI}cy^$)YUADK-_
zJo-CM%AtXuTI4bM?|9z_mR(GaK5e$T@6jcB{^oD<Cw?~*Kw_Ua=R(f88(eCPjr+Tx
zVABF-hvDh>i^vg-)%ag0cN70I4%7QWtn#<oW54wga64V|k_8lo77K3a|6O@L1b&i;
zMUkO<gxolzA;lkIb)WNqS?lkZlScyDM3qvogA3^C7TQ$55wJu4a-Xy~5YKKor9(_)
zXZ(NE0V&)7JL4Ld|Ei8WIlr~hs^5AGr3Qi(eMRx*i0BXhnH<mob?#v5bAlT-!#~lI
zlBo_bt6<3Q`%|GP89-We$Mbjwh&?KRirRgR=iGk?Y6r^z!2}nxvv1cc{1YtyBEZY`
z?t|ffI+4fpw>G>*TMEI_rx+hDxxGu6^8Yr=4G^Tzt6=&tC`$I98$DL94j_M_piTBC
z3i)t<=hI7OZ8{k`5kR3tD)qSMe}p0Ej09+~Z96>Z2@ykeE6w!(iT?4@ap^^s-={z2
zfq*K{ZC%8aO~-SIkN<0R?i)Y*_dgr#$^v~v<EI2a)F9r#{|BE+z%c1<5W%1DAwvbQ
zfrgYK&VUic`rAPnHae{ee<~yi*md!S{w3hm2mja=%&;Iufb*wOJv7L_3n7_r_ZLE}
z|Ln`?Fn-9jlN}W-{TaXi>Cnhhf4esIf+hcN^#7CIbX>nPwv$olPo4ie@&CVFcrT@B
Wo6M<KOyTeV_<$7D<;!GEg8vJBRskpg

diff --git a/web/public/index.html b/web/public/index.html
index 2ec6d7d..4ce0ddd 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -5,8 +5,24 @@
     <meta name="description" content="An alternative integrations manager for Riot. Check out #dimension:t2l.io for more information.">
 
     <title>Dimension</title>
-    <link rel="icon" type="image/x-icon" href="/img/favicon.ico">
-    <link rel="icon" type="image/png" href="/img/favicon.png">
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/img/logo/favicon/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/img/logo/favicon//apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/img/logo/favicon//apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/img/logo/favicon//apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/img/logo/favicon//apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/img/logo/favicon//apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/img/logo/favicon//apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/img/logo/favicon//apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/img/logo/favicon//apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/img/logo/favicon//android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/img/logo/favicon//favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/img/logo/favicon//favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/img/logo/favicon//favicon-16x16.png">
+    <link rel="manifest" href="/img/logo/favicon//manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/img/logo/favicon//ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
 

From 3f0f8160076ae517d6db7a19219851c0de5fe7aa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 18:47:41 -0700
Subject: [PATCH 039/111] Start of an admin section

---
 web/app/admin/admin.component.html            |  9 ++++
 web/app/admin/admin.component.scss            | 49 +++++++++++++++++++
 web/app/admin/admin.component.ts              | 31 ++++++++++++
 web/app/admin/home/home.component.html        |  1 +
 web/app/admin/home/home.component.scss        |  0
 web/app/admin/home/home.component.ts          | 11 +++++
 web/app/admin/test1/home.component.html       |  1 +
 web/app/admin/test1/home.component.scss       |  0
 web/app/admin/test1/home.component.ts         | 11 +++++
 web/app/admin/test2/home.component.html       | 34 +++++++++++++
 web/app/admin/test2/home.component.scss       |  0
 web/app/admin/test2/home.component.ts         | 11 +++++
 web/app/app.module.ts                         |  9 ++++
 web/app/app.routing.ts                        | 25 ++++++++++
 web/app/riot/riot-home/home.component.ts      | 10 ++++
 web/app/riot/riot.component.html              |  5 +-
 web/app/riot/riot.component.ts                |  8 +++
 .../scalar-close/scalar-close.component.html  |  4 +-
 .../scalar-close/scalar-close.component.scss  | 10 ----
 .../scalar-close/scalar-close.component.ts    |  1 +
 web/app/shared/SessionStorage.ts              |  1 +
 web/app/shared/services/admin-api.service.ts  |  4 ++
 web/style/_riot.scss                          | 18 ++++++-
 23 files changed, 240 insertions(+), 13 deletions(-)
 create mode 100644 web/app/admin/admin.component.html
 create mode 100644 web/app/admin/admin.component.scss
 create mode 100644 web/app/admin/admin.component.ts
 create mode 100644 web/app/admin/home/home.component.html
 create mode 100644 web/app/admin/home/home.component.scss
 create mode 100644 web/app/admin/home/home.component.ts
 create mode 100644 web/app/admin/test1/home.component.html
 create mode 100644 web/app/admin/test1/home.component.scss
 create mode 100644 web/app/admin/test1/home.component.ts
 create mode 100644 web/app/admin/test2/home.component.html
 create mode 100644 web/app/admin/test2/home.component.scss
 create mode 100644 web/app/admin/test2/home.component.ts

diff --git a/web/app/admin/admin.component.html b/web/app/admin/admin.component.html
new file mode 100644
index 0000000..f8db80f
--- /dev/null
+++ b/web/app/admin/admin.component.html
@@ -0,0 +1,9 @@
+<ul class="adminNav">
+    <li (click)="goto('')" [ngClass]="[isActive('', true) ? 'active' : '']">Dashboard</li>
+    <li (click)="goto('test1')" [ngClass]="[isActive('test1') ? 'active' : '']">Test 1</li>
+    <li (click)="goto('test2')" [ngClass]="[isActive('test2') ? 'active' : '']">Test 2</li>
+</ul>
+
+<div class="adminContent">
+    <router-outlet></router-outlet>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/admin.component.scss b/web/app/admin/admin.component.scss
new file mode 100644
index 0000000..7fbda52
--- /dev/null
+++ b/web/app/admin/admin.component.scss
@@ -0,0 +1,49 @@
+//$bgColor: #625F72;
+//$hoverColor: #6E8ABC;
+//$accentColor: #8ABBFF;
+
+$bgColor: #233046;
+$hoverColor: #374752;
+$accentColor: #DE6657;
+
+.adminNav {
+  width: 200px;
+  margin: 0;
+  padding: 0;
+  position: fixed;
+  top: 120px;
+  left: 0;
+  bottom: 0;
+  background-color: $bgColor;
+}
+
+.adminNav li {
+  list-style: none;
+  background-color: $bgColor;
+  border-left: 5px solid $bgColor;
+  padding: 5px 5px 5px 11px;
+  color: #fff;
+  opacity: 0.5;
+  cursor: pointer;
+}
+
+.adminNav li:hover,
+.adminNav li.active {
+  opacity: 1;
+  background-color: $hoverColor;
+  border-left: 5px solid $hoverColor;
+}
+
+.adminNav li.active {
+  border-left: 5px solid $accentColor;
+}
+
+.adminContent {
+  position: fixed;
+  top: 120px;
+  left: 200px;
+  bottom: 0;
+  right: 0;
+  padding: 15px;
+  overflow: auto;
+}
\ No newline at end of file
diff --git a/web/app/admin/admin.component.ts b/web/app/admin/admin.component.ts
new file mode 100644
index 0000000..fc7c48e
--- /dev/null
+++ b/web/app/admin/admin.component.ts
@@ -0,0 +1,31 @@
+import { Component } from "@angular/core";
+import { Router } from "@angular/router";
+
+@Component({
+    templateUrl: "./admin.component.html",
+    styleUrls: ["./admin.component.scss"],
+})
+export class AdminComponent {
+
+    constructor(private router: Router) {
+    }
+
+    public goto(adminRoute: string) {
+        const currentRoute = this.router.routerState.snapshot.url;
+        const baseRoute = currentRoute.substring(0, currentRoute.indexOf("/admin"));
+
+        const route = adminRoute ? [baseRoute, "admin", adminRoute] : [baseRoute, "admin"];
+        this.router.navigate(route);
+    }
+
+    public isActive(adminRoute: string, exact?: boolean) {
+        let currentRoute = this.router.routerState.snapshot.url;
+        currentRoute = currentRoute.substring(currentRoute.indexOf('/admin'));
+
+        // Specifically for the dashboard handling
+        if (adminRoute === "" && !currentRoute.endsWith("/")) currentRoute = currentRoute + "/";
+
+        if (exact) return currentRoute === "/admin/" + adminRoute;
+        return currentRoute.startsWith("/admin/" + adminRoute);
+    }
+}
diff --git a/web/app/admin/home/home.component.html b/web/app/admin/home/home.component.html
new file mode 100644
index 0000000..e3c0a2c
--- /dev/null
+++ b/web/app/admin/home/home.component.html
@@ -0,0 +1 @@
+<h1>This is the admin section</h1>
\ No newline at end of file
diff --git a/web/app/admin/home/home.component.scss b/web/app/admin/home/home.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/home/home.component.ts b/web/app/admin/home/home.component.ts
new file mode 100644
index 0000000..9183ab8
--- /dev/null
+++ b/web/app/admin/home/home.component.ts
@@ -0,0 +1,11 @@
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "./home.component.html",
+    styleUrls: ["./home.component.scss"],
+})
+export class AdminHomeComponent {
+
+    constructor() {
+    }
+}
diff --git a/web/app/admin/test1/home.component.html b/web/app/admin/test1/home.component.html
new file mode 100644
index 0000000..235445d
--- /dev/null
+++ b/web/app/admin/test1/home.component.html
@@ -0,0 +1 @@
+<h1>Test 1</h1>
\ No newline at end of file
diff --git a/web/app/admin/test1/home.component.scss b/web/app/admin/test1/home.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/test1/home.component.ts b/web/app/admin/test1/home.component.ts
new file mode 100644
index 0000000..15def28
--- /dev/null
+++ b/web/app/admin/test1/home.component.ts
@@ -0,0 +1,11 @@
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "./home.component.html",
+    styleUrls: ["./home.component.scss"],
+})
+export class Test1Component {
+
+    constructor() {
+    }
+}
diff --git a/web/app/admin/test2/home.component.html b/web/app/admin/test2/home.component.html
new file mode 100644
index 0000000..c17c405
--- /dev/null
+++ b/web/app/admin/test2/home.component.html
@@ -0,0 +1,34 @@
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
+<h1>Test 2</h1>
diff --git a/web/app/admin/test2/home.component.scss b/web/app/admin/test2/home.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/test2/home.component.ts b/web/app/admin/test2/home.component.ts
new file mode 100644
index 0000000..097d276
--- /dev/null
+++ b/web/app/admin/test2/home.component.ts
@@ -0,0 +1,11 @@
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "./home.component.html",
+    styleUrls: ["./home.component.scss"],
+})
+export class Test2Component {
+
+    constructor() {
+    }
+}
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index c23d34e..d7a127e 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -40,6 +40,10 @@ import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gd
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
+import { AdminComponent } from "./admin/admin.component";
+import { AdminHomeComponent } from "./admin/home/home.component";
+import { Test1Component } from "./admin/test1/home.component";
+import { Test2Component } from "./admin/test2/home.component";
 
 @NgModule({
     imports: [
@@ -79,6 +83,11 @@ import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.w
         JitsiWidgetConfigComponent,
         TwitchWidgetConfigComponent,
         YoutubeWidgetConfigComponent,
+        AdminComponent,
+        AdminHomeComponent,
+
+        Test1Component,
+        Test2Component,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index cbf414c..eef6367 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -13,6 +13,10 @@ import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gd
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
+import { AdminComponent } from "./admin/admin.component";
+import { AdminHomeComponent } from "./admin/home/home.component";
+import { Test1Component } from "./admin/test1/home.component";
+import { Test2Component } from "./admin/test2/home.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -26,6 +30,27 @@ const routes: Routes = [
                 path: "",
                 component: RiotHomeComponent,
             },
+            {
+                path: "admin",
+                component: AdminComponent,
+                data: {breadcrumb:"Admin", name: "Settings"},
+                children: [
+                    {
+                        path: "",
+                        component: AdminHomeComponent,
+                    },
+                    {
+                        path: "test1",
+                        component: Test1Component,
+                        data: {breadcrumb:"Test1", name: "Test1"},
+                    },
+                    {
+                        path: "test2",
+                        component: Test2Component,
+                        data: {breadcrumb:"Test2", name: "Test2"},
+                    },
+                ],
+            },
             {
                 path: "widget",
                 children: [
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 9e149ef..29eaf93 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -8,6 +8,7 @@ import { DimensionApiService } from "../../shared/services/dimension-api.service
 import { Integration, IntegrationRequirement } from "../../shared/models/integration";
 import { IntegrationService } from "../../shared/services/integration.service";
 import { SessionStorage } from "../../shared/SessionStorage";
+import { AdminApiService } from "../../shared/services/admin-api.service";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -37,6 +38,7 @@ export class RiotHomeComponent {
                 private scalarApi: ScalarServerApiService,
                 private scalar: ScalarClientApiService,
                 private dimensionApi: DimensionApiService,
+                private adminApi: AdminApiService,
                 private toaster: ToasterService,
                 private router: Router) {
         let params: any = this.activatedRoute.snapshot.queryParams;
@@ -73,6 +75,7 @@ export class RiotHomeComponent {
                 } else {
                     this.userId = userId;
                     console.log("Scalar token belongs to " + userId);
+                    this.checkAdmin();
                     this.prepareIntegrations();
                 }
             }).catch(err => {
@@ -84,6 +87,13 @@ export class RiotHomeComponent {
         }
     }
 
+    private checkAdmin() {
+        this.adminApi.isAdmin().then(() => {
+            console.log(SessionStorage.userId + " is an admin for this Dimension instance");
+            SessionStorage.isAdmin = true;
+        }).catch(() => SessionStorage.isAdmin = false);
+    }
+
     public hasIntegrations(): boolean {
         for (const category of this.getCategories()) {
             if (this.getIntegrationsIn(category).length > 0) return true;
diff --git a/web/app/riot/riot.component.html b/web/app/riot/riot.component.html
index 3e70586..3799567 100644
--- a/web/app/riot/riot.component.html
+++ b/web/app/riot/riot.component.html
@@ -1,6 +1,9 @@
 <div id="wrapper">
     <my-page-header>
-        <my-scalar-close class="closeButton"></my-scalar-close>
+        <span class="adminButton headerButton" *ngIf="isAdmin()" routerLink="/riot-app/admin/">
+            <i class="fa fa-cog"></i>
+        </span>
+        <my-scalar-close class="closeButton headerButton"></my-scalar-close>
     </my-page-header>
 
     <div class="page-content">
diff --git a/web/app/riot/riot.component.ts b/web/app/riot/riot.component.ts
index 52219a9..258c99d 100644
--- a/web/app/riot/riot.component.ts
+++ b/web/app/riot/riot.component.ts
@@ -1,4 +1,5 @@
 import { Component } from "@angular/core";
+import { SessionStorage } from "../shared/SessionStorage";
 
 @Component({
     selector: "my-riot",
@@ -6,4 +7,11 @@ import { Component } from "@angular/core";
     styleUrls: ["./riot.component.scss"],
 })
 export class RiotComponent {
+
+    constructor() {
+    }
+
+    public isAdmin(): boolean {
+        return SessionStorage.isAdmin;
+    }
 }
diff --git a/web/app/riot/scalar-close/scalar-close.component.html b/web/app/riot/scalar-close/scalar-close.component.html
index a6d4d5c..355965e 100644
--- a/web/app/riot/scalar-close/scalar-close.component.html
+++ b/web/app/riot/scalar-close/scalar-close.component.html
@@ -1 +1,3 @@
-<i class="far fa-times-circle scalarClose" (click)="closeScalar()"></i>
\ No newline at end of file
+<span class="scalarClose" (click)="closeScalar()">
+    <i class="far fa-times-circle"></i>
+</span>
\ No newline at end of file
diff --git a/web/app/riot/scalar-close/scalar-close.component.scss b/web/app/riot/scalar-close/scalar-close.component.scss
index a30ea6a..e69de29 100644
--- a/web/app/riot/scalar-close/scalar-close.component.scss
+++ b/web/app/riot/scalar-close/scalar-close.component.scss
@@ -1,10 +0,0 @@
-// component styles are encapsulated and only applied to their components
-.scalarClose {
-  font-size: 35px;
-  cursor: pointer;
-  color: #ccc;
-}
-
-.scalarClose:hover {
-  color: #888;
-}
\ No newline at end of file
diff --git a/web/app/riot/scalar-close/scalar-close.component.ts b/web/app/riot/scalar-close/scalar-close.component.ts
index 9d1e85f..265f248 100644
--- a/web/app/riot/scalar-close/scalar-close.component.ts
+++ b/web/app/riot/scalar-close/scalar-close.component.ts
@@ -12,6 +12,7 @@ export class ScalarCloseComponent {
     }
 
     public closeScalar() {
+        console.log("Closing scalar...");
         this.scalar.close();
     }
 }
diff --git a/web/app/shared/SessionStorage.ts b/web/app/shared/SessionStorage.ts
index d6a6926..6af9a36 100644
--- a/web/app/shared/SessionStorage.ts
+++ b/web/app/shared/SessionStorage.ts
@@ -5,6 +5,7 @@ export class SessionStorage {
     public static scalarToken: string;
     public static userId: string;
     public static roomId: string;
+    public static isAdmin: boolean;
     public static editIntegration: Integration;
     public static editIntegrationId: string;
     public static editsRequested = 0;
diff --git a/web/app/shared/services/admin-api.service.ts b/web/app/shared/services/admin-api.service.ts
index 7bda7cd..5f07674 100644
--- a/web/app/shared/services/admin-api.service.ts
+++ b/web/app/shared/services/admin-api.service.ts
@@ -7,4 +7,8 @@ export class AdminApiService extends AuthedApi {
     constructor(http: Http) {
         super(http);
     }
+
+    public isAdmin(): Promise<any> {
+        return this.authedGet("/api/v1/dimension/admin/info").map(r => r.json()).toPromise();
+    }
 }
diff --git a/web/style/_riot.scss b/web/style/_riot.scss
index 2214b7f..704ba1a 100644
--- a/web/style/_riot.scss
+++ b/web/style/_riot.scss
@@ -28,6 +28,22 @@
 
 .header .quickAction .closeButton .scalarClose {
   position: absolute;
-  top: 25px;
+  top: 19px;
   right: 15px;
+}
+
+.header .quickAction .adminButton {
+  position: absolute;
+  top: 19px;
+  right: 55px;
+}
+
+.header .quickAction .headerButton {
+  font-size: 35px;
+  cursor: pointer;
+  color: #ccc;
+}
+
+.header .quickAction .headerButton:hover {
+  color: #888;
 }
\ No newline at end of file

From 441bef56063f82da09dd545ae5563aeafc6977b0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 19:45:34 -0700
Subject: [PATCH 040/111] Add a landing page of sorts to the admin section

---
 package-lock.json                             | 26 ++++++++-
 package.json                                  |  1 +
 src-ts/api/dimension/DimensionAdminService.ts | 56 ++++++++++++++++---
 src-ts/index.ts                               |  3 +-
 src-ts/matrix/MatrixLiteClient.ts             | 17 +++++-
 src-ts/matrix/MatrixOpenIdClient.ts           |  2 -
 src-ts/matrix/helpers.ts                      |  1 +
 src-ts/version.ts                             | 12 ++++
 web/app/admin/admin.component.html            |  3 +-
 web/app/admin/admin.component.scss            | 11 ++++
 web/app/admin/admin.component.ts              |  6 +-
 web/app/admin/home/home.component.html        | 34 ++++++++++-
 web/app/admin/home/home.component.scss        |  3 +
 web/app/admin/home/home.component.ts          | 11 +++-
 web/app/admin/test1/home.component.html       |  1 -
 web/app/admin/test1/home.component.scss       |  0
 web/app/admin/test1/home.component.ts         | 11 ----
 web/app/admin/test2/home.component.html       | 34 -----------
 web/app/admin/test2/home.component.scss       |  0
 web/app/admin/test2/home.component.ts         | 11 ----
 web/app/app.module.ts                         |  5 --
 web/app/app.routing.ts                        | 14 +----
 web/app/elements/ibox/ibox.component.html     |  2 +-
 web/app/home/home.component.ts                |  2 +-
 web/app/shared/models/admin_responses.ts      | 13 +++++
 web/app/shared/services/admin-api.service.ts  | 11 +++-
 26 files changed, 193 insertions(+), 97 deletions(-)
 create mode 100644 src-ts/version.ts
 delete mode 100644 web/app/admin/test1/home.component.html
 delete mode 100644 web/app/admin/test1/home.component.scss
 delete mode 100644 web/app/admin/test1/home.component.ts
 delete mode 100644 web/app/admin/test2/home.component.html
 delete mode 100644 web/app/admin/test2/home.component.scss
 delete mode 100644 web/app/admin/test2/home.component.ts
 create mode 100644 web/app/shared/models/admin_responses.ts

diff --git a/package-lock.json b/package-lock.json
index e78e918..8930791 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3000,6 +3000,28 @@
         "assert-plus": "1.0.0"
       }
     },
+    "git-rev-sync": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.9.1.tgz",
+      "integrity": "sha1-oMLj3TkqvPa3aWLif8dfsyI0Sc4=",
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "graceful-fs": "4.1.11",
+        "shelljs": "0.7.7"
+      },
+      "dependencies": {
+        "shelljs": {
+          "version": "0.7.7",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz",
+          "integrity": "sha1-svXHfvlxSPS09uImguELuoZnz/E=",
+          "requires": {
+            "glob": "7.1.2",
+            "interpret": "1.0.3",
+            "rechoir": "0.6.2"
+          }
+        }
+      }
+    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
@@ -3670,8 +3692,7 @@
     "interpret": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
-      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
-      "dev": true
+      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A="
     },
     "invert-kv": {
       "version": "1.0.0",
@@ -7303,7 +7324,6 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
       "requires": {
         "resolve": "1.4.0"
       }
diff --git a/package.json b/package.json
index 5935e30..3f3f353 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "config": "^1.28.1",
     "dns-then": "^0.1.0",
     "express": "^4.16.2",
+    "git-rev-sync": "^1.9.1",
     "js-yaml": "^3.10.0",
     "lodash": "^4.17.4",
     "matrix-js-sdk": "^0.9.2",
diff --git a/src-ts/api/dimension/DimensionAdminService.ts b/src-ts/api/dimension/DimensionAdminService.ts
index 6f061e8..9d70638 100644
--- a/src-ts/api/dimension/DimensionAdminService.ts
+++ b/src-ts/api/dimension/DimensionAdminService.ts
@@ -3,9 +3,21 @@ import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
 import config from "../../config";
 import { ApiError } from "../ApiError";
+import { MatrixLiteClient } from "../../matrix/MatrixLiteClient";
+import { CURRENT_VERSION } from "../../version";
 
-interface DimensionInfoResponse {
-    admins: string[],
+interface DimensionVersionResponse {
+    version: string;
+}
+
+interface DimensionConfigResponse {
+    admins: string[];
+    widgetBlacklist: string[];
+    homeserver: {
+        name: string;
+        userId: string;
+        federationUrl: string;
+    };
 }
 
 @Path("/api/v1/dimension/admin")
@@ -24,12 +36,42 @@ export class DimensionAdminService {
     }
 
     @GET
-    @Path("info")
-    public getInfo(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionInfoResponse> {
+    @Path("check")
+    public checkIfAdmin(@QueryParam("scalar_token") scalarToken: string): Promise<{}> {
         return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            // Only let admins see other admins
-            // A 200 OK essentially means "you're an admin".
-            return {admins: config.admins};
+            return {}; // A 200 OK essentially means "you're an admin".
         });
     }
+
+    @GET
+    @Path("version")
+    public getVersion(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionVersionResponse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return {version: CURRENT_VERSION};
+        });
+    }
+
+    @GET
+    @Path("config")
+    public getConfig(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionConfigResponse> {
+        const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
+        const response: DimensionConfigResponse = {
+            admins: config.admins,
+            widgetBlacklist: config.widgetBlacklist,
+            homeserver: {
+                name: config.homeserver.name,
+                userId: "", // populated below
+                federationUrl: "", // populated below
+            },
+        };
+
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return client.whoAmI();
+        }).then(userId => {
+            response.homeserver.userId = userId;
+            return client.getFederationUrl();
+        }).then(url => {
+            response.homeserver.federationUrl = url;
+        }).then(() => response);
+    }
 }
\ No newline at end of file
diff --git a/src-ts/index.ts b/src-ts/index.ts
index ac720b8..17d2463 100644
--- a/src-ts/index.ts
+++ b/src-ts/index.ts
@@ -2,9 +2,10 @@ import { LogService } from "matrix-js-snippets";
 import config from "./config";
 import { DimensionStore } from "./db/DimensionStore";
 import Webserver from "./api/Webserver";
+import { CURRENT_VERSION } from "./version";
 
 LogService.configure(config.logging);
-LogService.info("index", "Starting voyager...");
+LogService.info("index", "Starting dimension " + CURRENT_VERSION);
 
 const webserver = new Webserver();
 
diff --git a/src-ts/matrix/MatrixLiteClient.ts b/src-ts/matrix/MatrixLiteClient.ts
index ccde92e..faf8782 100644
--- a/src-ts/matrix/MatrixLiteClient.ts
+++ b/src-ts/matrix/MatrixLiteClient.ts
@@ -1,5 +1,5 @@
 import * as Promise from "bluebird";
-import { doFederatedApiCall } from "./helpers";
+import { doFederatedApiCall, getFederationUrl as getFedUrl } from "./helpers";
 
 export interface MatrixUrlPreview {
     // This is really the only parameter we care about
@@ -11,6 +11,10 @@ export class MatrixLiteClient {
     constructor(private homeserverName: string, private accessToken: string) {
     }
 
+    public getFederationUrl(): Promise<string> {
+        return getFedUrl(this.homeserverName);
+    }
+
     public getUrlPreview(url: string): Promise<MatrixUrlPreview> {
         return doFederatedApiCall(
             "GET",
@@ -21,4 +25,15 @@ export class MatrixLiteClient {
             return response;
         });
     }
+
+    public whoAmI(): Promise<string> {
+        return doFederatedApiCall(
+            "GET",
+            this.homeserverName,
+            "/_matrix/client/r0/account/whoami",
+            {access_token: this.accessToken}
+        ).then(response => {
+            return response["user_id"];
+        });
+    }
 }
diff --git a/src-ts/matrix/MatrixOpenIdClient.ts b/src-ts/matrix/MatrixOpenIdClient.ts
index fe516f5..beec738 100644
--- a/src-ts/matrix/MatrixOpenIdClient.ts
+++ b/src-ts/matrix/MatrixOpenIdClient.ts
@@ -14,8 +14,6 @@ export class MatrixOpenIdClient {
             "/_matrix/federation/v1/openid/userinfo",
             {access_token: this.openId.access_token}
         ).then(response => {
-            // Annoyingly, the response isn't JSON for this
-            response = JSON.parse(response);
             return response['sub'];
         });
     }
diff --git a/src-ts/matrix/helpers.ts b/src-ts/matrix/helpers.ts
index 0e2543e..97c16ae 100644
--- a/src-ts/matrix/helpers.ts
+++ b/src-ts/matrix/helpers.ts
@@ -53,6 +53,7 @@ export function doFederatedApiCall(method: string, serverName: string, endpoint:
                     LogService.error("matrix", "Got status code " + res.statusCode + " while calling " + endpoint);
                     reject(new Error("Error in request: invalid status code"));
                 } else {
+                    if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
                     resolve(res.body);
                 }
             });
diff --git a/src-ts/version.ts b/src-ts/version.ts
new file mode 100644
index 0000000..ec868fb
--- /dev/null
+++ b/src-ts/version.ts
@@ -0,0 +1,12 @@
+import { LogService } from "matrix-js-snippets";
+import * as git from "git-rev-sync";
+
+let version = "Unknown";
+
+try {
+    version = "v" + require("../../package.json").version;
+} catch (error) {
+    LogService.error("version", error);
+}
+
+export const CURRENT_VERSION = version + "-" + git.short();
diff --git a/web/app/admin/admin.component.html b/web/app/admin/admin.component.html
index f8db80f..0a269de 100644
--- a/web/app/admin/admin.component.html
+++ b/web/app/admin/admin.component.html
@@ -1,8 +1,7 @@
 <ul class="adminNav">
     <li (click)="goto('')" [ngClass]="[isActive('', true) ? 'active' : '']">Dashboard</li>
-    <li (click)="goto('test1')" [ngClass]="[isActive('test1') ? 'active' : '']">Test 1</li>
-    <li (click)="goto('test2')" [ngClass]="[isActive('test2') ? 'active' : '']">Test 2</li>
 </ul>
+<span class="version">{{ version }}</span>
 
 <div class="adminContent">
     <router-outlet></router-outlet>
diff --git a/web/app/admin/admin.component.scss b/web/app/admin/admin.component.scss
index 7fbda52..c64395d 100644
--- a/web/app/admin/admin.component.scss
+++ b/web/app/admin/admin.component.scss
@@ -46,4 +46,15 @@ $accentColor: #DE6657;
   right: 0;
   padding: 15px;
   overflow: auto;
+}
+
+.version {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 200px;
+  text-align: center;
+  color: #7d7d7d;
+  font-size: 11px;
+  font-family: monospace;
 }
\ No newline at end of file
diff --git a/web/app/admin/admin.component.ts b/web/app/admin/admin.component.ts
index fc7c48e..2505d56 100644
--- a/web/app/admin/admin.component.ts
+++ b/web/app/admin/admin.component.ts
@@ -1,5 +1,6 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
+import { AdminApiService } from "../shared/services/admin-api.service";
 
 @Component({
     templateUrl: "./admin.component.html",
@@ -7,7 +8,10 @@ import { Router } from "@angular/router";
 })
 export class AdminComponent {
 
-    constructor(private router: Router) {
+    public version = "";
+
+    constructor(private router: Router, adminApi: AdminApiService) {
+        adminApi.getVersion().then(r => this.version = r.version);
     }
 
     public goto(adminRoute: string) {
diff --git a/web/app/admin/home/home.component.html b/web/app/admin/home/home.component.html
index e3c0a2c..98c9a8a 100644
--- a/web/app/admin/home/home.component.html
+++ b/web/app/admin/home/home.component.html
@@ -1 +1,33 @@
-<h1>This is the admin section</h1>
\ No newline at end of file
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox title="Configuration">
+        <div class="my-ibox-content">
+            <p>Parts of your configuration are displayed below. To change these values, edit your configuration and restart Dimension.</p>
+
+            <div class="row">
+                <div class="col-md-4">
+                    <strong>Administrators</strong>
+                    <ul>
+                        <li *ngFor="let user of config.admins trackById">{{ user }}</li>
+                    </ul>
+                </div>
+                <div class="col-md-4">
+                    <strong>Widget Blacklist</strong>
+                    <ul>
+                        <li *ngFor="let ip of config.widgetBlacklist trackById">{{ ip }}</li>
+                    </ul>
+                </div>
+                <div class="col-md-4">
+                    <strong>Homeserver</strong><br />
+                    Name: {{ config.homeserver.name }}<br />
+                    Federation URL: {{ config.homeserver.federationUrl }}<br />
+                    <!-- Dimension makes no distinction for the csapi -->
+                    Client/Server URL: {{ config.homeserver.federationUrl }}<br />
+                    User ID: {{ config.homeserver.userId }}
+                </div>
+            </div>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/home/home.component.scss b/web/app/admin/home/home.component.scss
index e69de29..af93ad3 100644
--- a/web/app/admin/home/home.component.scss
+++ b/web/app/admin/home/home.component.scss
@@ -0,0 +1,3 @@
+ul {
+  padding-left: 25px;
+}
\ No newline at end of file
diff --git a/web/app/admin/home/home.component.ts b/web/app/admin/home/home.component.ts
index 9183ab8..83d67b0 100644
--- a/web/app/admin/home/home.component.ts
+++ b/web/app/admin/home/home.component.ts
@@ -1,4 +1,6 @@
 import { Component } from "@angular/core";
+import { AdminApiService } from "../../shared/services/admin-api.service";
+import { DimensionConfigResponse } from "../../shared/models/admin_responses";
 
 @Component({
     templateUrl: "./home.component.html",
@@ -6,6 +8,13 @@ import { Component } from "@angular/core";
 })
 export class AdminHomeComponent {
 
-    constructor() {
+    public isLoading = true;
+    public config: DimensionConfigResponse;
+
+    constructor(adminApi: AdminApiService) {
+        adminApi.getConfig().then(config => {
+            this.config = config;
+            this.isLoading = false;
+        });
     }
 }
diff --git a/web/app/admin/test1/home.component.html b/web/app/admin/test1/home.component.html
deleted file mode 100644
index 235445d..0000000
--- a/web/app/admin/test1/home.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Test 1</h1>
\ No newline at end of file
diff --git a/web/app/admin/test1/home.component.scss b/web/app/admin/test1/home.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/web/app/admin/test1/home.component.ts b/web/app/admin/test1/home.component.ts
deleted file mode 100644
index 15def28..0000000
--- a/web/app/admin/test1/home.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-    templateUrl: "./home.component.html",
-    styleUrls: ["./home.component.scss"],
-})
-export class Test1Component {
-
-    constructor() {
-    }
-}
diff --git a/web/app/admin/test2/home.component.html b/web/app/admin/test2/home.component.html
deleted file mode 100644
index c17c405..0000000
--- a/web/app/admin/test2/home.component.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
-<h1>Test 2</h1>
diff --git a/web/app/admin/test2/home.component.scss b/web/app/admin/test2/home.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/web/app/admin/test2/home.component.ts b/web/app/admin/test2/home.component.ts
deleted file mode 100644
index 097d276..0000000
--- a/web/app/admin/test2/home.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-    templateUrl: "./home.component.html",
-    styleUrls: ["./home.component.scss"],
-})
-export class Test2Component {
-
-    constructor() {
-    }
-}
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index d7a127e..2749a40 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -42,8 +42,6 @@ import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widg
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
 import { AdminComponent } from "./admin/admin.component";
 import { AdminHomeComponent } from "./admin/home/home.component";
-import { Test1Component } from "./admin/test1/home.component";
-import { Test2Component } from "./admin/test2/home.component";
 
 @NgModule({
     imports: [
@@ -86,9 +84,6 @@ import { Test2Component } from "./admin/test2/home.component";
         AdminComponent,
         AdminHomeComponent,
 
-        Test1Component,
-        Test2Component,
-
         // Vendor
     ],
     providers: [
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index eef6367..0cf9e20 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -15,8 +15,6 @@ import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widg
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
 import { AdminComponent } from "./admin/admin.component";
 import { AdminHomeComponent } from "./admin/home/home.component";
-import { Test1Component } from "./admin/test1/home.component";
-import { Test2Component } from "./admin/test2/home.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -33,22 +31,12 @@ const routes: Routes = [
             {
                 path: "admin",
                 component: AdminComponent,
-                data: {breadcrumb:"Admin", name: "Settings"},
+                data: {breadcrumb: "Admin", name: "Settings"},
                 children: [
                     {
                         path: "",
                         component: AdminHomeComponent,
                     },
-                    {
-                        path: "test1",
-                        component: Test1Component,
-                        data: {breadcrumb:"Test1", name: "Test1"},
-                    },
-                    {
-                        path: "test2",
-                        component: Test2Component,
-                        data: {breadcrumb:"Test2", name: "Test2"},
-                    },
                 ],
             },
             {
diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index 6d6dd30..93d6b83 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -1,5 +1,5 @@
 <div class="ibox">
-    <div class="ibox-title" (click)="collapsed = !collapsed"
+    <div class="ibox-title" (click)="isCollapsible ? (collapsed = !collapsed) : false"
          [ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']">
         <h5 *ngIf="title">
             {{ title }}
diff --git a/web/app/home/home.component.ts b/web/app/home/home.component.ts
index f75ca23..b353465 100644
--- a/web/app/home/home.component.ts
+++ b/web/app/home/home.component.ts
@@ -8,7 +8,7 @@ import { Component } from "@angular/core";
 export class HomeComponent {
 
     public hostname: string = window.location.origin;
-    public integrationsConfig: string = `
+    public integrationsConfig = `
     "integrations_ui_url": "${this.hostname}/riot",
     "integrations_rest_url": "${this.hostname}/api/v1/scalar",
     "integrations_widgets_urls": ["${this.hostname}/widgets"],
diff --git a/web/app/shared/models/admin_responses.ts b/web/app/shared/models/admin_responses.ts
new file mode 100644
index 0000000..63cb43d
--- /dev/null
+++ b/web/app/shared/models/admin_responses.ts
@@ -0,0 +1,13 @@
+export interface DimensionConfigResponse {
+    admins: string[];
+    widgetBlacklist: string[];
+    homesever: {
+        name: string;
+        userId: string;
+        federationUrl: string;
+    };
+}
+
+export interface DimensionVersionResponse {
+    version: string;
+}
\ No newline at end of file
diff --git a/web/app/shared/services/admin-api.service.ts b/web/app/shared/services/admin-api.service.ts
index 5f07674..8404220 100644
--- a/web/app/shared/services/admin-api.service.ts
+++ b/web/app/shared/services/admin-api.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
 import { AuthedApi } from "./AuthedApi";
+import { DimensionConfigResponse, DimensionVersionResponse } from "../models/admin_responses";
 
 @Injectable()
 export class AdminApiService extends AuthedApi {
@@ -9,6 +10,14 @@ export class AdminApiService extends AuthedApi {
     }
 
     public isAdmin(): Promise<any> {
-        return this.authedGet("/api/v1/dimension/admin/info").map(r => r.json()).toPromise();
+        return this.authedGet("/api/v1/dimension/admin/check").map(r => r.json()).toPromise();
+    }
+
+    public getConfig(): Promise<DimensionConfigResponse> {
+        return this.authedGet("/api/v1/dimension/admin/config").map(r => r.json()).toPromise();
+    }
+
+    public getVersion(): Promise<DimensionVersionResponse> {
+        return this.authedGet("/api/v1/dimension/admin/version").map(r => r.json()).toPromise();
     }
 }

From 3f694c2b28a245875c562e4351d5236a44490274 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 23 Dec 2017 21:40:01 -0700
Subject: [PATCH 041/111] Admin section for enabling, disabling, and
 configuring widgets

---
 .../dimension/DimensionIntegrationsService.ts | 30 +++++++-
 src-ts/db/DimensionStore.ts                   | 25 +++++++
 web/app/admin/admin.component.html            |  1 +
 web/app/admin/widgets/config-dialog.scss      |  8 +++
 .../widgets/etherpad/etherpad.component.html  | 22 ++++++
 .../widgets/etherpad/etherpad.component.scss  |  0
 .../widgets/etherpad/etherpad.component.ts    | 35 ++++++++++
 .../admin/widgets/jitsi/jitsi.component.html  | 29 ++++++++
 .../admin/widgets/jitsi/jitsi.component.scss  |  0
 .../admin/widgets/jitsi/jitsi.component.ts    | 35 ++++++++++
 web/app/admin/widgets/widgets.component.html  | 34 +++++++++
 web/app/admin/widgets/widgets.component.scss  | 13 ++++
 web/app/admin/widgets/widgets.component.ts    | 69 +++++++++++++++++++
 web/app/app.module.ts                         | 11 ++-
 web/app/app.routing.ts                        |  6 ++
 web/app/shared/services/AuthedApi.ts          |  6 ++
 web/app/shared/services/admin-api.service.ts  | 13 ++++
 web/style/app.scss                            |  1 +
 web/style/components/dialog.scss              | 21 ++++++
 19 files changed, 357 insertions(+), 2 deletions(-)
 create mode 100644 web/app/admin/widgets/config-dialog.scss
 create mode 100644 web/app/admin/widgets/etherpad/etherpad.component.html
 create mode 100644 web/app/admin/widgets/etherpad/etherpad.component.scss
 create mode 100644 web/app/admin/widgets/etherpad/etherpad.component.ts
 create mode 100644 web/app/admin/widgets/jitsi/jitsi.component.html
 create mode 100644 web/app/admin/widgets/jitsi/jitsi.component.scss
 create mode 100644 web/app/admin/widgets/jitsi/jitsi.component.ts
 create mode 100644 web/app/admin/widgets/widgets.component.html
 create mode 100644 web/app/admin/widgets/widgets.component.scss
 create mode 100644 web/app/admin/widgets/widgets.component.ts
 create mode 100644 web/style/components/dialog.scss

diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
index 1ca5b57..7bdc637 100644
--- a/src-ts/api/dimension/DimensionIntegrationsService.ts
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -1,4 +1,4 @@
-import { GET, Path, PathParam, QueryParam } from "typescript-rest";
+import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
 import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
 import { DimensionStore } from "../../db/DimensionStore";
@@ -12,6 +12,14 @@ interface IntegrationsResponse {
     widgets: Widget[],
 }
 
+interface SetEnabledRequest {
+    enabled: boolean;
+}
+
+interface SetOptionsRequest {
+    options: any;
+}
+
 @Path("/api/v1/dimension/integrations")
 export class DimensionIntegrationsService {
 
@@ -21,6 +29,26 @@ export class DimensionIntegrationsService {
         DimensionIntegrationsService.integrationCache.clear();
     }
 
+    @POST
+    @Path(":category/:type/enabled")
+    public setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            if (category === "widget") {
+                return DimensionStore.setWidgetEnabled(type, body.enabled);
+            } else throw new ApiError(400, "Unrecongized category");
+        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
+    }
+
+    @POST
+    @Path(":category/:type/options")
+    public setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            if (category === "widget") {
+                return DimensionStore.setWidgetOptions(type, body.options);
+            } else throw new ApiError(400, "Unrecongized category");
+        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
+    }
+
     @GET
     @Path("enabled")
     public getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
diff --git a/src-ts/db/DimensionStore.ts b/src-ts/db/DimensionStore.ts
index ca326d3..6a9b97f 100644
--- a/src-ts/db/DimensionStore.ts
+++ b/src-ts/db/DimensionStore.ts
@@ -94,6 +94,31 @@ class _DimensionStore {
         if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
         return WidgetRecord.findAll(conditions).then(widgets => widgets.map(w => new Widget(w)));
     }
+
+    public setWidgetEnabled(type: string, isEnabled: boolean): Promise<any> {
+        return this.getWidget(type).then(widget => {
+            widget.isEnabled = isEnabled;
+            return widget.save();
+        });
+    }
+
+    public setWidgetOptions(type: string, options: any): Promise<any> {
+        const optionsJson = JSON.stringify(options);
+        return this.getWidget(type).then(widget => {
+            widget.optionsJson = optionsJson;
+            return widget.save();
+        });
+    }
+
+    private getWidget(type: string): Promise<WidgetRecord> {
+        return WidgetRecord.findAll({where: {type: type}}).then(widgets => {
+            if (!widgets || widgets.length !== 1) {
+                return Promise.reject("Widget not found or too many results");
+            }
+
+            return Promise.resolve(widgets[0]);
+        });
+    }
 }
 
 export const DimensionStore = new _DimensionStore();
\ No newline at end of file
diff --git a/web/app/admin/admin.component.html b/web/app/admin/admin.component.html
index 0a269de..2556572 100644
--- a/web/app/admin/admin.component.html
+++ b/web/app/admin/admin.component.html
@@ -1,5 +1,6 @@
 <ul class="adminNav">
     <li (click)="goto('')" [ngClass]="[isActive('', true) ? 'active' : '']">Dashboard</li>
+    <li (click)="goto('widgets')" [ngClass]="[isActive('widgets') ? 'active' : '']">Widgets</li>
 </ul>
 <span class="version">{{ version }}</span>
 
diff --git a/web/app/admin/widgets/config-dialog.scss b/web/app/admin/widgets/config-dialog.scss
new file mode 100644
index 0000000..dd4814b
--- /dev/null
+++ b/web/app/admin/widgets/config-dialog.scss
@@ -0,0 +1,8 @@
+.text-muted {
+  display: block;
+  font-size: 12px;
+}
+
+.label-block {
+  margin-bottom: 15px;
+}
\ No newline at end of file
diff --git a/web/app/admin/widgets/etherpad/etherpad.component.html b/web/app/admin/widgets/etherpad/etherpad.component.html
new file mode 100644
index 0000000..4bf7ec7
--- /dev/null
+++ b/web/app/admin/widgets/etherpad/etherpad.component.html
@@ -0,0 +1,22 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Etherpad Widget Configuration</h4>
+    </div>
+    <div class="dialog-content">
+        <label class="label-block">
+            Default Pad URL Template
+            <span class="text-muted ">$padName and $roomId will be replaced during creation to help create a unique pad URL.</span>
+            <input type="text" class="form-control"
+                   placeholder="https://demo.riot.im/etherpad/p/$padName_$roomId"
+                   [(ngModel)]="widget.options.defaultUrl" [disabled]="isUpdating"/>
+        </label>
+    </div>
+    <div class="dialog-footer">
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/widgets/etherpad/etherpad.component.scss b/web/app/admin/widgets/etherpad/etherpad.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/widgets/etherpad/etherpad.component.ts b/web/app/admin/widgets/etherpad/etherpad.component.ts
new file mode 100644
index 0000000..f2b31fc
--- /dev/null
+++ b/web/app/admin/widgets/etherpad/etherpad.component.ts
@@ -0,0 +1,35 @@
+import { Component } from "@angular/core";
+import { AdminApiService } from "../../../shared/services/admin-api.service";
+import { EtherpadWidget } from "../../../shared/models/integration";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { WidgetConfigDialogContext } from "../widgets.component";
+
+@Component({
+    templateUrl: "./etherpad.component.html",
+    styleUrls: ["./etherpad.component.scss", "../config-dialog.scss"],
+})
+export class AdminWidgetEtherpadConfigComponent implements ModalComponent<WidgetConfigDialogContext> {
+
+    public isUpdating = false;
+    public widget: EtherpadWidget;
+    private originalWidget: EtherpadWidget;
+
+    constructor(public dialog: DialogRef<WidgetConfigDialogContext>, private adminApi: AdminApiService, private toaster: ToasterService) {
+        this.originalWidget = dialog.context.widget;
+        this.widget = JSON.parse(JSON.stringify(this.originalWidget));
+    }
+
+    public save() {
+        this.isUpdating = true;
+        this.adminApi.setWidgetOptions(this.widget.category, this.widget.type, this.widget.options).then(() => {
+            this.originalWidget.options = this.widget.options;
+            this.toaster.pop("success", "Widget updated");
+            this.dialog.close();
+        }).catch(err => {
+            this.isUpdating = false;
+            console.error(err);
+            this.toaster.pop("error", "Error updating widget");
+        });
+    }
+}
diff --git a/web/app/admin/widgets/jitsi/jitsi.component.html b/web/app/admin/widgets/jitsi/jitsi.component.html
new file mode 100644
index 0000000..43f7978
--- /dev/null
+++ b/web/app/admin/widgets/jitsi/jitsi.component.html
@@ -0,0 +1,29 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Jitsi Widget Configuration</h4>
+    </div>
+    <div class="dialog-content">
+        <label class="label-block">
+            Jitsi Domain
+            <span class="text-muted ">This is the domain that is used to host the conference.</span>
+            <input type="text" class="form-control"
+                   placeholder="jitsi.riot.im"
+                   [(ngModel)]="widget.options.jitsiDomain" [disabled]="isUpdating"/>
+        </label>
+        <label class="label-block">
+            Jitsi Script URL
+            <span class="text-muted ">This is used to create the Jitsi widget. It is normally at /libs/external_api.min.js from your domain.</span>
+            <input type="text" class="form-control"
+                   placeholder="https://jitsi.riot.im/libs/external_api.min.js"
+                   [(ngModel)]="widget.options.scriptUrl" [disabled]="isUpdating"/>
+        </label>
+    </div>
+    <div class="dialog-footer">
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/widgets/jitsi/jitsi.component.scss b/web/app/admin/widgets/jitsi/jitsi.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/widgets/jitsi/jitsi.component.ts b/web/app/admin/widgets/jitsi/jitsi.component.ts
new file mode 100644
index 0000000..bdd6804
--- /dev/null
+++ b/web/app/admin/widgets/jitsi/jitsi.component.ts
@@ -0,0 +1,35 @@
+import { Component } from "@angular/core";
+import { AdminApiService } from "../../../shared/services/admin-api.service";
+import { JitsiWidget } from "../../../shared/models/integration";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { WidgetConfigDialogContext } from "../widgets.component";
+
+@Component({
+    templateUrl: "./jitsi.component.html",
+    styleUrls: ["./jitsi.component.scss", "../config-dialog.scss"],
+})
+export class AdminWidgetJitsiConfigComponent implements ModalComponent<WidgetConfigDialogContext> {
+
+    public isUpdating = false;
+    public widget: JitsiWidget;
+    private originalWidget: JitsiWidget;
+
+    constructor(public dialog: DialogRef<WidgetConfigDialogContext>, private adminApi: AdminApiService, private toaster: ToasterService) {
+        this.originalWidget = dialog.context.widget;
+        this.widget = JSON.parse(JSON.stringify(this.originalWidget));
+    }
+
+    public save() {
+        this.isUpdating = true;
+        this.adminApi.setWidgetOptions(this.widget.category, this.widget.type, this.widget.options).then(() => {
+            this.originalWidget.options = this.widget.options;
+            this.toaster.pop("success", "Widget updated");
+            this.dialog.close();
+        }).catch(err => {
+            this.isUpdating = false;
+            console.error(err);
+            this.toaster.pop("error", "Error updating widget");
+        });
+    }
+}
diff --git a/web/app/admin/widgets/widgets.component.html b/web/app/admin/widgets/widgets.component.html
new file mode 100644
index 0000000..2beebd6
--- /dev/null
+++ b/web/app/admin/widgets/widgets.component.html
@@ -0,0 +1,34 @@
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox title="Widgets">
+        <div class="my-ibox-content">
+            <p>Widgets are small webpages that can be embedded in a Matrix room. Here you can configure which widgets
+                Dimension will offer to users.</p>
+
+            <table class="table table-striped table-condensed table-bordered">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Description</th>
+                    <th class="text-center">Actions</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngFor="let widget of widgets trackById">
+                    <td>{{ widget.displayName }}</td>
+                    <td>{{ widget.description }}</td>
+                    <td class="text-right">
+                        <span class="editButton" (click)="editWidget(widget)" *ngIf="widget.isEnabled && hasConfiguration(widget)">
+                            <i class="fa fa-pencil-alt"></i>
+                        </span>
+                        <ui-switch [checked]="widget.isEnabled" size="small" [disabled]="isUpdating"
+                                   (change)="disableWidget(widget)"></ui-switch>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/widgets/widgets.component.scss b/web/app/admin/widgets/widgets.component.scss
new file mode 100644
index 0000000..65b9b23
--- /dev/null
+++ b/web/app/admin/widgets/widgets.component.scss
@@ -0,0 +1,13 @@
+ul {
+  padding-left: 25px;
+}
+
+.editButton {
+  cursor: pointer;
+  position: relative;
+  top: -5px;
+}
+
+tr td:last-child {
+  vertical-align: middle;
+}
\ No newline at end of file
diff --git a/web/app/admin/widgets/widgets.component.ts b/web/app/admin/widgets/widgets.component.ts
new file mode 100644
index 0000000..286c5b1
--- /dev/null
+++ b/web/app/admin/widgets/widgets.component.ts
@@ -0,0 +1,69 @@
+import { Component } from "@angular/core";
+import { AdminApiService } from "../../shared/services/admin-api.service";
+import { Widget } from "../../shared/models/integration";
+import { ToasterService } from "angular2-toaster";
+import { AdminWidgetEtherpadConfigComponent } from "./etherpad/etherpad.component";
+import { Modal, overlayConfigFactory } from "ngx-modialog";
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+import { AdminWidgetJitsiConfigComponent } from "./jitsi/jitsi.component";
+
+export class WidgetConfigDialogContext extends BSModalContext {
+    public widget: Widget;
+}
+
+@Component({
+    templateUrl: "./widgets.component.html",
+    styleUrls: ["./widgets.component.scss"],
+})
+export class AdminWidgetsComponent {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public widgets: Widget[];
+
+    constructor(private adminApi: AdminApiService, private toaster: ToasterService, private modal: Modal) {
+        adminApi.getAllIntegrations().then(integrations => {
+            this.isLoading = false;
+            this.widgets = integrations.widgets;
+        });
+    }
+
+    public disableWidget(widget: Widget) {
+        widget.isEnabled = !widget.isEnabled;
+        this.isUpdating = true;
+        this.adminApi.toggleIntegration(widget.category, widget.type, widget.isEnabled).then(() => {
+            this.isUpdating = false;
+            this.toaster.pop("success", "Widget updated");
+        }).catch(err => {
+            console.error(err);
+            widget.isEnabled = !widget.isEnabled; // revert change
+            this.isUpdating = false;
+            this.toaster.pop("error", "Error updating widget");
+        })
+    }
+
+    public editWidget(widget: Widget) {
+        let component = null;
+
+        if (widget.type === "etherpad") component = AdminWidgetEtherpadConfigComponent;
+        if (widget.type === "jitsi") component = AdminWidgetJitsiConfigComponent;
+
+        if (!component) {
+            console.error("No known dialog component for " + widget.type);
+            this.toaster.pop("error", "Error opening configuration page");
+            return;
+        }
+
+        this.modal.open(component, overlayConfigFactory({
+            widget: widget,
+
+            isBlocking: true,
+            size: 'lg',
+        }, WidgetConfigDialogContext));
+    }
+
+    public hasConfiguration(widget: Widget) {
+        // Currently only Jitsi and Etherpad have additional configuration
+        return widget.type === "jitsi" || widget.type === "etherpad";
+    }
+}
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 2749a40..59cfc39 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -42,6 +42,9 @@ import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widg
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
 import { AdminComponent } from "./admin/admin.component";
 import { AdminHomeComponent } from "./admin/home/home.component";
+import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
+import { AdminWidgetEtherpadConfigComponent } from "./admin/widgets/etherpad/etherpad.component";
+import { AdminWidgetJitsiConfigComponent } from "./admin/widgets/jitsi/jitsi.component";
 
 @NgModule({
     imports: [
@@ -83,6 +86,9 @@ import { AdminHomeComponent } from "./admin/home/home.component";
         YoutubeWidgetConfigComponent,
         AdminComponent,
         AdminHomeComponent,
+        AdminWidgetsComponent,
+        AdminWidgetEtherpadConfigComponent,
+        AdminWidgetJitsiConfigComponent,
 
         // Vendor
     ],
@@ -97,7 +103,10 @@ import { AdminHomeComponent } from "./admin/home/home.component";
         // Vendor
     ],
     bootstrap: [AppComponent],
-    entryComponents: []
+    entryComponents: [
+        AdminWidgetEtherpadConfigComponent,
+        AdminWidgetJitsiConfigComponent,
+    ]
 })
 export class AppModule {
     constructor(public appRef: ApplicationRef, injector: Injector) {
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 0cf9e20..dda540f 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -15,6 +15,7 @@ import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widg
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
 import { AdminComponent } from "./admin/admin.component";
 import { AdminHomeComponent } from "./admin/home/home.component";
+import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -37,6 +38,11 @@ const routes: Routes = [
                         path: "",
                         component: AdminHomeComponent,
                     },
+                    {
+                        path: "widgets",
+                        component: AdminWidgetsComponent,
+                        data: {breadcrumb: "Widgets", name: "Widgets"},
+                    },
                 ],
             },
             {
diff --git a/web/app/shared/services/AuthedApi.ts b/web/app/shared/services/AuthedApi.ts
index eb6161c..8334134 100644
--- a/web/app/shared/services/AuthedApi.ts
+++ b/web/app/shared/services/AuthedApi.ts
@@ -11,4 +11,10 @@ export class AuthedApi {
         qs["scalar_token"] = SessionStorage.scalarToken;
         return this.http.get(url, {params: qs});
     }
+
+    protected authedPost(url: string, body?: any): Observable<Response> {
+        if (!body) body = {};
+        const qs = {scalar_token: SessionStorage.scalarToken};
+        return this.http.post(url, body, {params: qs});
+    }
 }
diff --git a/web/app/shared/services/admin-api.service.ts b/web/app/shared/services/admin-api.service.ts
index 8404220..5003211 100644
--- a/web/app/shared/services/admin-api.service.ts
+++ b/web/app/shared/services/admin-api.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
 import { AuthedApi } from "./AuthedApi";
 import { DimensionConfigResponse, DimensionVersionResponse } from "../models/admin_responses";
+import { DimensionIntegrationsResponse } from "../models/dimension_responses";
 
 @Injectable()
 export class AdminApiService extends AuthedApi {
@@ -20,4 +21,16 @@ export class AdminApiService extends AuthedApi {
     public getVersion(): Promise<DimensionVersionResponse> {
         return this.authedGet("/api/v1/dimension/admin/version").map(r => r.json()).toPromise();
     }
+
+    public getAllIntegrations(): Promise<DimensionIntegrationsResponse> {
+        return this.authedGet("/api/v1/dimension/integrations/all").map(r => r.json()).toPromise();
+    }
+
+    public toggleIntegration(category: string, type: string, enabled: boolean): Promise<any> {
+        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/enabled", {enabled: enabled}).map(r => r.json()).toPromise();
+    }
+
+    public setWidgetOptions(category: string, type: string, options: any): Promise<any> {
+        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/options", {options: options}).map(r => r.json()).toPromise();
+    }
 }
diff --git a/web/style/app.scss b/web/style/app.scss
index 159ce79..28c6b31 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -2,6 +2,7 @@
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:100|Roboto:300');
 @import '../../node_modules/angular2-toaster/toaster';
 @import "components/ibox";
+@import "components/dialog";
 @import "riot";
 
 body {
diff --git a/web/style/components/dialog.scss b/web/style/components/dialog.scss
new file mode 100644
index 0000000..3e1ec50
--- /dev/null
+++ b/web/style/components/dialog.scss
@@ -0,0 +1,21 @@
+.dialog {
+  .dialog-header {
+    border-bottom: 1px solid #ddd;
+    padding: 20px;
+
+    h4 {
+      margin: 0;
+    }
+  }
+
+  .dialog-content {
+    padding: 20px;
+
+  }
+
+  .dialog-footer {
+    padding: 20px;
+    border-top: 1px solid #bbb;
+    background-color: #ddd;
+  }
+}
\ No newline at end of file

From 0a6c8b70377af9dbdd42803c24b6690167312c59 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Dec 2017 02:02:57 -0700
Subject: [PATCH 042/111] Start of support for go-neb via appservices

---
 src-ts/api/ApiError.ts                        |  1 +
 src-ts/api/Webserver.ts                       |  2 +-
 .../DimensionAppserviceAdminService.ts        | 93 +++++++++++++++++++
 .../DimensionIntegrationsAdminService.ts      | 46 +++++++++
 .../dimension/DimensionIntegrationsService.ts | 53 ++---------
 .../api/matrix/MatrixAppServiceApiService.ts  | 61 ++++++++++++
 src-ts/api/scalar/ScalarService.ts            |  4 +-
 src-ts/db/AppserviceStore.ts                  | 63 +++++++++++++
 src-ts/db/DimensionStore.ts                   | 87 ++---------------
 src-ts/db/ScalarStore.ts                      | 56 +++++++++++
 src-ts/db/WidgetStore.ts                      | 32 +++++++
 .../20171224122045-AddAppservices.ts          | 18 ++++
 .../20171224124645-AddAppserviceUsers.ts      | 23 +++++
 src-ts/db/models/AppService.ts                | 21 +++++
 src-ts/db/models/AppServiceUser.ts            | 31 +++++++
 src-ts/matrix/MatrixAppserviceClient.ts       | 26 ++++++
 src-ts/models/MatrixEvent.ts                  | 12 +++
 web/app/admin/admin.component.ts              |  2 +-
 web/app/admin/home/home.component.ts          |  6 +-
 .../widgets/etherpad/etherpad.component.ts    | 12 +--
 .../admin/widgets/jitsi/jitsi.component.ts    | 12 +--
 web/app/admin/widgets/widgets.component.ts    | 20 ++--
 web/app/app.module.ts                         | 18 ++--
 .../etherpad/etherpad.widget.component.ts     |  4 +-
 .../widget/jitsi/jitsi.widget.component.ts    |  4 +-
 web/app/configs/widget/widget.component.ts    |  4 +-
 .../integration-bag.component.ts              |  8 +-
 web/app/riot/riot-home/home.component.ts      | 36 +++----
 .../scalar-close/scalar-close.component.ts    |  2 +-
 web/app/shared/SessionStorage.ts              |  4 +-
 web/app/shared/models/admin_responses.ts      |  4 +-
 web/app/shared/models/dimension_responses.ts  |  6 +-
 web/app/shared/models/integration.ts          | 12 +--
 .../shared/models/scalar_server_responses.ts  |  2 +-
 .../ServiceLocator.ts}                        |  0
 .../integrations.registry.ts}                 | 14 +--
 web/app/shared/services/admin-api.service.ts  | 36 -------
 .../services/admin/admin-api.service.ts       | 23 +++++
 .../admin/admin-integrations-api.service.ts   | 23 +++++
 .../shared/services/dimension-api.service.ts  | 25 -----
 .../integrations/integrations-api.service.ts  | 29 ++++++
 .../integrations/widget-api.service.ts        | 21 +++++
 .../{ => scalar}/scalar-client-api.service.ts |  4 +-
 .../{ => scalar}/scalar-server-api.service.ts |  6 +-
 .../generic/generic.component.ts              |  6 +-
 .../widget_wrappers/jitsi/jitsi.component.ts  | 10 +-
 46 files changed, 701 insertions(+), 281 deletions(-)
 create mode 100644 src-ts/api/dimension/DimensionAppserviceAdminService.ts
 create mode 100644 src-ts/api/dimension/DimensionIntegrationsAdminService.ts
 create mode 100644 src-ts/api/matrix/MatrixAppServiceApiService.ts
 create mode 100644 src-ts/db/AppserviceStore.ts
 create mode 100644 src-ts/db/ScalarStore.ts
 create mode 100644 src-ts/db/WidgetStore.ts
 create mode 100644 src-ts/db/migrations/20171224122045-AddAppservices.ts
 create mode 100644 src-ts/db/migrations/20171224124645-AddAppserviceUsers.ts
 create mode 100644 src-ts/db/models/AppService.ts
 create mode 100644 src-ts/db/models/AppServiceUser.ts
 create mode 100644 src-ts/matrix/MatrixAppserviceClient.ts
 create mode 100644 src-ts/models/MatrixEvent.ts
 rename web/app/shared/{services/locator.service.ts => registry/ServiceLocator.ts} (100%)
 rename web/app/shared/{services/integration.service.ts => registry/integrations.registry.ts} (74%)
 delete mode 100644 web/app/shared/services/admin-api.service.ts
 create mode 100644 web/app/shared/services/admin/admin-api.service.ts
 create mode 100644 web/app/shared/services/admin/admin-integrations-api.service.ts
 delete mode 100644 web/app/shared/services/dimension-api.service.ts
 create mode 100644 web/app/shared/services/integrations/integrations-api.service.ts
 create mode 100644 web/app/shared/services/integrations/widget-api.service.ts
 rename web/app/shared/services/{ => scalar}/scalar-client-api.service.ts (97%)
 rename web/app/shared/services/{ => scalar}/scalar-server-api.service.ts (62%)

diff --git a/src-ts/api/ApiError.ts b/src-ts/api/ApiError.ts
index 6e99257..c9603a0 100644
--- a/src-ts/api/ApiError.ts
+++ b/src-ts/api/ApiError.ts
@@ -8,6 +8,7 @@ export class ApiError {
         // https://stackoverflow.com/questions/31626231/custom-error-class-in-typescript
         Error.apply(this, ["ApiError"]);
 
+        if (typeof(json) === "string") json = {message: json};
         this.jsonResponse = json;
         this.statusCode = statusCode;
     }
diff --git a/src-ts/api/Webserver.ts b/src-ts/api/Webserver.ts
index 03fd332..814a3f0 100644
--- a/src-ts/api/Webserver.ts
+++ b/src-ts/api/Webserver.ts
@@ -20,7 +20,7 @@ export default class Webserver {
     }
 
     private loadRoutes() {
-        const apis = ["scalar", "dimension"].map(a => path.join(__dirname, a, "*.js"));
+        const apis = ["scalar", "dimension", "matrix"].map(a => path.join(__dirname, a, "*.js"));
         const router = express.Router();
         apis.forEach(a => Server.loadServices(router, [a]));
         const routes = _.uniq(router.stack.map(r => r.route.path));
diff --git a/src-ts/api/dimension/DimensionAppserviceAdminService.ts b/src-ts/api/dimension/DimensionAppserviceAdminService.ts
new file mode 100644
index 0000000..942058e
--- /dev/null
+++ b/src-ts/api/dimension/DimensionAppserviceAdminService.ts
@@ -0,0 +1,93 @@
+import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { DimensionAdminService } from "./DimensionAdminService";
+import AppService from "../../db/models/AppService";
+import { AppserviceStore } from "../../db/AppserviceStore";
+import { ApiError } from "../ApiError";
+import AppServiceUser from "../../db/models/AppServiceUser";
+
+interface AppserviceResponse {
+    id: string;
+    hsToken: string;
+    asToken: string;
+    userPrefix: string;
+}
+
+interface UserResponse {
+    userId: string;
+    accessToken: string;
+    displayName: string;
+    avatarUrl: string;
+}
+
+interface NewUserRequest {
+    userId: string;
+}
+
+interface AppserviceCreateRequest {
+    userPrefix: string;
+}
+
+@Path("/api/v1/dimension/admin/appservices")
+export class DimensionAppserviceAdminService {
+
+    @GET
+    @Path("all")
+    public getAppservices(@QueryParam("scalar_token") scalarToken: string): Promise<AppserviceResponse[]> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return AppService.findAll();
+        }).then(appservices => {
+            return appservices.map(this.mapAppservice);
+        });
+    }
+
+    @POST
+    @Path("new")
+    public createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return AppserviceStore.getAllByUserPrefix(request.userPrefix);
+        }).then(appservices => {
+            if (appservices && appservices.length > 0) {
+                throw new ApiError(400, "User prefix is already in use");
+            }
+
+            return AppserviceStore.create(AppserviceStore.getSafeUserId(request.userPrefix));
+        }).then(this.mapAppservice);
+    }
+
+    @GET
+    @Path(":appserviceId/users")
+    public getUsers(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<UserResponse[]> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return AppserviceStore.getUsers(asId);
+        }).then(users => {
+            return users.map(this.mapUser);
+        });
+    }
+
+    @POST
+    @Path(":appserviceId/users/register")
+    public registerUser(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string, request: NewUserRequest): Promise<UserResponse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return AppserviceStore.registerUser(asId, request.userId);
+        }).then(this.mapUser);
+    }
+
+    private mapAppservice(as: AppService): AppserviceResponse {
+        return {
+            id: as.id,
+            hsToken: as.hsToken,
+            asToken: as.asToken,
+            userPrefix: as.userPrefix,
+        };
+    }
+
+    private mapUser(user: AppServiceUser): UserResponse {
+        return {
+            userId: user.id,
+            accessToken: user.accessToken,
+            displayName: user.displayName,
+            avatarUrl: user.avatarUrl,
+        };
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/dimension/DimensionIntegrationsAdminService.ts b/src-ts/api/dimension/DimensionIntegrationsAdminService.ts
new file mode 100644
index 0000000..1038271
--- /dev/null
+++ b/src-ts/api/dimension/DimensionIntegrationsAdminService.ts
@@ -0,0 +1,46 @@
+import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { ApiError } from "../ApiError";
+import { DimensionAdminService } from "./DimensionAdminService";
+import { DimensionIntegrationsService, IntegrationsResponse } from "./DimensionIntegrationsService";
+import { WidgetStore } from "../../db/WidgetStore";
+
+interface SetEnabledRequest {
+    enabled: boolean;
+}
+
+interface SetOptionsRequest {
+    options: any;
+}
+
+@Path("/api/v1/dimension/admin/integrations")
+export class DimensionIntegrationsAdminService {
+
+    @POST
+    @Path(":category/:type/options")
+    public setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            if (category === "widget") {
+                return WidgetStore.setOptions(type, body.options);
+            } else throw new ApiError(400, "Unrecongized category");
+        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
+    }
+
+    @POST
+    @Path(":category/:type/enabled")
+    public setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            if (category === "widget") {
+                return WidgetStore.setEnabled(type, body.enabled);
+            } else throw new ApiError(400, "Unrecongized category");
+        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
+    }
+
+    @GET
+    @Path("all")
+    public getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return DimensionIntegrationsService.getIntegrations(null);
+        });
+    }
+}
\ No newline at end of file
diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
index 7bdc637..3844ac4 100644
--- a/src-ts/api/dimension/DimensionIntegrationsService.ts
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -1,25 +1,16 @@
-import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
+import { GET, Path, PathParam, QueryParam } from "typescript-rest";
 import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
-import { DimensionStore } from "../../db/DimensionStore";
-import { DimensionAdminService } from "./DimensionAdminService";
 import { Widget } from "../../integrations/Widget";
 import { MemoryCache } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
 import { ApiError } from "../ApiError";
+import { WidgetStore } from "../../db/WidgetStore";
 
-interface IntegrationsResponse {
+export interface IntegrationsResponse {
     widgets: Widget[],
 }
 
-interface SetEnabledRequest {
-    enabled: boolean;
-}
-
-interface SetOptionsRequest {
-    options: any;
-}
-
 @Path("/api/v1/dimension/integrations")
 export class DimensionIntegrationsService {
 
@@ -29,53 +20,27 @@ export class DimensionIntegrationsService {
         DimensionIntegrationsService.integrationCache.clear();
     }
 
-    @POST
-    @Path(":category/:type/enabled")
-    public setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            if (category === "widget") {
-                return DimensionStore.setWidgetEnabled(type, body.enabled);
-            } else throw new ApiError(400, "Unrecongized category");
-        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
-    }
-
-    @POST
-    @Path(":category/:type/options")
-    public setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            if (category === "widget") {
-                return DimensionStore.setWidgetOptions(type, body.options);
-            } else throw new ApiError(400, "Unrecongized category");
-        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
-    }
-
     @GET
     @Path("enabled")
     public getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
         return ScalarService.getTokenOwner(scalarToken).then(_userId => {
-            return this.getIntegrations(true);
+            return DimensionIntegrationsService.getIntegrations(true);
         }, ScalarService.invalidTokenErrorHandler);
     }
 
-    @GET
-    @Path("all")
-    public getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return this.getIntegrations(null);
-        });
-    }
-
     @GET
     @Path("room/:roomId")
     public getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string): Promise<IntegrationsResponse> {
         console.log(roomId);
+        // TODO: Other integrations
         return this.getEnabledIntegrations(scalarToken);
     }
 
     @GET
     @Path(":category/:type")
     public getIntegration(@PathParam("category") category: string, @PathParam("type") type: string): Promise<Integration> {
-        return this.getIntegrations(true).then(response => {
+        // This is intentionally an unauthed endpoint to ensure we can use it in widgets
+        return DimensionIntegrationsService.getIntegrations(true).then(response => {
             for (const key of Object.keys(response)) {
                 for (const integration of <Integration[]>response[key]) {
                     if (integration.category === category && integration.type === type) {
@@ -88,7 +53,7 @@ export class DimensionIntegrationsService {
         });
     }
 
-    private getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
+    public static getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
         const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
         if (cachedResponse) {
             return cachedResponse;
@@ -97,7 +62,7 @@ export class DimensionIntegrationsService {
             widgets: [],
         };
         return Promise.resolve()
-            .then(() => DimensionStore.getWidgets(isEnabledCheck))
+            .then(() => WidgetStore.listAll(isEnabledCheck))
             .then(widgets => response.widgets = widgets)
 
             // Cache and return response
diff --git a/src-ts/api/matrix/MatrixAppServiceApiService.ts b/src-ts/api/matrix/MatrixAppServiceApiService.ts
new file mode 100644
index 0000000..fc0c78a
--- /dev/null
+++ b/src-ts/api/matrix/MatrixAppServiceApiService.ts
@@ -0,0 +1,61 @@
+import { GET, Path, PathParam, PUT, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { ApiError } from "../ApiError";
+import { LogService } from "matrix-js-snippets";
+import { SimplifiedMatrixEvent } from "../../models/MatrixEvent";
+import { AppserviceStore } from "../../db/AppserviceStore";
+
+interface AppServiceTransaction {
+    events: SimplifiedMatrixEvent[];
+}
+
+@Path("/_matrix/appservice/r0")
+export class MatrixAppServiceApiService {
+
+    @PUT
+    @Path("/transactions/:txnId")
+    public onTransaction(@QueryParam("access_token") homeserverToken: string, @PathParam("txnId") txnId: string, _txn: AppServiceTransaction): Promise<any> {
+        return AppserviceStore.getByHomeserverToken(homeserverToken).then(appservice => {
+            // We don't handle the transaction at all - we just don't want the homeserver to consider us down
+            LogService.verbose("MatrixAppServiceApiService", "Accepting transaction " + txnId + " for appservice " + appservice.id + " blindly");
+            return {}; // 200 OK
+        }, err => {
+            LogService.error("MatrixAppServiceApiService", err);
+            throw new ApiError(403, {errcode: "M_FORBIDDEN"});
+        });
+    }
+
+    @GET
+    @Path("/room/:alias")
+    public getRoom(@QueryParam("access_token") homeserverToken: string, @PathParam("alias") roomAlias: string): Promise<any> {
+        return AppserviceStore.getByHomeserverToken(homeserverToken).then(appservice => {
+            // We don't support room lookups
+            LogService.verbose("MatrixAppServiceApiService", "404ing request for room " + roomAlias + " at appservice " + appservice.id);
+            throw new ApiError(404, {errcode: "IO.T2BOT.DIMENSION.ROOMS_NOT_SUPPORTED"});
+        }, err => {
+            LogService.error("MatrixAppServiceApiService", err);
+            throw new ApiError(403, {errcode: "M_FORBIDDEN"});
+        });
+    }
+
+    @GET
+    @Path("/user/:userId")
+    public getUser(@QueryParam("access_token") homeserverToken: string, @PathParam("userId") userId: string): Promise<any> {
+        return AppserviceStore.getByHomeserverToken(homeserverToken).then(appservice => {
+            return AppserviceStore.getUser(appservice.id, userId).catch(err => {
+                LogService.error("MatrixAppServiceApiService", err);
+                throw new ApiError(404, {errcode: "IO.T2BOT.DIMENSION.USER_NOT_FOUND"});
+            });
+        }, err => {
+            LogService.error("MatrixAppServiceApiService", err);
+            throw new ApiError(403, {errcode: "M_FORBIDDEN"});
+        }).then(appserviceUser => {
+            return {
+                userId: appserviceUser.id,
+                displayName: appserviceUser.displayName,
+                avatarUrl: appserviceUser.avatarUrl,
+            };
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/src-ts/api/scalar/ScalarService.ts b/src-ts/api/scalar/ScalarService.ts
index 79499c3..bf804ec 100644
--- a/src-ts/api/scalar/ScalarService.ts
+++ b/src-ts/api/scalar/ScalarService.ts
@@ -10,8 +10,8 @@ import { ApiError } from "../ApiError";
 import * as randomString from "random-string";
 import { OpenId } from "../../models/OpenId";
 import { ScalarAccountResponse, ScalarRegisterResponse } from "../../models/ScalarResponses";
-import { DimensionStore } from "../../db/DimensionStore";
 import { MemoryCache } from "../../MemoryCache";
+import { ScalarStore } from "../../db/ScalarStore";
 
 interface RegisterRequest {
     access_token: string;
@@ -33,7 +33,7 @@ export class ScalarService {
         const cachedUserId = ScalarService.accountCache.get(scalarToken);
         if (cachedUserId) return Promise.resolve(cachedUserId);
 
-        return DimensionStore.getTokenOwner(scalarToken).then(user => {
+        return ScalarStore.getTokenOwner(scalarToken).then(user => {
             if (!user) return Promise.reject("Invalid token");
             ScalarService.accountCache.put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
             return Promise.resolve(user.userId);
diff --git a/src-ts/db/AppserviceStore.ts b/src-ts/db/AppserviceStore.ts
new file mode 100644
index 0000000..1748b4a
--- /dev/null
+++ b/src-ts/db/AppserviceStore.ts
@@ -0,0 +1,63 @@
+import AppService from "./models/AppService";
+import AppServiceUser from "./models/AppServiceUser";
+import * as randomString from "random-string";
+import * as Promise from "bluebird";
+import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
+import { resolveIfExists } from "./DimensionStore";
+import config from "../config";
+
+export class AppserviceStore {
+
+    private constructor() {
+    }
+
+    public static create(userPrefix: string): Promise<AppService> {
+        const id = "dimension-" + randomString({length: 25});
+        const asToken = randomString({length: 100});
+        const hsToken = randomString({length: 100});
+
+        return AppService.create({
+            id: id,
+            asToken: asToken,
+            hsToken: hsToken,
+            userPrefix: userPrefix,
+        });
+    }
+
+    public static getUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
+        return AppServiceUser.findOne({where: {appserviceId: appserviceId, id: userId}}).then(resolveIfExists);
+    }
+
+    public static getByHomeserverToken(hsToken: string): Promise<AppService> {
+        return AppService.findOne({where: {hsToken: hsToken}}).then(resolveIfExists);
+    }
+
+    public static getAllByUserPrefix(userPrefix: string): Promise<AppService[]> {
+        return AppService.findAll({where: {userPrefix: userPrefix}});
+    }
+
+    public static getSafeUserId(userIdOrPrefix: string): string {
+        // Force user IDs to be lowercase and strip out characters that aren't permitted
+        // https://matrix.org/docs/spec/appendices.html#user-identifiers
+        return userIdOrPrefix.toLowerCase().replace(/[^a-z0-9._\-=]/g, '.');
+    }
+
+    public static getUsers(appserviceId: string): Promise<AppServiceUser[]> {
+        return AppServiceUser.findAll({where: {appserviceId: appserviceId}});
+    }
+
+    public static registerUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
+        userId = AppserviceStore.getSafeUserId(userId);
+        return AppService.findOne({where: {id: appserviceId}}).then(resolveIfExists).then(appservice => {
+            const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
+            const localpart = userId.substring(1).split(":")[0];
+            return client.registerUser(localpart);
+        }).then(response => {
+            return AppServiceUser.create({
+                id: userId,
+                appserviceId: appserviceId,
+                accessToken: response.access_token,
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/src-ts/db/DimensionStore.ts b/src-ts/db/DimensionStore.ts
index 6a9b97f..a8f448f 100644
--- a/src-ts/db/DimensionStore.ts
+++ b/src-ts/db/DimensionStore.ts
@@ -8,7 +8,8 @@ import * as Promise from "bluebird";
 import WidgetRecord from "./models/WidgetRecord";
 import * as path from "path";
 import * as Umzug from "umzug";
-import { Widget } from "../integrations/Widget";
+import AppService from "./models/AppService";
+import AppServiceUser from "./models/AppServiceUser";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -27,6 +28,8 @@ class _DimensionStore {
             UserScalarToken,
             Upstream,
             WidgetRecord,
+            AppService,
+            AppServiceUser,
         ]);
     }
 
@@ -44,81 +47,11 @@ class _DimensionStore {
 
         return migrator.up();
     }
-
-    public doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
-        let upstreamTokenIds: number[] = [];
-        let hasDimensionToken = false;
-        return UserScalarToken.findAll({where: {userId: userId}}).then(results => {
-            upstreamTokenIds = results.filter(t => !t.isDimensionToken).map(t => t.upstreamId);
-            hasDimensionToken = results.filter(t => t.isDimensionToken).length >= 1;
-            return Upstream.findAll();
-        }).then(upstreams => {
-            if (!hasDimensionToken) {
-                LogService.warn("DimensionStore", "User " + userId + " is missing a Dimension scalar token");
-                return false;
-            }
-
-            for (const upstream of upstreams) {
-                if (upstreamTokenIds.indexOf(upstream.id) === -1) {
-                    LogService.warn("DimensionStore", "User " + userId + " is missing a scalar token for upstream " + upstream.id + " (" + upstream.name + ")");
-                    return false;
-                }
-            }
-
-            return true;
-        });
-    }
-
-    public getTokenOwner(scalarToken: string): Promise<User> {
-        let user: User = null;
-        return UserScalarToken.findAll({
-            where: {isDimensionToken: true, scalarToken: scalarToken},
-            include: [User]
-        }).then(tokens => {
-            if (!tokens || tokens.length === 0) {
-                return Promise.reject("Invalid token");
-            }
-
-            user = tokens[0].user;
-            return this.doesUserHaveTokensForAllUpstreams(user.userId);
-        }).then(hasUpstreams => {
-            if (!hasUpstreams) {
-                return Promise.reject("Invalid token"); // missing one or more upstreams == no validation
-            }
-            return Promise.resolve(user);
-        });
-    }
-
-    public getWidgets(isEnabled?: boolean): Promise<Widget[]> {
-        let conditions = {};
-        if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
-        return WidgetRecord.findAll(conditions).then(widgets => widgets.map(w => new Widget(w)));
-    }
-
-    public setWidgetEnabled(type: string, isEnabled: boolean): Promise<any> {
-        return this.getWidget(type).then(widget => {
-            widget.isEnabled = isEnabled;
-            return widget.save();
-        });
-    }
-
-    public setWidgetOptions(type: string, options: any): Promise<any> {
-        const optionsJson = JSON.stringify(options);
-        return this.getWidget(type).then(widget => {
-            widget.optionsJson = optionsJson;
-            return widget.save();
-        });
-    }
-
-    private getWidget(type: string): Promise<WidgetRecord> {
-        return WidgetRecord.findAll({where: {type: type}}).then(widgets => {
-            if (!widgets || widgets.length !== 1) {
-                return Promise.reject("Widget not found or too many results");
-            }
-
-            return Promise.resolve(widgets[0]);
-        });
-    }
 }
 
-export const DimensionStore = new _DimensionStore();
\ No newline at end of file
+export const DimensionStore = new _DimensionStore();
+
+export function resolveIfExists<T>(record: T): Promise<T> {
+    if (!record) return Promise.reject("Record not found");
+    return Promise.resolve(record);
+}
\ No newline at end of file
diff --git a/src-ts/db/ScalarStore.ts b/src-ts/db/ScalarStore.ts
new file mode 100644
index 0000000..17bd37a
--- /dev/null
+++ b/src-ts/db/ScalarStore.ts
@@ -0,0 +1,56 @@
+import * as Promise from "bluebird";
+import UserScalarToken from "./models/UserScalarToken";
+import { LogService } from "matrix-js-snippets";
+import Upstream from "./models/Upstream";
+import User from "./models/User";
+
+export class ScalarStore {
+
+    private constructor() {
+    }
+
+    public static doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
+        let upstreamTokenIds: number[] = [];
+        let hasDimensionToken = false;
+        return UserScalarToken.findAll({where: {userId: userId}}).then(results => {
+            upstreamTokenIds = results.filter(t => !t.isDimensionToken).map(t => t.upstreamId);
+            hasDimensionToken = results.filter(t => t.isDimensionToken).length >= 1;
+            return Upstream.findAll();
+        }).then(upstreams => {
+            if (!hasDimensionToken) {
+                LogService.warn("DimensionStore", "User " + userId + " is missing a Dimension scalar token");
+                return false;
+            }
+
+            for (const upstream of upstreams) {
+                if (upstreamTokenIds.indexOf(upstream.id) === -1) {
+                    LogService.warn("DimensionStore", "User " + userId + " is missing a scalar token for upstream " + upstream.id + " (" + upstream.name + ")");
+                    return false;
+                }
+            }
+
+            return true;
+        });
+    }
+
+    public static getTokenOwner(scalarToken: string): Promise<User> {
+        let user: User = null;
+        return UserScalarToken.findAll({
+            where: {isDimensionToken: true, scalarToken: scalarToken},
+            include: [User]
+        }).then(tokens => {
+            if (!tokens || tokens.length === 0) {
+                return Promise.reject("Invalid token");
+            }
+
+            user = tokens[0].user;
+            return ScalarStore.doesUserHaveTokensForAllUpstreams(user.userId);
+        }).then(hasUpstreams => {
+            if (!hasUpstreams) {
+                return Promise.reject("Invalid token"); // missing one or more upstreams == no validation
+            }
+            return Promise.resolve(user);
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/src-ts/db/WidgetStore.ts b/src-ts/db/WidgetStore.ts
new file mode 100644
index 0000000..3e8b37a
--- /dev/null
+++ b/src-ts/db/WidgetStore.ts
@@ -0,0 +1,32 @@
+import * as Promise from "bluebird";
+import WidgetRecord from "./models/WidgetRecord";
+import { Widget } from "../integrations/Widget";
+import { resolveIfExists } from "./DimensionStore";
+
+export class WidgetStore {
+
+    private constructor() {
+    }
+
+    public static listAll(isEnabled?: boolean): Promise<Widget[]> {
+        let conditions = {};
+        if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
+        return WidgetRecord.findAll(conditions).then(widgets => widgets.map(w => new Widget(w)));
+    }
+
+    public static setEnabled(type: string, isEnabled: boolean): Promise<any> {
+        return WidgetRecord.findOne({where: {type: type}}).then(resolveIfExists).then(widget => {
+            widget.isEnabled = isEnabled;
+            return widget.save();
+        });
+    }
+
+    public static setOptions(type: string, options: any): Promise<any> {
+        const optionsJson = JSON.stringify(options);
+        return WidgetRecord.findOne({where: {type: type}}).then(resolveIfExists).then(widget => {
+            widget.optionsJson = optionsJson;
+            return widget.save();
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/src-ts/db/migrations/20171224122045-AddAppservices.ts b/src-ts/db/migrations/20171224122045-AddAppservices.ts
new file mode 100644
index 0000000..cb22d08
--- /dev/null
+++ b/src-ts/db/migrations/20171224122045-AddAppservices.ts
@@ -0,0 +1,18 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+import * as Promise from "bluebird";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_appservice", {
+                "id": {type: DataType.STRING, primaryKey: true, allowNull: false},
+                "hsToken": {type: DataType.STRING, allowNull: false},
+                "asToken": {type: DataType.STRING, allowNull: false},
+                "userPrefix": {type: DataType.STRING, allowNull: false},
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return queryInterface.dropTable("dimension_appservice");
+    }
+}
\ No newline at end of file
diff --git a/src-ts/db/migrations/20171224124645-AddAppserviceUsers.ts b/src-ts/db/migrations/20171224124645-AddAppserviceUsers.ts
new file mode 100644
index 0000000..914d9db
--- /dev/null
+++ b/src-ts/db/migrations/20171224124645-AddAppserviceUsers.ts
@@ -0,0 +1,23 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+import * as Promise from "bluebird";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_appservice_users", {
+                "id": {type: DataType.STRING, primaryKey: true, allowNull: false},
+                "appserviceId": {
+                    type: DataType.STRING, allowNull: false,
+                    references: {model: "dimension_appservice", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "accessToken": {type: DataType.STRING, allowNull: false},
+                "displayName": {type: DataType.STRING, allowNull: true},
+                "avatarUrl": {type: DataType.STRING, allowNull: true},
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return queryInterface.dropTable("dimension_appservice_users");
+    }
+}
\ No newline at end of file
diff --git a/src-ts/db/models/AppService.ts b/src-ts/db/models/AppService.ts
new file mode 100644
index 0000000..2d6e746
--- /dev/null
+++ b/src-ts/db/models/AppService.ts
@@ -0,0 +1,21 @@
+import { Column, Model, PrimaryKey, Table } from "sequelize-typescript";
+
+@Table({
+    tableName: "dimension_appservice",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class AppService extends Model<AppService> {
+    @PrimaryKey
+    @Column
+    id: string;
+
+    @Column
+    hsToken: string;
+
+    @Column
+    asToken: string;
+
+    @Column
+    userPrefix: string;
+}
\ No newline at end of file
diff --git a/src-ts/db/models/AppServiceUser.ts b/src-ts/db/models/AppServiceUser.ts
new file mode 100644
index 0000000..a4e51fb
--- /dev/null
+++ b/src-ts/db/models/AppServiceUser.ts
@@ -0,0 +1,31 @@
+import { AllowNull, BelongsTo, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import AppService from "./AppService";
+
+@Table({
+    tableName: "dimension_appservice_users",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class AppServiceUser extends Model<AppServiceUser> {
+    @PrimaryKey
+    @Column
+    id: string;
+
+    @Column
+    accessToken: string;
+
+    @AllowNull
+    @Column
+    avatarUrl?: string;
+
+    @AllowNull
+    @Column
+    displayName?: string;
+
+    @Column
+    @ForeignKey(() => AppService)
+    appserviceId: string;
+
+    @BelongsTo(() => AppService)
+    appservice: AppService;
+}
\ No newline at end of file
diff --git a/src-ts/matrix/MatrixAppserviceClient.ts b/src-ts/matrix/MatrixAppserviceClient.ts
new file mode 100644
index 0000000..2d79560
--- /dev/null
+++ b/src-ts/matrix/MatrixAppserviceClient.ts
@@ -0,0 +1,26 @@
+import * as Promise from "bluebird";
+import { doFederatedApiCall } from "./helpers";
+import AppService from "../db/models/AppService";
+
+export interface MatrixUserResponse {
+    access_token: string;
+    device_id: string;
+    home_server: string;
+    user_id: string;
+}
+
+export class MatrixAppserviceClient {
+
+    constructor(private homeserverName: string, private appservice: AppService) {
+    }
+
+    public registerUser(localpart: string): Promise<MatrixUserResponse> {
+        return doFederatedApiCall(
+            "POST",
+            this.homeserverName,
+            "/_matrix/client/r0/register",
+            {access_token: this.appservice.asToken},
+            {type: "m.login.application_service", username: localpart},
+        );
+    }
+}
diff --git a/src-ts/models/MatrixEvent.ts b/src-ts/models/MatrixEvent.ts
new file mode 100644
index 0000000..d866c1f
--- /dev/null
+++ b/src-ts/models/MatrixEvent.ts
@@ -0,0 +1,12 @@
+export interface SimplifiedMatrixEvent {
+    age: number;
+    content: any;
+    event_id: string;
+    origin_server_ts: number;
+    room_id: string;
+    sender: string;
+    type: string;
+    unsigned: any;
+
+    // Other keys would be stuff related to the actual event, like membership and state_key
+}
\ No newline at end of file
diff --git a/web/app/admin/admin.component.ts b/web/app/admin/admin.component.ts
index 2505d56..e7f81ae 100644
--- a/web/app/admin/admin.component.ts
+++ b/web/app/admin/admin.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
-import { AdminApiService } from "../shared/services/admin-api.service";
+import { AdminApiService } from "../shared/services/admin/admin-api.service";
 
 @Component({
     templateUrl: "./admin.component.html",
diff --git a/web/app/admin/home/home.component.ts b/web/app/admin/home/home.component.ts
index 83d67b0..081e4db 100644
--- a/web/app/admin/home/home.component.ts
+++ b/web/app/admin/home/home.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
-import { AdminApiService } from "../../shared/services/admin-api.service";
-import { DimensionConfigResponse } from "../../shared/models/admin_responses";
+import { AdminApiService } from "../../shared/services/admin/admin-api.service";
+import { FE_DimensionConfig } from "../../shared/models/admin_responses";
 
 @Component({
     templateUrl: "./home.component.html",
@@ -9,7 +9,7 @@ import { DimensionConfigResponse } from "../../shared/models/admin_responses";
 export class AdminHomeComponent {
 
     public isLoading = true;
-    public config: DimensionConfigResponse;
+    public config: FE_DimensionConfig;
 
     constructor(adminApi: AdminApiService) {
         adminApi.getConfig().then(config => {
diff --git a/web/app/admin/widgets/etherpad/etherpad.component.ts b/web/app/admin/widgets/etherpad/etherpad.component.ts
index f2b31fc..87f63dc 100644
--- a/web/app/admin/widgets/etherpad/etherpad.component.ts
+++ b/web/app/admin/widgets/etherpad/etherpad.component.ts
@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
-import { AdminApiService } from "../../../shared/services/admin-api.service";
-import { EtherpadWidget } from "../../../shared/models/integration";
+import { FE_EtherpadWidget } from "../../../shared/models/integration";
 import { ToasterService } from "angular2-toaster";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetConfigDialogContext } from "../widgets.component";
+import { AdminIntegrationsApiService } from "../../../shared/services/admin/admin-integrations-api.service";
 
 @Component({
     templateUrl: "./etherpad.component.html",
@@ -12,17 +12,17 @@ import { WidgetConfigDialogContext } from "../widgets.component";
 export class AdminWidgetEtherpadConfigComponent implements ModalComponent<WidgetConfigDialogContext> {
 
     public isUpdating = false;
-    public widget: EtherpadWidget;
-    private originalWidget: EtherpadWidget;
+    public widget: FE_EtherpadWidget;
+    private originalWidget: FE_EtherpadWidget;
 
-    constructor(public dialog: DialogRef<WidgetConfigDialogContext>, private adminApi: AdminApiService, private toaster: ToasterService) {
+    constructor(public dialog: DialogRef<WidgetConfigDialogContext>, private adminIntegrationsApi: AdminIntegrationsApiService, private toaster: ToasterService) {
         this.originalWidget = dialog.context.widget;
         this.widget = JSON.parse(JSON.stringify(this.originalWidget));
     }
 
     public save() {
         this.isUpdating = true;
-        this.adminApi.setWidgetOptions(this.widget.category, this.widget.type, this.widget.options).then(() => {
+        this.adminIntegrationsApi.setIntegrationOptions(this.widget.category, this.widget.type, this.widget.options).then(() => {
             this.originalWidget.options = this.widget.options;
             this.toaster.pop("success", "Widget updated");
             this.dialog.close();
diff --git a/web/app/admin/widgets/jitsi/jitsi.component.ts b/web/app/admin/widgets/jitsi/jitsi.component.ts
index bdd6804..68ebfbd 100644
--- a/web/app/admin/widgets/jitsi/jitsi.component.ts
+++ b/web/app/admin/widgets/jitsi/jitsi.component.ts
@@ -1,9 +1,9 @@
 import { Component } from "@angular/core";
-import { AdminApiService } from "../../../shared/services/admin-api.service";
-import { JitsiWidget } from "../../../shared/models/integration";
+import { FE_JitsiWidget } from "../../../shared/models/integration";
 import { ToasterService } from "angular2-toaster";
 import { DialogRef, ModalComponent } from "ngx-modialog";
 import { WidgetConfigDialogContext } from "../widgets.component";
+import { AdminIntegrationsApiService } from "../../../shared/services/admin/admin-integrations-api.service";
 
 @Component({
     templateUrl: "./jitsi.component.html",
@@ -12,17 +12,17 @@ import { WidgetConfigDialogContext } from "../widgets.component";
 export class AdminWidgetJitsiConfigComponent implements ModalComponent<WidgetConfigDialogContext> {
 
     public isUpdating = false;
-    public widget: JitsiWidget;
-    private originalWidget: JitsiWidget;
+    public widget: FE_JitsiWidget;
+    private originalWidget: FE_JitsiWidget;
 
-    constructor(public dialog: DialogRef<WidgetConfigDialogContext>, private adminApi: AdminApiService, private toaster: ToasterService) {
+    constructor(public dialog: DialogRef<WidgetConfigDialogContext>, private adminIntegrationsApi: AdminIntegrationsApiService, private toaster: ToasterService) {
         this.originalWidget = dialog.context.widget;
         this.widget = JSON.parse(JSON.stringify(this.originalWidget));
     }
 
     public save() {
         this.isUpdating = true;
-        this.adminApi.setWidgetOptions(this.widget.category, this.widget.type, this.widget.options).then(() => {
+        this.adminIntegrationsApi.setIntegrationOptions(this.widget.category, this.widget.type, this.widget.options).then(() => {
             this.originalWidget.options = this.widget.options;
             this.toaster.pop("success", "Widget updated");
             this.dialog.close();
diff --git a/web/app/admin/widgets/widgets.component.ts b/web/app/admin/widgets/widgets.component.ts
index 286c5b1..510d1e0 100644
--- a/web/app/admin/widgets/widgets.component.ts
+++ b/web/app/admin/widgets/widgets.component.ts
@@ -1,14 +1,14 @@
 import { Component } from "@angular/core";
-import { AdminApiService } from "../../shared/services/admin-api.service";
-import { Widget } from "../../shared/models/integration";
+import { FE_Widget } from "../../shared/models/integration";
 import { ToasterService } from "angular2-toaster";
 import { AdminWidgetEtherpadConfigComponent } from "./etherpad/etherpad.component";
 import { Modal, overlayConfigFactory } from "ngx-modialog";
 import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
 import { AdminWidgetJitsiConfigComponent } from "./jitsi/jitsi.component";
+import { AdminIntegrationsApiService } from "../../shared/services/admin/admin-integrations-api.service";
 
 export class WidgetConfigDialogContext extends BSModalContext {
-    public widget: Widget;
+    public widget: FE_Widget;
 }
 
 @Component({
@@ -19,19 +19,19 @@ export class AdminWidgetsComponent {
 
     public isLoading = true;
     public isUpdating = false;
-    public widgets: Widget[];
+    public widgets: FE_Widget[];
 
-    constructor(private adminApi: AdminApiService, private toaster: ToasterService, private modal: Modal) {
-        adminApi.getAllIntegrations().then(integrations => {
+    constructor(private adminIntegrationsApi: AdminIntegrationsApiService, private toaster: ToasterService, private modal: Modal) {
+        this.adminIntegrationsApi.getAllIntegrations().then(integrations => {
             this.isLoading = false;
             this.widgets = integrations.widgets;
         });
     }
 
-    public disableWidget(widget: Widget) {
+    public disableWidget(widget: FE_Widget) {
         widget.isEnabled = !widget.isEnabled;
         this.isUpdating = true;
-        this.adminApi.toggleIntegration(widget.category, widget.type, widget.isEnabled).then(() => {
+        this.adminIntegrationsApi.toggleIntegration(widget.category, widget.type, widget.isEnabled).then(() => {
             this.isUpdating = false;
             this.toaster.pop("success", "Widget updated");
         }).catch(err => {
@@ -42,7 +42,7 @@ export class AdminWidgetsComponent {
         })
     }
 
-    public editWidget(widget: Widget) {
+    public editWidget(widget: FE_Widget) {
         let component = null;
 
         if (widget.type === "etherpad") component = AdminWidgetEtherpadConfigComponent;
@@ -62,7 +62,7 @@ export class AdminWidgetsComponent {
         }, WidgetConfigDialogContext));
     }
 
-    public hasConfiguration(widget: Widget) {
+    public hasConfiguration(widget: FE_Widget) {
         // Currently only Jitsi and Etherpad have additional configuration
         return widget.type === "jitsi" || widget.type === "etherpad";
     }
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 59cfc39..7475561 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -9,7 +9,7 @@ import { createNewHosts, removeNgStyles } from "@angularclass/hmr";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import { RiotComponent } from "./riot/riot.component";
 import { UiSwitchModule } from "angular2-ui-switch";
-import { ScalarClientApiService } from "./shared/services/scalar-client-api.service";
+import { ScalarClientApiService } from "./shared/services/scalar/scalar-client-api.service";
 import { ToasterModule } from "angular2-toaster";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { ScalarCloseComponent } from "./riot/scalar-close/scalar-close.component";
@@ -26,10 +26,9 @@ import { SpinnerComponent } from "./elements/spinner/spinner.component";
 import { BreadcrumbsModule } from "ng2-breadcrumbs";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { IntegrationBagComponent } from "./integration-bag/integration-bag.component";
-import { ScalarServerApiService } from "./shared/services/scalar-server-api.service";
-import { DimensionApiService } from "./shared/services/dimension-api.service";
-import { AdminApiService } from "./shared/services/admin-api.service";
-import { ServiceLocator } from "./shared/services/locator.service";
+import { ScalarServerApiService } from "./shared/services/scalar/scalar-server-api.service";
+import { AdminApiService } from "./shared/services/admin/admin-api.service";
+import { ServiceLocator } from "./shared/registry/ServiceLocator";
 import { IboxComponent } from "./elements/ibox/ibox.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/config_screen.widget.component";
@@ -45,6 +44,9 @@ import { AdminHomeComponent } from "./admin/home/home.component";
 import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
 import { AdminWidgetEtherpadConfigComponent } from "./admin/widgets/etherpad/etherpad.component";
 import { AdminWidgetJitsiConfigComponent } from "./admin/widgets/jitsi/jitsi.component";
+import { AdminIntegrationsApiService } from "./shared/services/admin/admin-integrations-api.service";
+import { IntegrationsApiService } from "./shared/services/integrations/integrations-api.service";
+import { WidgetApiService } from "./shared/services/integrations/widget-api.service";
 
 @NgModule({
     imports: [
@@ -93,10 +95,12 @@ import { AdminWidgetJitsiConfigComponent } from "./admin/widgets/jitsi/jitsi.com
         // Vendor
     ],
     providers: [
+        AdminApiService,
+        AdminIntegrationsApiService,
+        IntegrationsApiService,
+        WidgetApiService,
         ScalarClientApiService,
         ScalarServerApiService,
-        DimensionApiService,
-        AdminApiService,
         NameService,
         {provide: Window, useValue: window},
 
diff --git a/web/app/configs/widget/etherpad/etherpad.widget.component.ts b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
index 2f8f764..ae5fab1 100644
--- a/web/app/configs/widget/etherpad/etherpad.widget.component.ts
+++ b/web/app/configs/widget/etherpad/etherpad.widget.component.ts
@@ -1,7 +1,7 @@
 import { WidgetComponent } from "../widget.component";
 import { EditableWidget, WIDGET_ETHERPAD } from "../../../shared/models/widget";
 import { Component } from "@angular/core";
-import { EtherpadWidget } from "../../../shared/models/integration";
+import { FE_EtherpadWidget } from "../../../shared/models/integration";
 import { SessionStorage } from "../../../shared/SessionStorage";
 import { NameService } from "../../../shared/services/name.service";
 
@@ -11,7 +11,7 @@ import { NameService } from "../../../shared/services/name.service";
 })
 export class EtherpadWidgetConfigComponent extends WidgetComponent {
 
-    private etherpadWidget: EtherpadWidget = <EtherpadWidget>SessionStorage.editIntegration;
+    private etherpadWidget: FE_EtherpadWidget = <FE_EtherpadWidget>SessionStorage.editIntegration;
 
     constructor(private nameService: NameService) {
         super(WIDGET_ETHERPAD, "Etherpad", "generic", "etherpad");
diff --git a/web/app/configs/widget/jitsi/jitsi.widget.component.ts b/web/app/configs/widget/jitsi/jitsi.widget.component.ts
index 56966ef..ef4c805 100644
--- a/web/app/configs/widget/jitsi/jitsi.widget.component.ts
+++ b/web/app/configs/widget/jitsi/jitsi.widget.component.ts
@@ -1,7 +1,7 @@
 import { DISABLE_AUTOMATIC_WRAPPING, WidgetComponent } from "../widget.component";
 import { EditableWidget, WIDGET_JITSI } from "../../../shared/models/widget";
 import { Component } from "@angular/core";
-import { JitsiWidget } from "../../../shared/models/integration";
+import { FE_JitsiWidget } from "../../../shared/models/integration";
 import { SessionStorage } from "../../../shared/SessionStorage";
 import { NameService } from "../../../shared/services/name.service";
 import * as url from "url";
@@ -12,7 +12,7 @@ import * as url from "url";
 })
 export class JitsiWidgetConfigComponent extends WidgetComponent {
 
-    private jitsiWidget: JitsiWidget = <JitsiWidget>SessionStorage.editIntegration;
+    private jitsiWidget: FE_JitsiWidget = <FE_JitsiWidget>SessionStorage.editIntegration;
 
     constructor(private nameService: NameService) {
         super(WIDGET_JITSI, "Jitsi Video Conference", DISABLE_AUTOMATIC_WRAPPING);
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 1cce8f1..842c7f3 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,7 +1,7 @@
 import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
-import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
-import { ServiceLocator } from "../../shared/services/locator.service";
+import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
+import { ServiceLocator } from "../../shared/registry/ServiceLocator";
 import { SessionStorage } from "../../shared/SessionStorage";
 import { OnInit } from "@angular/core";
 
diff --git a/web/app/integration-bag/integration-bag.component.ts b/web/app/integration-bag/integration-bag.component.ts
index 046e161..125d21c 100644
--- a/web/app/integration-bag/integration-bag.component.ts
+++ b/web/app/integration-bag/integration-bag.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
-import { Integration } from "../shared/models/integration";
+import { FE_Integration } from "../shared/models/integration";
 
 @Component({
     selector: "my-integration-bag",
@@ -9,8 +9,8 @@ import { Integration } from "../shared/models/integration";
 })
 export class IntegrationBagComponent {
 
-    @Input() integrations: Integration[];
-    @Output() integrationClicked: EventEmitter<Integration> = new EventEmitter<Integration>();
+    @Input() integrations: FE_Integration[];
+    @Output() integrationClicked: EventEmitter<FE_Integration> = new EventEmitter<FE_Integration>();
 
     constructor(private sanitizer: DomSanitizer) {
     }
@@ -19,7 +19,7 @@ export class IntegrationBagComponent {
         return this.sanitizer.bypassSecurityTrustResourceUrl(url);
     }
 
-    public onClick(integration: Integration) {
+    public onClick(integration: FE_Integration) {
         this.integrationClicked.emit(integration);
     }
 }
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 29eaf93..e45783a 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -1,14 +1,14 @@
 import { Component } from "@angular/core";
 import { ToasterService } from "angular2-toaster";
 import { ActivatedRoute, Router } from "@angular/router";
-import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
+import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
 import * as _ from "lodash";
-import { ScalarServerApiService } from "../../shared/services/scalar-server-api.service";
-import { DimensionApiService } from "../../shared/services/dimension-api.service";
-import { Integration, IntegrationRequirement } from "../../shared/models/integration";
-import { IntegrationService } from "../../shared/services/integration.service";
+import { ScalarServerApiService } from "../../shared/services/scalar/scalar-server-api.service";
+import { FE_Integration, FE_IntegrationRequirement } from "../../shared/models/integration";
+import { IntegrationsRegistry } from "../../shared/registry/integrations.registry";
 import { SessionStorage } from "../../shared/SessionStorage";
-import { AdminApiService } from "../../shared/services/admin-api.service";
+import { AdminApiService } from "../../shared/services/admin/admin-api.service";
+import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -31,13 +31,13 @@ export class RiotHomeComponent {
     private userId: string;
     private requestedScreen: string = null;
     private requestedIntegrationId: string = null;
-    public integrationsForCategory: { [category: string]: Integration[] } = {};
+    public integrationsForCategory: { [category: string]: FE_Integration[] } = {};
     private categoryMap: { [categoryName: string]: string[] } = CATEGORY_MAP;
 
     constructor(private activatedRoute: ActivatedRoute,
                 private scalarApi: ScalarServerApiService,
                 private scalar: ScalarClientApiService,
-                private dimensionApi: DimensionApiService,
+                private integrationsApi: IntegrationsApiService,
                 private adminApi: AdminApiService,
                 private toaster: ToasterService,
                 private router: Router) {
@@ -106,12 +106,12 @@ export class RiotHomeComponent {
         return Object.keys(this.categoryMap);
     }
 
-    public getIntegrationsIn(category: string): Integration[] {
+    public getIntegrationsIn(category: string): FE_Integration[] {
         return this.integrationsForCategory[category];
     }
 
-    private getIntegrations(): Integration[] {
-        const result: Integration[] = [];
+    private getIntegrations(): FE_Integration[] {
+        const result: FE_Integration[] = [];
 
         for (const category of this.getCategories()) {
             for (const integration of this.getIntegrationsIn(category)) {
@@ -122,7 +122,7 @@ export class RiotHomeComponent {
         return result;
     }
 
-    public modifyIntegration(integration: Integration) {
+    public modifyIntegration(integration: FE_Integration) {
         SessionStorage.editIntegration = integration;
         SessionStorage.editsRequested++;
         console.log(this.userId + " is trying to modify " + integration.displayName);
@@ -165,10 +165,10 @@ export class RiotHomeComponent {
     private prepareIntegrations() {
         this.scalar.isRoomEncrypted(this.roomId).then(payload => {
             this.isRoomEncrypted = payload.response;
-            return this.dimensionApi.getIntegrations(this.roomId);
+            return this.integrationsApi.getIntegrations(this.roomId);
         }).then(response => {
-            const integrations: Integration[] = _.flatten(Object.keys(response).map(k => response[k]));
-            const supportedIntegrations: Integration[] = _.filter(integrations, i => IntegrationService.isSupported(i));
+            const integrations: FE_Integration[] = _.flatten(Object.keys(response).map(k => response[k]));
+            const supportedIntegrations: FE_Integration[] = _.filter(integrations, i => IntegrationsRegistry.isSupported(i));
 
             // Flag integrations that aren't supported in encrypted rooms
             if (this.isRoomEncrypted) {
@@ -206,7 +206,7 @@ export class RiotHomeComponent {
         let type = null;
         if (!this.requestedScreen) return;
 
-        const targetIntegration = IntegrationService.getIntegrationForScreen(this.requestedScreen);
+        const targetIntegration = IntegrationsRegistry.getIntegrationForScreen(this.requestedScreen);
         if (targetIntegration) {
             category = targetIntegration.category;
             type = targetIntegration.type;
@@ -228,7 +228,7 @@ export class RiotHomeComponent {
         console.log("Failed to find integration component for category=" + category + " type=" + type);
     }
 
-    private updateIntegrationState(integration: Integration) {
+    private updateIntegrationState(integration: FE_Integration) {
         if (!integration.requirements) return;
 
         let promises = integration.requirements.map(r => this.checkRequirement(r));
@@ -243,7 +243,7 @@ export class RiotHomeComponent {
         });
     }
 
-    private checkRequirement(requirement: IntegrationRequirement) {
+    private checkRequirement(requirement: FE_IntegrationRequirement) {
         switch (requirement.condition) {
             case "publicRoom":
                 return this.scalar.getJoinRule(this.roomId).then(payload => {
diff --git a/web/app/riot/scalar-close/scalar-close.component.ts b/web/app/riot/scalar-close/scalar-close.component.ts
index 265f248..fee01c0 100644
--- a/web/app/riot/scalar-close/scalar-close.component.ts
+++ b/web/app/riot/scalar-close/scalar-close.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { ScalarClientApiService } from "../../shared/services/scalar-client-api.service";
+import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
 
 @Component({
     selector: "my-scalar-close",
diff --git a/web/app/shared/SessionStorage.ts b/web/app/shared/SessionStorage.ts
index 6af9a36..e03477d 100644
--- a/web/app/shared/SessionStorage.ts
+++ b/web/app/shared/SessionStorage.ts
@@ -1,4 +1,4 @@
-import { Integration } from "./models/integration";
+import { FE_Integration } from "./models/integration";
 
 export class SessionStorage {
 
@@ -6,7 +6,7 @@ export class SessionStorage {
     public static userId: string;
     public static roomId: string;
     public static isAdmin: boolean;
-    public static editIntegration: Integration;
+    public static editIntegration: FE_Integration;
     public static editIntegrationId: string;
     public static editsRequested = 0;
 
diff --git a/web/app/shared/models/admin_responses.ts b/web/app/shared/models/admin_responses.ts
index 63cb43d..697c8cd 100644
--- a/web/app/shared/models/admin_responses.ts
+++ b/web/app/shared/models/admin_responses.ts
@@ -1,4 +1,4 @@
-export interface DimensionConfigResponse {
+export interface FE_DimensionConfig {
     admins: string[];
     widgetBlacklist: string[];
     homesever: {
@@ -8,6 +8,6 @@ export interface DimensionConfigResponse {
     };
 }
 
-export interface DimensionVersionResponse {
+export interface FE_DimensionVersion {
     version: string;
 }
\ No newline at end of file
diff --git a/web/app/shared/models/dimension_responses.ts b/web/app/shared/models/dimension_responses.ts
index 4da941f..23c5f1a 100644
--- a/web/app/shared/models/dimension_responses.ts
+++ b/web/app/shared/models/dimension_responses.ts
@@ -1,5 +1,5 @@
-import { Widget } from "./integration";
+import { FE_Widget } from "./integration";
 
-export interface DimensionIntegrationsResponse {
-    widgets: Widget[];
+export interface FE_IntegrationsResponse {
+    widgets: FE_Widget[];
 }
\ No newline at end of file
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index 949bce4..4bab96d 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -1,7 +1,7 @@
-export interface Integration {
+export interface FE_Integration {
     category: "bot" | "complex-bot" | "bridge" | "widget";
     type: string;
-    requirements: IntegrationRequirement[];
+    requirements: FE_IntegrationRequirement[];
     isEncryptionSupported: boolean;
     displayName: string;
     avatarUrl: string;
@@ -16,24 +16,24 @@ export interface Integration {
     _notSupportedReason: string;
 }
 
-export interface Widget extends Integration {
+export interface FE_Widget extends FE_Integration {
     options: any;
 }
 
-export interface EtherpadWidget extends Widget {
+export interface FE_EtherpadWidget extends FE_Widget {
     options: {
         defaultUrl: string;
     };
 }
 
-export interface JitsiWidget extends Widget {
+export interface FE_JitsiWidget extends FE_Widget {
     options: {
         jitsiDomain: string;
         scriptUrl: string;
     };
 }
 
-export interface IntegrationRequirement {
+export interface FE_IntegrationRequirement {
     condition: "publicRoom" | "canSendEventTypes";
     argument: any;
     expectedValue: any;
diff --git a/web/app/shared/models/scalar_server_responses.ts b/web/app/shared/models/scalar_server_responses.ts
index 9d29191..dbfa945 100644
--- a/web/app/shared/models/scalar_server_responses.ts
+++ b/web/app/shared/models/scalar_server_responses.ts
@@ -1,3 +1,3 @@
-export interface ScalarAccountResponse {
+export interface FE_ScalarAccountResponse {
     user_id: string;
 }
\ No newline at end of file
diff --git a/web/app/shared/services/locator.service.ts b/web/app/shared/registry/ServiceLocator.ts
similarity index 100%
rename from web/app/shared/services/locator.service.ts
rename to web/app/shared/registry/ServiceLocator.ts
diff --git a/web/app/shared/services/integration.service.ts b/web/app/shared/registry/integrations.registry.ts
similarity index 74%
rename from web/app/shared/services/integration.service.ts
rename to web/app/shared/registry/integrations.registry.ts
index 1a73f70..6ecacf8 100644
--- a/web/app/shared/services/integration.service.ts
+++ b/web/app/shared/registry/integrations.registry.ts
@@ -3,10 +3,10 @@ import {
     WIDGET_CUSTOM, WIDGET_ETHERPAD, WIDGET_GOOGLE_CALENDAR, WIDGET_GOOGLE_DOCS, WIDGET_JITSI, WIDGET_TWITCH,
     WIDGET_YOUTUBE
 } from "../models/widget";
-import { Integration } from "../models/integration";
+import { FE_Integration } from "../models/integration";
 
 @Injectable()
-export class IntegrationService {
+export class IntegrationsRegistry {
 
     private static supportedIntegrationsMap = {
         "bot": {}, // empty == supported
@@ -43,8 +43,8 @@ export class IntegrationService {
         },
     };
 
-    static isSupported(integration: Integration): boolean {
-        const forType = IntegrationService.supportedIntegrationsMap[integration.category];
+    static isSupported(integration: FE_Integration): boolean {
+        const forType = IntegrationsRegistry.supportedIntegrationsMap[integration.category];
         if (!forType) return false;
 
         if (Object.keys(forType).length === 0) return true;
@@ -53,9 +53,9 @@ export class IntegrationService {
     }
 
     static getIntegrationForScreen(screen: string): { category: string, type: string } {
-        for (const category of Object.keys(IntegrationService.supportedIntegrationsMap)) {
-            for (const type of Object.keys(IntegrationService.supportedIntegrationsMap[category])) {
-                const integrationTypes = IntegrationService.supportedIntegrationsMap[category][type].types;
+        for (const category of Object.keys(IntegrationsRegistry.supportedIntegrationsMap)) {
+            for (const type of Object.keys(IntegrationsRegistry.supportedIntegrationsMap[category])) {
+                const integrationTypes = IntegrationsRegistry.supportedIntegrationsMap[category][type].types;
                 if (!integrationTypes) continue;
 
                 const integrationScreens = integrationTypes.map(t => "type_" + t);
diff --git a/web/app/shared/services/admin-api.service.ts b/web/app/shared/services/admin-api.service.ts
deleted file mode 100644
index 5003211..0000000
--- a/web/app/shared/services/admin-api.service.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Injectable } from "@angular/core";
-import { Http } from "@angular/http";
-import { AuthedApi } from "./AuthedApi";
-import { DimensionConfigResponse, DimensionVersionResponse } from "../models/admin_responses";
-import { DimensionIntegrationsResponse } from "../models/dimension_responses";
-
-@Injectable()
-export class AdminApiService extends AuthedApi {
-    constructor(http: Http) {
-        super(http);
-    }
-
-    public isAdmin(): Promise<any> {
-        return this.authedGet("/api/v1/dimension/admin/check").map(r => r.json()).toPromise();
-    }
-
-    public getConfig(): Promise<DimensionConfigResponse> {
-        return this.authedGet("/api/v1/dimension/admin/config").map(r => r.json()).toPromise();
-    }
-
-    public getVersion(): Promise<DimensionVersionResponse> {
-        return this.authedGet("/api/v1/dimension/admin/version").map(r => r.json()).toPromise();
-    }
-
-    public getAllIntegrations(): Promise<DimensionIntegrationsResponse> {
-        return this.authedGet("/api/v1/dimension/integrations/all").map(r => r.json()).toPromise();
-    }
-
-    public toggleIntegration(category: string, type: string, enabled: boolean): Promise<any> {
-        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/enabled", {enabled: enabled}).map(r => r.json()).toPromise();
-    }
-
-    public setWidgetOptions(category: string, type: string, options: any): Promise<any> {
-        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/options", {options: options}).map(r => r.json()).toPromise();
-    }
-}
diff --git a/web/app/shared/services/admin/admin-api.service.ts b/web/app/shared/services/admin/admin-api.service.ts
new file mode 100644
index 0000000..b79b2d4
--- /dev/null
+++ b/web/app/shared/services/admin/admin-api.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_DimensionConfig, FE_DimensionVersion } from "../../models/admin_responses";
+
+@Injectable()
+export class AdminApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public isAdmin(): Promise<any> {
+        return this.authedGet("/api/v1/dimension/admin/check").map(r => r.json()).toPromise();
+    }
+
+    public getConfig(): Promise<FE_DimensionConfig> {
+        return this.authedGet("/api/v1/dimension/admin/config").map(r => r.json()).toPromise();
+    }
+
+    public getVersion(): Promise<FE_DimensionVersion> {
+        return this.authedGet("/api/v1/dimension/admin/version").map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/admin/admin-integrations-api.service.ts b/web/app/shared/services/admin/admin-integrations-api.service.ts
new file mode 100644
index 0000000..e2aee60
--- /dev/null
+++ b/web/app/shared/services/admin/admin-integrations-api.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_IntegrationsResponse } from "../../models/dimension_responses";
+
+@Injectable()
+export class AdminIntegrationsApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getAllIntegrations(): Promise<FE_IntegrationsResponse> {
+        return this.authedGet("/api/v1/dimension/integrations/all").map(r => r.json()).toPromise();
+    }
+
+    public toggleIntegration(category: string, type: string, enabled: boolean): Promise<any> {
+        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/enabled", {enabled: enabled}).map(r => r.json()).toPromise();
+    }
+
+    public setIntegrationOptions(category: string, type: string, options: any): Promise<any> {
+        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/options", {options: options}).map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/dimension-api.service.ts b/web/app/shared/services/dimension-api.service.ts
deleted file mode 100644
index 4c2174a..0000000
--- a/web/app/shared/services/dimension-api.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from "@angular/core";
-import { Http } from "@angular/http";
-import { AuthedApi } from "./AuthedApi";
-import { DimensionIntegrationsResponse } from "../models/dimension_responses";
-import { Widget } from "../models/integration";
-
-@Injectable()
-export class DimensionApiService extends AuthedApi {
-    constructor(http: Http) {
-        super(http);
-    }
-
-    public getIntegrations(roomId: string): Promise<DimensionIntegrationsResponse> {
-        return this.authedGet("/api/v1/dimension/integrations/room/" + roomId).map(r => r.json()).toPromise();
-    }
-
-    public getWidget(type: string): Promise<Widget> {
-        return this.http.get("/api/v1/dimension/integrations/widget/" + type).map(r => r.json()).toPromise();
-    }
-
-    public isEmbeddable(url: string): Promise<any> { // 200 = success, anything else = error
-        return this.http.get("/api/v1/dimension/widgets/embeddable", {params: {url: url}})
-            .map(r => r.json()).toPromise();
-    }
-}
diff --git a/web/app/shared/services/integrations/integrations-api.service.ts b/web/app/shared/services/integrations/integrations-api.service.ts
new file mode 100644
index 0000000..81a493c
--- /dev/null
+++ b/web/app/shared/services/integrations/integrations-api.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_IntegrationsResponse } from "../../models/dimension_responses";
+import { FE_Integration, FE_Widget } from "../../models/integration";
+
+@Injectable()
+export class IntegrationsApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getIntegrations(roomId: string): Promise<FE_IntegrationsResponse> {
+        return this.authedGet("/api/v1/dimension/integrations/room/" + roomId).map(r => r.json()).toPromise();
+    }
+
+    public getIntegration(category: string, type: string): Promise<FE_Integration> {
+        return this.http.get("/api/v1/dimension/integrations/" + category + "/" + type).map(r => r.json()).toPromise();
+    }
+
+    public getWidget(type: string): Promise<FE_Widget> {
+        return this.getIntegration("widget", type).then(i => <FE_Widget>i);
+    }
+
+    public isEmbeddable(url: string): Promise<any> { // 200 = success, anything else = error
+        return this.http.get("/api/v1/dimension/widgets/embeddable", {params: {url: url}})
+            .map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/integrations/widget-api.service.ts b/web/app/shared/services/integrations/widget-api.service.ts
new file mode 100644
index 0000000..d8aa2b6
--- /dev/null
+++ b/web/app/shared/services/integrations/widget-api.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_Widget } from "../../models/integration";
+import { IntegrationsApiService } from "./integrations-api.service";
+
+@Injectable()
+export class WidgetApiService extends AuthedApi {
+    constructor(http: Http, private integrationsApi: IntegrationsApiService) {
+        super(http);
+    }
+
+    public getWidget(type: string): Promise<FE_Widget> {
+        return this.integrationsApi.getIntegration("widget", type).then(i => <FE_Widget>i);
+    }
+
+    public isEmbeddable(url: string): Promise<any> { // 200 = success, anything else = error
+        return this.http.get("/api/v1/dimension/widgets/embeddable", {params: {url: url}})
+            .map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/scalar-client-api.service.ts b/web/app/shared/services/scalar/scalar-client-api.service.ts
similarity index 97%
rename from web/app/shared/services/scalar-client-api.service.ts
rename to web/app/shared/services/scalar/scalar-client-api.service.ts
index b117d52..0e82340 100644
--- a/web/app/shared/services/scalar-client-api.service.ts
+++ b/web/app/shared/services/scalar/scalar-client-api.service.ts
@@ -6,8 +6,8 @@ import {
     MembershipStateResponse, RoomEncryptionStatusResponse,
     ScalarSuccessResponse,
     WidgetsResponse
-} from "../models/scalar_client_responses";
-import { EditableWidget } from "../models/widget";
+} from "../../models/scalar_client_responses";
+import { EditableWidget } from "../../models/widget";
 
 @Injectable()
 export class ScalarClientApiService {
diff --git a/web/app/shared/services/scalar-server-api.service.ts b/web/app/shared/services/scalar/scalar-server-api.service.ts
similarity index 62%
rename from web/app/shared/services/scalar-server-api.service.ts
rename to web/app/shared/services/scalar/scalar-server-api.service.ts
index e0703a8..95a1818 100644
--- a/web/app/shared/services/scalar-server-api.service.ts
+++ b/web/app/shared/services/scalar/scalar-server-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { ScalarAccountResponse } from "../models/scalar_server_responses";
-import { AuthedApi } from "./AuthedApi";
+import { FE_ScalarAccountResponse } from "../../models/scalar_server_responses";
+import { AuthedApi } from "../AuthedApi";
 
 @Injectable()
 export class ScalarServerApiService extends AuthedApi {
@@ -9,7 +9,7 @@ export class ScalarServerApiService extends AuthedApi {
         super(http)
     }
 
-    public getAccount(): Promise<ScalarAccountResponse> {
+    public getAccount(): Promise<FE_ScalarAccountResponse> {
         return this.authedGet("/api/v1/scalar/account").map(res => res.json()).toPromise();
     }
 }
diff --git a/web/app/widget_wrappers/generic/generic.component.ts b/web/app/widget_wrappers/generic/generic.component.ts
index 50a6d99..701bfc5 100644
--- a/web/app/widget_wrappers/generic/generic.component.ts
+++ b/web/app/widget_wrappers/generic/generic.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { DomSanitizer, SafeUrl } from "@angular/platform-browser";
-import { DimensionApiService } from "../../shared/services/dimension-api.service";
+import { WidgetApiService } from "../../shared/services/integrations/widget-api.service";
 
 @Component({
     selector: "my-generic-widget-wrapper",
@@ -14,10 +14,10 @@ export class GenericWidgetWrapperComponent {
     public canEmbed = false;
     public embedUrl: SafeUrl = null;
 
-    constructor(api: DimensionApiService, activatedRoute: ActivatedRoute, sanitizer: DomSanitizer) {
+    constructor(widgetApi: WidgetApiService, activatedRoute: ActivatedRoute, sanitizer: DomSanitizer) {
         let params: any = activatedRoute.snapshot.queryParams;
 
-        api.isEmbeddable(params.url).then(result => {
+        widgetApi.isEmbeddable(params.url).then(result => {
             this.canEmbed = result.canEmbed;
             this.isLoading = false;
             this.embedUrl = sanitizer.bypassSecurityTrustResourceUrl(params.url);
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.ts b/web/app/widget_wrappers/jitsi/jitsi.component.ts
index 8b9edc0..790f280 100644
--- a/web/app/widget_wrappers/jitsi/jitsi.component.ts
+++ b/web/app/widget_wrappers/jitsi/jitsi.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import * as $ from "jquery";
-import { DimensionApiService } from "../../shared/services/dimension-api.service";
-import { JitsiWidget } from "../../shared/models/integration";
+import { FE_JitsiWidget } from "../../shared/models/integration";
+import { WidgetApiService } from "../../shared/services/integrations/widget-api.service";
 
 declare var JitsiMeetExternalAPI: any;
 
@@ -22,7 +22,7 @@ export class JitsiWidgetWrapperComponent implements OnInit {
     private userId: string;
     private jitsiApiObj: any;
 
-    constructor(activatedRoute: ActivatedRoute, private api: DimensionApiService) {
+    constructor(activatedRoute: ActivatedRoute, private widgetApi: WidgetApiService) {
         let params: any = activatedRoute.snapshot.queryParams;
 
         this.domain = params.domain;
@@ -33,8 +33,8 @@ export class JitsiWidgetWrapperComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.api.getWidget("jitsi").then(integration => {
-            const widget = <JitsiWidget>integration;
+        this.widgetApi.getWidget("jitsi").then(integration => {
+            const widget = <FE_JitsiWidget>integration;
             $.getScript(widget.options.scriptUrl);
         });
     }

From 70d1d23352e48aa1e409b8bfb0a9b6b5bdc8dc29 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Dec 2017 02:09:40 -0700
Subject: [PATCH 043/111] Appease the linter

---
 .../dimension/DimensionIntegrationsService.ts | 34 +++++++++----------
 .../api/matrix/MatrixAppServiceApiService.ts  |  4 +++
 src-ts/db/AppserviceStore.ts                  |  6 ++--
 src-ts/db/ScalarStore.ts                      |  5 ++-
 src-ts/db/WidgetStore.ts                      |  6 ++--
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src-ts/api/dimension/DimensionIntegrationsService.ts
index 3844ac4..52dfbef 100644
--- a/src-ts/api/dimension/DimensionIntegrationsService.ts
+++ b/src-ts/api/dimension/DimensionIntegrationsService.ts
@@ -20,6 +20,23 @@ export class DimensionIntegrationsService {
         DimensionIntegrationsService.integrationCache.clear();
     }
 
+    public static getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
+        const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
+        if (cachedResponse) {
+            return cachedResponse;
+        }
+        const response = <IntegrationsResponse>{
+            widgets: [],
+        };
+        return Promise.resolve()
+            .then(() => WidgetStore.listAll(isEnabledCheck))
+            .then(widgets => response.widgets = widgets)
+
+            // Cache and return response
+            .then(() => DimensionIntegrationsService.integrationCache.put("integrations_" + isEnabledCheck, response))
+            .then(() => response);
+    }
+
     @GET
     @Path("enabled")
     public getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
@@ -52,21 +69,4 @@ export class DimensionIntegrationsService {
             throw new ApiError(404, "Integration not found");
         });
     }
-
-    public static getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
-        const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
-        if (cachedResponse) {
-            return cachedResponse;
-        }
-        const response = <IntegrationsResponse>{
-            widgets: [],
-        };
-        return Promise.resolve()
-            .then(() => WidgetStore.listAll(isEnabledCheck))
-            .then(widgets => response.widgets = widgets)
-
-            // Cache and return response
-            .then(() => DimensionIntegrationsService.integrationCache.put("integrations_" + isEnabledCheck, response))
-            .then(() => response);
-    }
 }
\ No newline at end of file
diff --git a/src-ts/api/matrix/MatrixAppServiceApiService.ts b/src-ts/api/matrix/MatrixAppServiceApiService.ts
index fc0c78a..505ad63 100644
--- a/src-ts/api/matrix/MatrixAppServiceApiService.ts
+++ b/src-ts/api/matrix/MatrixAppServiceApiService.ts
@@ -9,6 +9,10 @@ interface AppServiceTransaction {
     events: SimplifiedMatrixEvent[];
 }
 
+// Note: There's no actual defined prefix for this API. The following was chosen to be
+// somewhat consistent with the other matrix APIs. In reality, the homeserver will just
+// hit the URL given in the registration - be sure to define it to match this prefix.
+// Eg: `url: "http://localhost:8184/_matrix/appservice/r0"`
 @Path("/_matrix/appservice/r0")
 export class MatrixAppServiceApiService {
 
diff --git a/src-ts/db/AppserviceStore.ts b/src-ts/db/AppserviceStore.ts
index 1748b4a..c454270 100644
--- a/src-ts/db/AppserviceStore.ts
+++ b/src-ts/db/AppserviceStore.ts
@@ -8,9 +8,6 @@ import config from "../config";
 
 export class AppserviceStore {
 
-    private constructor() {
-    }
-
     public static create(userPrefix: string): Promise<AppService> {
         const id = "dimension-" + randomString({length: 25});
         const asToken = randomString({length: 100});
@@ -60,4 +57,7 @@ export class AppserviceStore {
             });
         });
     }
+
+    private constructor() {
+    }
 }
\ No newline at end of file
diff --git a/src-ts/db/ScalarStore.ts b/src-ts/db/ScalarStore.ts
index 17bd37a..909fb5e 100644
--- a/src-ts/db/ScalarStore.ts
+++ b/src-ts/db/ScalarStore.ts
@@ -6,9 +6,6 @@ import User from "./models/User";
 
 export class ScalarStore {
 
-    private constructor() {
-    }
-
     public static doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
         let upstreamTokenIds: number[] = [];
         let hasDimensionToken = false;
@@ -53,4 +50,6 @@ export class ScalarStore {
         });
     }
 
+    private constructor() {
+    }
 }
\ No newline at end of file
diff --git a/src-ts/db/WidgetStore.ts b/src-ts/db/WidgetStore.ts
index 3e8b37a..4c22a5b 100644
--- a/src-ts/db/WidgetStore.ts
+++ b/src-ts/db/WidgetStore.ts
@@ -5,9 +5,6 @@ import { resolveIfExists } from "./DimensionStore";
 
 export class WidgetStore {
 
-    private constructor() {
-    }
-
     public static listAll(isEnabled?: boolean): Promise<Widget[]> {
         let conditions = {};
         if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
@@ -29,4 +26,7 @@ export class WidgetStore {
         });
     }
 
+    private constructor() {
+    }
+
 }
\ No newline at end of file

From c5b803343e58a1a9236e4463bc54c1b30f17b8f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Dec 2017 02:28:48 -0700
Subject: [PATCH 044/111] Move app from src-ts to src

---
 .gitignore                                    |   4 +-
 src/Dimension.js                              |  67 ----
 src/DimensionApi.js                           | 307 ------------------
 {src-ts => src}/MemoryCache.ts                |   0
 src/OpenID.js                                 |  11 -
 src/ScalarApi.js                              | 115 -------
 src/UpstreamConfiguration.js                  |  50 ---
 {src-ts => src}/api/ApiError.ts               |   0
 {src-ts => src}/api/Webserver.ts              |   0
 .../api/dimension/DimensionAdminService.ts    |   0
 .../DimensionAppserviceAdminService.ts        |   0
 .../DimensionIntegrationsAdminService.ts      |   0
 .../dimension/DimensionIntegrationsService.ts |   0
 .../api/matrix/MatrixAppServiceApiService.ts  |   0
 {src-ts => src}/api/scalar/ScalarService.ts   |   0
 .../api/scalar/ScalarWidgetService.ts         |   0
 {src-ts => src}/config.ts                     |   0
 {src-ts => src}/db/AppserviceStore.ts         |   0
 {src-ts => src}/db/DimensionStore.ts          |   0
 {src-ts => src}/db/ScalarStore.ts             |   0
 {src-ts => src}/db/WidgetStore.ts             |   0
 .../db/migrations/20171218203245-AddTables.ts |   0
 .../migrations/20171218203245-AddWidgets.ts   |   0
 .../20171224122045-AddAppservices.ts          |   0
 .../20171224124645-AddAppserviceUsers.ts      |   0
 {src-ts => src}/db/models/AppService.ts       |   0
 {src-ts => src}/db/models/AppServiceUser.ts   |   0
 .../db/models/IntegrationRecord.ts            |   0
 {src-ts => src}/db/models/Upstream.ts         |   0
 {src-ts => src}/db/models/User.ts             |   0
 {src-ts => src}/db/models/UserScalarToken.ts  |   0
 {src-ts => src}/db/models/WidgetRecord.ts     |   0
 {src-ts => src}/index.ts                      |   0
 src/integration/generic_types/Bridge.js       |  22 --
 src/integration/generic_types/ComplexBot.js   |  18 -
 .../generic_types/IntegrationStub.js          |  44 ---
 src/integration/generic_types/Widget.js       |  22 --
 src/integration/impl/StubbedFactory.js        |  20 --
 src/integration/impl/circleci/CircleCiBot.js  |  53 ---
 .../impl/circleci/CircleCiFactory.js          |  20 --
 .../impl/circleci/StubbedCircleCiBackbone.js  |  63 ----
 .../impl/circleci/VectorCircleCiBackbone.js   | 108 ------
 src/integration/impl/index.js                 |  46 ---
 src/integration/impl/irc/IRCApi.js            | 114 -------
 src/integration/impl/irc/IRCBridge.js         |  75 -----
 src/integration/impl/irc/IRCFactory.js        |  20 --
 .../impl/irc/StubbedIrcBackbone.js            |  60 ----
 src/integration/impl/irc/VectorIrcBackbone.js | 120 -------
 src/integration/impl/rss/RSSBot.js            |  49 ---
 src/integration/impl/rss/RSSFactory.js        |  20 --
 .../impl/rss/StubbedRssBackbone.js            |  55 ----
 src/integration/impl/rss/VectorRssBackbone.js |  82 -----
 .../impl/simple_bot/HostedSimpleBackbone.js   |  31 --
 src/integration/impl/simple_bot/SimpleBot.js  |  24 --
 .../impl/simple_bot/SimpleBotFactory.js       |  27 --
 .../impl/simple_bot/StubbedSimpleBackbone.js  |  24 --
 .../impl/simple_bot/VectorSimpleBackbone.js   |  28 --
 .../impl/simple_widget/SimpleWidget.js        |  17 -
 .../impl/simple_widget/SimpleWidgetFactory.js |  13 -
 .../impl/travisci/StubbedTravisCiBackbone.js  |  63 ----
 src/integration/impl/travisci/TravisCiBot.js  |  53 ---
 .../impl/travisci/TravisCiFactory.js          |  20 --
 .../impl/travisci/VectorTravisCiBackbone.js   | 108 ------
 src/integration/index.js                      |  78 -----
 {src-ts => src}/integrations/Integration.ts   |   0
 {src-ts => src}/integrations/Widget.ts        |   0
 src/matrix/DemoBot.js                         |  66 ----
 .../matrix/MatrixAppserviceClient.ts          |   0
 src/matrix/MatrixLiteClient.js                |  96 +-----
 {src-ts => src}/matrix/MatrixLiteClient.ts    |   0
 {src-ts => src}/matrix/MatrixOpenIdClient.ts  |   0
 {src-ts => src}/matrix/helpers.ts             |   0
 {src-ts => src}/models/MatrixEvent.ts         |   0
 {src-ts => src}/models/OpenId.ts              |   0
 {src-ts => src}/models/ScalarResponses.ts     |   0
 src/scalar/ScalarClient.js                    |  84 ++---
 {src-ts => src}/scalar/ScalarClient.ts        |   0
 src/scalar/VectorScalarClient.js              | 260 ---------------
 src/storage/DimensionStore.js                 | 120 -------
 src/storage/models/tokens.js                  |  45 ---
 {src-ts => src}/temp_todo.txt                 |   0
 src/util/LogService.js                        | 100 ------
 {src-ts => src}/version.ts                    |   0
 tsconfig-app.json                             |   2 +-
 84 files changed, 49 insertions(+), 2775 deletions(-)
 delete mode 100644 src/Dimension.js
 delete mode 100644 src/DimensionApi.js
 rename {src-ts => src}/MemoryCache.ts (100%)
 delete mode 100644 src/OpenID.js
 delete mode 100644 src/ScalarApi.js
 delete mode 100644 src/UpstreamConfiguration.js
 rename {src-ts => src}/api/ApiError.ts (100%)
 rename {src-ts => src}/api/Webserver.ts (100%)
 rename {src-ts => src}/api/dimension/DimensionAdminService.ts (100%)
 rename {src-ts => src}/api/dimension/DimensionAppserviceAdminService.ts (100%)
 rename {src-ts => src}/api/dimension/DimensionIntegrationsAdminService.ts (100%)
 rename {src-ts => src}/api/dimension/DimensionIntegrationsService.ts (100%)
 rename {src-ts => src}/api/matrix/MatrixAppServiceApiService.ts (100%)
 rename {src-ts => src}/api/scalar/ScalarService.ts (100%)
 rename {src-ts => src}/api/scalar/ScalarWidgetService.ts (100%)
 rename {src-ts => src}/config.ts (100%)
 rename {src-ts => src}/db/AppserviceStore.ts (100%)
 rename {src-ts => src}/db/DimensionStore.ts (100%)
 rename {src-ts => src}/db/ScalarStore.ts (100%)
 rename {src-ts => src}/db/WidgetStore.ts (100%)
 rename {src-ts => src}/db/migrations/20171218203245-AddTables.ts (100%)
 rename {src-ts => src}/db/migrations/20171218203245-AddWidgets.ts (100%)
 rename {src-ts => src}/db/migrations/20171224122045-AddAppservices.ts (100%)
 rename {src-ts => src}/db/migrations/20171224124645-AddAppserviceUsers.ts (100%)
 rename {src-ts => src}/db/models/AppService.ts (100%)
 rename {src-ts => src}/db/models/AppServiceUser.ts (100%)
 rename {src-ts => src}/db/models/IntegrationRecord.ts (100%)
 rename {src-ts => src}/db/models/Upstream.ts (100%)
 rename {src-ts => src}/db/models/User.ts (100%)
 rename {src-ts => src}/db/models/UserScalarToken.ts (100%)
 rename {src-ts => src}/db/models/WidgetRecord.ts (100%)
 rename {src-ts => src}/index.ts (100%)
 delete mode 100644 src/integration/generic_types/Bridge.js
 delete mode 100644 src/integration/generic_types/ComplexBot.js
 delete mode 100644 src/integration/generic_types/IntegrationStub.js
 delete mode 100644 src/integration/generic_types/Widget.js
 delete mode 100644 src/integration/impl/StubbedFactory.js
 delete mode 100644 src/integration/impl/circleci/CircleCiBot.js
 delete mode 100644 src/integration/impl/circleci/CircleCiFactory.js
 delete mode 100644 src/integration/impl/circleci/StubbedCircleCiBackbone.js
 delete mode 100644 src/integration/impl/circleci/VectorCircleCiBackbone.js
 delete mode 100644 src/integration/impl/index.js
 delete mode 100644 src/integration/impl/irc/IRCApi.js
 delete mode 100644 src/integration/impl/irc/IRCBridge.js
 delete mode 100644 src/integration/impl/irc/IRCFactory.js
 delete mode 100644 src/integration/impl/irc/StubbedIrcBackbone.js
 delete mode 100644 src/integration/impl/irc/VectorIrcBackbone.js
 delete mode 100644 src/integration/impl/rss/RSSBot.js
 delete mode 100644 src/integration/impl/rss/RSSFactory.js
 delete mode 100644 src/integration/impl/rss/StubbedRssBackbone.js
 delete mode 100644 src/integration/impl/rss/VectorRssBackbone.js
 delete mode 100644 src/integration/impl/simple_bot/HostedSimpleBackbone.js
 delete mode 100644 src/integration/impl/simple_bot/SimpleBot.js
 delete mode 100644 src/integration/impl/simple_bot/SimpleBotFactory.js
 delete mode 100644 src/integration/impl/simple_bot/StubbedSimpleBackbone.js
 delete mode 100644 src/integration/impl/simple_bot/VectorSimpleBackbone.js
 delete mode 100644 src/integration/impl/simple_widget/SimpleWidget.js
 delete mode 100644 src/integration/impl/simple_widget/SimpleWidgetFactory.js
 delete mode 100644 src/integration/impl/travisci/StubbedTravisCiBackbone.js
 delete mode 100644 src/integration/impl/travisci/TravisCiBot.js
 delete mode 100644 src/integration/impl/travisci/TravisCiFactory.js
 delete mode 100644 src/integration/impl/travisci/VectorTravisCiBackbone.js
 delete mode 100644 src/integration/index.js
 rename {src-ts => src}/integrations/Integration.ts (100%)
 rename {src-ts => src}/integrations/Widget.ts (100%)
 delete mode 100644 src/matrix/DemoBot.js
 rename {src-ts => src}/matrix/MatrixAppserviceClient.ts (100%)
 rename {src-ts => src}/matrix/MatrixLiteClient.ts (100%)
 rename {src-ts => src}/matrix/MatrixOpenIdClient.ts (100%)
 rename {src-ts => src}/matrix/helpers.ts (100%)
 rename {src-ts => src}/models/MatrixEvent.ts (100%)
 rename {src-ts => src}/models/OpenId.ts (100%)
 rename {src-ts => src}/models/ScalarResponses.ts (100%)
 rename {src-ts => src}/scalar/ScalarClient.ts (100%)
 delete mode 100644 src/scalar/VectorScalarClient.js
 delete mode 100644 src/storage/DimensionStore.js
 delete mode 100644 src/storage/models/tokens.js
 rename {src-ts => src}/temp_todo.txt (100%)
 delete mode 100644 src/util/LogService.js
 rename {src-ts => src}/version.ts (100%)

diff --git a/.gitignore b/.gitignore
index 1de6ce0..3d0f9d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,8 @@ config/integrations/*_development.yaml
 config/integrations/*_production.yaml
 build/
 dimension.db
-src-ts/**/*.js
-src-ts/**/*.js.map
+src/**/*.js
+src/**/*.js.map
 web/**/*.js
 web/**/*.js.map
 
diff --git a/src/Dimension.js b/src/Dimension.js
deleted file mode 100644
index 3914722..0000000
--- a/src/Dimension.js
+++ /dev/null
@@ -1,67 +0,0 @@
-var express = require("express");
-var config = require("config");
-var log = require("./util/LogService");
-var DimensionStore = require("./storage/DimensionStore");
-var bodyParser = require('body-parser');
-var path = require("path");
-var DimensionApi = require("./DimensionApi");
-var ScalarApi = require("./ScalarApi");
-var IRCApi = require("./integration/impl/irc/IRCApi");
-var URL = require("url");
-
-// TODO: Convert backend to typescript? Would avoid stubbing classes all over the place
-
-/**
- * Primary entry point for Dimension
- */
-class Dimension {
-
-    /**
-     * Creates a new Dimension
-     */
-    constructor() {
-    }
-
-    /**
-     * Starts the Dimension service
-     * @param {DimensionStore} db the store to use
-     */
-    start(db) {
-        this._db = db;
-        this._app = express();
-        this._app.use(express.static('web-dist'));
-        this._app.use(bodyParser.json());
-
-        // Register routes for angular app
-        this._app.get(['/riot', '/riot/*', '/widgets', '/widgets/*'], (req, res) => {
-            res.sendFile(path.join(__dirname, "..", "web-dist", "index.html"));
-        });
-
-        // Allow CORS
-        this._app.use((req, res, next) => {
-            res.setHeader("Access-Control-Allow-Origin", "*");
-            res.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-            next();
-        });
-
-        // Logging incoming requests
-        this._app.use((req, res, next) => {
-            var parsedUrl = URL.parse(req.url, true);
-            if (parsedUrl.query && parsedUrl.query["scalar_token"]) {
-                parsedUrl.query["scalar_token"] = "redacted";
-                parsedUrl.search = undefined; // to trigger the URL.format to use `query`
-            }
-            log.verbose("Dimension", "Incoming: " + req.method + " " + URL.format(parsedUrl));
-            next();
-        });
-
-        DimensionApi.bootstrap(this._app, this._db);
-        ScalarApi.bootstrap(this._app, this._db);
-        IRCApi.bootstrap(this._app, this._db);
-
-        this._app.listen(config.get('web.port'), config.get('web.address'));
-        log.info("Dimension", "API and UI listening on " + config.get("web.address") + ":" + config.get("web.port"));
-    }
-}
-
-module.exports = new Dimension();
\ No newline at end of file
diff --git a/src/DimensionApi.js b/src/DimensionApi.js
deleted file mode 100644
index 28f3061..0000000
--- a/src/DimensionApi.js
+++ /dev/null
@@ -1,307 +0,0 @@
-const IntegrationImpl = require("./integration/impl/index");
-const Integrations = require("./integration/index");
-const _ = require("lodash");
-const log = require("./util/LogService");
-const request = require("request");
-const dns = require("dns-then");
-const urlParse = require("url");
-const Netmask = require("netmask").Netmask;
-const config = require("config");
-
-/**
- * API handler for the Dimension API
- */
-class DimensionApi {
-
-    /**
-     * Creates a new Dimension API
-     */
-    constructor() {
-    }
-
-    /**
-     * Bootstraps the Dimension API
-     * @param {*} app the Express application
-     * @param {DimensionStore} db the store to use
-     */
-    bootstrap(app, db) {
-        this._db = db;
-
-        app.get("/api/v1/dimension/integrations/:roomId", this._getIntegrations.bind(this));
-        app.delete("/api/v1/dimension/integrations/:roomId/:type/:integrationType", this._removeIntegration.bind(this));
-        app.put("/api/v1/dimension/integrations/:roomId/:type/:integrationType/state", this._updateIntegrationState.bind(this));
-        app.get("/api/v1/dimension/integrations/:roomId/:type/:integrationType/state", this._getIntegrationState.bind(this));
-        app.get("/api/v1/dimension/widgets/embeddable", this._checkEmbeddable.bind(this));
-        app.get("/api/v1/dimension/integration/:type/:integrationType", this._getIntegration.bind(this));
-        app.get("/api/v1/dimension/whoami", this._getTokenOwner.bind(this));
-    }
-
-    _getTokenOwner(req, res) {
-        res.setHeader("Content-Type", "application/json");
-
-        var scalarToken = req.query.scalar_token;
-        if (!scalarToken) {
-            res.status(400).send({error: 'Missing scalar token'});
-            return;
-        }
-
-        this._db.getTokenOwner(scalarToken).then(userId => {
-            res.status(200).send({userId: userId});
-        }).catch(err => {
-            log.error("DimensionApi", err);
-            console.error(err);
-            res.status(401).send({error: 'Invalid token or other error'});
-        });
-    }
-
-    _checkEmbeddable(req, res) {
-        // Unauthed endpoint.
-
-        var url = req.query.url;
-        var parts = urlParse.parse(url);
-        var processed = false;
-
-        // Only allow http and https
-        if (parts.protocol !== "http:" && parts.protocol !== "https:") {
-            res.status(400).send({error: "Invalid request scheme " + parts.protocol, canEmbed: false});
-            processed = true;
-            return;
-        }
-
-        // Verify the address is permitted for widgets
-        var hostname = parts.hostname.split(":")[0];
-        dns.resolve4(hostname).then(addresses => {
-            log.verbose("DimensionApi", "Hostname " + hostname + " resolves to " + addresses);
-            if (addresses.length == 0) {
-                res.status(400).send({error: "Unrecongized address", canEmbed: false});
-                processed = true;
-                return;
-            }
-            for (var ipOrCidr of config.get("widgetBlacklist")) {
-                var block = new Netmask(ipOrCidr);
-                for (var address of addresses) {
-                    if (block.contains(address)) {
-                        res.status(400).send({error: "Address not allowed", canEmbed: false});
-                        processed = true;
-                        return;
-                    }
-                }
-            }
-        }, err => {
-            log.verbose("DimensionApi", "Error resolving host " + hostname);
-            log.verbose("DimensionApi", err);
-
-            res.status(400).send({error: "DNS error", canEmbed: false});
-            processed = true;
-        }).then(() => {
-            if (processed) return;
-
-            // Verify that the content can actually be embedded (CORS)
-            request(url, (err, response) => {
-                if (err) {
-                    log.verbose("DimensionApi", "Error contacting host " + hostname);
-                    log.verbose("DimensionApi", err);
-
-                    res.status(400).send({error: "Host error", canEmbed: false});
-                    return;
-                }
-
-                if (response.statusCode >= 200 && response.statusCode < 300) {
-                    // 200 OK
-                    var headers = response.headers;
-                    var xFrameOptions = (headers['x-frame-options'] || '').toLowerCase();
-
-                    if (xFrameOptions === 'sameorigin' || xFrameOptions === 'deny') {
-                        res.status(400).send({error: "X-Frame-Options forbids embedding", canEmbed: false});
-                    } else res.status(200).send({canEmbed: true});
-                } else {
-                    res.status(400).send({error: "Unsuccessful status code: " + response.statusCode, canEmbed: false});
-                }
-            });
-        });
-    }
-
-    _findIntegration(integrationConfig, roomId, scalarToken) {
-        var factory = IntegrationImpl.getFactory(integrationConfig);
-        if (!factory) throw new Error("Missing config factory for " + integrationConfig.name);
-
-        try {
-            return factory(this._db, integrationConfig, roomId, scalarToken);
-        } catch (err) {
-            throw new Error("Error using factory for " + integrationConfig.name + ". Please either fix the integration settings or disable the integration.", err);
-        }
-    }
-
-    _getIntegration(req, res) {
-        res.setHeader("Content-Type", "application/json");
-        // Unauthed endpoint.
-
-        var type = req.params.type;
-        var integrationType = req.params.integrationType;
-
-        if (!type || !integrationType) {
-            res.status(400).send({error: "Missing integration type or type"});
-            return;
-        }
-
-        var byIntegrationType = Integrations.byType[type];
-        if (!byIntegrationType || !byIntegrationType[integrationType]) {
-            res.status(400).send({error: "Unknown integration"});
-            return;
-        }
-        var integrationConfig = byIntegrationType[integrationType];
-
-        res.status(200).send(integrationConfig);
-    }
-
-    _getIntegrations(req, res) {
-        res.setHeader("Content-Type", "application/json");
-
-        var roomId = req.params.roomId;
-        if (!roomId) {
-            res.status(400).send({error: 'Missing room ID'});
-            return;
-        }
-
-        var scalarToken = req.query.scalar_token;
-        this._db.checkToken(scalarToken).then(() => {
-            var integrations = _.map(Integrations.all, i => JSON.parse(JSON.stringify(i))); // clone
-
-            var promises = [];
-            var remove = [];
-            _.forEach(integrations, integration => {
-                try {
-                    promises.push(this._findIntegration(integration, roomId, scalarToken).then(builtIntegration => {
-                        return builtIntegration.getState().then(state => {
-                            var keys = _.keys(state);
-                            for (var key of keys) {
-                                integration[key] = state[key];
-                            }
-
-                            return builtIntegration.getUserId();
-                        }).then(userId => {
-                            integration.userId = userId;
-                        });
-                    }));
-                } catch (err) {
-                    remove.push(integration);
-                    log.error("DimensionApi", err);
-                }
-            });
-
-            for (var toRemove of remove) {
-                var idx = integrations.indexOf(toRemove);
-                if (idx === -1) continue;
-                log.warn("DimensionApi", "Disabling integration " + toRemove.name + " due to an error encountered in setup");
-                integrations.splice(idx, 1);
-            }
-
-            Promise.all(promises).then(() => res.send(_.map(integrations, integration => {
-                // Remove sensitive material
-                integration.upstream = undefined;
-                integration.hosted = undefined;
-                return integration;
-            })));
-        }).catch(err => {
-            log.error("DimensionApi", err);
-            console.error(err);
-            res.status(500).send({error: err});
-        });
-    }
-
-    _removeIntegration(req, res) {
-        var roomId = req.params.roomId;
-        var scalarToken = req.query.scalar_token;
-        var type = req.params.type;
-        var integrationType = req.params.integrationType;
-
-        if (!roomId || !scalarToken || !type || !integrationType) {
-            res.status(400).send({error: "Missing room, integration type, type, or token"});
-            return;
-        }
-
-        var integrationConfig = Integrations.byType[type][integrationType];
-        if (!integrationConfig) {
-            res.status(400).send({error: "Unknown integration"});
-            return;
-        }
-
-        log.info("DimensionApi", "Remove requested for " + type + " (" + integrationType + ") in room " + roomId);
-
-        this._db.checkToken(scalarToken).then(() => {
-            return this._findIntegration(integrationConfig, roomId, scalarToken);
-        }).then(integration => integration.removeFromRoom(roomId)).then(() => {
-            res.status(200).send({success: true});
-        }).catch(err => {
-            log.error("DimensionApi", err);
-            console.error(err);
-            res.status(500).send({error: err.message});
-        });
-    }
-
-    _updateIntegrationState(req, res) {
-        var roomId = req.params.roomId;
-        var scalarToken = req.body.scalar_token;
-        var type = req.params.type;
-        var integrationType = req.params.integrationType;
-
-        if (!roomId || !scalarToken || !type || !integrationType) {
-            res.status(400).send({error: "Missing room, integration type, type, or token"});
-            return;
-        }
-
-        var integrationConfig = Integrations.byType[type][integrationType];
-        if (!integrationConfig) {
-            res.status(400).send({error: "Unknown integration"});
-            return;
-        }
-
-        log.info("DimensionApi", "Update state requested for " + type + " (" + integrationType + ") in room " + roomId);
-
-        this._db.checkToken(scalarToken).then(() => {
-            return this._findIntegration(integrationConfig, roomId, scalarToken);
-        }).then(integration => {
-            return integration.updateState(req.body.state);
-        }).then(newState => {
-            res.status(200).send(newState);
-        }).catch(err => {
-            log.error("DimensionApi", err);
-            console.error(err);
-            res.status(500).send({error: err.message});
-        });
-    }
-
-    _getIntegrationState(req, res) {
-        var roomId = req.params.roomId;
-        var scalarToken = req.query.scalar_token;
-        var type = req.params.type;
-        var integrationType = req.params.integrationType;
-
-        if (!roomId || !scalarToken || !type || !integrationType) {
-            res.status(400).send({error: "Missing room, integration type, type, or token"});
-            return;
-        }
-
-        var integrationConfig = Integrations.byType[type][integrationType];
-        if (!integrationConfig) {
-            res.status(400).send({error: "Unknown integration"});
-            return;
-        }
-
-        log.info("DimensionApi", "State requested for " + type + " (" + integrationType + ") in room " + roomId);
-
-        this._db.checkToken(scalarToken).then(() => {
-            return this._findIntegration(integrationConfig, roomId, scalarToken);
-        }).then(integration => {
-            return integration.getState();
-        }).then(state => {
-            res.status(200).send(state);
-        }).catch(err => {
-            log.error("DimensionApi", err);
-            console.error(err);
-            res.status(500).send({error: err.message});
-        });
-    }
-}
-
-module.exports = new DimensionApi();
diff --git a/src-ts/MemoryCache.ts b/src/MemoryCache.ts
similarity index 100%
rename from src-ts/MemoryCache.ts
rename to src/MemoryCache.ts
diff --git a/src/OpenID.js b/src/OpenID.js
deleted file mode 100644
index 75e9d12..0000000
--- a/src/OpenID.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Serves the purpose of being a documentation endpoint
- */
-class OpenID {
-    access_token = "";
-    token_type = "";
-    matrix_server_name = "";
-    expires_in = 0;
-}
-
-module.exports = OpenID;
\ No newline at end of file
diff --git a/src/ScalarApi.js b/src/ScalarApi.js
deleted file mode 100644
index 528bca1..0000000
--- a/src/ScalarApi.js
+++ /dev/null
@@ -1,115 +0,0 @@
-var MatrixLiteClient = require("./matrix/MatrixLiteClient");
-var randomString = require("random-string");
-var ScalarClient = require("./scalar/ScalarClient.js");
-var _ = require("lodash");
-var log = require("./util/LogService");
-var Promise = require("bluebird");
-var UpstreamConfiguration = require("./UpstreamConfiguration");
-
-/**
- * API handler for the Scalar API, as required by Riot
- */
-class ScalarApi {
-
-    /**
-     * Creates a new Scalar API
-     */
-    constructor() {
-    }
-
-    /**
-     * Bootstraps the Scalar API
-     * @param {*} app the Express application
-     * @param {DimensionStore} db the store to use
-     */
-    bootstrap(app, db) {
-        this._db = db;
-
-        app.post("/api/v1/scalar/register", this._scalarRegister.bind(this));
-        app.get("/api/v1/scalar/checkToken", this._checkScalarToken.bind(this));
-        app.get("/api/v1/scalar/widgets/title_lookup", this._getWidgetTitle.bind(this));
-    }
-
-    _getWidgetTitle(req, res) {
-        res.setHeader("Content-Type", "application/json");
-
-        var token = req.query.scalar_token;
-        var url = req.query.curl;
-
-        if (!token || !url) {
-            res.status(400).send({error: "Missing token or curl"});
-            return;
-        }
-
-        this._db.checkToken(token).then(() => {
-            MatrixLiteClient.getUrlPreview(url).then(preview => {
-                if (!preview["og:title"]) {
-                    res.status(404).send({error:{message:"Could not locate a title for the URL"}});
-                    return;
-                }
-
-                // We need to convert the preview response to what Scalar expects
-                res.status(200).send({
-                    cached_response: false,
-                    page_title_cache_item: {
-                        expires: null, // unused
-                        cached_response_err: null, // unused
-                        cached_title: preview["og:title"],
-                    }
-                });
-            }).catch(err => {
-                res.status(500).send({error: {message: "Failed to get preview"}});
-                log.error("ScalarApi", "Failed to get URL preview");
-                log.error("ScalarApi", err);
-            });
-        }).catch(err => {
-            res.status(401).send({error: {message: "Failed to authenticate token"}});
-            log.warn("ScalarApi", "Failed to authenticate token");
-            log.warn("ScalarApi", err);
-        });
-    }
-
-    _checkScalarToken(req, res) {
-        var token = req.query.scalar_token;
-        if (!token) res.sendStatus(400);
-        else this._db.checkToken(token).then(() => {
-            res.sendStatus(200);
-        }).catch(e => {
-            res.sendStatus(401);
-            log.warn("ScalarApi", "Failed to authenticate token");
-            log.verbose("ScalarApi", e);
-        });
-    }
-
-    _scalarRegister(req, res) {
-        res.setHeader("Content-Type", "application/json");
-
-        var tokenInfo = req.body;
-        if (!tokenInfo || !tokenInfo['access_token'] || !tokenInfo['token_type'] || !tokenInfo['matrix_server_name'] || !tokenInfo['expires_in']) {
-            res.status(400).send({error: 'Missing OpenID'});
-            return;
-        }
-
-        var client = new MatrixLiteClient(tokenInfo);
-        var scalarToken = randomString({length: 25});
-        var userId;
-        client.getSelfMxid().then(mxid => {
-            userId = mxid;
-            if (!mxid) throw new Error("Token does not resolve to a matrix user");
-
-            // TODO: Make this part more generic for other upstreams (#22)
-            if (!UpstreamConfiguration.hasUpstream("vector")) return Promise.resolve(null);
-            return ScalarClient.register(tokenInfo);
-        }).then(upstreamToken => {
-            return this._db.createToken(userId, tokenInfo, scalarToken, upstreamToken);
-        }).then(() => {
-            res.setHeader("Content-Type", "application/json");
-            res.send({scalar_token: scalarToken});
-        }).catch(err => {
-            log.error("ScalarApi", err);
-            res.status(500).send({error: err.message});
-        });
-    }
-}
-
-module.exports = new ScalarApi();
\ No newline at end of file
diff --git a/src/UpstreamConfiguration.js b/src/UpstreamConfiguration.js
deleted file mode 100644
index de22466..0000000
--- a/src/UpstreamConfiguration.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var LogService = require("./util/LogService");
-var _ = require("lodash");
-var config = require("config");
-
-/**
- * Handles all upstream configuration information, such as URLs, tokens, and whether or not they are enabled.
- */
-class UpstreamConfiguration {
-    /**
-     * Creates a new upstream configuration handler
-     */
-    constructor() {
-        this._upstreams = {};
-        this._loadUpstreams();
-    }
-
-    _loadUpstreams() {
-        for (var upstream of config.upstreams) {
-            var upstreamConfig = upstream;
-
-            if (this._upstreams[upstream.name]) {
-                LogService.warn("UpstreamConfiguration", "Duplicate upstream " + upstream.name +" - skipping");
-                continue;
-            }
-
-            this._upstreams[upstream.name] = upstreamConfig;
-            LogService.info("UpstreamConfiguration", "Loaded upstream '" + upstream.name + "' as: " + JSON.stringify(upstreamConfig));
-        }
-    }
-
-    /**
-     * Checks if a particular upstream exists
-     * @param {string} name the name of the upstream
-     * @returns {boolean} true if it is enabled and exists
-     */
-    hasUpstream(name) {
-        return !!this._upstreams[name];
-    }
-
-    /**
-     * Gets an upstream's configuration
-     * @param {string} name the upstream name
-     * @returns {{url:string}} the upstream configuration
-     */
-    getUpstream(name) {
-        return _.clone(this._upstreams[name]);
-    }
-}
-
-module.exports = new UpstreamConfiguration();
\ No newline at end of file
diff --git a/src-ts/api/ApiError.ts b/src/api/ApiError.ts
similarity index 100%
rename from src-ts/api/ApiError.ts
rename to src/api/ApiError.ts
diff --git a/src-ts/api/Webserver.ts b/src/api/Webserver.ts
similarity index 100%
rename from src-ts/api/Webserver.ts
rename to src/api/Webserver.ts
diff --git a/src-ts/api/dimension/DimensionAdminService.ts b/src/api/dimension/DimensionAdminService.ts
similarity index 100%
rename from src-ts/api/dimension/DimensionAdminService.ts
rename to src/api/dimension/DimensionAdminService.ts
diff --git a/src-ts/api/dimension/DimensionAppserviceAdminService.ts b/src/api/dimension/DimensionAppserviceAdminService.ts
similarity index 100%
rename from src-ts/api/dimension/DimensionAppserviceAdminService.ts
rename to src/api/dimension/DimensionAppserviceAdminService.ts
diff --git a/src-ts/api/dimension/DimensionIntegrationsAdminService.ts b/src/api/dimension/DimensionIntegrationsAdminService.ts
similarity index 100%
rename from src-ts/api/dimension/DimensionIntegrationsAdminService.ts
rename to src/api/dimension/DimensionIntegrationsAdminService.ts
diff --git a/src-ts/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
similarity index 100%
rename from src-ts/api/dimension/DimensionIntegrationsService.ts
rename to src/api/dimension/DimensionIntegrationsService.ts
diff --git a/src-ts/api/matrix/MatrixAppServiceApiService.ts b/src/api/matrix/MatrixAppServiceApiService.ts
similarity index 100%
rename from src-ts/api/matrix/MatrixAppServiceApiService.ts
rename to src/api/matrix/MatrixAppServiceApiService.ts
diff --git a/src-ts/api/scalar/ScalarService.ts b/src/api/scalar/ScalarService.ts
similarity index 100%
rename from src-ts/api/scalar/ScalarService.ts
rename to src/api/scalar/ScalarService.ts
diff --git a/src-ts/api/scalar/ScalarWidgetService.ts b/src/api/scalar/ScalarWidgetService.ts
similarity index 100%
rename from src-ts/api/scalar/ScalarWidgetService.ts
rename to src/api/scalar/ScalarWidgetService.ts
diff --git a/src-ts/config.ts b/src/config.ts
similarity index 100%
rename from src-ts/config.ts
rename to src/config.ts
diff --git a/src-ts/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
similarity index 100%
rename from src-ts/db/AppserviceStore.ts
rename to src/db/AppserviceStore.ts
diff --git a/src-ts/db/DimensionStore.ts b/src/db/DimensionStore.ts
similarity index 100%
rename from src-ts/db/DimensionStore.ts
rename to src/db/DimensionStore.ts
diff --git a/src-ts/db/ScalarStore.ts b/src/db/ScalarStore.ts
similarity index 100%
rename from src-ts/db/ScalarStore.ts
rename to src/db/ScalarStore.ts
diff --git a/src-ts/db/WidgetStore.ts b/src/db/WidgetStore.ts
similarity index 100%
rename from src-ts/db/WidgetStore.ts
rename to src/db/WidgetStore.ts
diff --git a/src-ts/db/migrations/20171218203245-AddTables.ts b/src/db/migrations/20171218203245-AddTables.ts
similarity index 100%
rename from src-ts/db/migrations/20171218203245-AddTables.ts
rename to src/db/migrations/20171218203245-AddTables.ts
diff --git a/src-ts/db/migrations/20171218203245-AddWidgets.ts b/src/db/migrations/20171218203245-AddWidgets.ts
similarity index 100%
rename from src-ts/db/migrations/20171218203245-AddWidgets.ts
rename to src/db/migrations/20171218203245-AddWidgets.ts
diff --git a/src-ts/db/migrations/20171224122045-AddAppservices.ts b/src/db/migrations/20171224122045-AddAppservices.ts
similarity index 100%
rename from src-ts/db/migrations/20171224122045-AddAppservices.ts
rename to src/db/migrations/20171224122045-AddAppservices.ts
diff --git a/src-ts/db/migrations/20171224124645-AddAppserviceUsers.ts b/src/db/migrations/20171224124645-AddAppserviceUsers.ts
similarity index 100%
rename from src-ts/db/migrations/20171224124645-AddAppserviceUsers.ts
rename to src/db/migrations/20171224124645-AddAppserviceUsers.ts
diff --git a/src-ts/db/models/AppService.ts b/src/db/models/AppService.ts
similarity index 100%
rename from src-ts/db/models/AppService.ts
rename to src/db/models/AppService.ts
diff --git a/src-ts/db/models/AppServiceUser.ts b/src/db/models/AppServiceUser.ts
similarity index 100%
rename from src-ts/db/models/AppServiceUser.ts
rename to src/db/models/AppServiceUser.ts
diff --git a/src-ts/db/models/IntegrationRecord.ts b/src/db/models/IntegrationRecord.ts
similarity index 100%
rename from src-ts/db/models/IntegrationRecord.ts
rename to src/db/models/IntegrationRecord.ts
diff --git a/src-ts/db/models/Upstream.ts b/src/db/models/Upstream.ts
similarity index 100%
rename from src-ts/db/models/Upstream.ts
rename to src/db/models/Upstream.ts
diff --git a/src-ts/db/models/User.ts b/src/db/models/User.ts
similarity index 100%
rename from src-ts/db/models/User.ts
rename to src/db/models/User.ts
diff --git a/src-ts/db/models/UserScalarToken.ts b/src/db/models/UserScalarToken.ts
similarity index 100%
rename from src-ts/db/models/UserScalarToken.ts
rename to src/db/models/UserScalarToken.ts
diff --git a/src-ts/db/models/WidgetRecord.ts b/src/db/models/WidgetRecord.ts
similarity index 100%
rename from src-ts/db/models/WidgetRecord.ts
rename to src/db/models/WidgetRecord.ts
diff --git a/src-ts/index.ts b/src/index.ts
similarity index 100%
rename from src-ts/index.ts
rename to src/index.ts
diff --git a/src/integration/generic_types/Bridge.js b/src/integration/generic_types/Bridge.js
deleted file mode 100644
index bb1a463..0000000
--- a/src/integration/generic_types/Bridge.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var IntegrationStub = require("./IntegrationStub");
-
-/**
- * Represents a bridge. Normally bridges have enhanced configuration and requirements over bots.
- */
-class Bridge extends IntegrationStub {
-
-    /**
-     * Creates a new bridge
-     * @param bridgeConfig the configuration for the bridge
-     */
-    constructor(bridgeConfig) {
-        super(bridgeConfig);
-    }
-
-    /*override*/
-    getUserId() {
-        return null; // bridges don't have bot users we care about
-    }
-}
-
-module.exports = Bridge;
\ No newline at end of file
diff --git a/src/integration/generic_types/ComplexBot.js b/src/integration/generic_types/ComplexBot.js
deleted file mode 100644
index fd96b46..0000000
--- a/src/integration/generic_types/ComplexBot.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var IntegrationStub = require("./IntegrationStub");
-
-/**
- * Represents a bot with additional configuration or setup needs. Normally indicates a bot needs
- * more than a simple invite to the room.
- */
-class ComplexBot extends IntegrationStub {
-
-    /**
-     * Creates a new complex bot
-     * @param botConfig the configuration for the bot
-     */
-    constructor(botConfig) {
-        super(botConfig);
-    }
-}
-
-module.exports = ComplexBot;
\ No newline at end of file
diff --git a/src/integration/generic_types/IntegrationStub.js b/src/integration/generic_types/IntegrationStub.js
deleted file mode 100644
index d867532..0000000
--- a/src/integration/generic_types/IntegrationStub.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Stub for an Integration
- */
-class IntegrationStub {
-    constructor(botConfig) {
-        this._config = botConfig;
-    }
-
-    /**
-     * Gets the user ID for this bot
-     * @return {Promise<string>} resolves to the user ID
-     */
-    getUserId() {
-        return Promise.resolve(this._config.userId);
-    }
-
-    /**
-     * Gets state information that represents how this bot is operating.
-     * @return {Promise<*>} resolves to the state information
-     */
-    getState() {
-        return Promise.resolve({});
-    }
-
-    /**
-     * Removes the integration from the given room
-     * @param {string} roomId the room ID to remove the integration from
-     * @returns {Promise<>} resolves when completed
-     */
-    removeFromRoom(roomId) {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Updates the state information for this integration. The data passed is an implementation detail.
-     * @param {*} newState the new state
-     * @returns {Promise<*>} resolves when completed, with the new state of the integration
-     */
-    updateState(newState) {
-        return Promise.resolve({});
-    }
-}
-
-module.exports = IntegrationStub;
diff --git a/src/integration/generic_types/Widget.js b/src/integration/generic_types/Widget.js
deleted file mode 100644
index f6f18e7..0000000
--- a/src/integration/generic_types/Widget.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var IntegrationStub = require("./IntegrationStub");
-
-/**
- * Represents a widget. Widgets allow for web applications or rich functionality within the room.
- */
-class Widget extends IntegrationStub {
-
-    /**
-     * Creates a new widget
-     * @param widgetConfig the configuration for the widget
-     */
-    constructor(widgetConfig) {
-        super(widgetConfig);
-    }
-
-    /*override*/
-    getUserId() {
-        return null; // widgets don't have bot users we care about
-    }
-}
-
-module.exports = Widget;
\ No newline at end of file
diff --git a/src/integration/impl/StubbedFactory.js b/src/integration/impl/StubbedFactory.js
deleted file mode 100644
index 918e7c0..0000000
--- a/src/integration/impl/StubbedFactory.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var IntegrationStub = require("../generic_types/IntegrationStub");
-
-/**
- * Creates an integration using the given
- * @param {DimensionStore} db the database
- * @param {*} integrationConfig the integration configuration
- * @param {string} roomId the room ID
- * @param {string} scalarToken the scalar token
- * @returns {Promise<*>} resolves to the configured integration
- */
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-    return Promise.resolve(new IntegrationStub(integrationConfig));
-};
-
-factory.validateConfig = (integrationConfig) => {
-    // Nothing to do
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/circleci/CircleCiBot.js b/src/integration/impl/circleci/CircleCiBot.js
deleted file mode 100644
index 0a70bfd..0000000
--- a/src/integration/impl/circleci/CircleCiBot.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var ComplexBot = require("../../generic_types/ComplexBot");
-
-/**
- * Represents a CircleCI bot
- */
-class CircleCiBot extends ComplexBot {
-
-    /**
-     * Creates a new CircleCI bot
-     * @param botConfig the bot configuration
-     * @param backbone the backbone powering this bot
-     */
-    constructor(botConfig, backbone) {
-        super(botConfig);
-        this._backbone = backbone;
-    }
-
-    /*override*/
-    getUserId() {
-        return this._backbone.getUserId();
-    }
-
-    /*override*/
-    getState() {
-        var response = {
-            repoTemplates: [],
-            immutableRepoTemplates: [],
-            webhookUrl: ""
-        };
-        return this._backbone.getRepos().then(templates => {
-            response.repoTemplates = templates;
-            return this._backbone.getImmutableRepos();
-        }).then(immutable => {
-            response.immutableRepoTemplates = immutable;
-            return this._backbone.getWebhookUrl();
-        }).then(url => {
-            response.webhookUrl = url;
-            return response;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return this._backbone.removeFromRoom(roomId);
-    }
-
-    /*override*/
-    updateState(newState) {
-        return this._backbone.setRepos(newState.repoTemplates).then(() => this.getState());
-    }
-}
-
-module.exports = CircleCiBot;
\ No newline at end of file
diff --git a/src/integration/impl/circleci/CircleCiFactory.js b/src/integration/impl/circleci/CircleCiFactory.js
deleted file mode 100644
index c3e7fa7..0000000
--- a/src/integration/impl/circleci/CircleCiFactory.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var CircleCiBot = require("./CircleCiBot");
-var VectorCircleCiBackbone = require("./VectorCircleCiBackbone");
-var UpstreamConfiguration = require("../../../UpstreamConfiguration");
-
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-
-    return db.getUpstreamToken(scalarToken).then(upstreamToken => {
-        var backbone = new VectorCircleCiBackbone(roomId, upstreamToken);
-        return new CircleCiBot(integrationConfig, backbone);
-    });
-};
-
-factory.validateConfig = (integrationConfig) => {
-    if (!integrationConfig.upstream) throw new Error("Unsupported configuration");
-    if (integrationConfig.upstream.type !== "vector") throw new Error("Unsupported upstream");
-    if (!UpstreamConfiguration.hasUpstream("vector")) throw new Error("Vector upstream not specified");
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/circleci/StubbedCircleCiBackbone.js b/src/integration/impl/circleci/StubbedCircleCiBackbone.js
deleted file mode 100644
index 0a454db..0000000
--- a/src/integration/impl/circleci/StubbedCircleCiBackbone.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Stubbed/placeholder CircleCI backbone
- */
-class StubbedCircleCiBackbone {
-
-    /**
-     * Creates a new stubbed CircleCI backbone
-     */
-    constructor() {
-    }
-
-    /**
-     * Gets the user ID for this backbone
-     * @returns {Promise<string>} resolves to the user ID
-     */
-    getUserId() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the repository templates for this backbone
-     * @returns {Promise<{repoKey:string,template:string}[]>} resolves to the collection of repositories and their templates
-     */
-    getRepos() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the immutable repository templates for this backbone (set by other users)
-     * @returns {Promise<{repoKey:string,template:string,ownerId:string}[]>} resolves to the collection of repositories and their templates
-     */
-    getImmutableRepos() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Sets the new repository templates for this backbone
-     * @param {{repoKey:string,template:string}[]} newRepos the new templates for the repositories
-     * @returns {Promise<>} resolves when complete
-     */
-    setRepos(newRepos) {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the webhook url for this backbone
-     * @returns {Promise<string>} resolves to the webhook URL
-     */
-    getWebhookUrl() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Removes the bot from the given room
-     * @param {string} roomId the room ID to remove the bot from
-     * @returns {Promise<>} resolves when completed
-     */
-    removeFromRoom(roomId) {
-        throw new Error("Not implemented");
-    }
-}
-
-module.exports = StubbedCircleCiBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/circleci/VectorCircleCiBackbone.js b/src/integration/impl/circleci/VectorCircleCiBackbone.js
deleted file mode 100644
index 9b3ee4a..0000000
--- a/src/integration/impl/circleci/VectorCircleCiBackbone.js
+++ /dev/null
@@ -1,108 +0,0 @@
-var StubbedCircleCiBackbone = require("./StubbedCircleCiBackbone");
-var VectorScalarClient = require("../../../scalar/VectorScalarClient");
-var _ = require("lodash");
-var log = require("../../../util/LogService");
-
-/**
- * Backbone for CircleCI bots running on vector.im through scalar
- */
-class VectorCircleCiBackbone extends StubbedCircleCiBackbone {
-
-    /**
-     * Creates a new Vector CircleCI backbone
-     * @param {string} roomId the room ID to manage
-     * @param {string} upstreamScalarToken the vector scalar token
-     */
-    constructor(roomId, upstreamScalarToken) {
-        super();
-        this._roomId = roomId;
-        this._scalarToken = upstreamScalarToken;
-        this._info = null;
-        this._otherTemplates = [];
-    }
-
-    /*override*/
-    getUserId() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            return this._info.bot_user_id;
-        });
-    }
-
-    /*override*/
-    getRepos() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            if (this._info.integrations.length == 0) return [];
-
-            var rooms = _.keys(this._info.integrations[0].config.rooms);
-            if (rooms.indexOf(this._roomId) === -1) return [];
-
-            var repos = _.keys(this._info.integrations[0].config.rooms[this._roomId].repos);
-            return _.map(repos, r => {
-                return {repoKey: r, template: this._info.integrations[0].config.rooms[this._roomId].repos[r].template};
-            });
-        });
-    }
-
-    /*override*/
-    getImmutableRepos() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            return this._otherTemplates;
-        });
-    }
-
-    /*override*/
-    setRepos(newRepos) {
-        var config = {};
-        config[this._roomId] = {repos: {}};
-        for (var repo of newRepos) config[this._roomId].repos[repo.repoKey] = {template: repo.template};
-
-        return VectorScalarClient.configureIntegration("circleci", this._scalarToken, {
-            rooms: config
-        });
-    }
-
-    /*override*/
-    getWebhookUrl() {
-        // string
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            if (this._info.integrations.length == 0) return "";
-            return this._info.integrations[0].config.webhook_url;
-        });
-    }
-
-    _getInfo() {
-        return VectorScalarClient.getIntegrationsForRoom(this._roomId, this._scalarToken).then(integrations => {
-            this._otherTemplates = [];
-            for (var integration of integrations) {
-                if (integration.self) continue; // skip - we're not looking for ones we know about
-                if (integration.type == "circleci") {
-                    var roomIds = _.keys(integration.config.rooms);
-                    if (roomIds.length === 0) continue;
-                    if (roomIds.length !== 1) log.warn("VectorCircleCiBackbone", "Expected 1 room but found " + roomIds.length);
-
-                    var roomConfig = integration.config.rooms[roomIds[0]];
-                    var repositories = _.keys(roomConfig.repos);
-
-                    for (var repo of repositories) {
-                        this._otherTemplates.push({
-                            repoKey: repo,
-                            template: roomConfig.repos[repo].template,
-                            ownerId: integration.user_id
-                        });
-                    }
-                }
-            }
-
-            return VectorScalarClient.getIntegration("circleci", this._roomId, this._scalarToken);
-        }).then(info => {
-            this._info = info;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return VectorScalarClient.removeIntegration("circleci", roomId, this._scalarToken);
-    }
-}
-
-module.exports = VectorCircleCiBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/index.js b/src/integration/impl/index.js
deleted file mode 100644
index 92d7e9b..0000000
--- a/src/integration/impl/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var log = require("../../util/LogService");
-var StubbedFactory = require("./StubbedFactory");
-var SimpleBotFactory = require("./simple_bot/SimpleBotFactory");
-var RSSFactory = require("./rss/RSSFactory");
-var IRCFactory = require("./irc/IRCFactory");
-var TravisCiFactory = require("./travisci/TravisCiFactory");
-var CircleCiFactory = require("./circleci/CircleCiFactory");
-var SimpleWidgetFactory = require("./simple_widget/SimpleWidgetFactory");
-
-var mapping = {
-    "complex-bot": {
-        "rss": RSSFactory,
-        "travisci": TravisCiFactory,
-        "circleci": CircleCiFactory,
-    },
-    "bridge": {
-        "irc": IRCFactory,
-    }
-};
-
-var defaultFactories = {
-    "complex-bot": null,
-    "bot": SimpleBotFactory,
-    "bridge": null,
-    "widget": SimpleWidgetFactory,
-};
-
-module.exports = {
-    getFactory: (integrationConfig) => {
-        var opts = mapping[integrationConfig.type];
-
-        if (!opts) {
-            log.verbose("IntegrationImpl", "No option set available for " + integrationConfig.type + " - will attempt defaults");
-        }
-
-        var factory = null;
-        if (!opts) factory = defaultFactories[integrationConfig.type];
-        else factory = opts[integrationConfig.integrationType];
-        if (!factory) {
-            log.verbose("IntegrationImpl", "No factory available for " + integrationConfig.type + " (" + integrationConfig.integrationType + ") - using stub");
-            factory = StubbedFactory;
-        }
-
-        return factory;
-    }
-};
\ No newline at end of file
diff --git a/src/integration/impl/irc/IRCApi.js b/src/integration/impl/irc/IRCApi.js
deleted file mode 100644
index aed963d..0000000
--- a/src/integration/impl/irc/IRCApi.js
+++ /dev/null
@@ -1,114 +0,0 @@
-var Integrations = require("../../index");
-var IntegrationImpl = require("../index");
-var log = require("../../../util/LogService");
-
-/**
- * API Handler for the IRC integration
- */
-class IRCApi {
-
-    /**
-     * Creates a new IRC API
-     */
-    constructor() {
-    }
-
-    /**
-     * Bootstraps the IRC API
-     * @param {*} app the Express application
-     * @param {DimensionStore} db the store to use
-     */
-    bootstrap(app, db) {
-        if (!Integrations.byType["bridge"] || !Integrations.byType["bridge"]["irc"]) {
-            log.info("IRCApi", "IRC Bridge not enabled - not setting up the API");
-            return;
-        } else log.info("IRCApi", "Setting up IRC API");
-
-        this._db = db;
-
-        app.get("/api/v1/irc/:roomId/ops/:network/:channel", this._getChannelOps.bind(this));
-        app.put("/api/v1/irc/:roomId/channels/:network/:channel", this._addChannel.bind(this));
-        app.delete("/api/v1/irc/:roomId/channels/:network/:channel", this._deleteChannel.bind(this));
-    }
-
-    _getChannelOps(req, res) {
-        this._generalProcessing(req, res).then(ircBridge => {
-            var network = req.params.network;
-            var channel = req.params.channel;
-            return ircBridge.getChannelOps(network, channel).catch(err => {
-                log.error("IRCApi", err);
-                console.error(err);
-                res.status(500).send({error: err});
-                return null;
-            });
-        }).then(ops => {
-            if (ops !== null) res.status(200).send(ops);
-        }).catch(() => null);
-    }
-
-    _addChannel(req, res) {
-        this._generalProcessing(req, res).then(ircBridge => {
-            var network = req.params.network;
-            var channel = req.params.channel;
-            var op = req.query.op;
-            return ircBridge.addChannel(network, channel, op).catch(err => {
-                log.error("IRCApi", err);
-                console.error(err);
-                res.status(500).send({error: err});
-                return null;
-            });
-        }).then(result => {
-            if (result !== null) res.status(200).send({successful: true});
-        }).catch(() => null);
-    }
-
-    _deleteChannel(req, res) {
-        this._generalProcessing(req, res).then(ircBridge => {
-            var network = req.params.network;
-            var channel = req.params.channel;
-            return ircBridge.removeChannel(network, channel).catch(err => {
-                log.error("IRCApi", err);
-                console.error(err);
-                res.status(500).send({error: err});
-                return null;
-            });
-        }).then(result => {
-            if (result !== null) res.status(200).send({successful: true});
-        }).catch(() => null);
-    }
-
-    _generalProcessing(req, res) {
-        return new Promise((resolve, reject) => {
-            res.setHeader("Content-Type", "application/json");
-
-            var roomId = req.params.roomId;
-            var network = req.params.network;
-            var channel = req.params.channel;
-            if (!roomId || !network || !channel) {
-                res.status(400).send({error: 'Missing room ID, network, or channel'});
-                reject();
-                return;
-            }
-
-            var scalarToken = req.query.scalar_token;
-            this._db.checkToken(scalarToken).then(() => {
-                var conf = Integrations.byType["bridge"]["irc"];
-                var factory = IntegrationImpl.getFactory(conf);
-                factory(this._db, conf, roomId, scalarToken).then(resolve).catch(err => {
-                    log.error("IRCApi", err);
-                    console.error(err);
-                    res.status(500).send({error: err});
-                    reject();
-                });
-            }).catch(err => {
-                log.error("IRCApi", err);
-                console.error(err);
-                res.status(500).send({error: err});
-                reject();
-            });
-        });
-    }
-
-}
-
-module.exports = new IRCApi();
\ No newline at end of file
diff --git a/src/integration/impl/irc/IRCBridge.js b/src/integration/impl/irc/IRCBridge.js
deleted file mode 100644
index 95a20bc..0000000
--- a/src/integration/impl/irc/IRCBridge.js
+++ /dev/null
@@ -1,75 +0,0 @@
-var Bridge = require("../../generic_types/Bridge");
-
-/**
- * Represents an IRC bridge
- */
-class IRCBridge extends Bridge {
-
-    /**
-     * Creates a new IRC bridge
-     * @param bridgeConfig the bridge configuration
-     * @param backbone the backbone powering this bridge
-     */
-    constructor(bridgeConfig, backbone) {
-        super(bridgeConfig);
-        this._backbone = backbone;
-    }
-
-    /*override*/
-    getState() {
-        var response = {
-            availableNetworks: [],
-            channels: {}
-        };
-        return this._backbone.getNetworks().then(networks => {
-            response.availableNetworks = networks;
-            return this._backbone.getLinkedChannels();
-        }).then(channels => {
-            response.channels = channels;
-            return response;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return this._backbone.removeFromRoom(roomId);
-    }
-
-    /*override*/
-    updateState(newState) {
-        throw new Error("State cannot be updated for an IRC bridge. Use the IRC API instead.");
-    }
-
-    /**
-     * Gets a list of operators available in a particular channel on a particular network
-     * @param {string} network the network to look at
-     * @param {string} channel the channel to look in (without prefixed #)
-     * @returns {Promise<string[]>} resolves to a list of operators
-     */
-    getChannelOps(network, channel) {
-        return this._backbone.getChannelOps(network, channel);
-    }
-
-    /**
-     * Links a channel to the room this bridge controls
-     * @param {string} network the network to link to
-     * @param {string} channel the channel to link to
-     * @param {string} op the channel operator to request permission from
-     * @returns {Promise<>} resolves when complete
-     */
-    addChannel(network, channel, op) {
-        return this._backbone.addChannel(network, channel, op);
-    }
-
-    /**
-     * Unlinks a channel from the room this bridge controls
-     * @param {string} network the network to unlink from
-     * @param {string} channel the channel to unlink
-     * @returns {Promise<>} resolves when complete
-     */
-    removeChannel(network, channel) {
-        return this._backbone.removeChannel(network, channel);
-    }
-}
-
-module.exports = IRCBridge;
\ No newline at end of file
diff --git a/src/integration/impl/irc/IRCFactory.js b/src/integration/impl/irc/IRCFactory.js
deleted file mode 100644
index 131d729..0000000
--- a/src/integration/impl/irc/IRCFactory.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var IRCBridge = require("./IRCBridge");
-var VectorIrcBackbone = require("./VectorIrcBackbone");
-var UpstreamConfiguration = require("../../../UpstreamConfiguration");
-
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-
-    return db.getUpstreamToken(scalarToken).then(upstreamToken => {
-        var backbone = new VectorIrcBackbone(roomId, upstreamToken);
-        return new IRCBridge(integrationConfig, backbone);
-    });
-};
-
-factory.validateConfig = (integrationConfig) => {
-    if (!integrationConfig.upstream) throw new Error("Unsupported configuration");
-    if (integrationConfig.upstream.type !== "vector") throw new Error("Unsupported upstream");
-    if (!UpstreamConfiguration.hasUpstream("vector")) throw new Error("Vector upstream not specified");
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/irc/StubbedIrcBackbone.js b/src/integration/impl/irc/StubbedIrcBackbone.js
deleted file mode 100644
index 2b323d1..0000000
--- a/src/integration/impl/irc/StubbedIrcBackbone.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Stubbed/placeholder IRC backbone
- */
-class StubbedIrcBackbone {
-
-    /**
-     * Creates a new stubbed IRC backbone
-     */
-    constructor() {
-    }
-
-    /**
-     * Gets a list of all available networks
-     * @returns {Promise<{name: string, id: string}[]>} resolves to the list of available networks
-     */
-    getNetworks() {
-        return Promise.resolve([]);
-    }
-
-    /**
-     * Gets a network representation of the linked channels
-     * @returns {Promise<{[string]: string[]}>} resolves to the network representation of linked channels
-     */
-    getLinkedChannels() {
-        return Promise.resolve({});
-    }
-
-    /**
-     * Gets a list of operators available in a particular channel on a particular network
-     * @param {string} network the network to look at
-     * @param {string} channel the channel to look in (without prefixed #)
-     * @returns {Promise<string[]>} resolves to a list of operators
-     */
-    getChannelOps(network, channel) {
-        return Promise.resolve([]);
-    }
-
-    /**
-     * Links a channel to the room this backbone controls
-     * @param {string} network the network to link to
-     * @param {string} channel the channel to link to
-     * @param {string} op the channel operator to request permission from
-     * @returns {Promise<>} resolves when complete
-     */
-    addChannel(network, channel, op) {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Unlinks a channel from the room this backbone controls
-     * @param {string} network the network to unlink from
-     * @param {string} channel the channel to unlink
-     * @returns {Promise<>} resolves when complete
-     */
-    removeChannel(network, channel) {
-        throw new Error("Not implemented");
-    }
-}
-
-module.exports = StubbedIrcBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/irc/VectorIrcBackbone.js b/src/integration/impl/irc/VectorIrcBackbone.js
deleted file mode 100644
index 65165ae..0000000
--- a/src/integration/impl/irc/VectorIrcBackbone.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var StubbedIrcBackbone = require("./StubbedIrcBackbone");
-var VectorScalarClient = require("../../../scalar/VectorScalarClient");
-var _ = require("lodash");
-var log = require("../../../util/LogService");
-
-/**
- * Backbone for IRC bridges running on vector.im through scalar
- */
-class VectorIrcBackbone extends StubbedIrcBackbone {
-
-    /**
-     * Creates a new Vector IRC backbone
-     * @param {string} roomId the room ID to manage
-     * @param {string} upstreamScalarToken the vector scalar token
-     */
-    constructor(roomId, upstreamScalarToken) {
-        super();
-        this._roomId = roomId;
-        this._scalarToken = upstreamScalarToken;
-        this._lastNetworkResponse = null;
-    }
-
-    /*override*/
-    getNetworks() {
-        return this._getNetworks().then(networks => _.map(networks, n => {
-            return {name: n.title, id: n.id};
-        }));
-    }
-
-    /*override*/
-    getLinkedChannels() {
-        var networks;
-        return this._getNetworks().then(n => {
-            networks = n;
-            return VectorScalarClient.getIrcLinks(this._roomId, this._scalarToken);
-        }).then(links => {
-            var container = {};
-
-            var ridToServerId = {};
-
-            for (var network of networks) {
-                ridToServerId[network.rid] = network.id;
-                container[network.id] = [];
-            }
-
-            for (var link of links) {
-                var server = ridToServerId[link.rid];
-                if (!server) {
-                    log.error("VectorIrcBackbone", "Could not find network for RID " + link.rid);
-                    throw new Error("Unexpected RID");
-                }
-
-                container[server].push(link.channel);
-            }
-
-            return container;
-        });
-    }
-
-    /*override*/
-    getChannelOps(network, channel) {
-        return this._getNetworks().then(networks => {
-            var networkServer = null;
-            var rid = null;
-            for (var n of networks) {
-                if (n.id === network) {
-                    networkServer = n.domain;
-                    rid = n.rid;
-                    break;
-                }
-            }
-
-            return VectorScalarClient.getIrcOperators(rid, networkServer, '#' + channel, this._scalarToken);
-        });
-    }
-
-    /*override*/
-    addChannel(network, channel, op) {
-        return this._getNetworks().then(networks => {
-            var networkServer = null;
-            var rid = null;
-            for (var n of networks) {
-                if (n.id === network) {
-                    networkServer = n.domain;
-                    rid = n.rid;
-                    break;
-                }
-            }
-
-            return VectorScalarClient.addIrcLink(rid, this._roomId, networkServer, '#' + channel, op, this._scalarToken);
-        });
-    }
-
-    /*override*/
-    removeChannel(network, channel) {
-        return this._getNetworks().then(networks => {
-            var networkServer = null;
-            var rid = null;
-            for (var n of networks) {
-                if (n.id === network) {
-                    networkServer = n.domain;
-                    rid = n.rid;
-                    break;
-                }
-            }
-
-            return VectorScalarClient.removeIrcLink(rid, this._roomId, networkServer, '#' + channel, this._scalarToken);
-        });
-    }
-
-    _getNetworks() {
-        if (this._lastNetworkResponse !== null) return Promise.resolve(this._lastNetworkResponse);
-        return VectorScalarClient.getIrcNetworks(this._scalarToken).then(networks => {
-            this._lastNetworkResponse = networks;
-            return networks;
-        });
-    }
-}
-
-module.exports = VectorIrcBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/rss/RSSBot.js b/src/integration/impl/rss/RSSBot.js
deleted file mode 100644
index f3384b2..0000000
--- a/src/integration/impl/rss/RSSBot.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var ComplexBot = require("../../generic_types/ComplexBot");
-
-/**
- * Represents an RSS bot
- */
-class RSSBot extends ComplexBot {
-
-    /**
-     * Creates a new RSS bot
-     * @param botConfig the bot configuration
-     * @param backbone the backbone powering this bot
-     */
-    constructor(botConfig, backbone) {
-        super(botConfig);
-        this._backbone = backbone;
-    }
-
-    /*override*/
-    getUserId() {
-        return this._backbone.getUserId();
-    }
-
-    /*override*/
-    getState() {
-        var response = {
-            feeds: [],
-            immutableFeeds: []
-        };
-        return this._backbone.getFeeds().then(feeds => {
-            response.feeds = feeds;
-            return this._backbone.getImmutableFeeds();
-        }).then(feeds => {
-            response.immutableFeeds = feeds;
-            return response;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return this._backbone.removeFromRoom(roomId);
-    }
-
-    /*override*/
-    updateState(newState) {
-        return this._backbone.setFeeds(newState.feeds).then(() => this.getState());
-    }
-}
-
-module.exports = RSSBot;
\ No newline at end of file
diff --git a/src/integration/impl/rss/RSSFactory.js b/src/integration/impl/rss/RSSFactory.js
deleted file mode 100644
index f800a7b..0000000
--- a/src/integration/impl/rss/RSSFactory.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var RSSBot = require("./RSSBot");
-var VectorRssBackbone = require("./VectorRssBackbone");
-var UpstreamConfiguration = require("../../../UpstreamConfiguration");
-
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-
-    return db.getUpstreamToken(scalarToken).then(upstreamToken => {
-        var backbone = new VectorRssBackbone(roomId, upstreamToken);
-        return new RSSBot(integrationConfig, backbone);
-    });
-};
-
-factory.validateConfig = (integrationConfig) => {
-    if (!integrationConfig.upstream) throw new Error("Unsupported configuration");
-    if (integrationConfig.upstream.type !== "vector") throw new Error("Unsupported upstream");
-    if (!UpstreamConfiguration.hasUpstream("vector")) throw new Error("Vector upstream not specified");
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/rss/StubbedRssBackbone.js b/src/integration/impl/rss/StubbedRssBackbone.js
deleted file mode 100644
index 6e51205..0000000
--- a/src/integration/impl/rss/StubbedRssBackbone.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Stubbed/placeholder RSS backbone
- */
-class StubbedRssBackbone {
-
-    /**
-     * Creates a new stubbed RSS backbone
-     */
-    constructor() {
-    }
-
-    /**
-     * Gets the user ID for this backbone
-     * @returns {Promise<string>} resolves to the user ID
-     */
-    getUserId() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the feeds for this backbone
-     * @returns {Promise<string[]>} resolves to the collection of feeds
-     */
-    getFeeds() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Sets the new feeds for this backbone
-     * @param {string[]} newFeeds the new feed URLs
-     * @returns {Promise<>} resolves when complete
-     */
-    setFeeds(newFeeds) {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the immutable feeds for this backbone
-     * @returns {Promise<{url:string,ownerId:string}>} resolves to the collection of immutable feeds
-     */
-    getImmutableFeeds() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Removes the bot from the given room
-     * @param {string} roomId the room ID to remove the bot from
-     * @returns {Promise<>} resolves when completed
-     */
-    removeFromRoom(roomId) {
-        throw new Error("Not implemented");
-    }
-}
-
-module.exports = StubbedRssBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/rss/VectorRssBackbone.js b/src/integration/impl/rss/VectorRssBackbone.js
deleted file mode 100644
index d4a37f6..0000000
--- a/src/integration/impl/rss/VectorRssBackbone.js
+++ /dev/null
@@ -1,82 +0,0 @@
-var StubbedRssBackbone = require("./StubbedRssBackbone");
-var VectorScalarClient = require("../../../scalar/VectorScalarClient");
-var _ = require("lodash");
-var log = require("../../../util/LogService");
-
-/**
- * Backbone for RSS bots running on vector.im through scalar
- */
-class VectorRssBackbone extends StubbedRssBackbone {
-
-    /**
-     * Creates a new Vector RSS backbone
-     * @param {string} roomId the room ID to manage
-     * @param {string} upstreamScalarToken the vector scalar token
-     */
-    constructor(roomId, upstreamScalarToken) {
-        super();
-        this._roomId = roomId;
-        this._scalarToken = upstreamScalarToken;
-        this._info = null;
-        this._otherFeeds = [];
-    }
-
-    /*override*/
-    getUserId() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            return this._info.bot_user_id;
-        });
-    }
-
-    /*override*/
-    getFeeds() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            if (this._info.integrations.length == 0) return [];
-            return _.keys(this._info.integrations[0].config.feeds);
-        });
-    }
-
-    /*override*/
-    setFeeds(newFeeds) {
-        var feedConfig = {};
-        for (var feed of newFeeds) feedConfig[feed] = {};
-
-        return VectorScalarClient.configureIntegration("rssbot", this._scalarToken, {
-            feeds: feedConfig,
-            room_id: this._roomId
-        });
-    }
-
-    /*override*/
-    getImmutableFeeds() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            return this._otherFeeds;
-        });
-    }
-
-    _getInfo() {
-        return VectorScalarClient.getIntegrationsForRoom(this._roomId, this._scalarToken).then(integrations => {
-            this._otherFeeds = [];
-            for (var integration of integrations) {
-                if (integration.self) continue; // skip - we're not looking for ones we know about
-                if (integration.type == "rssbot") {
-                    var urls = _.keys(integration.config.feeds);
-                    for (var url of urls) {
-                        this._otherFeeds.push({url: url, ownerId: integration.user_id});
-                    }
-                }
-            }
-
-            return VectorScalarClient.getIntegration("rssbot", this._roomId, this._scalarToken);
-        }).then(info => {
-            this._info = info;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return VectorScalarClient.removeIntegration("rssbot", roomId, this._scalarToken);
-    }
-}
-
-module.exports = VectorRssBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/simple_bot/HostedSimpleBackbone.js b/src/integration/impl/simple_bot/HostedSimpleBackbone.js
deleted file mode 100644
index ce10929..0000000
--- a/src/integration/impl/simple_bot/HostedSimpleBackbone.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var sdk = require("matrix-js-sdk");
-var log = require("../../../util/LogService");
-var StubbedSimpleBackbone = require("./StubbedSimpleBackbone");
-
-/**
- * Standalone (matrix) backbone for simple bots
- */
-class HostedSimpleBackbone extends StubbedSimpleBackbone {
-
-    /**
-     * Creates a new standalone bot backbone
-     * @param {*} botConfig the configuration for the bot
-     */
-    constructor(botConfig) {
-        super(botConfig);
-        this._config = botConfig;
-        this._client = sdk.createClient({
-            baseUrl: this._config.hosted.homeserverUrl,
-            accessToken: this._config.hosted.accessToken,
-            userId: this._config.userId,
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        log.info("HostedSimpleBackbone", "Removing " + this._config.userId + " from " + roomId);
-        return this._client.leave(roomId);
-    }
-}
-
-module.exports = HostedSimpleBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/simple_bot/SimpleBot.js b/src/integration/impl/simple_bot/SimpleBot.js
deleted file mode 100644
index 08cffbd..0000000
--- a/src/integration/impl/simple_bot/SimpleBot.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var IntegrationStub = require("../../generic_types/IntegrationStub");
-
-/**
- * Represents an RSS bot
- */
-class SimpleBot extends IntegrationStub {
-
-    /**
-     * Creates a new RSS bot
-     * @param botConfig the bot configuration
-     * @param backbone the backbone powering this bot
-     */
-    constructor(botConfig, backbone) {
-        super(botConfig);
-        this._backbone = backbone;
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return this._backbone.removeFromRoom(roomId);
-    }
-}
-
-module.exports = SimpleBot;
\ No newline at end of file
diff --git a/src/integration/impl/simple_bot/SimpleBotFactory.js b/src/integration/impl/simple_bot/SimpleBotFactory.js
deleted file mode 100644
index 1c4c1cc..0000000
--- a/src/integration/impl/simple_bot/SimpleBotFactory.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var SimpleBot = require("./SimpleBot");
-var VectorSimpleBackbone = require("./VectorSimpleBackbone");
-var HostedSimpleBackbone = require("./HostedSimpleBackbone");
-var UpstreamConfiguration = require("../../../UpstreamConfiguration");
-
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-
-    if (integrationConfig.upstream) {
-        return db.getUpstreamToken(scalarToken).then(upstreamToken => {
-            var backbone = new VectorSimpleBackbone(integrationConfig, upstreamToken);
-            return new SimpleBot(integrationConfig, backbone);
-        });
-    } else if (integrationConfig.hosted) {
-        var backbone = new HostedSimpleBackbone(integrationConfig);
-        return Promise.resolve(new SimpleBot(integrationConfig, backbone));
-    }
-};
-
-factory.validateConfig = (integrationConfig) => {
-    if (integrationConfig.upstream) {
-        if (integrationConfig.upstream.type !== "vector") throw new Error("Unsupported upstream");
-        if (!UpstreamConfiguration.hasUpstream("vector")) throw new Error("Vector upstream not specified");
-    } else if (!integrationConfig.hosted) throw new Error("Unsupported configuration");
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/simple_bot/StubbedSimpleBackbone.js b/src/integration/impl/simple_bot/StubbedSimpleBackbone.js
deleted file mode 100644
index a864912..0000000
--- a/src/integration/impl/simple_bot/StubbedSimpleBackbone.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Stubbed backbone for simple bots
- */
-class StubbedSimpleBackbone {
-
-    /**
-     * Creates a new stubbed bot backbone
-     * @param {*} botConfig the configuration for the bot
-     */
-    constructor(botConfig) {
-        this._config = botConfig;
-    }
-
-    /**
-     * Leaves a given Matrix room
-     * @param {string} roomId the room to leave
-     * @returns {Promise<>} resolves when completed
-     */
-    removeFromRoom(roomId) {
-        throw new Error("Not implemented");
-    }
-}
-
-module.exports = StubbedSimpleBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/simple_bot/VectorSimpleBackbone.js b/src/integration/impl/simple_bot/VectorSimpleBackbone.js
deleted file mode 100644
index 2d8fcfc..0000000
--- a/src/integration/impl/simple_bot/VectorSimpleBackbone.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var VectorScalarClient = require("../../../scalar/VectorScalarClient");
-var log = require("../../../util/LogService");
-var StubbedSimpleBackbone = require("./StubbedSimpleBackbone");
-
-/**
- * Vector backbone for simple bots
- */
-class VectorSimpleBackbone extends StubbedSimpleBackbone {
-
-    /**
-     * Creates a new vector bot backbone
-     * @param {*} botConfig the configuration for the bot
-     * @param {string} upstreamScalarToken the upstream scalar token
-     */
-    constructor(botConfig, upstreamScalarToken) {
-        super(botConfig);
-        this._config = botConfig;
-        this._upstreamToken = upstreamScalarToken;
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        log.info("VectorSimpleBackbone", "Removing " + this._config.userId + " from " + roomId);
-        return VectorScalarClient.removeIntegration(this._config.upstream.id, roomId, this._upstreamToken);
-    }
-}
-
-module.exports = VectorSimpleBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/simple_widget/SimpleWidget.js b/src/integration/impl/simple_widget/SimpleWidget.js
deleted file mode 100644
index b916d6b..0000000
--- a/src/integration/impl/simple_widget/SimpleWidget.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var Widget = require("../../generic_types/Widget");
-
-/**
- * Represents a simple widget
- */
-class SimpleWidget extends Widget {
-
-    /**
-     * Creates a new simple widget
-     * @param widgetConfig the widget configuration
-     */
-    constructor(widgetConfig) {
-        super(widgetConfig);
-    }
-}
-
-module.exports = SimpleWidget;
\ No newline at end of file
diff --git a/src/integration/impl/simple_widget/SimpleWidgetFactory.js b/src/integration/impl/simple_widget/SimpleWidgetFactory.js
deleted file mode 100644
index 34782e0..0000000
--- a/src/integration/impl/simple_widget/SimpleWidgetFactory.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var SimpleWidget = require("./SimpleWidget");
-var Promise = require("bluebird");
-
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-    return Promise.resolve(new SimpleWidget(integrationConfig, roomId));
-};
-
-factory.validateConfig = (integrationConfig) => {
-    // Nothing to do
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/travisci/StubbedTravisCiBackbone.js b/src/integration/impl/travisci/StubbedTravisCiBackbone.js
deleted file mode 100644
index 58b60c1..0000000
--- a/src/integration/impl/travisci/StubbedTravisCiBackbone.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Stubbed/placeholder Travis CI backbone
- */
-class StubbedTravisCiBackbone {
-
-    /**
-     * Creates a new stubbed RSS backbone
-     */
-    constructor() {
-    }
-
-    /**
-     * Gets the user ID for this backbone
-     * @returns {Promise<string>} resolves to the user ID
-     */
-    getUserId() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the repository templates for this backbone
-     * @returns {Promise<{repoKey:string,template:string}[]>} resolves to the collection of repositories and their templates
-     */
-    getRepos() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the immutable repository templates for this backbone (set by other users)
-     * @returns {Promise<{repoKey:string,template:string,ownerId:string}[]>} resolves to the collection of repositories and their templates
-     */
-    getImmutableRepos() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Sets the new repository templates for this backbone
-     * @param {{repoKey:string,template:string}[]} newRepos the new templates for the repositories
-     * @returns {Promise<>} resolves when complete
-     */
-    setRepos(newRepos) {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Gets the webhook url for this backbone
-     * @returns {Promise<string>} resolves to the webhook URL
-     */
-    getWebhookUrl() {
-        throw new Error("Not implemented");
-    }
-
-    /**
-     * Removes the bot from the given room
-     * @param {string} roomId the room ID to remove the bot from
-     * @returns {Promise<>} resolves when completed
-     */
-    removeFromRoom(roomId) {
-        throw new Error("Not implemented");
-    }
-}
-
-module.exports = StubbedTravisCiBackbone;
\ No newline at end of file
diff --git a/src/integration/impl/travisci/TravisCiBot.js b/src/integration/impl/travisci/TravisCiBot.js
deleted file mode 100644
index dbedbed..0000000
--- a/src/integration/impl/travisci/TravisCiBot.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var ComplexBot = require("../../generic_types/ComplexBot");
-
-/**
- * Represents a Travis CI bot
- */
-class TravisCiBot extends ComplexBot {
-
-    /**
-     * Creates a new Travis CI bot
-     * @param botConfig the bot configuration
-     * @param backbone the backbone powering this bot
-     */
-    constructor(botConfig, backbone) {
-        super(botConfig);
-        this._backbone = backbone;
-    }
-
-    /*override*/
-    getUserId() {
-        return this._backbone.getUserId();
-    }
-
-    /*override*/
-    getState() {
-        var response = {
-            repoTemplates: [],
-            immutableRepoTemplates: [],
-            webhookUrl: ""
-        };
-        return this._backbone.getRepos().then(templates => {
-            response.repoTemplates = templates;
-            return this._backbone.getImmutableRepos();
-        }).then(immutable => {
-            response.immutableRepoTemplates = immutable;
-            return this._backbone.getWebhookUrl();
-        }).then(url => {
-            response.webhookUrl = url;
-            return response;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return this._backbone.removeFromRoom(roomId);
-    }
-
-    /*override*/
-    updateState(newState) {
-        return this._backbone.setRepos(newState.repoTemplates).then(() => this.getState());
-    }
-}
-
-module.exports = TravisCiBot;
\ No newline at end of file
diff --git a/src/integration/impl/travisci/TravisCiFactory.js b/src/integration/impl/travisci/TravisCiFactory.js
deleted file mode 100644
index 42ac8e9..0000000
--- a/src/integration/impl/travisci/TravisCiFactory.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var TravisCiBot = require("./TravisCiBot");
-var VectorTravisCiBackbone = require("./VectorTravisCiBackbone");
-var UpstreamConfiguration = require("../../../UpstreamConfiguration");
-
-var factory = (db, integrationConfig, roomId, scalarToken) => {
-    factory.validateConfig(integrationConfig);
-
-    return db.getUpstreamToken(scalarToken).then(upstreamToken => {
-        var backbone = new VectorTravisCiBackbone(roomId, upstreamToken);
-        return new TravisCiBot(integrationConfig, backbone);
-    });
-};
-
-factory.validateConfig = (integrationConfig) => {
-    if (!integrationConfig.upstream) throw new Error("Unsupported configuration");
-    if (integrationConfig.upstream.type !== "vector") throw new Error("Unsupported upstream");
-    if (!UpstreamConfiguration.hasUpstream("vector")) throw new Error("Vector upstream not specified");
-};
-
-module.exports = factory;
\ No newline at end of file
diff --git a/src/integration/impl/travisci/VectorTravisCiBackbone.js b/src/integration/impl/travisci/VectorTravisCiBackbone.js
deleted file mode 100644
index 3d99d78..0000000
--- a/src/integration/impl/travisci/VectorTravisCiBackbone.js
+++ /dev/null
@@ -1,108 +0,0 @@
-var StubbedTravisCiBackbone = require("./StubbedTravisCiBackbone");
-var VectorScalarClient = require("../../../scalar/VectorScalarClient");
-var _ = require("lodash");
-var log = require("../../../util/LogService");
-
-/**
- * Backbone for Travis CI bots running on vector.im through scalar
- */
-class VectorTravisCiBackbone extends StubbedTravisCiBackbone {
-
-    /**
-     * Creates a new Vector Travis CI backbone
-     * @param {string} roomId the room ID to manage
-     * @param {string} upstreamScalarToken the vector scalar token
-     */
-    constructor(roomId, upstreamScalarToken) {
-        super();
-        this._roomId = roomId;
-        this._scalarToken = upstreamScalarToken;
-        this._info = null;
-        this._otherTemplates = [];
-    }
-
-    /*override*/
-    getUserId() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            return this._info.bot_user_id;
-        });
-    }
-
-    /*override*/
-    getRepos() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            if (this._info.integrations.length == 0) return [];
-
-            var rooms = _.keys(this._info.integrations[0].config.rooms);
-            if (rooms.indexOf(this._roomId) === -1) return [];
-
-            var repos = _.keys(this._info.integrations[0].config.rooms[this._roomId].repos);
-            return _.map(repos, r => {
-                return {repoKey: r, template: this._info.integrations[0].config.rooms[this._roomId].repos[r].template};
-            });
-        });
-    }
-
-    /*override*/
-    getImmutableRepos() {
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            return this._otherTemplates;
-        });
-    }
-
-    /*override*/
-    setRepos(newRepos) {
-        var config = {};
-        config[this._roomId] = {repos: {}};
-        for (var repo of newRepos) config[this._roomId].repos[repo.repoKey] = {template: repo.template};
-
-        return VectorScalarClient.configureIntegration("travis-ci", this._scalarToken, {
-            rooms: config
-        });
-    }
-
-    /*override*/
-    getWebhookUrl() {
-        // string
-        return (this._info ? Promise.resolve() : this._getInfo()).then(() => {
-            if (this._info.integrations.length == 0) return "";
-            return this._info.integrations[0].config.webhook_url;
-        });
-    }
-
-    _getInfo() {
-        return VectorScalarClient.getIntegrationsForRoom(this._roomId, this._scalarToken).then(integrations => {
-            this._otherTemplates = [];
-            for (var integration of integrations) {
-                if (integration.self) continue; // skip - we're not looking for ones we know about
-                if (integration.type == "travis-ci") {
-                    var roomIds = _.keys(integration.config.rooms);
-                    if (roomIds.length === 0) continue;
-                    if (roomIds.length !== 1) log.warn("VectorTravisCiBackbone", "Expected 1 room but found " + roomIds.length);
-
-                    var roomConfig = integration.config.rooms[roomIds[0]];
-                    var repositories = _.keys(roomConfig.repos);
-
-                    for (var repo of repositories) {
-                        this._otherTemplates.push({
-                            repoKey: repo,
-                            template: roomConfig.repos[repo].template,
-                            ownerId: integration.user_id
-                        });
-                    }
-                }
-            }
-
-            return VectorScalarClient.getIntegration("travis-ci", this._roomId, this._scalarToken);
-        }).then(info => {
-            this._info = info;
-        });
-    }
-
-    /*override*/
-    removeFromRoom(roomId) {
-        return VectorScalarClient.removeIntegration("travis-ci", roomId, this._scalarToken);
-    }
-}
-
-module.exports = VectorTravisCiBackbone;
\ No newline at end of file
diff --git a/src/integration/index.js b/src/integration/index.js
deleted file mode 100644
index dfa6a1d..0000000
--- a/src/integration/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-var config = require("config");
-var log = require("../util/LogService");
-var fs = require("fs");
-var path = require("path");
-var _ = require("lodash");
-var IntegrationImpl = require("./impl");
-
-log.info("Integrations", "Discovering integrations");
-
-var searchPath = path.join(process.cwd(), "config", "integrations");
-var files = _.filter(fs.readdirSync(searchPath), f => !fs.statSync(path.join(searchPath, f)).isDirectory() && f.endsWith(".yaml"));
-var currentEnv = config.util.initParam("NODE_ENV", "development");
-
-if (currentEnv !== "development" && currentEnv !== "production")
-    throw new Error("Unknown node environment: " + currentEnv);
-
-var configs = {};
-
-for (var file of files) {
-    if (file.endsWith("_development.yaml") || file.endsWith("_production.yaml")) {
-        if (!file.endsWith("_" + currentEnv + ".yaml")) continue;
-        var fileName = file.replace("_development.yaml", "").replace("_production.yaml", "") + ".yaml";
-
-        if (!configs[fileName]) configs[fileName] = {};
-        configs[fileName]["alt"] = config.util.parseFile(path.join(searchPath, file)) || {};
-    } else {
-        if (!configs[file]) configs[file] = {};
-        configs[file]["defaults"] = config.util.parseFile(path.join(searchPath, file)) || {};
-    }
-}
-
-var keys = _.keys(configs);
-log.info("Integrations", "Discovered " + keys.length + " integrations. Parsing definitions...");
-
-var linear = [];
-var byUserId = {};
-var byType = {};
-
-for (var key of keys) {
-    log.info("Integrations", "Preparing " + key);
-    if (!configs[key].defaults) configs[key].defaults = {};
-    var merged = config.util.extendDeep(configs[key].defaults, configs[key].alt);
-    if (!merged['enabled']) {
-        log.warn("Integrations", "Integration " + key + " is not enabled - skipping");
-        continue;
-    }
-
-    var factory = IntegrationImpl.getFactory(merged);
-    if (!factory) {
-        log.warn("Integrations", "Integration " + key + " does not have an associated factory - skipping");
-        continue;
-    }
-    try {
-        factory.validateConfig(merged);
-    } catch (err) {
-        log.error("Integrations", "Error while validating integration " + key + " - skipping");
-        log.error("Integrations", err);
-        continue;
-    }
-
-    linear.push(merged);
-    if (merged['userId'])
-        byUserId[merged['userId']] = merged;
-
-    if (!byType[merged['type']])
-        byType[merged['type']] = {};
-    if (byType[merged['type']][merged['integrationType']])
-        throw new Error("Duplicate type " + merged['type'] + " (" + merged['integrationType'] + ") at key " + key);
-    byType[merged['type']][merged['integrationType']] = merged;
-}
-
-log.info("Integrations", "Loaded " + linear.length + " integrations");
-
-module.exports = {
-    all: linear,
-    byUserId: byUserId,
-    byType: byType
-};
\ No newline at end of file
diff --git a/src-ts/integrations/Integration.ts b/src/integrations/Integration.ts
similarity index 100%
rename from src-ts/integrations/Integration.ts
rename to src/integrations/Integration.ts
diff --git a/src-ts/integrations/Widget.ts b/src/integrations/Widget.ts
similarity index 100%
rename from src-ts/integrations/Widget.ts
rename to src/integrations/Widget.ts
diff --git a/src/matrix/DemoBot.js b/src/matrix/DemoBot.js
deleted file mode 100644
index 1b519a9..0000000
--- a/src/matrix/DemoBot.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var sdk = require("matrix-js-sdk");
-var log = require("../util/LogService");
-
-/**
- * Dimension demo bot. Doesn't do anything except show how to add a self-hosted bot to Dimension
- */
-class DemoBot {
-
-    constructor(homeserverUrl, userId, accessToken) {
-        this._rooms = [];
-
-        log.info("DemoBot", "Constructing bot as " + userId);
-        this._client = sdk.createClient({
-            baseUrl: homeserverUrl,
-            accessToken: accessToken,
-            userId: userId,
-        });
-
-        this._client.on('event', event => {
-            if (event.getType() !== "m.room.member") return;
-            if (event.getStateKey() != this._client.credentials.userId) return;
-            if (event.getContent().membership === 'invite') {
-                if (this._rooms.indexOf(event.getRoomId()) !== -1) return;
-                log.info("DemoBot", "Joining " + event.getRoomId());
-                this._client.joinRoom(event.getRoomId()).then(() => {
-                    this._recalculateRooms();
-                    this._client.sendMessage(event.getRoomId(), {
-                        msgtype: "m.notice",
-                        body: "Hello! I'm a small bot that acts as an example for how to set up your own bot on Dimension."
-                    });
-                });
-            } else this._recalculateRooms();
-        });
-    }
-
-    start() {
-        log.info("DemoBot", "Starting bot");
-        this._client.startClient();
-
-        this._client.on('sync', state => {
-            if (state == 'PREPARED') this._recalculateRooms();
-        });
-    }
-
-    _recalculateRooms() {
-        var rooms = this._client.getRooms();
-        this._rooms = [];
-        for (var room of rooms) {
-            var me = room.getMember(this._client.credentials.userId);
-            if (!me) continue;
-
-            if (me.membership == "invite") {
-                this._client.joinRoom(room.roomId);
-                continue;
-            }
-
-            if (me.membership != "join") continue;
-            this._rooms.push(room.roomId);
-        }
-
-        log.verbose("DemoBot", "Currently in " + this._rooms.length + " rooms");
-    }
-
-}
-
-module.exports = DemoBot;
\ No newline at end of file
diff --git a/src-ts/matrix/MatrixAppserviceClient.ts b/src/matrix/MatrixAppserviceClient.ts
similarity index 100%
rename from src-ts/matrix/MatrixAppserviceClient.ts
rename to src/matrix/MatrixAppserviceClient.ts
diff --git a/src/matrix/MatrixLiteClient.js b/src/matrix/MatrixLiteClient.js
index 0cd9151..a774b13 100644
--- a/src/matrix/MatrixLiteClient.js
+++ b/src/matrix/MatrixLiteClient.js
@@ -1,83 +1,17 @@
-var request = require('request');
-var log = require("../util/LogService");
-var dns = require("dns-then");
-var Promise = require("bluebird");
-var config = require("config");
-
-/**
- * Represents a lightweight matrix client with minimal functionality
- */
-class MatrixLiteClient {
-
-    /**
-     * Creates a new matrix client
-     * @param {OpenID} openId the open ID to use
-     */
-    constructor(openId) {
-        this._openId = openId;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var helpers_1 = require("./helpers");
+var MatrixLiteClient = /** @class */ (function () {
+    function MatrixLiteClient(homeserverName, accessToken) {
+        this.homeserverName = homeserverName;
+        this.accessToken = accessToken;
     }
-
-    /**
-     * Gets the Matrix User ID that owns this open ID
-     * @return {Promise<string>} resolves to the mxid
-     */
-    getSelfMxid() {
-        return this._do("GET", "/_matrix/federation/v1/openid/userinfo", /*qs=*/null, /*body=*/null, /*allowSelfSigned=*/true).then((response, body) => {
-            var json = JSON.parse(response.body);
-            return json['sub'];
+    MatrixLiteClient.prototype.getUrlPreview = function (url) {
+        return helpers_1.doFederatedApiCall("GET", this.homeserverName, "/_matrix/media/r0/preview_url", { access_token: this.accessToken, url: url }).then(function (response) {
+            return response;
         });
-    }
-
-    /**
-     * Gets a URL preview from the media repo (as provided by the default homeserver)
-     * @param {string} url The URL to get the preview of
-     * @return {Promise<*>} resolves to the raw URL preview
-     */
-    static getUrlPreview(url) {
-        return MatrixLiteClient._do(config.homeserver.name, config.homeserver.accessToken, "GET", "/_matrix/media/r0/preview_url", {url: url}).then((response, body) => {
-            return JSON.parse(response.body);
-        });
-    }
-
-    _do(method, endpoint, qs = null, body = null, allowSelfSigned = false) {
-        return MatrixLiteClient._do(this._openId.matrix_server_name, this._openId.access_token, method, endpoint, qs, body, allowSelfSigned);
-    }
-
-    static _do(serverName, accessToken, method, endpoint, qs = null, body = null, allowSelfSigned = false) {
-        // HACK: We have to wrap the dns promise in a Bluebird promise just to make sure it works
-        var dnsPromise = dns.resolveSrv("_matrix._tcp." + serverName);
-        return Promise.resolve(dnsPromise).then(records => {
-            if (records && records.length > 0)
-                serverName = records[0].name + ":" + records[0].port;
-        }, err => {
-            log.warn("MatrixLiteClient", "Failed to lookup SRV for " + serverName + " - assuming none available.");
-            log.warn("MatrixLiteClient", err);
-        }).then(() => {
-            var url = "https://" + serverName + endpoint;
-
-            log.verbose("MatrixLiteClient", "Performing request: " + url);
-
-            if (!qs) qs = {};
-            if (accessToken) qs['access_token'] = accessToken;
-
-            var params = {
-                url: url,
-                method: method,
-                form: body,
-                qs: qs,
-                rejectUnauthorized: !allowSelfSigned
-            };
-
-            return new Promise((resolve, reject) => {
-                request(params, (err, response, body) => {
-                    if (err) {
-                        log.error("MatrixLiteClient", err);
-                        reject(err);
-                    } else resolve(response, body);
-                });
-            });
-        });
-    }
-}
-
-module.exports = MatrixLiteClient;
\ No newline at end of file
+    };
+    return MatrixLiteClient;
+}());
+exports.MatrixLiteClient = MatrixLiteClient;
+//# sourceMappingURL=MatrixLiteClient.js.map
\ No newline at end of file
diff --git a/src-ts/matrix/MatrixLiteClient.ts b/src/matrix/MatrixLiteClient.ts
similarity index 100%
rename from src-ts/matrix/MatrixLiteClient.ts
rename to src/matrix/MatrixLiteClient.ts
diff --git a/src-ts/matrix/MatrixOpenIdClient.ts b/src/matrix/MatrixOpenIdClient.ts
similarity index 100%
rename from src-ts/matrix/MatrixOpenIdClient.ts
rename to src/matrix/MatrixOpenIdClient.ts
diff --git a/src-ts/matrix/helpers.ts b/src/matrix/helpers.ts
similarity index 100%
rename from src-ts/matrix/helpers.ts
rename to src/matrix/helpers.ts
diff --git a/src-ts/models/MatrixEvent.ts b/src/models/MatrixEvent.ts
similarity index 100%
rename from src-ts/models/MatrixEvent.ts
rename to src/models/MatrixEvent.ts
diff --git a/src-ts/models/OpenId.ts b/src/models/OpenId.ts
similarity index 100%
rename from src-ts/models/OpenId.ts
rename to src/models/OpenId.ts
diff --git a/src-ts/models/ScalarResponses.ts b/src/models/ScalarResponses.ts
similarity index 100%
rename from src-ts/models/ScalarResponses.ts
rename to src/models/ScalarResponses.ts
diff --git a/src/scalar/ScalarClient.js b/src/scalar/ScalarClient.js
index c6586b2..6ac0363 100644
--- a/src/scalar/ScalarClient.js
+++ b/src/scalar/ScalarClient.js
@@ -1,58 +1,36 @@
-var request = require('request');
-var log = require("../util/LogService");
-var config = require("config");
-var UpstreamConfiguration = require("../UpstreamConfiguration");
-
-/**
- * Represents a scalar client
- */
-class ScalarClient {
-
-    /**
-     * Creates a new Scalar client
-     */
-    constructor() {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Promise = require("bluebird");
+var request = require("request");
+var matrix_js_snippets_1 = require("matrix-js-snippets");
+var ScalarClient = /** @class */ (function () {
+    function ScalarClient(upstream) {
+        this.upstream = upstream;
     }
-
-    /**
-     * Registers for a scalar token
-     * @param {OpenID} openId the open ID to register
-     * @returns {Promise<string>} resolves to a scalar token
-     */
-    register(openId) {
-        return this._do("POST", "/register", null, openId).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("ScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            return response.body['scalar_token'];
-        });
-    }
-
-    // TODO: Merge this, VectorScalarClient, and MatrixLiteClient into a base class
-    _do(method, endpoint, qs = null, body = null) {
-        // TODO: Generify URL
-        var url = UpstreamConfiguration.getUpstream("vector").url + endpoint;
-
-        log.verbose("ScalarClient", "Performing request: " + url);
-
-        var params = {
-            url: url,
-            method: method,
-            json: body,
-            qs: qs
-        };
-
-        return new Promise((resolve, reject) => {
-            request(params, (err, response, body) => {
+    ScalarClient.prototype.register = function (openId) {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            request({
+                method: "POST",
+                url: _this.upstream.scalarUrl + "/register",
+                json: openId,
+            }, function (err, res, _body) {
                 if (err) {
-                    log.error("ScalarClient", err);
+                    matrix_js_snippets_1.LogService.error("ScalarClient", "Error registering for token");
+                    matrix_js_snippets_1.LogService.error("ScalarClient", err);
                     reject(err);
-                } else resolve(response, body);
+                }
+                else if (res.statusCode !== 200) {
+                    matrix_js_snippets_1.LogService.error("ScalarClient", "Got status code " + res.statusCode + " while registering for token");
+                    reject(new Error("Could not get token"));
+                }
+                else {
+                    resolve(res.body);
+                }
             });
         });
-    }
-}
-
-module.exports = new ScalarClient();
\ No newline at end of file
+    };
+    return ScalarClient;
+}());
+exports.ScalarClient = ScalarClient;
+//# sourceMappingURL=ScalarClient.js.map
\ No newline at end of file
diff --git a/src-ts/scalar/ScalarClient.ts b/src/scalar/ScalarClient.ts
similarity index 100%
rename from src-ts/scalar/ScalarClient.ts
rename to src/scalar/ScalarClient.ts
diff --git a/src/scalar/VectorScalarClient.js b/src/scalar/VectorScalarClient.js
deleted file mode 100644
index 5129070..0000000
--- a/src/scalar/VectorScalarClient.js
+++ /dev/null
@@ -1,260 +0,0 @@
-var request = require('request');
-var log = require("../util/LogService");
-var config = require("config");
-var UpstreamConfiguration = require("../UpstreamConfiguration");
-
-/**
- * Represents a scalar client for vector.im
- */
-class VectorScalarClient {
-
-    /**
-     * Creates a new vector.im Scalar client
-     */
-    constructor() {
-    }
-
-    /**
-     * Registers for a scalar token
-     * @param {OpenID} openId the open ID to register
-     * @returns {Promise<string>} resolves to a scalar token
-     */
-    register(openId) {
-        return this._do("POST", "/register", null, openId).then((response, body) => {
-            var json = JSON.parse(response.body);
-            return json['scalar_token'];
-        });
-    }
-
-    /**
-     * Removes a scalar integration
-     * @param {string} type the type of integration to remove
-     * @param {string} roomId the room ID to remove it from
-     * @param {string} scalarToken the upstream scalar token
-     * @return {Promise<>} resolves when complete
-     */
-    removeIntegration(type, roomId, scalarToken) {
-        return this._do("POST", "/removeIntegration", {scalar_token: scalarToken}, {
-            type: type,
-            room_id: roomId
-        }).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            // no success processing
-        });
-    }
-
-    /**
-     * Configures an Integration on Vector
-     * @param {string} type the integration tpye
-     * @param {string} scalarToken the scalar token
-     * @param {*} config the config to POST to the service
-     * @return {Promise<>} resolves when completed
-     */
-    configureIntegration(type, scalarToken, config) {
-        return this._do("POST", "/integrations/" + type + "/configureService", {scalar_token: scalarToken}, config).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            // no success processing
-        });
-    }
-
-    /**
-     * Gets all of the integrations currently in a room
-     * @param {string} roomId the room ID
-     * @param {string} scalarToken the scalar token to use
-     * @returns {Promise<*[]>} resolves a collection of integrations
-     */
-    getIntegrationsForRoom(roomId, scalarToken) {
-        return this._do("POST", "/integrations", {scalar_token: scalarToken}, {RoomId: roomId}).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            return response.body.integrations;
-        });
-    }
-
-    /**
-     * Gets information for an integration
-     * @param {string} type the type to lookup
-     * @param {string} roomId the room ID to look in
-     * @param {string} scalarToken the scalar token
-     * @return {Promise<{bot_user_id:string,integrations:[]}>} resolves to the integration information
-     */
-    getIntegration(type, roomId, scalarToken) {
-        return this._do("POST", "/integrations/" + type, {scalar_token: scalarToken}, {room_id: roomId}).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            return response.body;
-        });
-    }
-
-    /**
-     * Gets a list of supported IRC networks
-     * @param {string} scalarToken the scalar token
-     * @returns {Promise<{rid: string, title: string, domain: string, id: string}[]>} resolves to the list of IRC networks
-     */
-    getIrcNetworks(scalarToken) {
-        return this._do("GET", "/bridges/irc/_matrix/provision/querynetworks", {scalar_token: scalarToken}).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            response.body = JSON.parse(response.body);
-
-            var results = [];
-            for (var network of response.body["replies"]) {
-                var result = {
-                    rid: network["rid"],
-                    // Assumption: All networks have 1 server from vector
-                    id: network["response"]["servers"][0]["network_id"],
-                    title: network["response"]["servers"][0]["desc"],
-                    domain: network["response"]["servers"][0]["fields"]["domain"]
-                };
-                results.push(result);
-            }
-
-            return results;
-        });
-    }
-
-    /**
-     * Gets a list of all linked IRC channels for a given room
-     * @param {string} roomId the room ID to look in
-     * @param {string} scalarToken the scalar token
-     * @returns {Promise<{rid: string, server: string, channel: string}>} resolves to a list of linked channels
-     */
-    getIrcLinks(roomId, scalarToken) {
-        return this._do("GET", "/bridges/irc/_matrix/provision/listlinks/" + roomId, {scalar_token: scalarToken}).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            response.body = JSON.parse(response.body);
-
-            var results = [];
-            for (var linkContainer of response.body["replies"]) {
-                for (var link of linkContainer["response"]) {
-                    results.push({
-                        rid: linkContainer["rid"],
-                        server: link["remote_room_server"],
-                        channel: link["remote_room_channel"]
-                    });
-                }
-            }
-
-            return results;
-        });
-    }
-
-    /**
-     * Gets a list of operators in a particular channel on a particular network
-     * @param {string} rid the network ID
-     * @param {string} networkServer the server that has the channel on it
-     * @param {string} channel the channel to look up, with prefix
-     * @param {string} scalarToken the scalar token
-     * @returns {Promise<string[]>} resolves to a list of operators in the channel
-     */
-    getIrcOperators(rid, networkServer, channel, scalarToken) {
-        return this._do("POST", "/bridges/irc/_matrix/provision/querylink", {scalar_token: scalarToken, rid: rid}, {
-            remote_room_server: networkServer,
-            remote_room_channel: channel
-        }).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            if (response.body["replies"]) {
-                return response.body["replies"][0]["response"]["operators"];
-            } else return Promise.reject("No operators could be found");
-        });
-    }
-
-    /**
-     * Requests an operator for permission to link an IRC channel to a matrix room
-     * @param {string} rid the network ID
-     * @param {string} roomId the matrix room ID
-     * @param {string} networkServer the server that has the channel on it
-     * @param {string} channel the channel to look up, with prefix
-     * @param {string} operator the channel operator's nick
-     * @param {string} scalarToken the scalar token
-     * @returns {Promise<>} resolves when completed
-     */
-    addIrcLink(rid, roomId, networkServer, channel, operator, scalarToken) {
-        return this._do("POST", "/bridges/irc/_matrix/provision/link", {rid: rid, scalar_token: scalarToken}, {
-            matrix_room_id: roomId,
-            remote_room_channel: channel,
-            remote_room_server: networkServer,
-            op_nick: operator
-        }).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            return {status: 'ok'};
-        })
-    }
-
-    /**
-     * Removes a channel link from a Matrix room
-     * @param {string} rid the network ID
-     * @param {string} roomId the matrix room ID
-     * @param {string} networkServer the server that has the channel on it
-     * @param {string} channel the channel to remove, with prefix
-     * @param {string} scalarToken the scalar token
-     * @returns {Promise<>} resolves when completed
-     */
-    removeIrcLink(rid, roomId, networkServer, channel, scalarToken) {
-        return this._do("POST", "/bridges/irc/_matrix/provision/unlink", {rid: rid, scalar_token: scalarToken}, {
-            matrix_room_id: roomId,
-            remote_room_channel: channel,
-            remote_room_server: networkServer
-        }).then((response, body) => {
-            if (response.statusCode !== 200) {
-                log.error("VectorScalarClient", response.body);
-                return Promise.reject(response.body);
-            }
-
-            return {status: 'ok'};
-        })
-    }
-
-    _do(method, endpoint, qs = null, body = null) {
-        var url = UpstreamConfiguration.getUpstream("vector").url + endpoint;
-
-        log.verbose("VectorScalarClient", "Performing request: " + url);
-
-        var params = {
-            url: url,
-            method: method,
-            json: body,
-            qs: qs
-        };
-
-        return new Promise((resolve, reject) => {
-            request(params, (err, response, body) => {
-                if (err) {
-                    log.error("VectorScalarClient", err);
-                    reject(err);
-                } else resolve(response, body);
-            });
-        });
-    }
-}
-
-module.exports = new VectorScalarClient();
\ No newline at end of file
diff --git a/src/storage/DimensionStore.js b/src/storage/DimensionStore.js
deleted file mode 100644
index 249bc55..0000000
--- a/src/storage/DimensionStore.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var DBMigrate = require("db-migrate");
-var log = require("./../util/LogService");
-var Sequelize = require('sequelize');
-var dbConfig = require("../../config/database.json");
-var moment = require("moment");
-
-/**
- * Primary storage for Dimension.
- */
-class DimensionStore {
-
-    constructor() {
-        this._orm = null;
-    }
-
-    /**
-     * Prepares the store for use
-     */
-    prepare() {
-        var env = process.env.NODE_ENV || "development";
-        log.info("DimensionStore", "Running migrations");
-        return new Promise((resolve, reject)=> {
-            var dbMigrate = DBMigrate.getInstance(true, {
-                config: "./config/database.json",
-                env: env
-            });
-            dbMigrate.up().then(() => {
-                var dbConfigEnv = dbConfig[env];
-                if (!dbConfigEnv) throw new Error("Could not find DB config for " + env);
-
-                var opts = {
-                    host: dbConfigEnv.host || 'localhost',
-                    dialect: 'sqlite',
-                    pool: {
-                        max: 5,
-                        min: 0,
-                        idle: 10000
-                    },
-                    storage: dbConfigEnv.filename,
-                    logging: i => log.verbose("DimensionStore [SQL]", i)
-                };
-
-                this._orm = new Sequelize(dbConfigEnv.database || 'dimension', dbConfigEnv.username, dbConfigEnv.password, opts);
-                this._bindModels();
-                resolve();
-            }, err => {
-                log.error("DimensionStore", err);
-                reject(err);
-            }).catch(err => {
-                log.error("DimensionStore", err);
-                reject(err);
-            });
-        });
-    }
-
-    _bindModels() {
-        // Models
-        this.__Tokens = this._orm.import(__dirname + "/models/tokens");
-
-        // Relationships
-    }
-
-    /**
-     * Creates a new Scalar token
-     * @param {string} mxid the matrix user id
-     * @param {OpenID} openId the open ID
-     * @param {string} scalarToken the token associated with the user
-     * @param {String?} upstreamToken the upstream scalar token (optional)
-     * @returns {Promise<>} resolves when complete
-     */
-    createToken(mxid, openId, scalarToken, upstreamToken) {
-        return this.__Tokens.create({
-            matrixUserId: mxid,
-            matrixServerName: openId.matrix_server_name,
-            matrixAccessToken: openId.access_token,
-            scalarToken: scalarToken,
-            upstreamToken: upstreamToken,
-            expires: moment().add(openId.expires_in, 'seconds').toDate()
-        });
-    }
-
-    /**
-     * Checks to determine if a token is valid or not
-     * @param {string} scalarToken the scalar token to check
-     * @returns {Promise<>} resolves if valid, rejected otherwise
-     */
-    checkToken(scalarToken) {
-        return this.__Tokens.find({where: {scalarToken: scalarToken}}).then(token => {
-            if (!token) return Promise.reject(new Error("Token not found"));
-            //if (moment().isAfter(moment(token.expires))) return this.__Tokens.destroy({where: {id: token.id}}).then(() => Promise.reject());
-            return Promise.resolve();
-        });
-    }
-
-    /**
-     * Gets the user ID that owns a given token, returning a falsey value if no one owns the token.
-     * @param {string} scalarToken the scalar token to check
-     * @returns {Promise<String>} resolves to the user ID, or a falsey value if no user ID was found
-     */
-    getTokenOwner(scalarToken) {
-        return this.__Tokens.find({where:{scalarToken: scalarToken}}).then(token => {
-            if (!token) return Promise.reject(new Error("Token not found"));
-            return Promise.resolve(token.matrixUserId);
-        });
-    }
-
-    /**
-     * Gets the upstream token for a given scalar token
-     * @param {string} scalarToken the scalar token to lookup
-     * @returns {Promise<string>} resolves to the upstream token, or null if not found
-     */
-    getUpstreamToken(scalarToken) {
-        return this.__Tokens.find({where: {scalarToken: scalarToken}}).then(token => {
-            if (!token) return null;
-            return token.upstreamToken;
-        });
-    }
-}
-
-module.exports = DimensionStore;
\ No newline at end of file
diff --git a/src/storage/models/tokens.js b/src/storage/models/tokens.js
deleted file mode 100644
index 75c9167..0000000
--- a/src/storage/models/tokens.js
+++ /dev/null
@@ -1,45 +0,0 @@
-module.exports = function (sequelize, DataTypes) {
-    return sequelize.define('tokens', {
-        id: {
-            type: DataTypes.INTEGER,
-            allowNull: false,
-            autoIncrement: true,
-            primaryKey: true,
-            field: 'id'
-        },
-        matrixUserId: {
-            type: DataTypes.STRING,
-            allowNull: false,
-            field: 'matrixUserId'
-        },
-        matrixServerName: {
-            type: DataTypes.STRING,
-            allowNull: false,
-            field: 'matrixServerName'
-        },
-        matrixAccessToken: {
-            type: DataTypes.STRING,
-            allowNull: false,
-            field: 'matrixAccessToken'
-        },
-        scalarToken: {
-            type: DataTypes.STRING,
-            allowNull: false,
-            field: 'scalarToken'
-        },
-        upstreamToken: {
-            type: DataTypes.STRING,
-            allowNull: true,
-            field: 'upstreamToken'
-        },
-        expires: {
-            type: DataTypes.TIME,
-            allowNull: false,
-            field: 'expires'
-        }
-    }, {
-        tableName: 'tokens',
-        underscored: false,
-        timestamps: false
-    });
-};
diff --git a/src-ts/temp_todo.txt b/src/temp_todo.txt
similarity index 100%
rename from src-ts/temp_todo.txt
rename to src/temp_todo.txt
diff --git a/src/util/LogService.js b/src/util/LogService.js
deleted file mode 100644
index e6c040f..0000000
--- a/src/util/LogService.js
+++ /dev/null
@@ -1,100 +0,0 @@
-var winston = require("winston");
-var chalk = require("chalk");
-var config = require("config");
-var fs = require('fs');
-var moment = require('moment');
-
-try {
-    fs.mkdirSync('logs')
-} catch (err) {
-    if (err.code !== 'EEXIST') throw err
-}
-
-const TERM_COLORS = {
-    error: "red",
-    warn: "yellow",
-    info: "blue",
-    verbose: "white",
-    silly: "grey",
-};
-
-function winstonColorFormatter(options) {
-    options.level = chalk[TERM_COLORS[options.level]](options.level);
-    return winstonFormatter(options);
-}
-
-function winstonFormatter(options) {
-    return options.timestamp() + ' ' + options.level + ' ' + (options.message ? options.message : '') +
-        (options.meta && Object.keys(options.meta).length ? '\n\t' + JSON.stringify(options.meta) : '' );
-}
-
-function getTimestamp() {
-    return moment().format('MMM-D-YYYY HH:mm:ss.SSS Z');
-}
-
-var loggingConfig = config.get('logging');
-
-var transports = [];
-transports.push(new (winston.transports.File)({
-    json: false,
-    name: "file",
-    filename: loggingConfig.file,
-    timestamp: getTimestamp,
-    formatter: winstonFormatter,
-    level: loggingConfig.fileLevel,
-    maxsize: loggingConfig.rotate.size,
-    maxFiles: loggingConfig.rotate.count,
-    zippedArchive: false
-}));
-
-if (loggingConfig.console) {
-    transports.push(new (winston.transports.Console)({
-        json: false,
-        name: "console",
-        timestamp: getTimestamp,
-        formatter: winstonColorFormatter,
-        level: loggingConfig.consoleLevel
-    }));
-}
-
-var log = new winston.Logger({
-    transports: transports,
-    levels: {
-        error: 0,
-        warn: 1,
-        info: 2,
-        verbose: 3,
-        silly: 4
-    }
-});
-
-function doLog(level, module, messageOrObject) {
-    if (typeof(messageOrObject) === 'object' && !(messageOrObject instanceof Error))
-        messageOrObject = JSON.stringify(messageOrObject);
-    var message = "[" + module + "] " + messageOrObject;
-    log.log(level, message);
-}
-
-class LogService {
-    static info(module, message) {
-        doLog('info', module, message);
-    }
-
-    static warn(module, message) {
-        doLog('warn', module, message);
-    }
-
-    static error(module, message) {
-        doLog('error', module, message);
-    }
-
-    static verbose(module, message) {
-        doLog('verbose', module, message);
-    }
-
-    static silly(module, message) {
-        doLog('silly', module, message);
-    }
-}
-
-module.exports = LogService;
\ No newline at end of file
diff --git a/src-ts/version.ts b/src/version.ts
similarity index 100%
rename from src-ts/version.ts
rename to src/version.ts
diff --git a/tsconfig-app.json b/tsconfig-app.json
index e58ba89..15a18f1 100644
--- a/tsconfig-app.json
+++ b/tsconfig-app.json
@@ -13,6 +13,6 @@
     ]
   },
   "include": [
-    "./src-ts/**/*"
+    "./src/**/*"
   ]
 }
\ No newline at end of file

From 5314bea52d27b8bbccdefc0d8e347ce86d44f0eb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 24 Dec 2017 14:16:39 -0700
Subject: [PATCH 045/111] Database structure for NEB

---
 src/db/DimensionStore.ts                   |  8 +++
 src/db/migrations/20171224140745-AddNeb.ts | 77 ++++++++++++++++++++++
 src/db/models/AppServiceUser.ts            |  5 +-
 src/db/models/NebBotUser.ts                | 26 ++++++++
 src/db/models/NebConfiguration.ts          | 29 ++++++++
 src/db/models/NebIntegration.ts            | 37 +++++++++++
 src/db/models/NebNotificationUser.ts       | 31 +++++++++
 src/db/models/UserScalarToken.ts           |  3 -
 8 files changed, 209 insertions(+), 7 deletions(-)
 create mode 100644 src/db/migrations/20171224140745-AddNeb.ts
 create mode 100644 src/db/models/NebBotUser.ts
 create mode 100644 src/db/models/NebConfiguration.ts
 create mode 100644 src/db/models/NebIntegration.ts
 create mode 100644 src/db/models/NebNotificationUser.ts

diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index a8f448f..34e7d2a 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -10,6 +10,10 @@ import * as path from "path";
 import * as Umzug from "umzug";
 import AppService from "./models/AppService";
 import AppServiceUser from "./models/AppServiceUser";
+import NebConfiguration from "./models/NebConfiguration";
+import NebIntegration from "./models/NebIntegration";
+import NebBotUser from "./models/NebBotUser";
+import NebNotificationUser from "./models/NebNotificationUser";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -30,6 +34,10 @@ class _DimensionStore {
             WidgetRecord,
             AppService,
             AppServiceUser,
+            NebConfiguration,
+            NebIntegration,
+            NebBotUser,
+            NebNotificationUser,
         ]);
     }
 
diff --git a/src/db/migrations/20171224140745-AddNeb.ts b/src/db/migrations/20171224140745-AddNeb.ts
new file mode 100644
index 0000000..4fcf944
--- /dev/null
+++ b/src/db/migrations/20171224140745-AddNeb.ts
@@ -0,0 +1,77 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+import * as Promise from "bluebird";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_neb_configurations", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "appserviceId": {
+                    type: DataType.STRING, allowNull: true,
+                    references: {model: "dimension_appservice", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "upstreamId": {
+                    type: DataType.INTEGER, allowNull: true,
+                    references: {model: "dimension_upstreams", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "adminUrl": {type: DataType.STRING, allowNull: true},
+            }))
+            .then(() => queryInterface.createTable("dimension_neb_integrations", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "type": {type: DataType.STRING, allowNull: false},
+                "name": {type: DataType.STRING, allowNull: false},
+                "avatarUrl": {type: DataType.STRING, allowNull: false},
+                "description": {type: DataType.STRING, allowNull: false},
+                "isEnabled": {type: DataType.BOOLEAN, allowNull: false},
+                "isPublic": {type: DataType.BOOLEAN, allowNull: false},
+                "nebId": {
+                    type: DataType.INTEGER, allowNull: false,
+                    references: {model: "dimension_neb_configurations", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+            }))
+            .then(() => queryInterface.createTable("dimension_neb_bot_users", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "serviceId": {type: DataType.STRING, allowNull: false},
+                "appserviceUserId": {
+                    type: DataType.STRING, allowNull: false,
+                    references: {model: "dimension_appservice_users", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "integrationId": {
+                    type: DataType.INTEGER, allowNull: false,
+                    references: {model: "dimension_neb_integrations", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+            }))
+            .then(() => queryInterface.createTable("dimension_neb_notification_users", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "serviceId": {type: DataType.STRING, allowNull: false},
+                "ownerId": {
+                    type: DataType.STRING, allowNull: false,
+                    references: {model: "dimension_users", key: "userId"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "appserviceUserId": {
+                    type: DataType.STRING, allowNull: false,
+                    references: {model: "dimension_appservice_users", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "integrationId": {
+                    type: DataType.INTEGER, allowNull: false,
+                    references: {model: "dimension_neb_integrations", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.dropTable("dimension_neb_notification_users"))
+            .then(() => queryInterface.dropTable("dimension_neb_bot_users"))
+            .then(() => queryInterface.dropTable("dimension_neb_integrations"))
+            .then(() => queryInterface.dropTable("dimension_neb_configurations"));
+    }
+}
\ No newline at end of file
diff --git a/src/db/models/AppServiceUser.ts b/src/db/models/AppServiceUser.ts
index a4e51fb..c7eb137 100644
--- a/src/db/models/AppServiceUser.ts
+++ b/src/db/models/AppServiceUser.ts
@@ -1,4 +1,4 @@
-import { AllowNull, BelongsTo, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import { AllowNull, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
 import AppService from "./AppService";
 
 @Table({
@@ -25,7 +25,4 @@ export default class AppServiceUser extends Model<AppServiceUser> {
     @Column
     @ForeignKey(() => AppService)
     appserviceId: string;
-
-    @BelongsTo(() => AppService)
-    appservice: AppService;
 }
\ No newline at end of file
diff --git a/src/db/models/NebBotUser.ts b/src/db/models/NebBotUser.ts
new file mode 100644
index 0000000..70d7509
--- /dev/null
+++ b/src/db/models/NebBotUser.ts
@@ -0,0 +1,26 @@
+import { AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import AppServiceUser from "./AppServiceUser";
+import NebIntegration from "./NebIntegration";
+
+@Table({
+    tableName: "dimension_neb_bot_users",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class NebBotUser extends Model<NebBotUser> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    serviceId: string;
+
+    @Column
+    @ForeignKey(() => AppServiceUser)
+    appserviceUserId: string;
+
+    @Column
+    @ForeignKey(() => NebIntegration)
+    integrationId: number;
+}
\ No newline at end of file
diff --git a/src/db/models/NebConfiguration.ts b/src/db/models/NebConfiguration.ts
new file mode 100644
index 0000000..718607f
--- /dev/null
+++ b/src/db/models/NebConfiguration.ts
@@ -0,0 +1,29 @@
+import { AllowNull, AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import Upstream from "./Upstream";
+import AppService from "./AppService";
+
+@Table({
+    tableName: "dimension_neb_configurations",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class NebConfiguration extends Model<NebConfiguration> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @AllowNull
+    @Column
+    adminUrl?: string;
+
+    @AllowNull
+    @Column
+    @ForeignKey(() => AppService)
+    appserviceId?: string;
+
+    @AllowNull
+    @Column
+    @ForeignKey(() => Upstream)
+    upstreamId?: number;
+}
\ No newline at end of file
diff --git a/src/db/models/NebIntegration.ts b/src/db/models/NebIntegration.ts
new file mode 100644
index 0000000..84cab20
--- /dev/null
+++ b/src/db/models/NebIntegration.ts
@@ -0,0 +1,37 @@
+import { AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import { IntegrationRecord } from "./IntegrationRecord";
+import NebConfiguration from "./NebConfiguration";
+
+@Table({
+    tableName: "dimension_neb_integrations",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class NebIntegration extends Model<NebIntegration> implements IntegrationRecord {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    type: string;
+
+    @Column
+    name: string;
+
+    @Column
+    avatarUrl: string;
+
+    @Column
+    description: string;
+
+    @Column
+    isEnabled: boolean;
+
+    @Column
+    isPublic: boolean;
+
+    @Column
+    @ForeignKey(() => NebConfiguration)
+    nebId: number;
+}
\ No newline at end of file
diff --git a/src/db/models/NebNotificationUser.ts b/src/db/models/NebNotificationUser.ts
new file mode 100644
index 0000000..d72dff4
--- /dev/null
+++ b/src/db/models/NebNotificationUser.ts
@@ -0,0 +1,31 @@
+import { AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import AppServiceUser from "./AppServiceUser";
+import NebIntegration from "./NebIntegration";
+import User from "./User";
+
+@Table({
+    tableName: "dimension_neb_notification_users",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class NebNotificationUser extends Model<NebNotificationUser> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    serviceId: string;
+
+    @Column
+    @ForeignKey(() => User)
+    ownerId: string;
+
+    @Column
+    @ForeignKey(() => AppServiceUser)
+    appserviceUserId: string;
+
+    @Column
+    @ForeignKey(() => NebIntegration)
+    integrationId: number;
+}
\ No newline at end of file
diff --git a/src/db/models/UserScalarToken.ts b/src/db/models/UserScalarToken.ts
index 522d573..e086a04 100644
--- a/src/db/models/UserScalarToken.ts
+++ b/src/db/models/UserScalarToken.ts
@@ -33,7 +33,4 @@ export default class UserScalarToken extends Model<UserScalarToken> {
     @Column
     @ForeignKey(() => Upstream)
     upstreamId?: number;
-
-    @BelongsTo(() => Upstream)
-    upstream: Upstream;
 }
\ No newline at end of file

From 8b3f6e37ce7ae044d227169811806b8ac0bcbf2c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 28 Dec 2017 18:22:50 -0700
Subject: [PATCH 046/111] Support configuring the upstream go-neb bots

---
 src/MemoryCache.ts                            |  24 ++-
 src/api/dimension/DimensionAdminService.ts    |   2 +-
 .../DimensionIntegrationsAdminService.ts      |   5 +-
 .../dimension/DimensionIntegrationsService.ts |  12 +-
 src/api/dimension/DimensionNebAdminService.ts |  91 +++++++++
 .../DimensionUpstreamAdminService.ts          |  65 +++++++
 src/api/scalar/ScalarService.ts               |  16 +-
 src/api/scalar/ScalarWidgetService.ts         |   8 +-
 src/db/NebStore.ts                            | 179 ++++++++++++++++++
 src/db/ScalarStore.ts                         |   3 +-
 src/matrix/helpers.ts                         |   8 +-
 src/models/neb.ts                             |  19 ++
 web/app/admin/admin.component.html            |   1 +
 web/app/admin/neb/edit/edit.component.html    |  37 ++++
 web/app/admin/neb/edit/edit.component.scss    |   0
 web/app/admin/neb/edit/edit.component.ts      |  87 +++++++++
 web/app/admin/neb/neb.component.html          |  45 +++++
 web/app/admin/neb/neb.component.scss          |   8 +
 web/app/admin/neb/neb.component.ts            | 103 ++++++++++
 web/app/admin/widgets/widgets.component.html  |   2 +-
 web/app/admin/widgets/widgets.component.scss  |   4 -
 web/app/admin/widgets/widgets.component.ts    |   4 +-
 web/app/app.module.ts                         |  10 +
 web/app/app.routing.ts                        |  17 ++
 web/app/shared/models/admin_responses.ts      |  25 +++
 web/app/shared/models/neb.ts                  |   8 +
 .../admin/admin-appservice-api.service.ts     |  15 ++
 .../admin/admin-integrations-api.service.ts   |   6 +-
 .../services/admin/admin-neb-api.service.ts   |  34 ++++
 .../admin/admin-upstream-api.service.ts       |  24 +++
 30 files changed, 817 insertions(+), 45 deletions(-)
 create mode 100644 src/api/dimension/DimensionNebAdminService.ts
 create mode 100644 src/api/dimension/DimensionUpstreamAdminService.ts
 create mode 100644 src/db/NebStore.ts
 create mode 100644 src/models/neb.ts
 create mode 100644 web/app/admin/neb/edit/edit.component.html
 create mode 100644 web/app/admin/neb/edit/edit.component.scss
 create mode 100644 web/app/admin/neb/edit/edit.component.ts
 create mode 100644 web/app/admin/neb/neb.component.html
 create mode 100644 web/app/admin/neb/neb.component.scss
 create mode 100644 web/app/admin/neb/neb.component.ts
 create mode 100644 web/app/shared/models/neb.ts
 create mode 100644 web/app/shared/services/admin/admin-appservice-api.service.ts
 create mode 100644 web/app/shared/services/admin/admin-neb-api.service.ts
 create mode 100644 web/app/shared/services/admin/admin-upstream-api.service.ts

diff --git a/src/MemoryCache.ts b/src/MemoryCache.ts
index 6934d32..2fdae45 100644
--- a/src/MemoryCache.ts
+++ b/src/MemoryCache.ts
@@ -22,4 +22,26 @@ export class MemoryCache {
     public clear(): void {
         this.internalCache.clear();
     }
-}
\ No newline at end of file
+}
+
+class _CacheManager {
+    private caches: { [namespace: string]: MemoryCache } = {};
+
+    public for(namespace: string): MemoryCache {
+        let cache = this.caches[namespace];
+        if (!cache) {
+            cache = this.caches[namespace] = new MemoryCache();
+        }
+
+        return cache;
+    }
+}
+
+export const Cache = new _CacheManager();
+
+export const CACHE_INTEGRATIONS = "integrations";
+export const CACHE_NEB = "neb";
+export const CACHE_UPSTREAM = "upstream";
+export const CACHE_SCALAR_ACCOUNTS = "scalar-accounts";
+export const CACHE_WIDGET_TITLES = "widget-titles";
+export const CACHE_FEDERATION = "federation";
\ No newline at end of file
diff --git a/src/api/dimension/DimensionAdminService.ts b/src/api/dimension/DimensionAdminService.ts
index 9d70638..10f5b38 100644
--- a/src/api/dimension/DimensionAdminService.ts
+++ b/src/api/dimension/DimensionAdminService.ts
@@ -28,7 +28,7 @@ export class DimensionAdminService {
     }
 
     public static validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
-        return ScalarService.getTokenOwner(scalarToken).then(userId => {
+        return ScalarService.getTokenOwner(scalarToken, true).then(userId => {
             if (!DimensionAdminService.isAdmin(userId))
                 throw new ApiError(401, {message: "You must be an administrator to use this API"});
             else return userId;
diff --git a/src/api/dimension/DimensionIntegrationsAdminService.ts b/src/api/dimension/DimensionIntegrationsAdminService.ts
index 1038271..50db610 100644
--- a/src/api/dimension/DimensionIntegrationsAdminService.ts
+++ b/src/api/dimension/DimensionIntegrationsAdminService.ts
@@ -4,6 +4,7 @@ import { ApiError } from "../ApiError";
 import { DimensionAdminService } from "./DimensionAdminService";
 import { DimensionIntegrationsService, IntegrationsResponse } from "./DimensionIntegrationsService";
 import { WidgetStore } from "../../db/WidgetStore";
+import { CACHE_INTEGRATIONS, Cache } from "../../MemoryCache";
 
 interface SetEnabledRequest {
     enabled: boolean;
@@ -23,7 +24,7 @@ export class DimensionIntegrationsAdminService {
             if (category === "widget") {
                 return WidgetStore.setOptions(type, body.options);
             } else throw new ApiError(400, "Unrecongized category");
-        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
+        }).then(() => Cache.for(CACHE_INTEGRATIONS).clear());
     }
 
     @POST
@@ -33,7 +34,7 @@ export class DimensionIntegrationsAdminService {
             if (category === "widget") {
                 return WidgetStore.setEnabled(type, body.enabled);
             } else throw new ApiError(400, "Unrecongized category");
-        }).then(() => DimensionIntegrationsService.clearIntegrationCache());
+        }).then(() => Cache.for(CACHE_INTEGRATIONS).clear());
     }
 
     @GET
diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 52dfbef..fd6617f 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -2,7 +2,7 @@ import { GET, Path, PathParam, QueryParam } from "typescript-rest";
 import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
 import { Widget } from "../../integrations/Widget";
-import { MemoryCache } from "../../MemoryCache";
+import { CACHE_INTEGRATIONS, Cache } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
 import { ApiError } from "../ApiError";
 import { WidgetStore } from "../../db/WidgetStore";
@@ -14,14 +14,8 @@ export interface IntegrationsResponse {
 @Path("/api/v1/dimension/integrations")
 export class DimensionIntegrationsService {
 
-    private static integrationCache = new MemoryCache();
-
-    public static clearIntegrationCache() {
-        DimensionIntegrationsService.integrationCache.clear();
-    }
-
     public static getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
-        const cachedResponse = DimensionIntegrationsService.integrationCache.get("integrations_" + isEnabledCheck);
+        const cachedResponse = Cache.for(CACHE_INTEGRATIONS).get("integrations_" + isEnabledCheck);
         if (cachedResponse) {
             return cachedResponse;
         }
@@ -33,7 +27,7 @@ export class DimensionIntegrationsService {
             .then(widgets => response.widgets = widgets)
 
             // Cache and return response
-            .then(() => DimensionIntegrationsService.integrationCache.put("integrations_" + isEnabledCheck, response))
+            .then(() => Cache.for(CACHE_INTEGRATIONS).put("integrations_" + isEnabledCheck, response))
             .then(() => response);
     }
 
diff --git a/src/api/dimension/DimensionNebAdminService.ts b/src/api/dimension/DimensionNebAdminService.ts
new file mode 100644
index 0000000..eeebc2b
--- /dev/null
+++ b/src/api/dimension/DimensionNebAdminService.ts
@@ -0,0 +1,91 @@
+import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { DimensionAdminService } from "./DimensionAdminService";
+import { Cache, CACHE_NEB } from "../../MemoryCache";
+import { NebStore } from "../../db/NebStore";
+import { NebConfig } from "../../models/neb";
+import { LogService } from "matrix-js-snippets";
+import { ApiError } from "../ApiError";
+
+interface CreateWithUpstream {
+    upstreamId: number;
+}
+
+interface CreateWithAppservice {
+    appserviceId: string;
+    adminUrl: string;
+}
+
+interface SetEnabledRequest {
+    enabled: boolean;
+}
+
+
+@Path("/api/v1/dimension/admin/neb")
+export class DimensionNebAdminService {
+
+    @GET
+    @Path("all")
+    public getNebConfigs(@QueryParam("scalar_token") scalarToken: string): Promise<NebConfig[]> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            const cachedConfigs = Cache.for(CACHE_NEB).get("configurations");
+            if (cachedConfigs) return cachedConfigs;
+
+            return NebStore.getAllConfigs().then(configs => {
+                Cache.for(CACHE_NEB).put("configurations", configs);
+                return configs;
+            });
+        });
+    }
+
+    @GET
+    @Path(":id/config")
+    public getNebConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number): Promise<NebConfig> {
+        return this.getNebConfigs(scalarToken).then(configs => {
+            for (const config of configs) {
+                if (config.id === nebId) return config;
+            }
+
+            throw new ApiError(404, "Configuration not found");
+        });
+    }
+
+    @POST
+    @Path(":id/integration/:type/enabled")
+    public setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return NebStore.getOrCreateIntegration(nebId, integrationType);
+        }).then(integration => {
+            integration.isEnabled = request.enabled;
+            return integration.save();
+        }).then(() => Cache.for(CACHE_NEB).clear());
+    }
+
+    @POST
+    @Path("new/upstream")
+    public newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<NebConfig> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return NebStore.createForUpstream(request.upstreamId).catch(err => {
+                LogService.error("DimensionNebAdminService", err);
+                throw new ApiError(500, "Error creating go-neb instance");
+            });
+        }).then(config => {
+            Cache.for(CACHE_NEB).clear();
+            return config;
+        });
+    }
+
+    @POST
+    @Path("new/appservice")
+    public newConfigForAppservice(@QueryParam("scalar_token") scalarToken: string, request: CreateWithAppservice): Promise<NebConfig> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return NebStore.createForAppservice(request.appserviceId, request.adminUrl).catch(err => {
+                LogService.error("DimensionNebAdminService", err);
+                throw new ApiError(500, "Error creating go-neb instance");
+            });
+        }).then(config => {
+            Cache.for(CACHE_NEB).clear();
+            return config;
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/api/dimension/DimensionUpstreamAdminService.ts b/src/api/dimension/DimensionUpstreamAdminService.ts
new file mode 100644
index 0000000..bc8fc6a
--- /dev/null
+++ b/src/api/dimension/DimensionUpstreamAdminService.ts
@@ -0,0 +1,65 @@
+import { GET, Path, POST, QueryParam } from "typescript-rest";
+import * as Promise from "bluebird";
+import { DimensionAdminService } from "./DimensionAdminService";
+import { Cache, CACHE_UPSTREAM } from "../../MemoryCache";
+import Upstream from "../../db/models/Upstream";
+
+interface UpstreamRepsonse {
+    id: number;
+    name: string;
+    type: string;
+    scalarUrl: string;
+    apiUrl: string;
+}
+
+interface NewUpstreamRequest {
+    name: string;
+    type: string;
+    scalarUrl: string;
+    apiUrl: string;
+}
+
+@Path("/api/v1/dimension/admin/upstreams")
+export class DimensionUpstreamAdminService {
+
+    @GET
+    @Path("all")
+    public getUpstreams(@QueryParam("scalar_token") scalarToken: string): Promise<UpstreamRepsonse[]> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            const cachedUpstreams = Cache.for(CACHE_UPSTREAM).get("upstreams");
+            if (cachedUpstreams) return cachedUpstreams;
+            return Upstream.findAll().then(upstreams => {
+                const mapped = upstreams.map(this.mapUpstream);
+                Cache.for(CACHE_UPSTREAM).put("upstreams", mapped);
+
+                return mapped;
+            });
+        });
+    }
+
+    @POST
+    @Path("new")
+    public createUpstream(@QueryParam("scalar_token") scalarToken: string, request: NewUpstreamRequest): Promise<UpstreamRepsonse> {
+        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
+            return Upstream.create({
+                name: request.name,
+                type: request.type,
+                scalarUrl: request.scalarUrl,
+                apiUrl: request.apiUrl,
+            });
+        }).then(upstream => {
+            Cache.for(CACHE_UPSTREAM).clear();
+            return this.mapUpstream(upstream);
+        });
+    }
+
+    private mapUpstream(upstream: Upstream): UpstreamRepsonse {
+        return {
+            id: upstream.id,
+            name: upstream.name,
+            type: upstream.type,
+            scalarUrl: upstream.scalarUrl,
+            apiUrl: upstream.apiUrl
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/api/scalar/ScalarService.ts b/src/api/scalar/ScalarService.ts
index bf804ec..3d7c467 100644
--- a/src/api/scalar/ScalarService.ts
+++ b/src/api/scalar/ScalarService.ts
@@ -10,7 +10,7 @@ import { ApiError } from "../ApiError";
 import * as randomString from "random-string";
 import { OpenId } from "../../models/OpenId";
 import { ScalarAccountResponse, ScalarRegisterResponse } from "../../models/ScalarResponses";
-import { MemoryCache } from "../../MemoryCache";
+import { Cache, CACHE_SCALAR_ACCOUNTS } from "../../MemoryCache";
 import { ScalarStore } from "../../db/ScalarStore";
 
 interface RegisterRequest {
@@ -23,19 +23,13 @@ interface RegisterRequest {
 @Path("/api/v1/scalar")
 export class ScalarService {
 
-    private static accountCache = new MemoryCache();
-
-    public static clearAccountCache(): void {
-        ScalarService.accountCache.clear();
-    }
-
-    public static getTokenOwner(scalarToken: string): Promise<string> {
-        const cachedUserId = ScalarService.accountCache.get(scalarToken);
+    public static getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<string> {
+        const cachedUserId = Cache.for(CACHE_SCALAR_ACCOUNTS).get(scalarToken);
         if (cachedUserId) return Promise.resolve(cachedUserId);
 
-        return ScalarStore.getTokenOwner(scalarToken).then(user => {
+        return ScalarStore.getTokenOwner(scalarToken, ignoreUpstreams).then(user => {
             if (!user) return Promise.reject("Invalid token");
-            ScalarService.accountCache.put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
+            Cache.for(CACHE_SCALAR_ACCOUNTS).put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
             return Promise.resolve(user.userId);
         });
     }
diff --git a/src/api/scalar/ScalarWidgetService.ts b/src/api/scalar/ScalarWidgetService.ts
index 39f91bd..46e40b8 100644
--- a/src/api/scalar/ScalarWidgetService.ts
+++ b/src/api/scalar/ScalarWidgetService.ts
@@ -1,7 +1,7 @@
 import { GET, Path, QueryParam } from "typescript-rest";
 import * as Promise from "bluebird";
 import { LogService } from "matrix-js-snippets";
-import { MemoryCache } from "../../MemoryCache";
+import { CACHE_WIDGET_TITLES, Cache } from "../../MemoryCache";
 import { MatrixLiteClient } from "../../matrix/MatrixLiteClient";
 import config from "../../config";
 import { ScalarService } from "./ScalarService";
@@ -22,10 +22,8 @@ interface UrlPreviewResponse {
 @Path("/api/v1/scalar/widgets")
 export class ScalarWidgetService {
 
-    private static urlCache = new MemoryCache();
-
     private static getUrlTitle(url: string): Promise<UrlPreviewResponse> {
-        const cachedResult = ScalarWidgetService.urlCache.get(url);
+        const cachedResult = Cache.for(CACHE_WIDGET_TITLES).get(url);
         if (cachedResult) {
             cachedResult.cached_response = true;
             return Promise.resolve(cachedResult);
@@ -44,7 +42,7 @@ export class ScalarWidgetService {
                 },
                 error: {message: null},
             };
-            ScalarWidgetService.urlCache.put(url, cachedItem, expirationTime);
+            Cache.for(CACHE_WIDGET_TITLES).put(url, cachedItem, expirationTime);
             return cachedItem;
         }).catch(err => {
             LogService.error("ScalarWidgetService", "Error getting URL preview");
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
new file mode 100644
index 0000000..faf8849
--- /dev/null
+++ b/src/db/NebStore.ts
@@ -0,0 +1,179 @@
+import * as Promise from "bluebird";
+import { resolveIfExists } from "./DimensionStore";
+import { NebConfig } from "../models/neb";
+import NebConfiguration from "./models/NebConfiguration";
+import NebIntegration from "./models/NebIntegration";
+import Upstream from "./models/Upstream";
+import AppService from "./models/AppService";
+import { LogService } from "matrix-js-snippets";
+
+export interface SupportedIntegration {
+    type: string;
+    name: string;
+    avatarUrl: string;
+    description: string;
+}
+
+export class NebStore {
+
+    private static INTEGRATIONS_MODULAR_SUPPORTED = ["giphy", "guggy", "github", "google", "imgur", "rss", "travisci", "wikipedia"];
+
+    private static INTEGRATIONS = {
+        "circleci": {
+            name: "Circle CI",
+            avatarUrl: "/img/avatars/circleci.png",
+            description: "Announces build results from Circle CI to the room.",
+        },
+        "echo": {
+            name: "Echo",
+            avatarUrl: "/img/avatars/echo.png", // TODO: Make this image
+            description: "Repeats text given to it from !echo",
+        },
+        "giphy": {
+            name: "Giphy",
+            avatarUrl: "/img/avatars/giphy.png",
+            description: "Posts a GIF from Giphy using !giphy <query>",
+        },
+        "guggy": {
+            name: "Guggy",
+            avatarUrl: "/img/avatars/guggy.png",
+            description: "Send a reaction GIF using !guggy <query>",
+        },
+        "github": {
+            name: "Github",
+            avatarUrl: "/img/avatars/github.png",
+            description: "Github issue management and announcements for a repository",
+        },
+        "google": {
+            name: "Google",
+            avatarUrl: "/img/avatars/google.png",
+            description: "Searches Google Images using !google image <query>",
+        },
+        "imgur": {
+            name: "Imgur",
+            avatarUrl: "/img/avatars/imgur.png",
+            description: "Searches and posts images from Imgur using !imgur <query>",
+        },
+        // TODO: Support JIRA
+        // "jira": {
+        //     name: "Jira",
+        //     avatarUrl: "/img/avatars/jira.png",
+        //     description: "Jira issue management and announcements for a project",
+        // },
+        "rss": {
+            name: "RSS",
+            avatarUrl: "/img/avatars/rssbot.png",
+            description: "Announces changes to RSS feeds in the room",
+        },
+        "travisci": {
+            name: "Travis CI",
+            avatarUrl: "/img/avatars/travisci.png",
+            description: "Announces build results from Travis CI to the room",
+        },
+        "wikipedia": {
+            name: "Wikipedia",
+            avatarUrl: "/img/avatars/wikipedia.png",
+            description: "Searches wikipedia using !wikipedia <query>",
+        },
+    };
+
+    public static getAllConfigs(): Promise<NebConfig[]> {
+        return NebConfiguration.findAll().then(configs => {
+            return Promise.all((configs || []).map(c => NebStore.getConfig(c.id)));
+        });
+    }
+
+    public static getConfig(id: number): Promise<NebConfig> {
+        let nebConfig: NebConfiguration;
+        return NebConfiguration.findByPrimary(id).then(resolveIfExists).then(conf => {
+            nebConfig = conf;
+            return NebIntegration.findAll({where: {nebId: id}});
+        }).then(integrations => {
+            return NebStore.getCompleteIntegrations(nebConfig, integrations);
+        }).then(integrations => {
+            return new NebConfig(nebConfig, integrations);
+        });
+    }
+
+    public static createForUpstream(upstreamId: number): Promise<NebConfig> {
+        return Upstream.findByPrimary(upstreamId).then(resolveIfExists).then(upstream => {
+            return NebConfiguration.create({
+                upstreamId: upstream.id,
+            });
+        }).then(config => {
+            return NebStore.getConfig(config.id);
+        });
+    }
+
+    public static createForAppservice(appserviceId: string, adminUrl: string): Promise<NebConfig> {
+        return AppService.findByPrimary(appserviceId).then(resolveIfExists).then(appservice => {
+            return NebConfiguration.create({
+                appserviceId: appservice.id,
+                adminUrl: adminUrl,
+            });
+        }).then(config => {
+            return NebStore.getConfig(config.id);
+        });
+    }
+
+    public static getOrCreateIntegration(configurationId: number, integrationType: string): Promise<NebIntegration> {
+        if (!NebStore.INTEGRATIONS[integrationType]) return Promise.reject(new Error("Integration not supported"));
+
+        return NebConfiguration.findByPrimary(configurationId).then(resolveIfExists).then(config => {
+            return NebIntegration.findOne({where: {nebId: config.id, type: integrationType}});
+        }).then(integration => {
+            if (!integration) {
+                LogService.info("NebStore", "Creating integration " + integrationType + " for NEB " + configurationId);
+                return NebIntegration.create({
+                    type: integrationType,
+                    name: NebStore.INTEGRATIONS[integrationType].name,
+                    avatarUrl: NebStore.INTEGRATIONS[integrationType].avatarUrl,
+                    description: NebStore.INTEGRATIONS[integrationType].description,
+                    isEnabled: false,
+                    isPublic: true,
+                    nebId: configurationId,
+                });
+            } else return Promise.resolve(integration);
+        });
+    }
+
+    public static getCompleteIntegrations(nebConfig: NebConfiguration, knownIntegrations: NebIntegration[]): Promise<NebIntegration[]> {
+        const supported = NebStore.getSupportedIntegrations(nebConfig);
+        const notSupported: SupportedIntegration[] = [];
+        for (const supportedIntegration of supported) {
+            let isSupported = false;
+            for (const integration of knownIntegrations) {
+                if (integration.type === supportedIntegration.type) {
+                    isSupported = true;
+                    break;
+                }
+            }
+
+            if (!isSupported) notSupported.push(supportedIntegration);
+        }
+
+        const promises = [];
+        for (const missingIntegration of notSupported) {
+            promises.push(NebStore.getOrCreateIntegration(nebConfig.id, missingIntegration.type));
+        }
+
+        return Promise.all(promises).then(addedIntegrations => (addedIntegrations || []).concat(knownIntegrations));
+    }
+
+    public static getSupportedIntegrations(nebConfig: NebConfiguration): SupportedIntegration[] {
+        const result = [];
+
+        for (const type of Object.keys(NebStore.INTEGRATIONS)) {
+            if (nebConfig.upstreamId && NebStore.INTEGRATIONS_MODULAR_SUPPORTED.indexOf(type) === -1) continue;
+
+            const config = JSON.parse(JSON.stringify(NebStore.INTEGRATIONS[type]));
+            config["type"] = type;
+            result.push(config);
+        }
+
+        return result;
+    }
+
+    private constructor() {
+    }
+}
\ No newline at end of file
diff --git a/src/db/ScalarStore.ts b/src/db/ScalarStore.ts
index 909fb5e..b34c5ea 100644
--- a/src/db/ScalarStore.ts
+++ b/src/db/ScalarStore.ts
@@ -30,7 +30,7 @@ export class ScalarStore {
         });
     }
 
-    public static getTokenOwner(scalarToken: string): Promise<User> {
+    public static getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<User> {
         let user: User = null;
         return UserScalarToken.findAll({
             where: {isDimensionToken: true, scalarToken: scalarToken},
@@ -41,6 +41,7 @@ export class ScalarStore {
             }
 
             user = tokens[0].user;
+            if (ignoreUpstreams) return true; // they have all the upstreams as far as we're concerned
             return ScalarStore.doesUserHaveTokensForAllUpstreams(user.userId);
         }).then(hasUpstreams => {
             if (!hasUpstreams) {
diff --git a/src/matrix/helpers.ts b/src/matrix/helpers.ts
index 97c16ae..4700890 100644
--- a/src/matrix/helpers.ts
+++ b/src/matrix/helpers.ts
@@ -1,13 +1,11 @@
 import * as dns from "dns-then";
 import * as Promise from "bluebird";
 import { LogService } from "matrix-js-snippets";
-import { MemoryCache } from "../MemoryCache";
+import { Cache, CACHE_FEDERATION } from "../MemoryCache";
 import * as request from "request";
 
-const federationUrlCache = new MemoryCache();
-
 export function getFederationUrl(serverName: string): Promise<string> {
-    const cachedUrl = federationUrlCache.get(serverName);
+    const cachedUrl = Cache.for(CACHE_FEDERATION).get(serverName);
     if (cachedUrl) {
         LogService.verbose("matrix", "Cached federation URL for " + serverName + " is " + cachedUrl);
         return Promise.resolve(cachedUrl);
@@ -30,7 +28,7 @@ export function getFederationUrl(serverName: string): Promise<string> {
     }).then(() => {
         if (!serverUrl) serverUrl = "https://" + serverName + ":8448";
         LogService.verbose("matrix", "Federation URL for " + serverName + " is " + serverUrl + " - caching for " + expirationMs + " ms");
-        federationUrlCache.put(serverName, serverUrl, expirationMs);
+        Cache.for(CACHE_FEDERATION).put(serverName, serverUrl, expirationMs);
         return serverUrl;
     });
 }
diff --git a/src/models/neb.ts b/src/models/neb.ts
new file mode 100644
index 0000000..ea94eba
--- /dev/null
+++ b/src/models/neb.ts
@@ -0,0 +1,19 @@
+import NebConfiguration from "../db/models/NebConfiguration";
+import { Integration } from "../integrations/Integration";
+import NebIntegration from "../db/models/NebIntegration";
+
+export class NebConfig {
+    public id: number;
+    public adminUrl?: string;
+    public appserviceId?: string;
+    public upstreamId?: number;
+    public integrations: Integration[];
+
+    public constructor(config: NebConfiguration, integrations: NebIntegration[]) {
+        this.id = config.id;
+        this.adminUrl = config.adminUrl;
+        this.appserviceId = config.appserviceId;
+        this.upstreamId = config.upstreamId;
+        this.integrations = integrations.map(i => new Integration(i));
+    }
+}
\ No newline at end of file
diff --git a/web/app/admin/admin.component.html b/web/app/admin/admin.component.html
index 2556572..000c411 100644
--- a/web/app/admin/admin.component.html
+++ b/web/app/admin/admin.component.html
@@ -1,6 +1,7 @@
 <ul class="adminNav">
     <li (click)="goto('')" [ngClass]="[isActive('', true) ? 'active' : '']">Dashboard</li>
     <li (click)="goto('widgets')" [ngClass]="[isActive('widgets') ? 'active' : '']">Widgets</li>
+    <li (click)="goto('neb')" [ngClass]="[isActive('neb') ? 'active' : '']">go-neb</li>
 </ul>
 <span class="version">{{ version }}</span>
 
diff --git a/web/app/admin/neb/edit/edit.component.html b/web/app/admin/neb/edit/edit.component.html
new file mode 100644
index 0000000..1fb290b
--- /dev/null
+++ b/web/app/admin/neb/edit/edit.component.html
@@ -0,0 +1,37 @@
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox title="go-neb configuration">
+        <div class="my-ibox-content">
+            <p>go-neb supports many different types of bots, each of which is listed below. Here you can configure which
+                bots this go-neb instance should use.</p>
+
+            <table class="table table-striped table-condensed table-bordered">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Description</th>
+                    <th class="text-center">Actions</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngFor="let bot of nebConfig.integrations trackById">
+                    <td>{{ bot.displayName }}</td>
+                    <td>{{ bot.description }}</td>
+                    <td class="text-right">
+                        <span class="editButton" (click)="editBot(widget)"
+                              *ngIf="bot.isEnabled && hasConfig(bot) && !isUpstream">
+                            <i class="fa fa-pencil-alt"></i>
+                        </span>
+                        <ui-switch [checked]="bot.isEnabled" size="small" [disabled]="isUpdating"
+                                   (change)="toggleBot(bot)" *ngIf="!isOverlapping(bot)"></ui-switch>
+                        <ui-switch [checked]="false" size="small" [disabled]="true" *ngIf="isOverlapping(bot)"
+                                   ngbTooltip="This bot is handled by another go-neb instance"></ui-switch>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/edit/edit.component.scss b/web/app/admin/neb/edit/edit.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
new file mode 100644
index 0000000..245b7b3
--- /dev/null
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -0,0 +1,87 @@
+import { Component, OnDestroy, OnInit } from "@angular/core";
+import { FE_NebConfiguration } from "../../../shared/models/admin_responses";
+import { AdminNebApiService } from "../../../shared/services/admin/admin-neb-api.service";
+import { ActivatedRoute } from "@angular/router";
+import { ToasterService } from "angular2-toaster";
+import { FE_Integration } from "../../../shared/models/integration";
+import { NEB_HAS_CONFIG } from "../../../shared/models/neb";
+
+
+@Component({
+    templateUrl: "./edit.component.html",
+    styleUrls: ["./edit.component.scss"],
+})
+export class AdminEditNebComponent implements OnInit, OnDestroy {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public isUpstream = false;
+    public nebConfig: FE_NebConfiguration;
+
+    private subscription: any;
+    private overlappingTypes: string[];
+    private botTypes: string[];
+
+    constructor(private nebApi: AdminNebApiService, private route: ActivatedRoute, private toaster: ToasterService) {
+    }
+
+    public ngOnInit() {
+        this.subscription = this.route.params.subscribe(params => {
+            this.loadNeb(params["nebId"]);
+        });
+    }
+
+    public ngOnDestroy() {
+        this.subscription.unsubscribe();
+    }
+
+    public isOverlapping(bot: FE_Integration) {
+        return this.overlappingTypes.indexOf(bot.type) !== -1;
+    }
+
+    public hasConfig(bot: FE_Integration): boolean {
+        return NEB_HAS_CONFIG.indexOf(bot.type) !== -1;
+    }
+
+    public toggleBot(bot: FE_Integration) {
+        bot.isEnabled = !bot.isEnabled;
+        this.isUpdating = true;
+        this.nebApi.toggleIntegration(this.nebConfig.id, bot.type, bot.isEnabled).then(() => {
+            this.isUpdating = false;
+            this.toaster.pop("success", "Integration updated");
+        }).catch(err => {
+            console.error(err);
+            bot.isEnabled = !bot.isEnabled; // revert change
+            this.isUpdating = false;
+            this.toaster.pop("error", "Error updating integration");
+        });
+    }
+
+    public editBot(bot: FE_Integration) {
+        console.log(bot);
+    }
+
+    private loadNeb(nebId: number) {
+        this.isLoading = true;
+        this.nebApi.getConfigurations().then(configs => {
+            const handledTypes: string[] = [];
+            for (const config of configs) {
+                if (config.id == nebId) {
+                    this.nebConfig = config;
+                } else {
+                    for (const type of config.integrations) {
+                        this.botTypes.push(type.type);
+                        handledTypes.push(type.type);
+                    }
+                }
+            }
+
+            this.overlappingTypes = handledTypes;
+            this.isUpstream = !!this.nebConfig.upstreamId;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop('error', "Could not get go-neb configuration");
+        });
+    }
+}
diff --git a/web/app/admin/neb/neb.component.html b/web/app/admin/neb/neb.component.html
new file mode 100644
index 0000000..11d5803
--- /dev/null
+++ b/web/app/admin/neb/neb.component.html
@@ -0,0 +1,45 @@
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox title="go-neb configurations">
+        <div class="my-ibox-content">
+            <p><a href="https://github.com/matrix-org/go-neb" target="_blank">go-neb</a> is a multi-purpose bot that can
+                provide various services, such as reaction GIFs and Github notifications. There are two options for
+                go-neb support in Dimension: using matrix.org's or self-hosting it. Each go-neb instance can have
+                multiple services associated with it (ie: one go-neb here can do everything).</p>
+
+            <table class="table table-striped table-condensed table-bordered">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th class="text-center" style="width: 120px;">Actions</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngIf="!configurations || configurations.length === 0">
+                    <td colspan="2"><i>No go-neb configurations.</i></td>
+                </tr>
+                <tr *ngFor="let neb of configurations trackById">
+                    <td>{{ neb.upstreamId ? "matrix.org's go-neb" : "Self-hosted go-neb" }}</td>
+                    <td class="text-center">
+                        <span class="appsvcConfigButton" (click)="showAppserviceConfig(neb)"
+                              *ngIf="!neb.upstreamId">
+                            <i class="far fa-file"></i>
+                        </span>
+                        <span class="editButton" [routerLink]="[neb.id, 'edit']" title="edit">
+                            <i class="fa fa-pencil-alt"></i>
+                        </span>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+            <button type="button" class="btn btn-success btn-sm" (click)="addModularHostedNeb()" *ngIf="!hasModularNeb">
+                <i class="fa fa-plus"></i> Add matrix.org's go-neb
+            </button>
+            <button type="button" class="btn btn-success btn-sm" (click)="addSelfHostedNeb()">
+                <i class="fa fa-plus"></i> Add self-hosted go-neb
+            </button>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/neb.component.scss b/web/app/admin/neb/neb.component.scss
new file mode 100644
index 0000000..847d207
--- /dev/null
+++ b/web/app/admin/neb/neb.component.scss
@@ -0,0 +1,8 @@
+tr td:last-child {
+  vertical-align: middle;
+}
+
+.appsvcConfigButton,
+.editButton {
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/web/app/admin/neb/neb.component.ts b/web/app/admin/neb/neb.component.ts
new file mode 100644
index 0000000..619da60
--- /dev/null
+++ b/web/app/admin/neb/neb.component.ts
@@ -0,0 +1,103 @@
+import { Component } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { AdminNebApiService } from "../../shared/services/admin/admin-neb-api.service";
+import { AdminUpstreamApiService } from "../../shared/services/admin/admin-upstream-api.service";
+import { AdminAppserviceApiService } from "../../shared/services/admin/admin-appservice-api.service";
+import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../shared/models/admin_responses";
+
+@Component({
+    templateUrl: "./neb.component.html",
+    styleUrls: ["./neb.component.scss"],
+})
+export class AdminNebComponent {
+
+    public isLoading = true;
+    public isAddingModularNeb = false;
+    public hasModularNeb = false;
+    public upstreams: FE_Upstream[];
+    public appservices: FE_Appservice[];
+    public configurations: FE_NebConfiguration[];
+
+    constructor(private nebApi: AdminNebApiService,
+                private upstreamApi: AdminUpstreamApiService,
+                private appserviceApi: AdminAppserviceApiService,
+                private toaster: ToasterService) {
+
+        this.reload().then(() => this.isLoading = false).catch(error => {
+            console.error(error);
+            this.toaster.pop("error", "Error loading go-neb configuration");
+        });
+    }
+
+    private reload(): Promise<any> {
+        return Promise.all([
+            this.loadAppservices(),
+            this.loadConfigurations(),
+            this.loadUpstreams(),
+        ]);
+    }
+
+    private loadUpstreams(): Promise<any> {
+        return this.upstreamApi.getUpstreams().then(upstreams => {
+            this.upstreams = upstreams;
+        });
+    }
+
+    private loadAppservices(): Promise<any> {
+        return this.appserviceApi.getAppservices().then(appservices => {
+            this.appservices = appservices;
+        });
+    }
+
+    private loadConfigurations(): Promise<any> {
+        return this.nebApi.getConfigurations().then(nebConfigs => {
+            this.configurations = nebConfigs;
+            this.isLoading = false;
+
+            this.hasModularNeb = false;
+            for (const neb of this.configurations) {
+                if (neb.upstreamId) {
+                    this.hasModularNeb = true;
+                    break;
+                }
+            }
+        });
+    }
+
+    public showAppserviceConfig(neb: FE_NebConfiguration) {
+        console.log(neb);
+    }
+
+    public addSelfHostedNeb() {
+        console.log("ADD Hosted");
+    }
+
+    public addModularHostedNeb() {
+        this.isAddingModularNeb = true;
+        const createNeb = (upstream: FE_Upstream) => {
+            this.nebApi.newUpstreamConfiguration(upstream).then(neb => {
+                this.configurations.push(neb);
+                this.toaster.pop("success", "matrix.org's go-neb added", "Click the pencil icon to enable the bots.");
+                this.isAddingModularNeb = false;
+                this.hasModularNeb = true;
+            }).catch(error => {
+                console.error(error);
+                this.isAddingModularNeb = false;
+                this.toaster.pop("error", "Error adding matrix.org's go-neb");
+            });
+        };
+
+        const vectorUpstreams = this.upstreams.filter(u => u.type === "vector");
+        if (vectorUpstreams.length === 0) {
+            console.log("Creating default scalar upstream");
+            const scalarUrl = "https://scalar.vector.im/api";
+            this.upstreamApi.newUpstream("modular", "vector", scalarUrl, scalarUrl).then(upstream => {
+                this.upstreams.push(upstream);
+                createNeb(upstream);
+            }).catch(err => {
+                console.error(err);
+                this.toaster.pop("error", "Error creating matrix.org go-neb");
+            });
+        } else createNeb(vectorUpstreams[0]);
+    }
+}
diff --git a/web/app/admin/widgets/widgets.component.html b/web/app/admin/widgets/widgets.component.html
index 2beebd6..ed5c11b 100644
--- a/web/app/admin/widgets/widgets.component.html
+++ b/web/app/admin/widgets/widgets.component.html
@@ -24,7 +24,7 @@
                             <i class="fa fa-pencil-alt"></i>
                         </span>
                         <ui-switch [checked]="widget.isEnabled" size="small" [disabled]="isUpdating"
-                                   (change)="disableWidget(widget)"></ui-switch>
+                                   (change)="toggleWidget(widget)"></ui-switch>
                     </td>
                 </tr>
                 </tbody>
diff --git a/web/app/admin/widgets/widgets.component.scss b/web/app/admin/widgets/widgets.component.scss
index 65b9b23..1894618 100644
--- a/web/app/admin/widgets/widgets.component.scss
+++ b/web/app/admin/widgets/widgets.component.scss
@@ -1,7 +1,3 @@
-ul {
-  padding-left: 25px;
-}
-
 .editButton {
   cursor: pointer;
   position: relative;
diff --git a/web/app/admin/widgets/widgets.component.ts b/web/app/admin/widgets/widgets.component.ts
index 510d1e0..24b341c 100644
--- a/web/app/admin/widgets/widgets.component.ts
+++ b/web/app/admin/widgets/widgets.component.ts
@@ -28,7 +28,7 @@ export class AdminWidgetsComponent {
         });
     }
 
-    public disableWidget(widget: FE_Widget) {
+    public toggleWidget(widget: FE_Widget) {
         widget.isEnabled = !widget.isEnabled;
         this.isUpdating = true;
         this.adminIntegrationsApi.toggleIntegration(widget.category, widget.type, widget.isEnabled).then(() => {
@@ -39,7 +39,7 @@ export class AdminWidgetsComponent {
             widget.isEnabled = !widget.isEnabled; // revert change
             this.isUpdating = false;
             this.toaster.pop("error", "Error updating widget");
-        })
+        });
     }
 
     public editWidget(widget: FE_Widget) {
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 7475561..ab11e38 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -47,6 +47,11 @@ import { AdminWidgetJitsiConfigComponent } from "./admin/widgets/jitsi/jitsi.com
 import { AdminIntegrationsApiService } from "./shared/services/admin/admin-integrations-api.service";
 import { IntegrationsApiService } from "./shared/services/integrations/integrations-api.service";
 import { WidgetApiService } from "./shared/services/integrations/widget-api.service";
+import { AdminAppserviceApiService } from "./shared/services/admin/admin-appservice-api.service";
+import { AdminNebApiService } from "./shared/services/admin/admin-neb-api.service";
+import { AdminUpstreamApiService } from "./shared/services/admin/admin-upstream-api.service";
+import { AdminNebComponent } from "./admin/neb/neb.component";
+import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 
 @NgModule({
     imports: [
@@ -91,6 +96,8 @@ import { WidgetApiService } from "./shared/services/integrations/widget-api.serv
         AdminWidgetsComponent,
         AdminWidgetEtherpadConfigComponent,
         AdminWidgetJitsiConfigComponent,
+        AdminNebComponent,
+        AdminEditNebComponent,
 
         // Vendor
     ],
@@ -102,6 +109,9 @@ import { WidgetApiService } from "./shared/services/integrations/widget-api.serv
         ScalarClientApiService,
         ScalarServerApiService,
         NameService,
+        AdminAppserviceApiService,
+        AdminNebApiService,
+        AdminUpstreamApiService,
         {provide: Window, useValue: window},
 
         // Vendor
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index dda540f..f2ad93f 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -16,6 +16,8 @@ import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.w
 import { AdminComponent } from "./admin/admin.component";
 import { AdminHomeComponent } from "./admin/home/home.component";
 import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
+import { AdminNebComponent } from "./admin/neb/neb.component";
+import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -43,6 +45,21 @@ const routes: Routes = [
                         component: AdminWidgetsComponent,
                         data: {breadcrumb: "Widgets", name: "Widgets"},
                     },
+                    {
+                        path: "neb",
+                        data: {breadcrumb: "go-neb", name: "go-neb configuration"},
+                        children: [
+                            {
+                                path: "",
+                                component: AdminNebComponent,
+                            },
+                            {
+                                path: ":nebId/edit",
+                                component: AdminEditNebComponent,
+                                data: {breadcrumb: "Edit go-neb", name: "Edit go-neb"},
+                            }
+                        ]
+                    },
                 ],
             },
             {
diff --git a/web/app/shared/models/admin_responses.ts b/web/app/shared/models/admin_responses.ts
index 697c8cd..134ae51 100644
--- a/web/app/shared/models/admin_responses.ts
+++ b/web/app/shared/models/admin_responses.ts
@@ -1,3 +1,5 @@
+import { FE_Integration } from "./integration";
+
 export interface FE_DimensionConfig {
     admins: string[];
     widgetBlacklist: string[];
@@ -10,4 +12,27 @@ export interface FE_DimensionConfig {
 
 export interface FE_DimensionVersion {
     version: string;
+}
+
+export interface FE_Upstream {
+    id: number;
+    name: string;
+    type: string;
+    scalarUrl: string;
+    apiUrl: string;
+}
+
+export interface FE_Appservice {
+    id: number;
+    hsToken: string;
+    asToken: string;
+    userPrefix: string;
+}
+
+export interface FE_NebConfiguration {
+    id: number;
+    adminUrl?: string;
+    appserviceId?: string;
+    upstreamId?: string;
+    integrations: FE_Integration[];
 }
\ No newline at end of file
diff --git a/web/app/shared/models/neb.ts b/web/app/shared/models/neb.ts
new file mode 100644
index 0000000..33a98e6
--- /dev/null
+++ b/web/app/shared/models/neb.ts
@@ -0,0 +1,8 @@
+export const NEB_HAS_CONFIG = [
+    "giphy",
+    "guggy",
+    "github",
+    "google",
+    "imgur",
+    "wikipedia",
+];
\ No newline at end of file
diff --git a/web/app/shared/services/admin/admin-appservice-api.service.ts b/web/app/shared/services/admin/admin-appservice-api.service.ts
new file mode 100644
index 0000000..81b2bf3
--- /dev/null
+++ b/web/app/shared/services/admin/admin-appservice-api.service.ts
@@ -0,0 +1,15 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_Appservice } from "../../models/admin_responses";
+
+@Injectable()
+export class AdminAppserviceApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getAppservices(): Promise<FE_Appservice[]> {
+        return this.authedGet("/api/v1/dimension/admin/appservices/all").map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/admin/admin-integrations-api.service.ts b/web/app/shared/services/admin/admin-integrations-api.service.ts
index e2aee60..b639685 100644
--- a/web/app/shared/services/admin/admin-integrations-api.service.ts
+++ b/web/app/shared/services/admin/admin-integrations-api.service.ts
@@ -10,14 +10,14 @@ export class AdminIntegrationsApiService extends AuthedApi {
     }
 
     public getAllIntegrations(): Promise<FE_IntegrationsResponse> {
-        return this.authedGet("/api/v1/dimension/integrations/all").map(r => r.json()).toPromise();
+        return this.authedGet("/api/v1/dimension/admin/integrations/all").map(r => r.json()).toPromise();
     }
 
     public toggleIntegration(category: string, type: string, enabled: boolean): Promise<any> {
-        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/enabled", {enabled: enabled}).map(r => r.json()).toPromise();
+        return this.authedPost("/api/v1/dimension/admin/integrations/" + category + "/" + type + "/enabled", {enabled: enabled}).map(r => r.json()).toPromise();
     }
 
     public setIntegrationOptions(category: string, type: string, options: any): Promise<any> {
-        return this.authedPost("/api/v1/dimension/integrations/" + category + "/" + type + "/options", {options: options}).map(r => r.json()).toPromise();
+        return this.authedPost("/api/v1/dimension/admin/integrations/" + category + "/" + type + "/options", {options: options}).map(r => r.json()).toPromise();
     }
 }
diff --git a/web/app/shared/services/admin/admin-neb-api.service.ts b/web/app/shared/services/admin/admin-neb-api.service.ts
new file mode 100644
index 0000000..eb2f5e0
--- /dev/null
+++ b/web/app/shared/services/admin/admin-neb-api.service.ts
@@ -0,0 +1,34 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../models/admin_responses";
+
+@Injectable()
+export class AdminNebApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getConfigurations(): Promise<FE_NebConfiguration[]> {
+        return this.authedGet("/api/v1/dimension/admin/neb/all").map(r => r.json()).toPromise();
+    }
+
+    public getConfiguration(nebId: number): Promise<FE_NebConfiguration> {
+        return this.authedGet("/api/v1/dimension/admin/neb/" + nebId + "/config").map(r => r.json()).toPromise();
+    }
+
+    public newUpstreamConfiguration(upstream: FE_Upstream): Promise<FE_NebConfiguration> {
+        return this.authedPost("/api/v1/dimension/admin/neb/new/upstream", {upstreamId: upstream.id}).map(r => r.json()).toPromise();
+    }
+
+    public newAppserviceConfiguration(adminUrl: string, appservice: FE_Appservice): Promise<FE_NebConfiguration> {
+        return this.authedPost("/api/v1/dimension/admin/neb/new/appservice", {
+            adminUrl: adminUrl,
+            appserviceId: appservice.id
+        }).map(r => r.json()).toPromise();
+    }
+
+    public toggleIntegration(nebId: number, integrationType: string, setEnabled: boolean): Promise<any> {
+        return this.authedPost("/api/v1/dimension/admin/neb/" + nebId + "/integration/" + integrationType + "/enabled", {enabled: setEnabled}).map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/admin/admin-upstream-api.service.ts b/web/app/shared/services/admin/admin-upstream-api.service.ts
new file mode 100644
index 0000000..800d06f
--- /dev/null
+++ b/web/app/shared/services/admin/admin-upstream-api.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../AuthedApi";
+import { FE_Upstream } from "../../models/admin_responses";
+
+@Injectable()
+export class AdminUpstreamApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getUpstreams(): Promise<FE_Upstream[]> {
+        return this.authedGet("/api/v1/dimension/admin/upstreams/all").map(r => r.json()).toPromise();
+    }
+
+    public newUpstream(name: string, type: string, scalarUrl: string, apiUrl: string): Promise<FE_Upstream> {
+        return this.authedPost("/api/v1/dimension/admin/upstreams/new", {
+            name: name,
+            type: type,
+            scalarUrl: scalarUrl,
+            apiUrl: apiUrl,
+        }).map(r => r.json()).toPromise();
+    }
+}

From 1ae69bc563e1149858d727a99e9693fac3b58a17 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 28 Dec 2017 18:25:40 -0700
Subject: [PATCH 047/111] Remove old files

---
 src/matrix/MatrixLiteClient.js | 17 ----------------
 src/scalar/ScalarClient.js     | 36 ----------------------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 src/matrix/MatrixLiteClient.js
 delete mode 100644 src/scalar/ScalarClient.js

diff --git a/src/matrix/MatrixLiteClient.js b/src/matrix/MatrixLiteClient.js
deleted file mode 100644
index a774b13..0000000
--- a/src/matrix/MatrixLiteClient.js
+++ /dev/null
@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var helpers_1 = require("./helpers");
-var MatrixLiteClient = /** @class */ (function () {
-    function MatrixLiteClient(homeserverName, accessToken) {
-        this.homeserverName = homeserverName;
-        this.accessToken = accessToken;
-    }
-    MatrixLiteClient.prototype.getUrlPreview = function (url) {
-        return helpers_1.doFederatedApiCall("GET", this.homeserverName, "/_matrix/media/r0/preview_url", { access_token: this.accessToken, url: url }).then(function (response) {
-            return response;
-        });
-    };
-    return MatrixLiteClient;
-}());
-exports.MatrixLiteClient = MatrixLiteClient;
-//# sourceMappingURL=MatrixLiteClient.js.map
\ No newline at end of file
diff --git a/src/scalar/ScalarClient.js b/src/scalar/ScalarClient.js
deleted file mode 100644
index 6ac0363..0000000
--- a/src/scalar/ScalarClient.js
+++ /dev/null
@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var Promise = require("bluebird");
-var request = require("request");
-var matrix_js_snippets_1 = require("matrix-js-snippets");
-var ScalarClient = /** @class */ (function () {
-    function ScalarClient(upstream) {
-        this.upstream = upstream;
-    }
-    ScalarClient.prototype.register = function (openId) {
-        var _this = this;
-        return new Promise(function (resolve, reject) {
-            request({
-                method: "POST",
-                url: _this.upstream.scalarUrl + "/register",
-                json: openId,
-            }, function (err, res, _body) {
-                if (err) {
-                    matrix_js_snippets_1.LogService.error("ScalarClient", "Error registering for token");
-                    matrix_js_snippets_1.LogService.error("ScalarClient", err);
-                    reject(err);
-                }
-                else if (res.statusCode !== 200) {
-                    matrix_js_snippets_1.LogService.error("ScalarClient", "Got status code " + res.statusCode + " while registering for token");
-                    reject(new Error("Could not get token"));
-                }
-                else {
-                    resolve(res.body);
-                }
-            });
-        });
-    };
-    return ScalarClient;
-}());
-exports.ScalarClient = ScalarClient;
-//# sourceMappingURL=ScalarClient.js.map
\ No newline at end of file

From 74054c3962c6e9a3546f6e9f833a39b873833eaf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 31 Jan 2018 16:30:08 -0700
Subject: [PATCH 048/111] Add ability to create self-hosted go-neb instances

They can't be provisioned or configured correctly yet, but they exist.
---
 .../DimensionAppserviceAdminService.ts        |  5 +++
 .../add_selfhosted.component.html             | 24 ++++++++++++
 .../add_selfhosted.component.scss             |  0
 .../add_selfhosted.component.ts               | 38 +++++++++++++++++++
 web/app/admin/neb/edit/edit.component.ts      |  4 +-
 web/app/admin/neb/neb.component.html          |  5 ++-
 web/app/admin/neb/neb.component.ts            |  7 +++-
 web/app/admin/widgets/config-dialog.scss      |  5 ---
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        |  6 +++
 .../admin/admin-appservice-api.service.ts     |  4 ++
 web/style/app.scss                            |  5 +++
 12 files changed, 95 insertions(+), 10 deletions(-)
 create mode 100644 web/app/admin/neb/add_selfhosted/add_selfhosted.component.html
 create mode 100644 web/app/admin/neb/add_selfhosted/add_selfhosted.component.scss
 create mode 100644 web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts

diff --git a/src/api/dimension/DimensionAppserviceAdminService.ts b/src/api/dimension/DimensionAppserviceAdminService.ts
index 942058e..b253562 100644
--- a/src/api/dimension/DimensionAppserviceAdminService.ts
+++ b/src/api/dimension/DimensionAppserviceAdminService.ts
@@ -44,6 +44,11 @@ export class DimensionAppserviceAdminService {
     @POST
     @Path("new")
     public createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
+        // Trim off the @ sign if it's on the prefix
+        if (request.userPrefix[0] === "@") {
+            request.userPrefix = request.userPrefix.substring(1);
+        }
+
         return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
             return AppserviceStore.getAllByUserPrefix(request.userPrefix);
         }).then(appservices => {
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.html b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.html
new file mode 100644
index 0000000..b868a69
--- /dev/null
+++ b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.html
@@ -0,0 +1,24 @@
+<my-ibox title="New self-hosted go-neb">
+    <div class="my-ibox-content">
+        <p>Self-hosted go-neb instances are powered by application services installed on your homeserver. The application service is responsible for creating the bots dynamically.</p>
+
+        <label class="label-block">
+            User Prefix
+            <span class="text-muted ">This is the prefix used for all bot users.</span>
+            <input type="text" class="form-control"
+                   placeholder="@_neb"
+                   [(ngModel)]="userPrefix" [disabled]="isSaving"/>
+        </label>
+        <label class="label-block">
+            API URL
+            <span class="text-muted ">The admin/api url for go-neb. Be sure to not expose the admin API to the outside world because this endpoint is not authenticated.</span>
+            <input type="text" class="form-control"
+                   placeholder="http://localhost:4050"
+                   [(ngModel)]="adminUrl" [disabled]="isSaving"/>
+        </label>
+
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm" [disabled]="isSaving">
+            <i class="far fa-save"></i> Save
+        </button>
+    </div>
+</my-ibox>
\ No newline at end of file
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.scss b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
new file mode 100644
index 0000000..1ccd6d0
--- /dev/null
+++ b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
@@ -0,0 +1,38 @@
+import { Component } from "@angular/core";
+import { AdminAppserviceApiService } from "../../../shared/services/admin/admin-appservice-api.service";
+import { AdminNebApiService } from "../../../shared/services/admin/admin-neb-api.service";
+import { ToasterService } from "angular2-toaster";
+import { ActivatedRoute, Router } from "@angular/router";
+
+
+@Component({
+    templateUrl: "./add_selfhosted.component.html",
+    styleUrls: ["./add_selfhosted.component.scss"],
+})
+export class AdminAddSelfhostedNebComponent {
+
+    public isSaving = false;
+    public userPrefix = "@_neb";
+    public adminUrl = "http://localhost:4050";
+
+    constructor(private asApi: AdminAppserviceApiService,
+                private nebApi: AdminNebApiService,
+                private toaster: ToasterService,
+                private router: Router,
+                private activatedRoute: ActivatedRoute) {
+    }
+
+    public save(): void {
+        this.isSaving = true;
+        this.asApi.createAppservice(this.userPrefix).then(appservice => {
+            return this.nebApi.newAppserviceConfiguration(this.adminUrl, appservice);
+        }).then(() => {
+            this.toaster.pop("success", "New go-neb created");
+            this.router.navigate(["../.."], {relativeTo: this.activatedRoute});
+        }).catch(err => {
+            console.error(err);
+            this.isSaving = false;
+            this.toaster.pop("error", "Error creating appservice");
+        });
+    }
+}
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 245b7b3..52955a2 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -19,8 +19,8 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
     public nebConfig: FE_NebConfiguration;
 
     private subscription: any;
-    private overlappingTypes: string[];
-    private botTypes: string[];
+    private overlappingTypes: string[] = [];
+    private botTypes: string[] = [];
 
     constructor(private nebApi: AdminNebApiService, private route: ActivatedRoute, private toaster: ToasterService) {
     }
diff --git a/web/app/admin/neb/neb.component.html b/web/app/admin/neb/neb.component.html
index 11d5803..a80a802 100644
--- a/web/app/admin/neb/neb.component.html
+++ b/web/app/admin/neb/neb.component.html
@@ -21,7 +21,10 @@
                     <td colspan="2"><i>No go-neb configurations.</i></td>
                 </tr>
                 <tr *ngFor="let neb of configurations trackById">
-                    <td>{{ neb.upstreamId ? "matrix.org's go-neb" : "Self-hosted go-neb" }}</td>
+                    <td>
+                        {{ neb.upstreamId ? "matrix.org's go-neb" : "Self-hosted go-neb" }}
+                        <span class="text-muted" style="display: inline-block;" *ngIf="!neb.upstreamId">({{ neb.adminUrl }})</span>
+                    </td>
                     <td class="text-center">
                         <span class="appsvcConfigButton" (click)="showAppserviceConfig(neb)"
                               *ngIf="!neb.upstreamId">
diff --git a/web/app/admin/neb/neb.component.ts b/web/app/admin/neb/neb.component.ts
index 619da60..f81e2a0 100644
--- a/web/app/admin/neb/neb.component.ts
+++ b/web/app/admin/neb/neb.component.ts
@@ -4,6 +4,7 @@ import { AdminNebApiService } from "../../shared/services/admin/admin-neb-api.se
 import { AdminUpstreamApiService } from "../../shared/services/admin/admin-upstream-api.service";
 import { AdminAppserviceApiService } from "../../shared/services/admin/admin-appservice-api.service";
 import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../shared/models/admin_responses";
+import { ActivatedRoute, Router } from "@angular/router";
 
 @Component({
     templateUrl: "./neb.component.html",
@@ -21,7 +22,9 @@ export class AdminNebComponent {
     constructor(private nebApi: AdminNebApiService,
                 private upstreamApi: AdminUpstreamApiService,
                 private appserviceApi: AdminAppserviceApiService,
-                private toaster: ToasterService) {
+                private toaster: ToasterService,
+                private router: Router,
+                private activatedRoute:ActivatedRoute) {
 
         this.reload().then(() => this.isLoading = false).catch(error => {
             console.error(error);
@@ -69,7 +72,7 @@ export class AdminNebComponent {
     }
 
     public addSelfHostedNeb() {
-        console.log("ADD Hosted");
+        this.router.navigate(["new", "selfhosted"], {relativeTo: this.activatedRoute});
     }
 
     public addModularHostedNeb() {
diff --git a/web/app/admin/widgets/config-dialog.scss b/web/app/admin/widgets/config-dialog.scss
index dd4814b..0cb632f 100644
--- a/web/app/admin/widgets/config-dialog.scss
+++ b/web/app/admin/widgets/config-dialog.scss
@@ -1,8 +1,3 @@
-.text-muted {
-  display: block;
-  font-size: 12px;
-}
-
 .label-block {
   margin-bottom: 15px;
 }
\ No newline at end of file
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index ab11e38..61e51c1 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -52,6 +52,7 @@ import { AdminNebApiService } from "./shared/services/admin/admin-neb-api.servic
 import { AdminUpstreamApiService } from "./shared/services/admin/admin-upstream-api.service";
 import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
+import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_selfhosted.component";
 
 @NgModule({
     imports: [
@@ -98,6 +99,7 @@ import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
         AdminWidgetJitsiConfigComponent,
         AdminNebComponent,
         AdminEditNebComponent,
+        AdminAddSelfhostedNebComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index f2ad93f..fe80441 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -18,6 +18,7 @@ import { AdminHomeComponent } from "./admin/home/home.component";
 import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
 import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
+import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_selfhosted.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -57,6 +58,11 @@ const routes: Routes = [
                                 path: ":nebId/edit",
                                 component: AdminEditNebComponent,
                                 data: {breadcrumb: "Edit go-neb", name: "Edit go-neb"},
+                            },
+                            {
+                                path: "new/selfhosted",
+                                component: AdminAddSelfhostedNebComponent,
+                                data: {breadcrumb: "Add self-hosted go-neb", name: "Add self-hosted go-neb"},
                             }
                         ]
                     },
diff --git a/web/app/shared/services/admin/admin-appservice-api.service.ts b/web/app/shared/services/admin/admin-appservice-api.service.ts
index 81b2bf3..5263036 100644
--- a/web/app/shared/services/admin/admin-appservice-api.service.ts
+++ b/web/app/shared/services/admin/admin-appservice-api.service.ts
@@ -12,4 +12,8 @@ export class AdminAppserviceApiService extends AuthedApi {
     public getAppservices(): Promise<FE_Appservice[]> {
         return this.authedGet("/api/v1/dimension/admin/appservices/all").map(r => r.json()).toPromise();
     }
+
+    public createAppservice(userPrefix: string): Promise<FE_Appservice> {
+        return this.authedPost("/api/v1/dimension/admin/appservices/new", {userPrefix: userPrefix}).map(r => r.json()).toPromise();
+    }
 }
diff --git a/web/style/app.scss b/web/style/app.scss
index 28c6b31..ea70abf 100644
--- a/web/style/app.scss
+++ b/web/style/app.scss
@@ -35,4 +35,9 @@ button {
 
 .label-block {
   display: block;
+}
+
+.text-muted {
+  display: block;
+  font-size: 12px;
 }
\ No newline at end of file

From 1e52617df1e7bdd239ab9b1a16b41330d41f5482 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 21 Mar 2018 20:40:03 -0600
Subject: [PATCH 049/111] Package upgrades and change linting rules

---
 package-lock.json | 5100 +++++++++++++++++++++++++++++++--------------
 package.json      |  100 +-
 tslint.json       |    5 +-
 3 files changed, 3606 insertions(+), 1599 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8930791..ec68714 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,84 +5,84 @@
   "requires": true,
   "dependencies": {
     "@angular/animations": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.1.0.tgz",
-      "integrity": "sha512-s0tV6y2D16CQAcXjv8CN8AahHb+LoWm9KAUkxvSJ18ZZQweuAY4T8jlRB95ODRFFKfjwyRD9HqXKUC5yHmG9ww==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.2.9.tgz",
+      "integrity": "sha512-H/3fMs4PhYjKoA81II6D0PHifDrqlKet2u/EXzUBq3ehXby+N/0GBzqsBYwPeU5pTye7WPFfW+5sgoJpN8Ye6Q==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/common": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.1.0.tgz",
-      "integrity": "sha512-J6E0OfTJJGcyoKU51ZucsDFV40YEAPgP6VCIPYECgOFHxrqg6O1ZFZSD1fdviMXMLVEFCi6Fy6IB7GJyiWgDIA==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-5.2.9.tgz",
+      "integrity": "sha512-g2hPcI0fnT4TV+Fd+1IohjuqBxPvxwyH9IzTn8PkU9X2M+F6cHCUvHxL1sWI2sF8pYcaHzVjq9WClym10X36Lg==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/compiler": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.1.0.tgz",
-      "integrity": "sha512-iyFQqmhKNRSc9JRx7ty6z/wCsypjpbRu0QR6q2LMa6imuCt9qLHOvTajBQExRB8guqd/LTVDG4WiYY1lf8iO2w==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.2.9.tgz",
+      "integrity": "sha512-mN+ofInk8y/tk2TCJZx8RrGdOKdrfunoCair7tfDy4XoQJE90waGfaYWo07hYU+UYwLhrg19m2Czy6rIDciUJA==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/core": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.1.0.tgz",
-      "integrity": "sha512-duObjve+INoz4wWuqcaJzl1isUyI37RtRblTFXgZBp2n2n0nXJq1CubcfgxQhMMR2d64xWLKg9+d34PvnzaMmg==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-5.2.9.tgz",
+      "integrity": "sha512-cvHBJGtasrIoARvbLFyHaOsiWKVwMNrrSTZLwrlyHP8oYzkDrE0qKGer6QCqyKt+51hF53cgWEffGzM/u/0wYg==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/forms": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.1.0.tgz",
-      "integrity": "sha512-2sJqtMht/6vbFg6HwFs0MX4pRhgLt7h2pa6oTH4oBoQ2UF67jCuq4cMljDm9SVxrGw0Q83+/eBk3ER4QnKk48Q==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.2.9.tgz",
+      "integrity": "sha512-zyIOiZV/FAm1iVZWTk3Joz6Jt096hbhfDbBUrssmuiTKi9dU6rWG+Z4b88zStqulKe3HFVZkgdixWlminG8nKA==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/http": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.1.0.tgz",
-      "integrity": "sha512-ltSs52OYnWZJEnbxtHoN5LQiH/37F3GxN6iL0TsQdSlw8HzrdcdbmebKlCpfXwhgcgZC48KWbKSaOs5/xVurfQ==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-5.2.9.tgz",
+      "integrity": "sha512-DKjgIk+Dp0Xv1ieG8LawvUnL4dYZp1KroAq5cfKuO9EojP0zM3tUvBtw2vbPLsHYma7g7ZMjOoAbzVxtmTBZqw==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/platform-browser": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.1.0.tgz",
-      "integrity": "sha512-8aeppeASwQv4Fj3B8KBiFHQrKPrwA328AEhlH/HnggCvt0CFffIs2PSqzJBwnOfFWvhFZk020W51B8jrHLQyoQ==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.2.9.tgz",
+      "integrity": "sha512-P6iviRTuLsLRuqtZNOO0fd4cjTo8DWsDCecwntUlI08R3kH5qeqvqarTzlw/4oD+wBzZY6bfb89JyY+n5XbX3Q==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.0.tgz",
-      "integrity": "sha512-f6Iv4NCYQwBkNeyInZzja8pg0nfUOrxx5H5rEvr0J1bwag2eDofGVPOftha7LDOLVALVOQQiXQBePATMNLB85g==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.9.tgz",
+      "integrity": "sha512-8C3MtyguJKDTT8FcHIRDlBxswcIdpfugOf4S2t94pVedCr4h9w2da/lcfwJKUISw1aKjfA77Sl8TDUhoS8ymmQ==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angular/router": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.1.0.tgz",
-      "integrity": "sha512-CtOwqeo1IUk4kUs+tUggkYFmuu2fPTZ1G/GP7YK6gd3Jr9OtkMFB7wkmnd5YcaYo3wVeYkJWZdJQAvj6OakMww==",
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.9.tgz",
+      "integrity": "sha512-NtDbFK0EA1rfFc+5Dqd5mIv8E1Wcc5rDUnSty4cX2V+HxTEZvQ9DRdpO2Q0abWU5siXyqponuPHJzF08OVGyNA==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "@angularclass/hmr": {
@@ -101,33 +101,51 @@
       }
     },
     "@fortawesome/fontawesome": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.0.tgz",
-      "integrity": "sha512-HitzVVotHB70QGYaoKvkvaGqKL2P/xdpeg1KK1ESEyI5qBcZdRTWpH9W5XVB72Ev02V4Qo/Ldxjf4UL+kakWdw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.4.tgz",
+      "integrity": "sha512-KgmesNO47kpIRBWgy9Tkw62T5stz1PDKn2QNFCuwEuk05zl+NHgy90oZQuww2dXZ24hTOS9YRAx0klE8UBLsxg==",
+      "dev": true,
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "0.1.3"
+      }
+    },
+    "@fortawesome/fontawesome-common-types": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.3.tgz",
+      "integrity": "sha512-jJXUoNkmHozqlcXzNiYytcmEe3eNxn7Vh8hmnIoRi0TmT3ChQ0osuSApuIObIomnIcvqlA24FCpnamKvfZ7F5g==",
       "dev": true
     },
     "@fortawesome/fontawesome-free-brands": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.2.tgz",
-      "integrity": "sha512-J7SyvuBFxx3/4VcuSkVlsWxDLCj34Pc1zkOkxQkBDIvmbv6uXC3IUqkhZjyV7AHSM9iDoDeI9CczLk0sJwW25g==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.8.tgz",
+      "integrity": "sha512-r7qD8ZZt4ke0w1ZBHuINNIVHlSQpZOxhToF8CA2PK1TQsg2l/PsM2reTlzkNg/t1EldU4ivXW/qt6Y/uHEMMhw==",
+      "dev": true,
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "0.1.3"
+      }
     },
     "@fortawesome/fontawesome-free-regular": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.2.tgz",
-      "integrity": "sha512-E4mG2ab0SH9+uEuPvPoDWnIshBGMD3LKih73pR2Kn+qPHujJw/UQXy1D2ousaSD7oLPBO1g0c3dx3laX2i/Neg==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.8.tgz",
+      "integrity": "sha512-FsLlHx6tKr6sE6Vy8rUEOJI39/UeLebsMGfcsLfvTfq//Y4hjRFJuK1LWpunmOTfT8oxUNvp9fuDPlxO42MEfg==",
+      "dev": true,
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "0.1.3"
+      }
     },
     "@fortawesome/fontawesome-free-solid": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.2.tgz",
-      "integrity": "sha512-By7V/yO2XyMonzTmo6KxPcw0OLqycozNDJaASAcky+YZkIL7p1hJ8Ki5OlF4X2z1fMQfpXbbBVfeU6atr1rlUQ==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.8.tgz",
+      "integrity": "sha512-c7cO2YkX+q1jprm/jMq7hzwl46uaeu1T+UF6ecOnvKIvpZbhmA3swomTDgXUXwVTnY17B9hc7XgXLKjzADFxOw==",
+      "dev": true,
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "0.1.3"
+      }
     },
     "@ng-bootstrap/ng-bootstrap": {
-      "version": "1.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.0-beta.7.tgz",
-      "integrity": "sha1-WLyB9hACj0BSZSnOQEg6lQKBY7A=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.0.2.tgz",
+      "integrity": "sha1-hZoacvfysXZQQL5WbIU03KrQ1w0=",
       "dev": true
     },
     "@types/bluebird": {
@@ -141,7 +159,7 @@
       "integrity": "sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA==",
       "requires": {
         "@types/express": "4.0.39",
-        "@types/node": "8.5.1"
+        "@types/node": "8.9.5"
       }
     },
     "@types/continuation-local-storage": {
@@ -149,7 +167,7 @@
       "resolved": "https://registry.npmjs.org/@types/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz",
       "integrity": "sha1-oz4N+dzptCTRyY/E/evYV43O7H4=",
       "requires": {
-        "@types/node": "8.5.1"
+        "@types/node": "8.9.5"
       }
     },
     "@types/cookie-parser": {
@@ -175,7 +193,7 @@
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.57.tgz",
       "integrity": "sha512-QLAHjdLwEICm3thVbXSKRoisjfgMVI4xJH/HU8F385BR2HI7PmM6ax4ELXf8Du6sLmSpySXMYaI+xc//oQ/IFw==",
       "requires": {
-        "@types/node": "8.5.1"
+        "@types/node": "8.9.5"
       }
     },
     "@types/geojson": {
@@ -184,15 +202,15 @@
       "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="
     },
     "@types/jquery": {
-      "version": "3.2.16",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.16.tgz",
-      "integrity": "sha512-q2WC02YxQoX2nY1HRKlYGHpGP1saPmD7GN0pwCDlTz35a4eOtJG+aHRlXyjCuXokUukSrR2aXyBhSW3j+jPc0A==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.1.tgz",
+      "integrity": "sha512-N3h+rzN518yl2xKrW0o6KKdNmWZ+OwG6SoM5TBEQFF0tTv5wXPEsoOuYQ2Kt3/89XbcSZUJLdjiT/2c3BR/ApQ==",
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.91",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.91.tgz",
-      "integrity": "sha512-k+nc3moSlAaXacyvz4/c6D9lnUeI6AKsLvkXFuNzUEEqMw7sjDnLW2GqlJ4nyFgMX/p+QzvVG6zRoDo4lJIV5g=="
+      "version": "4.14.105",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.105.tgz",
+      "integrity": "sha512-LB5PKR4QNoDrgcl4H8JdhBMp9wHWp0OATkU9EHzuXKiutRwbvsyYmqPUaMSWmdCycJoKHtdAWh47/zSe/GZ1yA=="
     },
     "@types/mime": {
       "version": "2.0.0",
@@ -208,9 +226,9 @@
       }
     },
     "@types/node": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.1.tgz",
-      "integrity": "sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw=="
+      "version": "8.9.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
+      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
     },
     "@types/reflect-metadata": {
       "version": "0.0.4",
@@ -218,14 +236,14 @@
       "integrity": "sha1-tkd8qal+UmXyrGf56nBOrl4Or00="
     },
     "@types/sequelize": {
-      "version": "4.0.79",
-      "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.0.79.tgz",
-      "integrity": "sha512-rtBBoxXNrSyEaBJm1duQy8C6AeZ4EoSI2MzI/twAVZShKa9y4tAhMiFWwACkrp1VInbJ1aSB+IaCtL+B9btpNA==",
+      "version": "4.27.5",
+      "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.5.tgz",
+      "integrity": "sha512-K2xXW0IYWZj2VX4DxyHQERxrWHNyZuSOERyo+wcZOgWUHzjICwrwcusvSnO4aIiCXqPA2NDjqbb0o0GrVzIqVA==",
       "requires": {
         "@types/bluebird": "3.5.18",
         "@types/continuation-local-storage": "3.2.1",
-        "@types/lodash": "4.14.91",
-        "@types/validator": "6.3.0"
+        "@types/lodash": "4.14.105",
+        "@types/validator": "9.4.0"
       }
     },
     "@types/serve-static": {
@@ -238,9 +256,9 @@
       }
     },
     "@types/validator": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-6.3.0.tgz",
-      "integrity": "sha512-fUc+9BEr1WWW8wVRl5I/pyRDGZNe9nH06kOzlGH3eN7N8VVPW/zSrE0Vdca6G2sRCVmIN/XuOenbmldAAyTYaw=="
+      "version": "9.4.0",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-9.4.0.tgz",
+      "integrity": "sha512-SxPH9AKnmr9I2V4CnPgG9BEUEJ6wUUoEZt4hVcCKUM143qMHQgU8ewLQO5WKSjgQqVyTmVufmouY1z0cKaOFhQ=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -249,18 +267,33 @@
       "dev": true
     },
     "accepts": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
-      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "requires": {
-        "mime-types": "2.1.17",
+        "mime-types": "2.1.18",
         "negotiator": "0.6.1"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.33.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+        },
+        "mime-types": {
+          "version": "2.1.18",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+          "requires": {
+            "mime-db": "1.33.0"
+          }
+        }
       }
     },
     "acorn": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-      "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+      "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -281,20 +314,20 @@
       }
     },
     "ajv": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz",
-      "integrity": "sha1-s4u4h22ehr7plJVqBOch6IskjrI=",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz",
+      "integrity": "sha1-FlCkERTvAFdMrBC4Ay2PTBSBLac=",
+      "dev": true,
       "requires": {
-        "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
         "fast-json-stable-stringify": "2.0.0",
         "json-schema-traverse": "0.3.1"
       }
     },
     "ajv-keywords": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-      "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
+      "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=",
       "dev": true
     },
     "align-text": {
@@ -314,7 +347,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -361,9 +394,9 @@
       }
     },
     "angular2-toaster": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/angular2-toaster/-/angular2-toaster-4.0.1.tgz",
-      "integrity": "sha1-WHrvbfkDz14rfrpAR7VOyaIbjjs=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/angular2-toaster/-/angular2-toaster-4.0.2.tgz",
+      "integrity": "sha512-/ndYYbV/7WZx6ujm6avFUqfb+FKbrx7oT+3mYj8i0o9N26Ug+BseFjy6oRnlVVedl39yRP6hhea81QgKmoYbbQ==",
       "dev": true
     },
     "angular2-ui-switch": {
@@ -398,104 +431,13 @@
       }
     },
     "anymatch": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "2.3.11",
+        "micromatch": "3.1.9",
         "normalize-path": "2.1.1"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "1.1.0"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-          "dev": true
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-          "dev": true,
-          "requires": {
-            "expand-range": "1.8.2",
-            "preserve": "0.2.0",
-            "repeat-element": "1.1.2"
-          }
-        },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-          "dev": true,
-          "requires": {
-            "is-posix-bracket": "0.1.1"
-          }
-        },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "dev": true,
-          "requires": {
-            "arr-diff": "2.0.0",
-            "array-unique": "0.2.1",
-            "braces": "1.8.5",
-            "expand-brackets": "0.1.5",
-            "extglob": "0.3.2",
-            "filename-regex": "2.0.1",
-            "is-extglob": "1.0.0",
-            "is-glob": "2.0.1",
-            "kind-of": "3.2.2",
-            "normalize-path": "2.1.1",
-            "object.omit": "2.0.1",
-            "parse-glob": "3.0.4",
-            "regex-cache": "0.4.4"
-          }
-        }
       }
     },
     "app-root-path": {
@@ -522,7 +464,7 @@
       "dev": true,
       "requires": {
         "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
+        "readable-stream": "2.3.5"
       }
     },
     "argparse": {
@@ -569,7 +511,7 @@
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
-        "es-abstract": "1.10.0"
+        "es-abstract": "1.11.0"
       }
     },
     "array-union": {
@@ -591,15 +533,21 @@
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
       "dev": true
     },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
       "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "asn1.js": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",
-      "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -621,12 +569,27 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
     "ast-types": {
       "version": "0.9.6",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
       "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
       "dev": true
     },
+    "async": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+      "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.5"
+      }
+    },
     "async-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
@@ -665,19 +628,55 @@
       }
     },
     "awesome-typescript-loader": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.4.1.tgz",
-      "integrity": "sha512-fYxBtN6s4Dm6vtsROWi8IQ4I+KcmwRWePAVvhI06mFcHbtHfZopOs4qGNu9LyCPEw403LDROKFA+NVV6ig5yNw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-3.5.0.tgz",
+      "integrity": "sha512-qzgm9SEvodVkSi9QY7Me1/rujg+YBNMjayNSAyzNghwTEez++gXoPCwMvpbHRG7wrOkDCiF6dquvv9ESmUBAuw==",
       "dev": true,
       "requires": {
-        "colors": "1.1.2",
+        "chalk": "2.3.2",
         "enhanced-resolve": "3.3.0",
         "loader-utils": "1.1.0",
-        "lodash": "4.17.4",
-        "micromatch": "3.1.4",
+        "lodash": "4.17.5",
+        "micromatch": "3.1.9",
         "mkdirp": "0.5.1",
-        "object-assign": "4.1.1",
-        "source-map-support": "0.4.18"
+        "source-map-support": "0.5.4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
       }
     },
     "aws-sign2": {
@@ -733,7 +732,7 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "2.5.2",
+        "core-js": "2.5.3",
         "regenerator-runtime": "0.11.0"
       }
     },
@@ -750,18 +749,29 @@
       "dev": true,
       "requires": {
         "cache-base": "1.0.1",
-        "class-utils": "0.3.5",
+        "class-utils": "0.3.6",
         "component-emitter": "1.2.1",
         "define-property": "1.0.0",
         "isobject": "3.0.1",
-        "mixin-deep": "1.3.0",
+        "mixin-deep": "1.3.1",
         "pascalcase": "0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        }
       }
     },
     "base64-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
+      "integrity": "sha512-MsAhsUW1GxCdgYSO6tAfZrNapmUKk7mWx/k5mFY/A1gBtkaCaNapTg+FExCw1r9yeaZhqx/xPg43xgTFH6KL5w==",
       "dev": true
     },
     "batch": {
@@ -845,7 +855,7 @@
         "deep-equal": "1.0.1",
         "dns-equal": "1.0.0",
         "dns-txt": "2.0.2",
-        "multicast-dns": "6.2.1",
+        "multicast-dns": "6.2.3",
         "multicast-dns-service-types": "1.1.0"
       },
       "dependencies": {
@@ -854,12 +864,6 @@
           "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
           "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
           "dev": true
-        },
-        "deep-equal": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-          "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-          "dev": true
         }
       }
     },
@@ -874,7 +878,7 @@
       "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
       "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
       "requires": {
-        "hoek": "4.2.0"
+        "hoek": "4.2.1"
       }
     },
     "brace-expansion": {
@@ -894,9 +898,9 @@
       }
     },
     "braces": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz",
-      "integrity": "sha512-P4O8UQRdGiMLWSizsApmXVQDBS6KCt7dSexgLKBmH5Hr1CZq7vsnscFh8oR1sP1ab1Zj0uCHCEzZeV6SfUf3rA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz",
+      "integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==",
       "dev": true,
       "requires": {
         "arr-flatten": "1.1.0",
@@ -905,11 +909,32 @@
         "extend-shallow": "2.0.1",
         "fill-range": "4.0.0",
         "isobject": "3.0.1",
+        "kind-of": "6.0.2",
         "repeat-element": "1.1.2",
-        "snapdragon": "0.8.1",
+        "snapdragon": "0.8.2",
         "snapdragon-node": "2.1.1",
         "split-string": "3.1.0",
-        "to-regex": "3.0.1"
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
       }
     },
     "brorand": {
@@ -966,7 +991,7 @@
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.6"
       }
     },
     "browserify-sign": {
@@ -1009,11 +1034,16 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.2.1",
-        "ieee754": "1.1.8",
+        "base64-js": "1.2.3",
+        "ieee754": "1.1.10",
         "isarray": "1.0.0"
       }
     },
+    "buffer-from": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
+      "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
+    },
     "buffer-indexof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
@@ -1075,6 +1105,27 @@
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
+    "cacache": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "chownr": "1.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.2",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.0",
+        "y18n": "4.0.0"
+      }
+    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -1142,9 +1193,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz",
-      "integrity": "sha1-DdJCkL6xExCy2A9rcKgjwqZab60=",
+      "version": "1.0.30000817",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000817.tgz",
+      "integrity": "sha512-O68CSiZY4NuxdGT0gQO+2vtU07/FOrCUpGPYincrOjybQIdsSyWC9CWx+hhm+SnCTAwpG/AywH4cU5RAkqbFXA==",
       "dev": true
     },
     "caseless": {
@@ -1160,14 +1211,6 @@
       "requires": {
         "align-text": "0.1.4",
         "lazy-cache": "1.0.4"
-      },
-      "dependencies": {
-        "lazy-cache": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-          "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-          "dev": true
-        }
       }
     },
     "chalk": {
@@ -1181,38 +1224,30 @@
       }
     },
     "chokidar": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.2.tgz",
+      "integrity": "sha512-l32Hw3wqB0L2kGVmSbK/a+xXLDrUEsc84pSgMkmwygHvD7ubRsP/vxxHa5BtB6oix1XLLVCHyYMsckRXxThmZw==",
       "dev": true,
       "requires": {
-        "anymatch": "1.3.2",
+        "anymatch": "2.0.0",
         "async-each": "1.0.1",
-        "glob-parent": "2.0.0",
+        "braces": "2.3.1",
+        "glob-parent": "3.1.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
-        "is-glob": "2.0.1",
+        "is-glob": "4.0.0",
+        "normalize-path": "2.1.1",
         "path-is-absolute": "1.0.1",
-        "readdirp": "2.1.0"
-      },
-      "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "1.0.0"
-          }
-        }
+        "readdirp": "2.1.0",
+        "upath": "1.0.4"
       }
     },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+      "dev": true
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -1260,15 +1295,14 @@
       }
     },
     "class-utils": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz",
-      "integrity": "sha1-F+eTEDdQ+WJ7IXbqNM/RtWWQPIA=",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
         "arr-union": "3.1.0",
         "define-property": "0.2.5",
         "isobject": "3.0.1",
-        "lazy-cache": "2.0.2",
         "static-extend": "0.1.2"
       },
       "dependencies": {
@@ -1281,6 +1315,46 @@
             "is-descriptor": "0.1.6"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
         "is-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -1327,26 +1401,15 @@
       "dev": true
     },
     "clone-deep": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz",
-      "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
         "for-own": "1.0.0",
         "is-plain-object": "2.0.4",
-        "kind-of": "3.2.2",
-        "shallow-clone": "0.1.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        }
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "cls-bluebird": {
@@ -1379,9 +1442,9 @@
       "dev": true
     },
     "codelyzer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.0.2.tgz",
-      "integrity": "sha512-nYwOr49+IV09e7C4aXkVALRz0+XpHqZiUUcxHuDZH4xP1FBcHINyr3qvVhv5Gfm7XRmoLx32tsIhrQhW/gBcog==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.2.1.tgz",
+      "integrity": "sha512-CKwfgpfkqi9dyzy4s6ELaxJ54QgJ6A8iTSsM4bzHbLuTpbKncvNc3DUlCvpnkHBhK47gEf4qFsWoYqLrJPhy6g==",
       "dev": true,
       "requires": {
         "app-root-path": "2.0.1",
@@ -1453,9 +1516,9 @@
       "dev": true
     },
     "combined-stream": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
       "requires": {
         "delayed-stream": "1.0.0"
       }
@@ -1466,6 +1529,12 @@
       "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
     "component-emitter": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
@@ -1473,23 +1542,31 @@
       "dev": true
     },
     "compressible": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
-      "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
+      "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
       "dev": true,
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "1.33.0"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.33.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+          "dev": true
+        }
       }
     },
     "compression": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
-      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+      "version": "1.7.2",
+      "resolved": "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz",
+      "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.4",
+        "accepts": "1.3.5",
         "bytes": "3.0.0",
-        "compressible": "2.0.12",
+        "compressible": "2.0.13",
         "debug": "2.6.9",
         "on-headers": "1.0.1",
         "safe-buffer": "5.1.1",
@@ -1502,19 +1579,20 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "requires": {
+        "buffer-from": "1.0.0",
         "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
+        "readable-stream": "2.3.5",
         "typedarray": "0.0.6"
       }
     },
     "config": {
-      "version": "1.28.1",
-      "resolved": "https://registry.npmjs.org/config/-/config-1.28.1.tgz",
-      "integrity": "sha1-diXSoeTJDxMdinM0eYLZPDhzKC0=",
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/config/-/config-1.30.0.tgz",
+      "integrity": "sha1-HWCp81NIoTwXV5jThOgaWhbDum4=",
       "requires": {
         "json5": "0.4.0",
         "os-homedir": "1.0.2"
@@ -1576,6 +1654,20 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
+      }
+    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -1583,43 +1675,25 @@
       "dev": true
     },
     "copy-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-cL/Wl3Y1QmmKThl/mWeGB+HH3YH+25tn8nhqEGsZda4Yn7GqGnDZ+TbeKJ7A6zvrxyNhhuviYAxn/tCyyAqh8Q==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.1.tgz",
+      "integrity": "sha512-OlTo6DYg0XfTKOF8eLf79wcHm4Ut10xU2cRBRPMW/NA5F9VMjZGTfRHWDIYC3s+1kObGYrBLshXWU1K0hILkNQ==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.1",
-        "glob": "7.1.2",
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "globby": "7.1.1",
         "is-glob": "4.0.0",
-        "loader-utils": "0.2.17",
-        "lodash": "4.17.4",
-        "minimatch": "3.0.4"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "dev": true,
-          "requires": {
-            "big.js": "3.1.3",
-            "emojis-list": "2.1.0",
-            "json5": "0.5.1",
-            "object-assign": "4.1.1"
-          }
-        }
+        "loader-utils": "1.1.0",
+        "minimatch": "3.0.4",
+        "p-limit": "1.2.0",
+        "serialize-javascript": "1.4.0"
       }
     },
     "core-js": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.2.tgz",
-      "integrity": "sha1-vEZIZW59ydyA19PHu8Fy2W50TmM="
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
+      "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -1642,7 +1716,7 @@
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
-        "js-yaml": "3.10.0",
+        "js-yaml": "3.11.0",
         "minimist": "1.2.0",
         "object-assign": "4.1.1",
         "os-homedir": "1.0.2",
@@ -1677,7 +1751,7 @@
         "cipher-base": "1.0.4",
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
@@ -1691,7 +1765,7 @@
         "inherits": "2.0.3",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
@@ -1700,7 +1774,7 @@
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
       "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
+        "lru-cache": "4.1.2",
         "which": "1.3.0"
       }
     },
@@ -1717,7 +1791,7 @@
           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
           "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
           "requires": {
-            "hoek": "4.2.0"
+            "hoek": "4.2.1"
           }
         }
       }
@@ -1737,19 +1811,19 @@
         "inherits": "2.0.3",
         "pbkdf2": "3.0.14",
         "public-encrypt": "4.0.0",
-        "randombytes": "2.0.5",
-        "randomfill": "1.0.3"
+        "randombytes": "2.0.6",
+        "randomfill": "1.0.4"
       }
     },
     "css-color-function": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.0.tgz",
-      "integrity": "sha1-csdnuvl48BuKipT0Lxe6XSKndvw=",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
+      "integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
       "dev": true,
       "requires": {
         "balanced-match": "0.1.0",
         "color": "0.11.4",
-        "debug": "0.7.4",
+        "debug": "3.1.0",
         "rgb": "0.1.0"
       },
       "dependencies": {
@@ -1760,10 +1834,13 @@
           "dev": true
         },
         "debug": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz",
-          "integrity": "sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=",
-          "dev": true
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
         }
       }
     },
@@ -1774,9 +1851,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.7",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
-      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
+      "version": "0.28.11",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz",
+      "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -1787,7 +1864,7 @@
         "lodash.camelcase": "4.3.0",
         "object-assign": "4.1.1",
         "postcss": "5.2.17",
-        "postcss-modules-extract-imports": "1.1.0",
+        "postcss-modules-extract-imports": "1.2.0",
         "postcss-modules-local-by-default": "1.2.0",
         "postcss-modules-scope": "1.1.0",
         "postcss-modules-values": "1.3.0",
@@ -1909,13 +1986,19 @@
       "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz",
       "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI="
     },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
     "d": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.37"
+        "es5-ext": "0.10.41"
       }
     },
     "dashdash": {
@@ -1952,6 +2035,12 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
@@ -1963,12 +2052,13 @@
       }
     },
     "define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "1.0.1"
+        "is-descriptor": "1.0.2",
+        "isobject": "3.0.1"
       }
     },
     "defined": {
@@ -1991,11 +2081,26 @@
         "rimraf": "2.6.2"
       },
       "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -2069,9 +2174,9 @@
       }
     },
     "diff": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz",
-      "integrity": "sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
     "diffie-hellman": {
@@ -2082,7 +2187,17 @@
       "requires": {
         "bn.js": "4.11.8",
         "miller-rabin": "4.0.1",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.6"
+      }
+    },
+    "dir-glob": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+      "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "path-type": "3.0.0"
       }
     },
     "dns-equal": {
@@ -2092,9 +2207,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz",
-      "integrity": "sha512-kN+DjfGF7dJGUL7nWRktL9Z18t1rWP3aQlyZdY8XlpvU3Nc6GeFTQApftcjtWKxAZfiggZSGrCEoszNgvnpwDg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
         "ip": "1.1.5",
@@ -2154,9 +2269,9 @@
       }
     },
     "domain-browser": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
-      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
     "domelementtype": {
@@ -2189,6 +2304,18 @@
       "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.0.tgz",
       "integrity": "sha1-2hkZgci41xPKARXViYzzl8Lw3dA="
     },
+    "duplexify": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
+      "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5",
+        "stream-shift": "1.0.0"
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -2242,9 +2369,9 @@
       "dev": true
     },
     "encodeurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "encoding": {
       "version": "0.1.12",
@@ -2255,6 +2382,15 @@
         "iconv-lite": "0.4.15"
       }
     },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
     "enhanced-resolve": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz",
@@ -2274,12 +2410,12 @@
       "dev": true
     },
     "errno": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "0.0.0"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -2292,9 +2428,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
-      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz",
+      "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==",
       "dev": true,
       "requires": {
         "es-to-primitive": "1.1.1",
@@ -2324,13 +2460,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.37",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
-      "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=",
+      "version": "0.10.41",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.41.tgz",
+      "integrity": "sha512-MYK02wXfwTMie5TEJWPolgOsXEmz7wKCQaGzgmRjZOoV6VLG8I5dSv2bn6AOClXhK64gnSQTQ9W9MKvx87J4gw==",
       "dev": true,
       "requires": {
         "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.1"
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
       }
     },
     "es6-iterator": {
@@ -2340,7 +2477,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.37",
+        "es5-ext": "0.10.41",
         "es6-symbol": "3.1.1"
       }
     },
@@ -2351,7 +2488,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.37",
+        "es5-ext": "0.10.41",
         "es6-iterator": "2.0.3",
         "es6-set": "0.1.5",
         "es6-symbol": "3.1.1",
@@ -2365,7 +2502,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.37",
+        "es5-ext": "0.10.41",
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1",
         "event-emitter": "0.3.5"
@@ -2383,7 +2520,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.37"
+        "es5-ext": "0.10.41"
       }
     },
     "es6-templates": {
@@ -2403,7 +2540,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.37",
+        "es5-ext": "0.10.41",
         "es6-iterator": "2.0.3",
         "es6-symbol": "3.1.1"
       }
@@ -2426,23 +2563,23 @@
       "requires": {
         "es6-map": "0.1.5",
         "es6-weak-map": "2.0.2",
-        "esrecurse": "4.2.0",
+        "esrecurse": "4.2.1",
         "estraverse": "4.2.0"
       }
     },
     "esprima": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+      "dev": true
     },
     "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
+        "estraverse": "4.2.0"
       }
     },
     "estraverse": {
@@ -2469,7 +2606,7 @@
       "dev": true,
       "requires": {
         "d": "1.0.0",
-        "es5-ext": "0.10.37"
+        "es5-ext": "0.10.41"
       }
     },
     "eventemitter3": {
@@ -2524,7 +2661,7 @@
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.1",
+            "lru-cache": "4.1.2",
             "shebang-command": "1.2.0",
             "which": "1.3.0"
           }
@@ -2541,9 +2678,9 @@
         "define-property": "0.2.5",
         "extend-shallow": "2.0.1",
         "posix-character-classes": "0.1.1",
-        "regex-not": "1.0.0",
-        "snapdragon": "0.8.1",
-        "to-regex": "3.0.1"
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       },
       "dependencies": {
         "define-property": {
@@ -2555,6 +2692,55 @@
             "is-descriptor": "0.1.6"
           }
         },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
         "is-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -2620,17 +2806,17 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
     },
     "express": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
-      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+      "version": "4.16.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
       "requires": {
-        "accepts": "1.3.4",
+        "accepts": "1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
@@ -2638,39 +2824,61 @@
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "1.1.1",
-        "encodeurl": "1.0.1",
+        "depd": "1.1.2",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
-        "finalhandler": "1.1.0",
+        "finalhandler": "1.1.1",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "1.1.2",
         "on-finished": "2.3.0",
         "parseurl": "1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.2",
+        "proxy-addr": "2.0.3",
         "qs": "6.5.1",
         "range-parser": "1.2.0",
         "safe-buffer": "5.1.1",
-        "send": "0.16.1",
-        "serve-static": "1.13.1",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
         "setprototypeof": "1.1.0",
-        "statuses": "1.3.1",
-        "type-is": "1.6.15",
+        "statuses": "1.4.0",
+        "type-is": "1.6.16",
         "utils-merge": "1.0.1",
         "vary": "1.1.2"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+        },
+        "mime-db": {
+          "version": "1.33.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+          "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+        },
+        "mime-types": {
+          "version": "2.1.18",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+          "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+          "requires": {
+            "mime-db": "1.33.0"
+          }
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
         },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
+        "type-is": {
+          "version": "1.6.16",
+          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+          "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+          "requires": {
+            "media-typer": "0.3.0",
+            "mime-types": "2.1.18"
+          }
         }
       }
     },
@@ -2680,18 +2888,30 @@
       "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
     "extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "is-extendable": "0.1.1"
+        "assign-symbols": "1.0.0",
+        "is-extendable": "1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        }
       }
     },
     "extglob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.2.tgz",
-      "integrity": "sha512-I0+eZBH+jFGL8F5BnIz2ON2nKCjTS3AS3H/5PeSmCp7UVC70Ym8IhdRiQly2juKYQ//f7z1aj1BRpQniFJoU1w==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
         "array-unique": "0.3.2",
@@ -2699,9 +2919,29 @@
         "expand-brackets": "2.1.4",
         "extend-shallow": "2.0.1",
         "fragment-cache": "0.2.1",
-        "regex-not": "1.0.0",
-        "snapdragon": "0.8.1",
-        "to-regex": "3.0.1"
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
       }
     },
     "extract-text-webpack-plugin": {
@@ -2722,7 +2962,7 @@
           "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
           "dev": true,
           "requires": {
-            "lodash": "4.17.4"
+            "lodash": "4.17.5"
           }
         }
       }
@@ -2772,13 +3012,25 @@
       }
     },
     "file-loader": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz",
-      "integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0"
+        "schema-utils": "0.4.5"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+          "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.3.0",
+            "ajv-keywords": "3.1.0"
+          }
+        }
       }
     },
     "filename-regex": {
@@ -2797,37 +3049,51 @@
         "is-number": "3.0.0",
         "repeat-string": "1.6.1",
         "to-regex-range": "2.1.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
       },
       "dependencies": {
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
         }
       }
     },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.4.0",
+        "unpipe": "1.0.0"
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "commondir": "1.0.1",
+        "make-dir": "1.2.0",
+        "pkg-dir": "2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "2.0.0"
       }
     },
     "flatten": {
@@ -2836,6 +3102,16 @@
       "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
       "dev": true
     },
+    "flush-write-stream": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -2863,12 +3139,12 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "requires": {
         "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
+        "combined-stream": "1.0.6",
         "mime-types": "2.1.17"
       }
     },
@@ -2891,6 +3167,16 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
+      }
+    },
     "fs-extra": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
@@ -2900,6 +3186,18 @@
         "jsonfile": "2.4.0"
       }
     },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "2.3.5"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2964,9 +3262,9 @@
       }
     },
     "generic-pool": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.2.0.tgz",
-      "integrity": "sha512-JjcXDHT84icN/kFaF5+rNd1trZsgJFVqTSgM9dv6eayxSIQKMq0ilBJ+5pvf0SgimacMlZEsav4oL+4dUE4E2g=="
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.4.2.tgz",
+      "integrity": "sha512-H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag=="
     },
     "get-caller-file": {
       "version": "1.0.2",
@@ -3001,9 +3299,9 @@
       }
     },
     "git-rev-sync": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.9.1.tgz",
-      "integrity": "sha1-oMLj3TkqvPa3aWLif8dfsyI0Sc4=",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.10.0.tgz",
+      "integrity": "sha1-6KxP0JZyRJFI/2lOLXxqbuNck6Y=",
       "requires": {
         "escape-string-regexp": "1.0.5",
         "graceful-fs": "4.1.11",
@@ -3045,6 +3343,15 @@
         "is-glob": "2.0.1"
       },
       "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "2.0.1"
+          }
+        },
         "is-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
@@ -3063,41 +3370,36 @@
       }
     },
     "glob-parent": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "requires": {
-        "is-glob": "2.0.1"
+        "is-glob": "3.1.0",
+        "path-dirname": "1.0.2"
       },
       "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-          "dev": true
-        },
         "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "dev": true,
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "requires": {
-            "is-extglob": "1.0.0"
+            "is-extglob": "2.1.1"
           }
         }
       }
     },
     "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
       "requires": {
         "array-union": "1.0.2",
+        "dir-glob": "2.0.0",
         "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "ignore": "3.3.7",
+        "pify": "3.0.0",
+        "slash": "1.0.0"
       }
     },
     "globule": {
@@ -3107,7 +3409,7 @@
       "dev": true,
       "requires": {
         "glob": "7.1.2",
-        "lodash": "4.17.4",
+        "lodash": "4.17.5",
         "minimatch": "3.0.4"
       }
     },
@@ -3141,8 +3443,21 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
       "requires": {
-        "ajv": "5.5.1",
+        "ajv": "5.5.2",
         "har-schema": "2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
+          }
+        }
       }
     },
     "has": {
@@ -3201,7 +3516,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -3232,7 +3547,7 @@
       "requires": {
         "boom": "4.3.1",
         "cryptiles": "3.1.2",
-        "hoek": "4.2.0",
+        "hoek": "4.2.1",
         "sntp": "2.1.0"
       }
     },
@@ -3254,14 +3569,14 @@
       }
     },
     "hoek": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
+      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
     },
     "hosted-git-info": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
+      "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
       "dev": true
     },
     "hpack.js": {
@@ -3271,9 +3586,9 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
-        "obuf": "1.1.1",
-        "readable-stream": "2.3.3",
-        "wbuf": "1.7.2"
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.5",
+        "wbuf": "1.7.3"
       }
     },
     "html-comment-regex": {
@@ -3289,16 +3604,56 @@
       "dev": true
     },
     "html-loader": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.1.tgz",
-      "integrity": "sha512-RxokXoxcsRSWcN553Ew+K0TUo68gQfmddTuUIZ4xRD8Ax1xXzX2UYQ3FC3D5MoRPGAdL1erWKeEFihDrrdxHiA==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.5.tgz",
+      "integrity": "sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==",
       "dev": true,
       "requires": {
         "es6-templates": "0.2.3",
         "fastparse": "1.1.1",
-        "html-minifier": "3.5.3",
+        "html-minifier": "3.5.12",
         "loader-utils": "1.1.0",
         "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.15.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+          "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+          "dev": true
+        },
+        "html-minifier": {
+          "version": "3.5.12",
+          "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.12.tgz",
+          "integrity": "sha512-+N778qLf0RWBscD0TPGoYdeGNDZ0s76/0pQhY1/409EOudcENkm9IbSkk37RDyPdg/09GVHTKotU4ya93RF1Gg==",
+          "dev": true,
+          "requires": {
+            "camel-case": "3.0.0",
+            "clean-css": "4.1.7",
+            "commander": "2.15.1",
+            "he": "1.1.1",
+            "ncname": "1.0.0",
+            "param-case": "2.1.1",
+            "relateurl": "0.2.7",
+            "uglify-js": "3.3.16"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "3.3.16",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.16.tgz",
+          "integrity": "sha512-FMh5SRqJRGhv9BbaTffENIpDDQIoPDR8DBraunGORGhySArsXlw9++CN+BWzPBLpoI4RcSnpfGPnilTxWL3Vvg==",
+          "dev": true,
+          "requires": {
+            "commander": "2.15.1",
+            "source-map": "0.6.1"
+          }
+        }
       }
     },
     "html-minifier": {
@@ -3326,7 +3681,7 @@
         "bluebird": "3.5.1",
         "html-minifier": "3.5.3",
         "loader-utils": "0.2.17",
-        "lodash": "4.17.4",
+        "lodash": "4.17.5",
         "pretty-error": "2.1.1",
         "toposort": "1.0.3"
       },
@@ -3416,9 +3771,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
-      "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz",
+      "integrity": "sha512-QCR5O2AjjMW8Mo4HyI1ctFcv+O99j/0g367V3YoVnrNw5hkDvAWZD0lWGcc+F4yN3V55USPCVix4efb75HxFfA==",
       "dev": true
     },
     "http-proxy": {
@@ -3439,7 +3794,7 @@
       "requires": {
         "http-proxy": "1.16.2",
         "is-glob": "3.1.0",
-        "lodash": "4.17.4",
+        "lodash": "4.17.5",
         "micromatch": "2.3.11"
       },
       "dependencies": {
@@ -3510,7 +3865,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         },
         "micromatch": {
@@ -3560,7 +3915,7 @@
       "requires": {
         "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
+        "sshpk": "1.14.1"
       }
     },
     "https-browserify": {
@@ -3587,18 +3942,44 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.14"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
           }
         },
         "source-map": {
@@ -3608,32 +3989,50 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
     },
     "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.10.tgz",
+      "integrity": "sha512-byWFX8OyW/qeVxcY21r6Ncxl0ZYHgnf0cPup2h34eHXrCJbOp7IuqnJ4Q0omfyWl6Z++BTI6bByf31pZt7iRLg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
       "dev": true
     },
     "import-local": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz",
-      "integrity": "sha1-sReVcqrNwRxqkQCftDDbyrX2aKg=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+      "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
       "dev": true,
       "requires": {
         "pkg-dir": "2.0.0",
         "resolve-cwd": "2.0.0"
       }
     },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
@@ -3707,9 +4106,9 @@
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
-      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
+      "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs="
     },
     "is-absolute-url": {
       "version": "2.1.0",
@@ -3718,23 +4117,12 @@
       "dev": true
     },
     "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        }
+        "kind-of": "6.0.2"
       }
     },
     "is-arrayish": {
@@ -3758,9 +4146,9 @@
       "integrity": "sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI="
     },
     "is-buffer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
-      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
     "is-builtin-module": {
@@ -3779,23 +4167,12 @@
       "dev": true
     },
     "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        }
+        "kind-of": "6.0.2"
       }
     },
     "is-date-object": {
@@ -3805,22 +4182,14 @@
       "dev": true
     },
     "is-descriptor": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.1.tgz",
-      "integrity": "sha512-G3fFVFTqfaqu7r4YuSBHKBAuOaLz8Sy7ekklUpFEliaLMP1Y2ZjoN9jS62YWCAPQrQpMUQSitRlrzibbuCZjdA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "0.1.6",
-        "is-data-descriptor": "0.1.4",
-        "kind-of": "5.1.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "is-accessor-descriptor": "1.0.0",
+        "is-data-descriptor": "1.0.0",
+        "kind-of": "6.0.2"
       }
     },
     "is-directory": {
@@ -3882,14 +4251,21 @@
         "is-extglob": "2.1.1"
       }
     },
+    "is-my-ip-valid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+      "dev": true
+    },
     "is-my-json-valid": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "version": "2.17.2",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
+      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
       "dev": true,
       "requires": {
         "generate-function": "2.0.0",
         "generate-object-property": "1.2.0",
+        "is-my-ip-valid": "1.0.0",
         "jsonpointer": "4.0.1",
         "xtend": "4.0.1"
       }
@@ -3909,18 +4285,26 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
     },
     "is-odd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz",
-      "integrity": "sha1-O4qTLrAos3dcObsJ6RdnrM22kIg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
+      "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0"
+        "is-number": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
       }
     },
     "is-path-cwd": {
@@ -4021,6 +4405,12 @@
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
     "is-wsl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
@@ -4056,9 +4446,9 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jquery": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
-      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
       "dev": true
     },
     "js-base64": {
@@ -4074,12 +4464,19 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
       "requires": {
         "argparse": "1.0.9",
         "esprima": "4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+        }
       }
     },
     "jsbn": {
@@ -4179,13 +4576,10 @@
       "dev": true
     },
     "lazy-cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
-      "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
-      "dev": true,
-      "requires": {
-        "set-getter": "0.1.0"
-      }
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
     },
     "lcid": {
       "version": "1.0.0",
@@ -4207,6 +4601,14 @@
         "pify": "2.3.0",
         "pinkie-promise": "2.0.1",
         "strip-bom": "2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "loader-runner": {
@@ -4242,20 +4644,12 @@
       "requires": {
         "p-locate": "2.0.0",
         "path-exists": "3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
       }
     },
     "lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+      "version": "4.17.5",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
+      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",
@@ -4294,9 +4688,9 @@
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
-      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
       "dev": true
     },
     "lodash.tail": {
@@ -4331,9 +4725,9 @@
       "dev": true
     },
     "loglevel": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.0.tgz",
-      "integrity": "sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
+      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
       "dev": true
     },
     "longest": {
@@ -4359,9 +4753,9 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
+      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
       "dev": true,
       "requires": {
         "pseudomap": "1.0.2",
@@ -4374,6 +4768,15 @@
       "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
       "dev": true
     },
+    "make-dir": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
+      "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
+      "dev": true,
+      "requires": {
+        "pify": "3.0.0"
+      }
+    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -4411,7 +4814,7 @@
         "bluebird": "3.5.1",
         "browser-request": "0.3.3",
         "content-type": "1.0.4",
-        "request": "2.83.0"
+        "request": "2.85.0"
       }
     },
     "matrix-js-snippets": {
@@ -4465,7 +4868,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "memory-cache": {
@@ -4479,8 +4882,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "0.1.4",
-        "readable-stream": "2.3.3"
+        "errno": "0.1.7",
+        "readable-stream": "2.3.5"
       }
     },
     "meow": {
@@ -4520,24 +4923,24 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.4.tgz",
-      "integrity": "sha512-kFRtviKYoAJT+t7HggMl0tBFGNAKLw/S7N+CO9qfEQyisob1Oy4pao+geRbkyeEd+V9aOkvZ4mhuyPvI/q9Sfg==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.9.tgz",
+      "integrity": "sha512-SlIz6sv5UPaAVVFRKodKjCg48EbNoIhgetzfK/Cy0v5U52Z6zB136M8tp0UC9jM53LYbmIRihJszvvqpKkfm9g==",
       "dev": true,
       "requires": {
         "arr-diff": "4.0.0",
         "array-unique": "0.3.2",
-        "braces": "2.3.0",
-        "define-property": "1.0.0",
-        "extend-shallow": "2.0.1",
-        "extglob": "2.0.2",
+        "braces": "2.3.1",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "extglob": "2.0.4",
         "fragment-cache": "0.2.1",
         "kind-of": "6.0.2",
-        "nanomatch": "1.2.6",
+        "nanomatch": "1.2.9",
         "object.pick": "1.3.0",
-        "regex-not": "1.0.0",
-        "snapdragon": "0.8.1",
-        "to-regex": "3.0.1"
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "miller-rabin": {
@@ -4551,9 +4954,9 @@
       }
     },
     "mime": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz",
-      "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz",
+      "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA=="
     },
     "mime-db": {
       "version": "1.30.0",
@@ -4569,9 +4972,9 @@
       }
     },
     "mimic-fn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
     "mini-deep-assign": {
@@ -4604,10 +5007,28 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "mississippi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.2",
+        "duplexify": "3.5.4",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.4.0",
+        "stream-each": "1.2.2",
+        "through2": "2.0.3"
+      }
+    },
     "mixin-deep": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz",
-      "integrity": "sha512-dgaCvoh6i1nosAUBKb0l0pfJ78K8+S9fluyIR2YvAeUD/QuMahnFnF3xYty5eYXMjhGSsB0DsW6A0uAZyetoAg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
         "for-in": "1.0.2",
@@ -4657,16 +5078,30 @@
       "integrity": "sha1-vhy7PLalUGD8hkZ9Ly0s0KYA4Zk="
     },
     "moment": {
-      "version": "2.19.3",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.3.tgz",
-      "integrity": "sha1-vbmdJw1tf9p4zA+6zoVeJ/59pp8="
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz",
+      "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ=="
     },
     "moment-timezone": {
       "version": "0.5.14",
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz",
       "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=",
       "requires": {
-        "moment": "2.19.3"
+        "moment": "2.21.0"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
       }
     },
     "ms": {
@@ -4681,7 +5116,7 @@
       "requires": {
         "append-field": "0.1.0",
         "busboy": "0.2.14",
-        "concat-stream": "1.6.0",
+        "concat-stream": "1.6.2",
         "mkdirp": "0.5.1",
         "object-assign": "3.0.0",
         "on-finished": "2.3.0",
@@ -4697,13 +5132,13 @@
       }
     },
     "multicast-dns": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz",
-      "integrity": "sha512-uV3/ckdsffHx9IrGQrx613mturMdMqQ06WTq+C09NsStJ9iNG6RcUWgPKs1Rfjy+idZT6tfQoXEusGNnEZhT3w==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "1.2.2",
-        "thunky": "0.1.0"
+        "dns-packet": "1.3.1",
+        "thunky": "1.0.2"
       }
     },
     "multicast-dns-service-types": {
@@ -4713,36 +5148,29 @@
       "dev": true
     },
     "nan": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
       "dev": true
     },
     "nanomatch": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.6.tgz",
-      "integrity": "sha512-WJ6XTCbvWXUFPbi/bDwKcYkCeOGUHzaJj72KbuPqGn78Ba/F5Vu26Zlo6SuMQbCIst1RGKL1zfWBCOGAlbRLAg==",
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz",
+      "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
       "dev": true,
       "requires": {
         "arr-diff": "4.0.0",
         "array-unique": "0.3.2",
-        "define-property": "1.0.0",
-        "extend-shallow": "2.0.1",
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
         "fragment-cache": "0.2.1",
-        "is-odd": "1.0.0",
-        "kind-of": "5.1.0",
+        "is-odd": "2.0.0",
+        "is-windows": "1.0.2",
+        "kind-of": "6.0.2",
         "object.pick": "1.3.0",
-        "regex-not": "1.0.0",
-        "snapdragon": "0.8.1",
-        "to-regex": "3.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "regex-not": "1.0.2",
+        "snapdragon": "0.8.2",
+        "to-regex": "3.0.2"
       }
     },
     "ncname": {
@@ -4759,11 +5187,23 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
       "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
     },
+    "neo-async": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz",
+      "integrity": "sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g==",
+      "dev": true
+    },
     "netmask": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
       "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU="
     },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
     "ng2-breadcrumbs": {
       "version": "0.1.281",
       "resolved": "https://registry.npmjs.org/ng2-breadcrumbs/-/ng2-breadcrumbs-0.1.281.tgz",
@@ -4796,9 +5236,9 @@
       }
     },
     "node-forge": {
-      "version": "0.6.33",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz",
-      "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
+      "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
       "dev": true
     },
     "node-gyp": {
@@ -4814,8 +5254,8 @@
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
-        "osenv": "0.1.4",
-        "request": "2.83.0",
+        "osenv": "0.1.5",
+        "request": "2.85.0",
         "rimraf": "2.6.2",
         "semver": "5.3.0",
         "tar": "2.2.1",
@@ -4842,7 +5282,7 @@
         "console-browserify": "1.1.0",
         "constants-browserify": "1.0.0",
         "crypto-browserify": "3.12.0",
-        "domain-browser": "1.1.7",
+        "domain-browser": "1.2.0",
         "events": "1.1.1",
         "https-browserify": "1.0.0",
         "os-browserify": "0.3.0",
@@ -4850,11 +5290,11 @@
         "process": "0.11.10",
         "punycode": "1.4.1",
         "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.3",
+        "readable-stream": "2.3.5",
         "stream-browserify": "2.0.1",
-        "stream-http": "2.7.2",
+        "stream-http": "2.8.1",
         "string_decoder": "1.0.3",
-        "timers-browserify": "2.0.4",
+        "timers-browserify": "2.0.6",
         "tty-browserify": "0.0.0",
         "url": "0.11.0",
         "util": "0.10.3",
@@ -4862,9 +5302,9 @@
       }
     },
     "node-sass": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
-      "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==",
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.8.3.tgz",
+      "integrity": "sha512-tfFWhUsCk/Y19zarDcPo5xpj+IW3qCfOjVdHtYeG6S1CKbQOh1zqylnQK6cV3z9k80yxAnFX9Y+a9+XysDhhfg==",
       "dev": true,
       "requires": {
         "async-foreach": "0.1.3",
@@ -4876,10 +5316,10 @@
         "in-publish": "2.0.0",
         "lodash.assign": "4.2.0",
         "lodash.clonedeep": "4.5.0",
-        "lodash.mergewith": "4.6.0",
+        "lodash.mergewith": "4.6.1",
         "meow": "3.7.0",
         "mkdirp": "0.5.1",
-        "nan": "2.8.0",
+        "nan": "2.10.0",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
         "request": "2.79.0",
@@ -4950,7 +5390,7 @@
           "dev": true,
           "requires": {
             "asynckit": "0.4.0",
-            "combined-stream": "1.0.5",
+            "combined-stream": "1.0.6",
             "mime-types": "2.1.17"
           }
         },
@@ -4962,7 +5402,7 @@
           "requires": {
             "chalk": "1.1.3",
             "commander": "2.11.0",
-            "is-my-json-valid": "2.16.1",
+            "is-my-json-valid": "2.17.2",
             "pinkie-promise": "2.0.1"
           }
         },
@@ -4992,7 +5432,7 @@
           "requires": {
             "assert-plus": "0.2.0",
             "jsprim": "1.4.1",
-            "sshpk": "1.13.1"
+            "sshpk": "1.14.1"
           }
         },
         "qs": {
@@ -5010,7 +5450,7 @@
             "aws-sign2": "0.6.0",
             "aws4": "1.6.0",
             "caseless": "0.11.0",
-            "combined-stream": "1.0.5",
+            "combined-stream": "1.0.6",
             "extend": "3.0.1",
             "forever-agent": "0.6.1",
             "form-data": "2.1.4",
@@ -5024,9 +5464,9 @@
             "oauth-sign": "0.8.2",
             "qs": "6.3.2",
             "stringstream": "0.0.5",
-            "tough-cookie": "2.3.3",
+            "tough-cookie": "2.3.4",
             "tunnel-agent": "0.4.3",
-            "uuid": "3.1.0"
+            "uuid": "3.2.1"
           }
         },
         "sntp": {
@@ -5082,10 +5522,10 @@
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.5.0",
+        "hosted-git-info": "2.6.0",
         "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
-        "validate-npm-package-license": "3.0.1"
+        "semver": "5.5.0",
+        "validate-npm-package-license": "3.0.3"
       }
     },
     "normalize-path": {
@@ -5187,6 +5627,24 @@
             "is-descriptor": "0.1.6"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          }
+        },
         "is-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -5212,7 +5670,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -5263,9 +5721,9 @@
       }
     },
     "obuf": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz",
-      "integrity": "sha1-EEEktsYCxnlogaBCVB0220OlJk4=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
     "on-finished": {
@@ -5291,15 +5749,15 @@
       }
     },
     "onecolor": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.4.tgz",
-      "integrity": "sha1-daRvgNpseqpbTarhekcZi9llJJQ=",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.5.tgz",
+      "integrity": "sha1-Nu/zIgE3nv3xGA+0ReUajiQl+fY=",
       "dev": true
     },
     "opn": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
-      "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
       "dev": true,
       "requires": {
         "is-wsl": "1.1.0"
@@ -5353,9 +5811,9 @@
       "dev": true
     },
     "osenv": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "dev": true,
       "requires": {
         "os-homedir": "1.0.2",
@@ -5369,10 +5827,13 @@
       "dev": true
     },
     "p-limit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
-      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+      "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+      "dev": true,
+      "requires": {
+        "p-try": "1.0.0"
+      }
     },
     "p-locate": {
       "version": "2.0.0",
@@ -5380,7 +5841,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "1.1.0"
+        "p-limit": "1.2.0"
       }
     },
     "p-map": {
@@ -5389,12 +5850,29 @@
       "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
       "dev": true
     },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
       "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
       "dev": true
     },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
+      }
+    },
     "param-case": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
@@ -5418,7 +5896,7 @@
       "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
       "dev": true,
       "requires": {
-        "asn1.js": "4.9.2",
+        "asn1.js": "4.10.1",
         "browserify-aes": "1.1.1",
         "create-hash": "1.1.3",
         "evp_bytestokey": "1.0.3",
@@ -5495,13 +5973,10 @@
       "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
     },
     "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "2.0.1"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -5531,14 +6006,12 @@
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
     "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "pify": "3.0.0"
       }
     },
     "pbkdf2": {
@@ -5551,7 +6024,7 @@
         "create-hmac": "1.1.6",
         "ripemd160": "2.0.1",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.9"
+        "sha.js": "2.4.11"
       }
     },
     "performance-now": {
@@ -5560,9 +6033,10 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
     },
     "pinkie": {
       "version": "2.0.4",
@@ -5583,30 +6057,77 @@
       "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=",
       "dev": true,
       "requires": {
-        "browserslist": "2.3.3",
-        "postcss": "6.0.9",
+        "browserslist": "2.11.3",
+        "postcss": "6.0.20",
         "reduce-css-calc": "1.3.0"
       },
       "dependencies": {
-        "browserslist": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.3.3.tgz",
-          "integrity": "sha512-p9hz6FA2H1w1ZUAXKfK3MlIA4Z9fEd56hnZSOecBIITb5j0oZk/tZRwhdE0xG56RGx2x8cc1c5AWJKWVjMLOEQ==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "1.0.30000718",
-            "electron-to-chromium": "1.3.18"
+            "color-convert": "1.9.0"
           }
         },
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "browserslist": {
+          "version": "2.11.3",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+          "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "caniuse-lite": "1.0.30000817",
+            "electron-to-chromium": "1.3.40"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.40",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz",
+          "integrity": "sha1-H71tl779crim+SHcONIkE9L2/d8=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5618,17 +6139,6 @@
       "dev": true,
       "requires": {
         "find-up": "2.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        }
       }
     },
     "pleeease-filters": {
@@ -5637,19 +6147,60 @@
       "integrity": "sha1-ZjKy+wVkjSdY2GU4T7zteeHMrsc=",
       "dev": true,
       "requires": {
-        "onecolor": "3.0.4",
-        "postcss": "6.0.9"
+        "onecolor": "3.0.5",
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5743,18 +6294,59 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "balanced-match": "0.4.2",
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5765,19 +6357,60 @@
       "integrity": "sha1-lNxCLI+QmX8WvTOjZUu77AhJY7Q=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-selector-parser": "2.2.3"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5794,52 +6427,122 @@
       }
     },
     "postcss-color-function": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.0.0.tgz",
-      "integrity": "sha1-fgEG9Pah7LGtWzqFU6zl6Ciq4Yc=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.0.1.tgz",
+      "integrity": "sha1-QCs/LOvD9pR+YY+2vjZU++zvZEQ=",
       "dev": true,
       "requires": {
-        "css-color-function": "1.3.0",
-        "postcss": "6.0.9",
+        "css-color-function": "1.3.3",
+        "postcss": "6.0.20",
         "postcss-message-helpers": "2.0.0",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
     },
     "postcss-color-gray": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.0.0.tgz",
-      "integrity": "sha1-aBvzBQl91mv+8OHmKC1dmbWsyV0=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz",
+      "integrity": "sha512-L4iLKQLdqChz6ZOgGb6dRxkBNw78JFYcJmBz1orHpZoeLtuhDDGegRtX9gSyfoCIM7rWZ3VNOyiqqvk83BEN+w==",
       "dev": true,
       "requires": {
-        "color": "1.0.3",
-        "postcss": "6.0.9",
+        "color": "2.0.1",
+        "postcss": "6.0.20",
         "postcss-message-helpers": "2.0.0",
         "reduce-function-call": "1.0.2"
       },
       "dependencies": {
-        "color": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-          "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.0",
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "color": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
+          "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.1",
             "color-string": "1.5.2"
           }
         },
+        "color-convert": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+          "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
         "color-string": {
           "version": "1.5.2",
           "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz",
@@ -5850,15 +6553,36 @@
             "simple-swizzle": "0.2.2"
           }
         },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5870,10 +6594,30 @@
       "dev": true,
       "requires": {
         "color": "1.0.3",
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-message-helpers": "2.0.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
         "color": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
@@ -5894,15 +6638,36 @@
             "simple-swizzle": "0.2.2"
           }
         },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5913,20 +6678,61 @@
       "integrity": "sha1-EnA2ZvoxBDDj8wpFTawThjF9WEQ=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-value-parser": "3.3.0",
         "units-css": "0.4.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5938,11 +6744,31 @@
       "dev": true,
       "requires": {
         "color": "1.0.3",
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-message-helpers": "2.0.0",
         "reduce-function-call": "1.0.2"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
         "color": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
@@ -5963,15 +6789,36 @@
             "simple-swizzle": "0.2.2"
           }
         },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -5982,19 +6829,60 @@
       "integrity": "sha1-7rrwPTY7QwC5Z5K9MIHBntZlE9M=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6005,19 +6893,60 @@
       "integrity": "sha1-FFOcinExSUtILg3RzCZf9lFLUmM=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-value-parser": "3.3.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6028,20 +6957,61 @@
       "integrity": "sha1-N9XJNToHoJJwkSqCYGu0Kg1wLAQ=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-value-parser": "3.3.0",
         "rgb-hex": "2.1.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6068,22 +7038,22 @@
       }
     },
     "postcss-cssnext": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.0.2.tgz",
-      "integrity": "sha512-jA6kGdcUMZqLUgw6MdpyNWGFhk0LIITVhC/jTnLRZLoXSTR88qT2cFOn3LbY06udt1PVdTCHDG3plBjxVKf8BQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.0.tgz",
+      "integrity": "sha512-awPDhI4OKetcHCr560iVCoDuP6e/vn0r6EAqdWPpAavJMvkBSZ6kDpSN4b3mB3Ti57hQMunHHM8Wvx9PeuYXtA==",
       "dev": true,
       "requires": {
-        "autoprefixer": "7.1.2",
+        "autoprefixer": "7.2.6",
         "caniuse-api": "2.0.0",
         "chalk": "2.3.0",
         "pixrem": "4.0.1",
         "pleeease-filters": "4.0.0",
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-apply": "0.8.0",
         "postcss-attribute-case-insensitive": "2.0.0",
-        "postcss-calc": "6.0.0",
-        "postcss-color-function": "4.0.0",
-        "postcss-color-gray": "4.0.0",
+        "postcss-calc": "6.0.1",
+        "postcss-color-function": "4.0.1",
+        "postcss-color-gray": "4.1.0",
         "postcss-color-hex-alpha": "3.0.0",
         "postcss-color-hsl": "2.0.0",
         "postcss-color-hwb": "3.0.0",
@@ -6091,14 +7061,14 @@
         "postcss-color-rgb": "2.0.0",
         "postcss-color-rgba-fallback": "3.0.0",
         "postcss-custom-media": "6.0.0",
-        "postcss-custom-properties": "6.1.0",
+        "postcss-custom-properties": "6.3.1",
         "postcss-custom-selectors": "4.0.1",
-        "postcss-font-family-system-ui": "2.0.1",
+        "postcss-font-family-system-ui": "3.0.0",
         "postcss-font-variant": "3.0.0",
         "postcss-image-set-polyfill": "0.3.5",
         "postcss-initial": "2.0.0",
         "postcss-media-minmax": "3.0.0",
-        "postcss-nesting": "4.1.0",
+        "postcss-nesting": "4.2.1",
         "postcss-pseudo-class-any-link": "4.0.0",
         "postcss-pseudoelements": "5.0.0",
         "postcss-replace-overflow-wrap": "2.0.0",
@@ -6106,28 +7076,37 @@
         "postcss-selector-not": "3.0.1"
       },
       "dependencies": {
-        "autoprefixer": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.2.tgz",
-          "integrity": "sha1-++rwfUj9h44Ggr98vurecorbKxg=",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "browserslist": "2.3.3",
-            "caniuse-lite": "1.0.30000718",
+            "color-convert": "1.9.0"
+          }
+        },
+        "autoprefixer": {
+          "version": "7.2.6",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+          "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+          "dev": true,
+          "requires": {
+            "browserslist": "2.11.3",
+            "caniuse-lite": "1.0.30000817",
             "normalize-range": "0.1.2",
             "num2fraction": "1.2.2",
-            "postcss": "6.0.9",
+            "postcss": "6.0.20",
             "postcss-value-parser": "3.3.0"
           }
         },
         "browserslist": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.3.3.tgz",
-          "integrity": "sha512-p9hz6FA2H1w1ZUAXKfK3MlIA4Z9fEd56hnZSOecBIITb5j0oZk/tZRwhdE0xG56RGx2x8cc1c5AWJKWVjMLOEQ==",
+          "version": "2.11.3",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+          "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "1.0.30000718",
-            "electron-to-chromium": "1.3.18"
+            "caniuse-lite": "1.0.30000817",
+            "electron-to-chromium": "1.3.40"
           }
         },
         "caniuse-api": {
@@ -6136,44 +7115,84 @@
           "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=",
           "dev": true,
           "requires": {
-            "browserslist": "2.3.3",
-            "caniuse-lite": "1.0.30000718",
+            "browserslist": "2.11.3",
+            "caniuse-lite": "1.0.30000817",
             "lodash.memoize": "4.1.2",
             "lodash.uniq": "4.5.0"
           }
         },
+        "electron-to-chromium": {
+          "version": "1.3.40",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz",
+          "integrity": "sha1-H71tl779crim+SHcONIkE9L2/d8=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "2.3.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+              "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+              "dev": true,
+              "requires": {
+                "ansi-styles": "3.2.1",
+                "escape-string-regexp": "1.0.5",
+                "supports-color": "5.3.0"
+              }
+            }
           }
         },
         "postcss-calc": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.0.tgz",
-          "integrity": "sha1-toGyecbST74OM+2QRYA3BURdYTs=",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.1.tgz",
+          "integrity": "sha1-PSQXG79udinUIqQ26/5t2VEfQzA=",
           "dev": true,
           "requires": {
             "css-unit-converter": "1.1.1",
-            "postcss": "6.0.9",
+            "postcss": "6.0.20",
             "postcss-selector-parser": "2.2.3",
-            "reduce-css-calc": "2.0.5"
+            "reduce-css-calc": "2.1.4"
           }
         },
         "reduce-css-calc": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.0.5.tgz",
-          "integrity": "sha1-M8l4OMXUxxGlwU74XOT95BSD970=",
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.4.tgz",
+          "integrity": "sha512-i/vWQbyd3aJRmip9OVSN9V6nIjLf/gg/ctxb0CpvHWtcRysFl/ngDBQD+rqavxdw/doScA3GMBXhzkHQ4GCzFQ==",
           "dev": true,
           "requires": {
             "css-unit-converter": "1.1.1",
             "postcss-value-parser": "3.3.0"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
         }
       }
     },
@@ -6183,47 +7202,129 @@
       "integrity": "sha1-vlMnhBEOyylQRPtTlaGABushpzc=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
     },
     "postcss-custom-properties": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.1.0.tgz",
-      "integrity": "sha1-nK8RUaxBsenmTTov+ezplsoYl30=",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz",
+      "integrity": "sha512-zoiwn4sCiUFbr4KcgcNZLFkR6gVQom647L+z1p/KBVHZ1OYwT87apnS42atJtx6XlX2yI7N5fjXbFixShQO2QQ==",
       "dev": true,
       "requires": {
         "balanced-match": "1.0.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "dev": true
         },
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6234,19 +7335,60 @@
       "integrity": "sha1-eBOC+UxS5yfvXKR3bqKt9JphE4I=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-selector-matches": "3.0.1"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6308,25 +7450,64 @@
       }
     },
     "postcss-font-family-system-ui": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-2.0.1.tgz",
-      "integrity": "sha1-MYoHX9y4S4ZKqCOlGTXvClhy6RE=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz",
+      "integrity": "sha512-58G/hTxMSSKlIRpcPUjlyo6hV2MEzvcVO2m4L/T7Bb2fJTG4DYYfQjQeRvuimKQh1V1sOzCIz99g+H2aFNtlQw==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.4",
-        "postcss": "6.0.9",
-        "postcss-value-parser": "3.3.0"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6337,18 +7518,59 @@
       "integrity": "sha1-CMzIj2BQuoLtjvLMdsDGprQfGD4=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6359,44 +7581,45 @@
       "integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-media-query-parser": "0.2.3"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
           }
-        }
-      }
-    },
-    "postcss-import": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.0.0.tgz",
-      "integrity": "sha1-qWLi34LTvFptpqOGhBdHIE9B71s=",
-      "dev": true,
-      "requires": {
-        "postcss": "6.0.14",
-        "postcss-value-parser": "3.3.0",
-        "read-cache": "1.0.0",
-        "resolve": "1.4.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
           }
         },
         "source-map": {
@@ -6406,12 +7629,78 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-import": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz",
+      "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.20",
+        "postcss-value-parser": "3.3.0",
+        "read-cache": "1.0.0",
+        "resolve": "1.4.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6423,18 +7712,59 @@
       "dev": true,
       "requires": {
         "lodash.template": "4.4.0",
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6472,26 +7802,62 @@
       }
     },
     "postcss-loader": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.9.tgz",
-      "integrity": "sha512-sgoXPtmgVT3aBAhU47Kig8oPF+mbXl8Unjvtz1Qj1q2D2EvSVJW2mKJNzxv5y/LvA9xWwuvdysvhc7Zn80UWWw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.3.tgz",
+      "integrity": "sha512-RuBcNE8rjCkIB0IsbmkGFRmQJTeQJfCI88E0VTarPNTvaNSv9OFv1DvTwgtAN/qlzyiELsmmmtX/tEzKp/cdug==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
-        "postcss": "6.0.14",
+        "postcss": "6.0.20",
         "postcss-load-config": "1.2.0",
-        "schema-utils": "0.3.0"
+        "schema-utils": "0.4.5"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
+          }
+        },
+        "schema-utils": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+          "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+          "dev": true,
+          "requires": {
+            "ajv": "6.3.0",
+            "ajv-keywords": "3.1.0"
           }
         },
         "source-map": {
@@ -6501,12 +7867,12 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6517,18 +7883,59 @@
       "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6624,23 +8031,49 @@
       }
     },
     "postcss-modules-extract-imports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz",
+      "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.14"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
           }
         },
         "source-map": {
@@ -6650,12 +8083,12 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6667,18 +8100,44 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
           }
         },
         "source-map": {
@@ -6688,12 +8147,12 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6705,18 +8164,44 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
           }
         },
         "source-map": {
@@ -6726,12 +8211,12 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6743,18 +8228,44 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.14"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz",
-          "integrity": "sha512-NJ1z0f+1offCgadPhz+DvGm5Mkci+mmV5BqD13S992o0Xk9eElxUfPPF+t2ksH5R/17gz4xVK8KWocUQ5o3Rog==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
             "source-map": "0.6.1",
-            "supports-color": "4.5.0"
+            "supports-color": "5.3.0"
           }
         },
         "source-map": {
@@ -6764,34 +8275,75 @@
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
     },
     "postcss-nesting": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.1.0.tgz",
-      "integrity": "sha512-jn5bGJMSAawifyj2cXcqDw7mWt36HKY3TBCPlzkYpgOAwZcHpM5C5K5xPdj97pmdj5Q5SCpaFobt9ONitYo5lg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.2.1.tgz",
+      "integrity": "sha512-IkyWXICwagCnlaviRexi7qOdwPw3+xVVjgFfGsxmztvRVaNxAlrypOIKqDE5mxY+BVxnId1rnUKBRQoNE2VDaA==",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6833,19 +8385,60 @@
       "integrity": "sha1-kVKgYT00UHIFE+iJKFS65C0O5o4=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9",
+        "postcss": "6.0.20",
         "postcss-selector-parser": "2.2.3"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6856,18 +8449,59 @@
       "integrity": "sha1-7vGU6NUkZFylIKlJ6V5RjoEkAss=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6908,40 +8542,122 @@
       "integrity": "sha1-eU22+qVPjbEAhUOSqTr0V2i04ls=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
     },
     "postcss-scss": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.2.tgz",
-      "integrity": "sha1-/0XPM1S4ee6JpOtoaA9GrJuxT5Q=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.4.tgz",
+      "integrity": "sha512-IFj42Hz2cBHHFvZTqkJqU08JCCM/MZU5/uNkTUZBaBFP2d4C5unw4HyCL52RfCwJb6KoVUD3eoepxMh1dfBFCQ==",
       "dev": true,
       "requires": {
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6953,18 +8669,59 @@
       "dev": true,
       "requires": {
         "balanced-match": "0.4.2",
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -6976,18 +8733,59 @@
       "dev": true,
       "requires": {
         "balanced-match": "0.4.2",
-        "postcss": "6.0.9"
+        "postcss": "6.0.20"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.9",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.9.tgz",
-          "integrity": "sha512-bBE2AHNEBhF23TfET6AA/lFP8ah+qHOZoFJEflFG+HgvVLdTmMOrocx/4LVVDIn3w6jUssw1q2Exk1cc9UOI8w==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
-            "source-map": "0.5.7",
-            "supports-color": "4.2.1"
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.20",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.20.tgz",
+          "integrity": "sha512-Opr6usW30Iy0xEDrJywDckRxtylfO7gTGs3Kfb2LdLQlGsUg89fTy0R3Vm1Dub2YHO7MK58avr0p70+uFFHb7A==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.3.2",
+            "source-map": "0.6.1",
+            "supports-color": "5.3.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -7066,9 +8864,9 @@
       }
     },
     "private": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
-      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
       "dev": true
     },
     "process": {
@@ -7077,9 +8875,15 @@
       "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
     },
     "promise-polyfill": {
       "version": "6.0.2",
@@ -7088,18 +8892,18 @@
       "dev": true
     },
     "proxy-addr": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
-      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
+      "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
       "requires": {
         "forwarded": "0.1.2",
-        "ipaddr.js": "1.5.2"
+        "ipaddr.js": "1.6.0"
       }
     },
     "prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
       "dev": true
     },
     "pseudomap": {
@@ -7118,7 +8922,28 @@
         "browserify-rsa": "4.0.1",
         "create-hash": "1.1.3",
         "parse-asn1": "5.1.0",
-        "randombytes": "2.0.5"
+        "randombytes": "2.0.6"
+      }
+    },
+    "pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0"
+      }
+    },
+    "pumpify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
+      "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
+      "dev": true,
+      "requires": {
+        "duplexify": "3.5.4",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
       }
     },
     "punycode": {
@@ -7191,27 +9016,27 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
     },
     "randombytes": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
     },
     "randomfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz",
-      "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "2.0.5",
+        "randombytes": "2.0.6",
         "safe-buffer": "5.1.1"
       }
     },
@@ -7251,6 +9076,14 @@
       "dev": true,
       "requires": {
         "pify": "2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "read-pkg": {
@@ -7262,6 +9095,25 @@
         "load-json-file": "1.1.0",
         "normalize-package-data": "2.4.0",
         "path-type": "1.1.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "read-pkg-up": {
@@ -7272,17 +9124,38 @@
       "requires": {
         "find-up": "1.1.2",
         "read-pkg": "1.1.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "2.1.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "2.0.1"
+          }
+        }
       }
     },
     "readable-stream": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+      "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
         "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
+        "process-nextick-args": "2.0.0",
         "safe-buffer": "5.1.1",
         "string_decoder": "1.0.3",
         "util-deprecate": "1.0.2"
@@ -7296,7 +9169,7 @@
       "requires": {
         "graceful-fs": "4.1.11",
         "minimatch": "3.0.4",
-        "readable-stream": "2.3.3",
+        "readable-stream": "2.3.5",
         "set-immediate-shim": "1.0.1"
       }
     },
@@ -7308,16 +9181,8 @@
       "requires": {
         "ast-types": "0.9.6",
         "esprima": "3.1.3",
-        "private": "0.1.7",
+        "private": "0.1.8",
         "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        }
       }
     },
     "rechoir": {
@@ -7359,9 +9224,9 @@
       }
     },
     "reflect-metadata": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",
-      "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz",
+      "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A=="
     },
     "regenerate": {
       "version": "1.3.3",
@@ -7384,12 +9249,13 @@
       }
     },
     "regex-not": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz",
-      "integrity": "sha1-Qvg+OXcWIt+CawKvF2Ul1qXxV/k=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1"
+        "extend-shallow": "3.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "regexpu-core": {
@@ -7473,17 +9339,17 @@
       }
     },
     "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "version": "2.85.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
+      "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
       "requires": {
         "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
         "caseless": "0.12.0",
-        "combined-stream": "1.0.5",
+        "combined-stream": "1.0.6",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.3.1",
+        "form-data": "2.3.2",
         "har-validator": "5.0.3",
         "hawk": "6.0.2",
         "http-signature": "1.2.0",
@@ -7496,15 +9362,15 @@
         "qs": "6.5.1",
         "safe-buffer": "5.1.1",
         "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
+        "tough-cookie": "2.3.4",
         "tunnel-agent": "0.6.0",
-        "uuid": "3.1.0"
+        "uuid": "3.2.1"
       }
     },
     "require-dir-all": {
-      "version": "0.4.12",
-      "resolved": "https://registry.npmjs.org/require-dir-all/-/require-dir-all-0.4.12.tgz",
-      "integrity": "sha1-7HxyFadukiB5IMlx8VR3aZ6vY6c=",
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/require-dir-all/-/require-dir-all-0.4.15.tgz",
+      "integrity": "sha1-TpkogxrfHhixXTlDyX+RrIhVezs=",
       "requires": {
         "mini-deep-assign": "0.0.8",
         "module-parent": "0.0.2"
@@ -7532,22 +9398,22 @@
         "parent-module": "0.1.0"
       },
       "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "requires": {
-            "is-glob": "3.1.0",
-            "path-dirname": "1.0.2"
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
           }
         },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "requires": {
-            "is-extglob": "2.1.1"
-          }
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -7592,6 +9458,12 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
     "retry-as-promised": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz",
@@ -7641,10 +9513,19 @@
         "inherits": "2.0.3"
       }
     },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0"
+      }
+    },
     "rxjs": {
-      "version": "5.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.5.tgz",
-      "integrity": "sha512-D/MfQnPMBk8P8gfwGxvCkuaWBcG58W7dUMT//URPoYzIbDEKT0GezdirkK5whMgKFBATfCoTpxO8bJQGJ04W5A==",
+      "version": "5.5.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.7.tgz",
+      "integrity": "sha512-Hxo2ac8gRQjwjtKgukMIwBRbq5+KAeEV5hXM4obYBOAghev41bDQWgFH4svYiU9UnQ5kNww2LgfyBdevCd2HXA==",
       "dev": true,
       "requires": {
         "symbol-observable": "1.0.1"
@@ -7655,6 +9536,15 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "0.1.15"
+      }
+    },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
@@ -7662,39 +9552,22 @@
       "dev": true,
       "requires": {
         "glob": "7.1.2",
-        "lodash": "4.17.4",
+        "lodash": "4.17.5",
         "scss-tokenizer": "0.2.3",
         "yargs": "7.1.0"
       }
     },
     "sass-loader": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz",
-      "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==",
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
+      "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
       "dev": true,
       "requires": {
-        "async": "2.5.0",
-        "clone-deep": "0.3.0",
+        "clone-deep": "2.0.2",
         "loader-utils": "1.1.0",
         "lodash.tail": "4.1.1",
+        "neo-async": "2.5.0",
         "pify": "3.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
-          "dev": true,
-          "requires": {
-            "lodash": "4.17.4"
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
       }
     },
     "sax": {
@@ -7760,18 +9633,18 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.1.tgz",
-      "integrity": "sha1-v4y3uDJWxFUeMTR8YxF3jbme7FI=",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.2.tgz",
+      "integrity": "sha1-tESVgNmZKbZbEKSDiTAaZZIIh1g=",
       "dev": true,
       "requires": {
-        "node-forge": "0.6.33"
+        "node-forge": "0.7.1"
       }
     },
     "semver": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "semver-dsl": {
       "version": "1.0.1",
@@ -7779,18 +9652,18 @@
       "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
       "dev": true,
       "requires": {
-        "semver": "5.4.1"
+        "semver": "5.5.0"
       }
     },
     "send": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
-      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "1.1.1",
+        "depd": "1.1.2",
         "destroy": "1.0.4",
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "etag": "1.8.1",
         "fresh": "0.5.2",
@@ -7799,43 +9672,43 @@
         "ms": "2.0.0",
         "on-finished": "2.3.0",
         "range-parser": "1.2.0",
-        "statuses": "1.3.1"
+        "statuses": "1.4.0"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+        },
         "mime": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
           "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
-        },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
         }
       }
     },
     "sequelize": {
-      "version": "4.27.0",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.27.0.tgz",
-      "integrity": "sha512-HO4dz8sexVIgQtm5K+YqKLah1dWY9BK0tCRwUVbjB/VQCyqmJ73Dm+5Ci0C1oXSjMvWKsPK/GUgJuQsAPE0KsA==",
+      "version": "4.37.3",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.37.3.tgz",
+      "integrity": "sha512-4hTKikL3T8YovUYKJiqFw6I96WuDtsSEhuClL+CZk6gVq97F45tgAlYt+uYJGipGyr4HW4HV5pJ6STJ1e21W+g==",
       "requires": {
         "bluebird": "3.5.1",
         "cls-bluebird": "2.1.0",
         "debug": "3.1.0",
         "depd": "1.1.1",
         "dottie": "2.0.0",
-        "generic-pool": "3.2.0",
+        "generic-pool": "3.4.2",
         "inflection": "1.12.0",
-        "lodash": "4.17.4",
-        "moment": "2.19.3",
+        "lodash": "4.17.5",
+        "moment": "2.21.0",
         "moment-timezone": "0.5.14",
         "retry-as-promised": "2.3.2",
-        "semver": "5.4.1",
+        "semver": "5.5.0",
         "terraformer-wkt-parser": "1.1.2",
         "toposort-class": "1.0.1",
-        "uuid": "3.1.0",
-        "validator": "9.2.0",
-        "wkx": "0.4.2"
+        "uuid": "3.2.1",
+        "validator": "9.4.1",
+        "wkx": "0.4.4"
       },
       "dependencies": {
         "debug": {
@@ -7849,14 +9722,14 @@
       }
     },
     "sequelize-typescript": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.1.tgz",
-      "integrity": "sha512-DbKayDlqzg13qMGvhDg7/wvoaNYO1dIhHdyt12Nbf6Kr12yFS/apqe9MecniEXYFt0nsqQFa/6RZXVM0IJt3/g==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/sequelize-typescript/-/sequelize-typescript-0.6.3.tgz",
+      "integrity": "sha512-Mj+/g8QPqWJ+0h7IsmHUzJziu8vINKPZFhBBkClF066gPOHOz3xay+iQudVkdVdMEjMRqwfp2YoPARSqr+r5Fw==",
       "requires": {
         "@types/bluebird": "3.5.18",
         "@types/node": "6.0.41",
         "@types/reflect-metadata": "0.0.4",
-        "@types/sequelize": "4.0.79",
+        "@types/sequelize": "4.27.5",
         "es6-shim": "0.35.3",
         "glob": "7.1.2"
       },
@@ -7868,13 +9741,19 @@
         }
       }
     },
+    "serialize-javascript": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz",
+      "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=",
+      "dev": true
+    },
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.4",
+        "accepts": "1.3.5",
         "batch": "0.6.1",
         "debug": "2.6.9",
         "escape-html": "1.0.3",
@@ -7884,14 +9763,14 @@
       }
     },
     "serve-static": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
-      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "requires": {
-        "encodeurl": "1.0.1",
+        "encodeurl": "1.0.2",
         "escape-html": "1.0.3",
         "parseurl": "1.3.2",
-        "send": "0.16.1"
+        "send": "0.16.2"
       }
     },
     "set-blocking": {
@@ -7900,15 +9779,6 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
-    "set-getter": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz",
-      "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
-      "dev": true,
-      "requires": {
-        "to-object-path": "0.3.0"
-      }
-    },
     "set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
@@ -7925,6 +9795,17 @@
         "is-extendable": "0.1.1",
         "is-plain-object": "2.0.4",
         "split-string": "3.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        }
       }
     },
     "setimmediate": {
@@ -7939,9 +9820,9 @@
       "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
     },
     "sha.js": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz",
-      "integrity": "sha512-G8zektVqbiPHrylgew9Zg1VRB1L/DtXNUVAM6q4QLy8NE3qtHlFXTf8VLL4k1Yl6c7NMjtZUTdXV+X44nFaT6A==",
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -7949,30 +9830,20 @@
       }
     },
     "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
         "is-extendable": "0.1.1",
-        "kind-of": "2.0.1",
-        "lazy-cache": "0.2.7",
+        "kind-of": "5.1.0",
         "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.5"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -8031,10 +9902,16 @@
         }
       }
     },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
     "snapdragon": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz",
-      "integrity": "sha1-4StUh/re0+PeoKyR6UAL91tAE3A=",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
         "base": "0.11.2",
@@ -8044,7 +9921,7 @@
         "map-cache": "0.2.2",
         "source-map": "0.5.7",
         "source-map-resolve": "0.5.1",
-        "use": "2.0.2"
+        "use": "3.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -8056,6 +9933,55 @@
             "is-descriptor": "0.1.6"
           }
         },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
         "is-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -8084,6 +10010,17 @@
         "define-property": "1.0.0",
         "isobject": "3.0.1",
         "snapdragon-util": "3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "1.0.2"
+          }
+        }
       }
     },
     "snapdragon-util": {
@@ -8101,7 +10038,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
@@ -8111,25 +10048,17 @@
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
       "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
       "requires": {
-        "hoek": "4.2.0"
+        "hoek": "4.2.1"
       }
     },
     "sockjs": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz",
-      "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
         "faye-websocket": "0.10.0",
-        "uuid": "2.0.3"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
-        }
+        "uuid": "3.2.1"
       }
     },
     "sockjs-client": {
@@ -8192,12 +10121,20 @@
       }
     },
     "source-map-support": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz",
+      "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7"
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "source-map-url": {
@@ -8207,24 +10144,35 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
-      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
       "dev": true,
       "requires": {
-        "spdx-license-ids": "1.2.2"
+        "spdx-expression-parse": "3.0.0",
+        "spdx-license-ids": "3.0.0"
       }
     },
-    "spdx-expression-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+    "spdx-exceptions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
       "dev": true
     },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "2.1.0",
+        "spdx-license-ids": "3.0.0"
+      }
+    },
     "spdx-license-ids": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
       "dev": true
     },
     "spdy": {
@@ -8238,22 +10186,22 @@
         "http-deceiver": "1.2.7",
         "safe-buffer": "5.1.1",
         "select-hose": "2.0.0",
-        "spdy-transport": "2.0.20"
+        "spdy-transport": "2.1.0"
       }
     },
     "spdy-transport": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz",
-      "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz",
+      "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
         "detect-node": "2.0.3",
         "hpack.js": "2.1.6",
-        "obuf": "1.1.1",
-        "readable-stream": "2.3.3",
+        "obuf": "1.1.2",
+        "readable-stream": "2.3.5",
         "safe-buffer": "5.1.1",
-        "wbuf": "1.7.2"
+        "wbuf": "1.7.3"
       }
     },
     "spinkit": {
@@ -8268,27 +10216,7 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.1.tgz",
-          "integrity": "sha512-Fg1xXAv+qXKdwHiJFMcZSqsMcbPlkzsZtf8KkLJ2fqnP+lqg2RjEKgDcSfO9CO1+p4LZKgApDBUUUqKaaRhwZQ==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "2.0.4"
-          }
-        }
+        "extend-shallow": "3.0.2"
       }
     },
     "sprintf-js": {
@@ -9014,9 +10942,9 @@
       }
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
       "requires": {
         "asn1": "0.2.3",
         "assert-plus": "1.0.0",
@@ -9028,6 +10956,15 @@
         "tweetnacl": "0.14.5"
       }
     },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -9052,6 +10989,46 @@
             "is-descriptor": "0.1.6"
           }
         },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.6"
+              }
+            }
+          }
+        },
         "is-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -9082,7 +11059,7 @@
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "2.3.5"
       }
     },
     "stream-browserify": {
@@ -9092,22 +11069,38 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "readable-stream": "2.3.5"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
+      "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "stream-shift": "1.0.0"
       }
     },
     "stream-http": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
+      "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
       "dev": true,
       "requires": {
         "builtin-status-codes": "3.0.0",
         "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
+        "readable-stream": "2.3.5",
         "to-arraybuffer": "1.0.1",
         "xtend": "4.0.1"
       }
     },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
     "streamsearch": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
@@ -9228,9 +11221,9 @@
       }
     },
     "swagger-ui-express": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-2.0.13.tgz",
-      "integrity": "sha1-IDQ1GPIxPHiVps3/ZHjg7xPLn2Q="
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-2.0.15.tgz",
+      "integrity": "sha1-+6haNXtAwNYp6UJTcZmYe4CFWH0="
     },
     "symbol-observable": {
       "version": "1.0.1",
@@ -9277,10 +11270,20 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.5",
+        "xtend": "4.0.1"
+      }
+    },
     "thunky": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
-      "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz",
+      "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=",
       "dev": true
     },
     "time-stamp": {
@@ -9290,9 +11293,9 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
-      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
+      "integrity": "sha512-HQ3nbYRAowdVd0ckGFvmJPPCOH/CHleFN/Y0YQCX1DVaB7t+KFvisuyN09fuP8Jtp1CpfSh8O8bMkHbdbPe6Pw==",
       "dev": true,
       "requires": {
         "setimmediate": "1.0.5"
@@ -9319,48 +11322,21 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.5"
+            "is-buffer": "1.1.6"
           }
         }
       }
     },
     "to-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz",
-      "integrity": "sha1-FTWL7kosg712N3uh3ASdDxiDeq4=",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "regex-not": "1.0.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "0.1.6",
-            "is-data-descriptor": "0.1.4",
-            "kind-of": "5.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "define-property": "2.0.2",
+        "extend-shallow": "3.0.2",
+        "regex-not": "1.0.2",
+        "safe-regex": "1.1.0"
       }
     },
     "to-regex-range": {
@@ -9385,9 +11361,9 @@
       "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg="
     },
     "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "requires": {
         "punycode": "1.4.1"
       }
@@ -9429,50 +11405,59 @@
       "dev": true
     },
     "tslib": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz",
-      "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
+      "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==",
       "dev": true
     },
     "tslint": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.8.0.tgz",
-      "integrity": "sha1-H0mtWy53x2w69N3K5VKuTjYS6xM=",
+      "version": "5.9.1",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz",
+      "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
         "builtin-modules": "1.1.1",
         "chalk": "2.3.0",
-        "commander": "2.11.0",
-        "diff": "3.4.0",
+        "commander": "2.15.1",
+        "diff": "3.5.0",
         "glob": "7.1.2",
+        "js-yaml": "3.11.0",
         "minimatch": "3.0.4",
         "resolve": "1.4.0",
-        "semver": "5.4.1",
-        "tslib": "1.8.1",
-        "tsutils": "2.13.0"
+        "semver": "5.5.0",
+        "tslib": "1.9.0",
+        "tsutils": "2.22.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.15.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+          "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+          "dev": true
+        }
       }
     },
     "tslint-loader": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/tslint-loader/-/tslint-loader-3.5.3.tgz",
-      "integrity": "sha1-ND90Ei2U81a2iUV9P1n2SmmrYG8=",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/tslint-loader/-/tslint-loader-3.6.0.tgz",
+      "integrity": "sha512-Me9Qf/87BOfCY8uJJw+J7VMF4U8WiMXKLhKKKugMydF0xMhMOt9wo2mjYTNhwbF9H7SHh8PAIwRG8roisTNekQ==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
         "mkdirp": "0.5.1",
         "object-assign": "4.1.1",
         "rimraf": "2.6.2",
-        "semver": "5.4.1"
+        "semver": "5.5.0"
       }
     },
     "tsutils": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.13.0.tgz",
-      "integrity": "sha512-FuWzNJbMsp3gcZMbI3b5DomhW4Ia41vMxjN63nKWI0t7f+I3UmHfRl0TrXJTwI2LUduDG+eR1Mksp3pvtlyCFQ==",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.22.2.tgz",
+      "integrity": "sha512-u06FUSulCJ+Y8a2ftuqZN6kIGqdP2yJjUPEngXqmdPND4UQfb04igcotH+dw+IFr417yP6muCLE8/5/Qlfnx0w==",
       "dev": true,
       "requires": {
-        "tslib": "1.8.1"
+        "tslib": "1.9.0"
       }
     },
     "tty-browserify": {
@@ -9515,27 +11500,27 @@
       "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q="
     },
     "typescript-rest": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/typescript-rest/-/typescript-rest-1.2.0.tgz",
-      "integrity": "sha1-4B+oM2VU/tYt6qmQuq7VK2gISQ8=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/typescript-rest/-/typescript-rest-1.3.0.tgz",
+      "integrity": "sha1-t/KAcRKXsQIJ5qIDDw3J7wNcvyI=",
       "requires": {
         "@types/body-parser": "0.0.33",
         "@types/cookie-parser": "1.4.1",
-        "@types/express": "4.0.39",
+        "@types/express": "4.11.1",
         "@types/express-serve-static-core": "4.0.57",
         "@types/multer": "0.0.32",
         "@types/serve-static": "1.13.1",
         "body-parser": "1.18.2",
         "cookie-parser": "1.4.3",
         "cors": "2.8.4",
-        "express": "4.16.2",
+        "express": "4.16.3",
         "fs-extra": "2.1.2",
-        "lodash": "4.17.4",
+        "lodash": "4.17.5",
         "multer": "1.3.0",
         "path": "0.12.7",
-        "reflect-metadata": "0.1.10",
+        "reflect-metadata": "0.1.12",
         "require-glob": "3.2.0",
-        "swagger-ui-express": "2.0.13",
+        "swagger-ui-express": "2.0.15",
         "yamljs": "0.2.10"
       },
       "dependencies": {
@@ -9544,7 +11529,17 @@
           "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-0.0.33.tgz",
           "integrity": "sha1-M8oUmPw35Rxd8MgcrjRWnnBB4CU=",
           "requires": {
-            "@types/express": "4.0.39"
+            "@types/express": "4.11.1"
+          }
+        },
+        "@types/express": {
+          "version": "4.11.1",
+          "resolved": "https://registry.npmjs.org/@types/express/-/express-4.11.1.tgz",
+          "integrity": "sha512-ttWle8cnPA5rAelauSWeWJimtY2RsUf2aspYZs7xPHiWgOlPn6nnUfBMtrkcnjFJuIHJF4gNOdVvpLK2Zmvh6g==",
+          "requires": {
+            "@types/body-parser": "0.0.33",
+            "@types/express-serve-static-core": "4.0.57",
+            "@types/serve-static": "1.13.1"
           }
         }
       }
@@ -9605,12 +11600,6 @@
             "yargs": "3.10.0"
           }
         },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-          "dev": true
-        },
         "yargs": {
           "version": "3.10.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
@@ -9632,7 +11621,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "bluebird": "3.5.1",
-        "lodash": "4.17.4",
+        "lodash": "4.17.5",
         "resolve": "1.4.0"
       }
     },
@@ -9648,6 +11637,15 @@
         "set-value": "0.4.3"
       },
       "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "0.1.1"
+          }
+        },
         "set-value": {
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
@@ -9683,6 +11681,24 @@
       "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
       "dev": true
     },
+    "unique-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
+      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+      "dev": true,
+      "requires": {
+        "unique-slug": "2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
+      "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "0.1.4"
+      }
+    },
     "units-css": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
@@ -9738,6 +11754,12 @@
         }
       }
     },
+    "upath": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz",
+      "integrity": "sha512-d4SJySNBXDaQp+DPrziv3xGS6w3d2Xt69FijJr86zMPBy23JEloMCEOUBBzuN7xCtjLCnmB9tI/z7SBCahHBOw==",
+      "dev": true
+    },
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -9804,42 +11826,12 @@
       }
     },
     "use": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/use/-/use-2.0.2.tgz",
-      "integrity": "sha1-riig1y+TvyJCKhii43mZMRLeyOg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz",
+      "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==",
       "dev": true,
       "requires": {
-        "define-property": "0.2.5",
-        "isobject": "3.0.1",
-        "lazy-cache": "2.0.2"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "0.1.6"
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "0.1.6",
-            "is-data-descriptor": "0.1.4",
-            "kind-of": "5.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "kind-of": "6.0.2"
       }
     },
     "util": {
@@ -9874,24 +11866,24 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
     },
     "validate-npm-package-license": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
-      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
+      "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
       "dev": true,
       "requires": {
-        "spdx-correct": "1.0.2",
-        "spdx-expression-parse": "1.0.4"
+        "spdx-correct": "3.0.0",
+        "spdx-expression-parse": "3.0.0"
       }
     },
     "validator": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-9.2.0.tgz",
-      "integrity": "sha512-6Ij4Eo0KM4LkR0d0IegOwluG5453uqT5QyF5SV5Ezvm8/zmkKI/L4eoraafZGlZPC9guLkwKzgypcw8VGWWnGA=="
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz",
+      "integrity": "sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="
     },
     "vary": {
       "version": "1.1.2",
@@ -9930,46 +11922,35 @@
       }
     },
     "watchpack": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
-      "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz",
+      "integrity": "sha512-RSlipNQB1u48cq0wH/BNfCu1tD/cJ8ydFIkNYhp9o+3d+8unClkIovpW5qpFPgmL9OE48wfAnlZydXByWP82AA==",
       "dev": true,
       "requires": {
-        "async": "2.6.0",
-        "chokidar": "1.7.0",
-        "graceful-fs": "4.1.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-          "dev": true,
-          "requires": {
-            "lodash": "4.17.4"
-          }
-        }
+        "chokidar": "2.0.2",
+        "graceful-fs": "4.1.11",
+        "neo-async": "2.5.0"
       }
     },
     "wbuf": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.2.tgz",
-      "integrity": "sha1-1pe5nx9ZUS3ydRvkJ2nBWAtYAf4=",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
         "minimalistic-assert": "1.0.0"
       }
     },
     "webpack": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz",
-      "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.11.0.tgz",
+      "integrity": "sha512-3kOFejWqj5ISpJk4Qj/V7w98h9Vl52wak3CLiw/cDOfbVTq7FeoZ0SdoHHY9PYlHr50ZS42OfvzE2vB4nncKQg==",
       "dev": true,
       "requires": {
-        "acorn": "5.2.1",
+        "acorn": "5.5.3",
         "acorn-dynamic-import": "2.0.2",
-        "ajv": "5.5.1",
-        "ajv-keywords": "2.1.1",
+        "ajv": "6.3.0",
+        "ajv-keywords": "3.1.0",
         "async": "2.6.0",
         "enhanced-resolve": "3.4.1",
         "escope": "3.6.0",
@@ -9985,7 +11966,7 @@
         "supports-color": "4.2.1",
         "tapable": "0.2.8",
         "uglifyjs-webpack-plugin": "0.4.6",
-        "watchpack": "1.4.0",
+        "watchpack": "1.5.0",
         "webpack-sources": "1.1.0",
         "yargs": "8.0.2"
       },
@@ -9996,15 +11977,6 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "async": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
-          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
-          "dev": true,
-          "requires": {
-            "lodash": "4.17.4"
-          }
-        },
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
@@ -10023,15 +11995,6 @@
             "tapable": "0.2.8"
           }
         },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -10076,6 +12039,12 @@
             "pify": "2.3.0"
           }
         },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
         "read-pkg": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -10128,6 +12097,12 @@
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        },
         "yargs": {
           "version": "8.0.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
@@ -10182,36 +12157,36 @@
       }
     },
     "webpack-dev-server": {
-      "version": "2.9.7",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.7.tgz",
-      "integrity": "sha512-Pu7uoQFgQj5RE5wmlfkpYSzihMKxulwEuO2xCsaMnAnyRSApwoVi3B8WCm9XbigyWTHaIMzYGkB90Vr6leAeTQ==",
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz",
+      "integrity": "sha512-zrPoX97bx47vZiAXfDrkw8pe9QjJ+lunQl3dypojyWwWr1M5I2h0VSrMPfTjopHQPRNn+NqfjcMmhoLcUJe2gA==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
         "array-includes": "3.0.3",
         "bonjour": "3.5.0",
-        "chokidar": "1.7.0",
-        "compression": "1.7.1",
+        "chokidar": "2.0.2",
+        "compression": "1.7.2",
         "connect-history-api-fallback": "1.5.0",
         "debug": "3.1.0",
         "del": "3.0.0",
-        "express": "4.16.2",
+        "express": "4.16.3",
         "html-entities": "1.2.1",
         "http-proxy-middleware": "0.17.4",
-        "import-local": "0.1.1",
+        "import-local": "1.0.0",
         "internal-ip": "1.2.0",
         "ip": "1.1.5",
         "killable": "1.0.0",
-        "loglevel": "1.6.0",
-        "opn": "5.1.0",
+        "loglevel": "1.6.1",
+        "opn": "5.3.0",
         "portfinder": "1.0.13",
-        "selfsigned": "1.10.1",
+        "selfsigned": "1.10.2",
         "serve-index": "1.9.1",
-        "sockjs": "0.3.18",
+        "sockjs": "0.3.19",
         "sockjs-client": "1.1.4",
         "spdy": "3.4.7",
         "strip-ansi": "3.0.1",
-        "supports-color": "4.2.1",
+        "supports-color": "5.3.0",
         "webpack-dev-middleware": "1.12.2",
         "yargs": "6.6.0"
       },
@@ -10231,6 +12206,27 @@
             "ms": "2.0.0"
           }
         },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        },
         "yargs": {
           "version": "6.6.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
@@ -10287,7 +12283,7 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": "0.4.9",
+        "http-parser-js": "0.4.11",
         "websocket-extensions": "0.1.3"
       }
     },
@@ -10359,13 +12355,19 @@
       }
     },
     "wkx": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.2.tgz",
-      "integrity": "sha1-d201pjSlwi5lbkdEvetU+D/Szo0=",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.4.tgz",
+      "integrity": "sha512-eVVHka2jRaAp9QanKhLpxWs3AGDV0b8cijlavxBnn4ryXzq5N/3Xe3nkQsI0XMRA16RURwviCWuOCj4mXCmrxw==",
       "requires": {
-        "@types/node": "8.5.1"
+        "@types/node": "8.9.5"
       }
     },
+    "wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+      "dev": true
+    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -10393,9 +12395,9 @@
       "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
     },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
     "yallist": {
@@ -10439,6 +12441,12 @@
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
         }
       }
     },
@@ -10460,9 +12468,9 @@
       }
     },
     "zone.js": {
-      "version": "0.8.18",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.18.tgz",
-      "integrity": "sha512-knKOBQM0oea3/x9pdyDuDi7RhxDlJhOIkeixXSiTKWLgs4LpK37iBc+1HaHwzlciHUKT172CymJFKo8Xgh+44Q==",
+      "version": "0.8.20",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.20.tgz",
+      "integrity": "sha512-FXlA37ErSXCMy5RNBcGFgCI/Zivqzr0D19GuvDxhcYIJc7xkFp6c29DKyODJu0Zo+EMyur/WPPgcBh1EHjB9jA==",
       "dev": true
     }
   }
diff --git a/package.json b/package.json
index 3f3f353..4aa9876 100644
--- a/package.json
+++ b/package.json
@@ -19,88 +19,88 @@
   "author": "Travis Ralston",
   "dependencies": {
     "@types/body-parser": "^1.16.8",
-    "@types/node": "^8.5.1",
+    "@types/node": "^8.9.5",
     "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
-    "config": "^1.28.1",
+    "config": "^1.30.0",
     "dns-then": "^0.1.0",
-    "express": "^4.16.2",
-    "git-rev-sync": "^1.9.1",
-    "js-yaml": "^3.10.0",
-    "lodash": "^4.17.4",
+    "express": "^4.16.3",
+    "git-rev-sync": "^1.10.0",
+    "js-yaml": "^3.11.0",
+    "lodash": "^4.17.5",
     "matrix-js-sdk": "^0.9.2",
     "matrix-js-snippets": "^0.2.5",
     "memory-cache": "^0.2.0",
-    "mime": "^2.0.3",
-    "moment": "^2.19.3",
+    "mime": "^2.2.0",
+    "moment": "^2.21.0",
     "netmask": "^1.0.6",
     "random-string": "^0.2.0",
-    "request": "^2.83.0",
-    "require-dir-all": "^0.4.12",
-    "sequelize": "^4.27.0",
-    "sequelize-typescript": "^0.6.1",
+    "request": "^2.85.0",
+    "require-dir-all": "^0.4.15",
+    "sequelize": "^4.37.3",
+    "sequelize-typescript": "^0.6.3",
     "sqlite3": "^3.1.13",
-    "typescript-rest": "^1.2.0",
+    "typescript-rest": "^1.3.0",
     "umzug": "^2.1.0",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@angular/animations": "^5.0.0",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "@angular/core": "^5.0.0",
-    "@angular/forms": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/platform-browser": "^5.0.0",
-    "@angular/platform-browser-dynamic": "^5.0.0",
-    "@angular/router": "^5.0.0",
+    "@angular/animations": "^5.2.9",
+    "@angular/common": "^5.2.9",
+    "@angular/compiler": "^5.2.9",
+    "@angular/core": "^5.2.9",
+    "@angular/forms": "^5.2.9",
+    "@angular/http": "^5.2.9",
+    "@angular/platform-browser": "^5.2.9",
+    "@angular/platform-browser-dynamic": "^5.2.9",
+    "@angular/router": "^5.2.9",
     "@angularclass/hmr": "^2.1.0",
     "@angularclass/hmr-loader": "^3.0.2",
-    "@fortawesome/fontawesome": "^1.1.0",
-    "@fortawesome/fontawesome-free-brands": "^5.0.2",
-    "@fortawesome/fontawesome-free-regular": "^5.0.2",
-    "@fortawesome/fontawesome-free-solid": "^5.0.2",
-    "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.7",
-    "@types/jquery": "^3.2.16",
+    "@fortawesome/fontawesome": "^1.1.4",
+    "@fortawesome/fontawesome-free-brands": "^5.0.8",
+    "@fortawesome/fontawesome-free-regular": "^5.0.8",
+    "@fortawesome/fontawesome-free-solid": "^5.0.8",
+    "@ng-bootstrap/ng-bootstrap": "^1.0.2",
+    "@types/jquery": "^3.3.1",
     "angular2-template-loader": "^0.6.2",
-    "angular2-toaster": "^4.0.0",
+    "angular2-toaster": "^4.0.2",
     "angular2-ui-switch": "^1.2.0",
-    "awesome-typescript-loader": "^3.4.1",
-    "codelyzer": "^4.0.2",
-    "copy-webpack-plugin": "^4.2.3",
-    "core-js": "^2.5.2",
-    "css-loader": "^0.28.7",
+    "awesome-typescript-loader": "^3.5.0",
+    "codelyzer": "^4.2.1",
+    "copy-webpack-plugin": "^4.5.1",
+    "core-js": "^2.5.3",
+    "css-loader": "^0.28.11",
     "cssnano": "^3.10.0",
     "embed-video": "^2.0.0",
     "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^1.1.5",
+    "file-loader": "^1.1.11",
     "goby": "^1.1.2",
-    "html-loader": "^0.5.1",
+    "html-loader": "^0.5.5",
     "html-webpack-plugin": "^2.28.0",
-    "jquery": "^3.2.1",
+    "jquery": "^3.3.1",
     "json-loader": "^0.5.4",
     "ng2-breadcrumbs": "^0.1.281",
     "ngx-modialog": "^5.0.0",
-    "node-sass": "^4.7.2",
-    "postcss-cssnext": "^3.0.0",
-    "postcss-import": "^11.0.0",
-    "postcss-loader": "^2.0.9",
-    "postcss-scss": "^1.0.0",
+    "node-sass": "^4.8.3",
+    "postcss-cssnext": "^3.1.0",
+    "postcss-import": "^11.1.0",
+    "postcss-loader": "^2.1.3",
+    "postcss-scss": "^1.0.4",
     "raw-loader": "^0.5.1",
-    "reflect-metadata": "^0.1.10",
+    "reflect-metadata": "^0.1.12",
     "rimraf": "^2.6.2",
-    "rxjs": "^5.5.5",
-    "sass-loader": "^6.0.3",
+    "rxjs": "^5.5.7",
+    "sass-loader": "^6.0.7",
     "screenfull": "^3.3.2",
     "shelljs": "^0.7.8",
     "spinkit": "^1.2.5",
     "style-loader": "^0.19.1",
     "ts-helpers": "^1.1.2",
-    "tslint": "^5.8.0",
-    "tslint-loader": "^3.4.3",
+    "tslint": "^5.9.1",
+    "tslint-loader": "^3.6.0",
     "url-loader": "^0.6.2",
-    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.9.7",
-    "zone.js": "^0.8.18"
+    "webpack": "^3.11.0",
+    "webpack-dev-server": "^2.11.2",
+    "zone.js": "^0.8.20"
   }
 }
diff --git a/tslint.json b/tslint.json
index 94550bd..a589c97 100644
--- a/tslint.json
+++ b/tslint.json
@@ -5,8 +5,7 @@
   "rules": {
     "class-name": false,
     "comment-format": [
-      true,
-      "check-space"
+      true
     ],
     "curly": false,
     "eofline": false,
@@ -20,7 +19,7 @@
     "member-access": false,
     "member-ordering": [
       true,
-      "static-before-instance",
+      "static-after-instance",
       "variables-before-functions"
     ],
     "no-arg": true,

From cee2e72a46d1ad775a484cc872ffdf21f98b794d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 21 Mar 2018 20:41:39 -0600
Subject: [PATCH 050/111] Appease the linter

---
 package.json       | 1 +
 src/MemoryCache.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4aa9876..23847c1 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "build": "rimraf build && npm run-script build:web && npm run-script build:app",
     "build:web": "webpack --progress --profile --bail",
     "build:app": "tsc -p tsconfig-app.json",
+    "lint": "npm run-script lint:app",
     "lint:app": "tslint --project ./tsconfig-app.json -t stylish"
   },
   "repository": {
diff --git a/src/MemoryCache.ts b/src/MemoryCache.ts
index 2fdae45..6453a26 100644
--- a/src/MemoryCache.ts
+++ b/src/MemoryCache.ts
@@ -1,8 +1,8 @@
-import * as cache from "memory-cache";
+import * as memoryCache from "memory-cache";
 
 export class MemoryCache {
 
-    private internalCache = new cache.Cache();
+    private internalCache = new memoryCache.Cache();
 
     constructor() {
     }

From 9a62b34fb7fc8501a2478e3b44e94fa968e55a98 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 22 Mar 2018 12:55:50 -0600
Subject: [PATCH 051/111] Fix type parameters coming from parsed URLs

---
 web/app/configs/widget/jitsi/jitsi.widget.component.ts     | 2 +-
 web/app/configs/widget/youtube/youtube.widget.component.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/configs/widget/jitsi/jitsi.widget.component.ts b/web/app/configs/widget/jitsi/jitsi.widget.component.ts
index ef4c805..0750aef 100644
--- a/web/app/configs/widget/jitsi/jitsi.widget.component.ts
+++ b/web/app/configs/widget/jitsi/jitsi.widget.component.ts
@@ -25,7 +25,7 @@ export class JitsiWidgetConfigComponent extends WidgetComponent {
             const conferenceId = parsedUrl.query["conferenceId"];
             const confId = parsedUrl.query["confId"];
             const domain = parsedUrl.query["domain"];
-            let isAudioConf = parsedUrl.query["isAudioConf"];
+            let isAudioConf: string | boolean = <string>parsedUrl.query["isAudioConf"];
 
             // Convert isAudioConf to boolean
             if (isAudioConf === "true") isAudioConf = true;
diff --git a/web/app/configs/widget/youtube/youtube.widget.component.ts b/web/app/configs/widget/youtube/youtube.widget.component.ts
index 8cce0cb..28f8d15 100644
--- a/web/app/configs/widget/youtube/youtube.widget.component.ts
+++ b/web/app/configs/widget/youtube/youtube.widget.component.ts
@@ -29,7 +29,7 @@ export class YoutubeWidgetConfigComponent extends WidgetComponent {
                 // Older Dimension widget - infer link
                 const parsedUrl = url.parse(widget.url, true);
                 if (parsedUrl.query["url"]) {
-                    widget.data.videoUrl = this.parseVideoUrl(decodeURIComponent(parsedUrl.query["url"]));
+                    widget.data.videoUrl = this.parseVideoUrl(decodeURIComponent(<string>parsedUrl.query["url"]));
                 } else console.warn("Cannot parse URL for " + widget.id);
             }
         }

From b0de14eb57e3b63e64bf21b93853542bde88309d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 20:14:43 -0600
Subject: [PATCH 052/111] Change the Dimension startup to make use of
 async/await

---
 src/index.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 17d2463..43e96c0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,10 +7,11 @@ import { CURRENT_VERSION } from "./version";
 LogService.configure(config.logging);
 LogService.info("index", "Starting dimension " + CURRENT_VERSION);
 
-const webserver = new Webserver();
+async function startup() {
+    await DimensionStore.updateSchema();
 
-DimensionStore.updateSchema()
-    .then(() => webserver.start())
-    .then(() => {
-        LogService.info("index", "Dimension is ready!");
-    });
\ No newline at end of file
+    const webserver = new Webserver();
+    await webserver.start();
+}
+
+startup().then(() => LogService.info("index", "Dimension is ready!"));
\ No newline at end of file

From b8591b51e43f8d45d4116b0fce61815e39c5518c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 20:15:03 -0600
Subject: [PATCH 053/111] Fix the edit button alignment on the self-hosted bot
 configuration

---
 web/app/admin/neb/edit/edit.component.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/app/admin/neb/edit/edit.component.scss b/web/app/admin/neb/edit/edit.component.scss
index e69de29..62d2182 100644
--- a/web/app/admin/neb/edit/edit.component.scss
+++ b/web/app/admin/neb/edit/edit.component.scss
@@ -0,0 +1,4 @@
+.editButton {
+  cursor: pointer;
+  vertical-align: text-bottom;
+}
\ No newline at end of file

From 51ea270fba518fd678a111e63a2751dd69c43bc5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 20:15:29 -0600
Subject: [PATCH 054/111] Adjust the widget configuration button alignment to
 be better aligned

Using `top` was really just a hack
---
 web/app/admin/widgets/widgets.component.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/app/admin/widgets/widgets.component.scss b/web/app/admin/widgets/widgets.component.scss
index 1894618..3a81310 100644
--- a/web/app/admin/widgets/widgets.component.scss
+++ b/web/app/admin/widgets/widgets.component.scss
@@ -1,7 +1,6 @@
 .editButton {
   cursor: pointer;
-  position: relative;
-  top: -5px;
+  vertical-align: text-bottom;
 }
 
 tr td:last-child {

From 42315de8df831745c3a8ae4de6ed4619293697d0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 20:15:51 -0600
Subject: [PATCH 055/111] List the enabled bots on the go-neb page

---
 web/app/admin/neb/neb.component.html | 4 ++++
 web/app/admin/neb/neb.component.ts   | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/app/admin/neb/neb.component.html b/web/app/admin/neb/neb.component.html
index a80a802..6c0bdfe 100644
--- a/web/app/admin/neb/neb.component.html
+++ b/web/app/admin/neb/neb.component.html
@@ -13,6 +13,7 @@
                 <thead>
                 <tr>
                     <th>Name</th>
+                    <th>Enabled Bots</th>
                     <th class="text-center" style="width: 120px;">Actions</th>
                 </tr>
                 </thead>
@@ -25,6 +26,9 @@
                         {{ neb.upstreamId ? "matrix.org's go-neb" : "Self-hosted go-neb" }}
                         <span class="text-muted" style="display: inline-block;" *ngIf="!neb.upstreamId">({{ neb.adminUrl }})</span>
                     </td>
+                    <td>
+                        {{ getEnabledBotsString(neb) }}
+                    </td>
                     <td class="text-center">
                         <span class="appsvcConfigButton" (click)="showAppserviceConfig(neb)"
                               *ngIf="!neb.upstreamId">
diff --git a/web/app/admin/neb/neb.component.ts b/web/app/admin/neb/neb.component.ts
index f81e2a0..a52e5e1 100644
--- a/web/app/admin/neb/neb.component.ts
+++ b/web/app/admin/neb/neb.component.ts
@@ -24,7 +24,7 @@ export class AdminNebComponent {
                 private appserviceApi: AdminAppserviceApiService,
                 private toaster: ToasterService,
                 private router: Router,
-                private activatedRoute:ActivatedRoute) {
+                private activatedRoute: ActivatedRoute) {
 
         this.reload().then(() => this.isLoading = false).catch(error => {
             console.error(error);
@@ -71,6 +71,12 @@ export class AdminNebComponent {
         console.log(neb);
     }
 
+    public getEnabledBotsString(neb: FE_NebConfiguration): string {
+        const result = neb.integrations.filter(i => i.isEnabled).map(i => i.displayName).join(", ");
+        if (!result) return "None";
+        return result;
+    }
+
     public addSelfHostedNeb() {
         this.router.navigate(["new", "selfhosted"], {relativeTo: this.activatedRoute});
     }

From 51740308a2d95d142f0bb8026f63d875258b6e88 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 20:15:59 -0600
Subject: [PATCH 056/111] Fix a bug where all bots are considered handled

---
 web/app/admin/neb/edit/edit.component.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 52955a2..8d46437 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -20,7 +20,6 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
 
     private subscription: any;
     private overlappingTypes: string[] = [];
-    private botTypes: string[] = [];
 
     constructor(private nebApi: AdminNebApiService, private route: ActivatedRoute, private toaster: ToasterService) {
     }
@@ -70,8 +69,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
                     this.nebConfig = config;
                 } else {
                     for (const type of config.integrations) {
-                        this.botTypes.push(type.type);
-                        handledTypes.push(type.type);
+                        if (type.isEnabled) handledTypes.push(type.type);
                     }
                 }
             }

From 8d6c2dfa00dd71e6087bb986ee6794aa84ebf3c0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 21:01:56 -0600
Subject: [PATCH 057/111] Convert the frontend to the async/await pattern

We have to drop bluebird to be able to do this.
---
 package.json                                  |   1 -
 src/api/ApiError.ts                           |   4 +-
 src/api/dimension/DimensionAdminService.ts    |  45 +++-----
 .../DimensionAppserviceAdminService.ts        |  46 ++++----
 .../DimensionIntegrationsAdminService.ts      |  39 ++++---
 .../dimension/DimensionIntegrationsService.ts |  49 ++++-----
 src/api/dimension/DimensionNebAdminService.ts |  85 +++++++--------
 .../DimensionUpstreamAdminService.ts          |  42 ++++---
 src/api/matrix/MatrixAppServiceApiService.ts  |  51 +++++----
 src/api/scalar/ScalarService.ts               | 103 +++++++-----------
 src/api/scalar/ScalarWidgetService.ts         |  29 +++--
 src/db/AppserviceStore.ts                     |  13 +--
 src/db/DimensionStore.ts                      |   1 -
 src/db/NebStore.ts                            |  11 +-
 src/db/ScalarStore.ts                         |   5 +-
 src/db/WidgetStore.ts                         |   7 +-
 src/db/migrations/20171218203245-AddTables.ts |   1 -
 .../migrations/20171218203245-AddWidgets.ts   |   1 -
 .../20171224122045-AddAppservices.ts          |   1 -
 .../20171224124645-AddAppserviceUsers.ts      |   1 -
 src/db/migrations/20171224140745-AddNeb.ts    |   1 -
 src/matrix/MatrixAppserviceClient.ts          |   1 -
 src/matrix/MatrixLiteClient.ts                |   1 -
 src/matrix/MatrixOpenIdClient.ts              |   1 -
 src/matrix/helpers.ts                         |   1 -
 src/scalar/ScalarClient.ts                    |   1 -
 26 files changed, 243 insertions(+), 298 deletions(-)

diff --git a/package.json b/package.json
index 23847c1..97afd29 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
   "dependencies": {
     "@types/body-parser": "^1.16.8",
     "@types/node": "^8.9.5",
-    "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
     "config": "^1.30.0",
     "dns-then": "^0.1.0",
diff --git a/src/api/ApiError.ts b/src/api/ApiError.ts
index c9603a0..1df7964 100644
--- a/src/api/ApiError.ts
+++ b/src/api/ApiError.ts
@@ -2,8 +2,9 @@ export class ApiError {
 
     public statusCode: number;
     public jsonResponse: any;
+    public errorCode: string;
 
-    constructor(statusCode: number, json: any) {
+    constructor(statusCode: number, json: any, errCode = "D_UNKNOWN") {
         // Because typescript is just plain dumb
         // https://stackoverflow.com/questions/31626231/custom-error-class-in-typescript
         Error.apply(this, ["ApiError"]);
@@ -11,5 +12,6 @@ export class ApiError {
         if (typeof(json) === "string") json = {message: json};
         this.jsonResponse = json;
         this.statusCode = statusCode;
+        this.errorCode = errCode;
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionAdminService.ts b/src/api/dimension/DimensionAdminService.ts
index 10f5b38..6b84905 100644
--- a/src/api/dimension/DimensionAdminService.ts
+++ b/src/api/dimension/DimensionAdminService.ts
@@ -1,5 +1,4 @@
 import { GET, Path, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
 import config from "../../config";
 import { ApiError } from "../ApiError";
@@ -27,51 +26,41 @@ export class DimensionAdminService {
         return config.admins.indexOf(userId) >= 0;
     }
 
-    public static validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
-        return ScalarService.getTokenOwner(scalarToken, true).then(userId => {
-            if (!DimensionAdminService.isAdmin(userId))
-                throw new ApiError(401, {message: "You must be an administrator to use this API"});
-            else return userId;
-        }, ScalarService.invalidTokenErrorHandler);
+    public static async validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
+        const userId = await ScalarService.getTokenOwner(scalarToken, true);
+        if (!DimensionAdminService.isAdmin(userId))
+            throw new ApiError(401, "You must be an administrator to use this API");
+        return userId;
     }
 
     @GET
     @Path("check")
-    public checkIfAdmin(@QueryParam("scalar_token") scalarToken: string): Promise<{}> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return {}; // A 200 OK essentially means "you're an admin".
-        });
+    public async checkIfAdmin(@QueryParam("scalar_token") scalarToken: string): Promise<{}> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return {}; // A 200 OK essentially means "you're an admin".
     }
 
     @GET
     @Path("version")
-    public getVersion(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionVersionResponse> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return {version: CURRENT_VERSION};
-        });
+    public async getVersion(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionVersionResponse> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return {version: CURRENT_VERSION};
     }
 
     @GET
     @Path("config")
-    public getConfig(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionConfigResponse> {
+    public async getConfig(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionConfigResponse> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
         const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
-        const response: DimensionConfigResponse = {
+        return {
             admins: config.admins,
             widgetBlacklist: config.widgetBlacklist,
             homeserver: {
                 name: config.homeserver.name,
-                userId: "", // populated below
-                federationUrl: "", // populated below
+                userId: await client.whoAmI(),
+                federationUrl: await client.getFederationUrl(),
             },
         };
-
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return client.whoAmI();
-        }).then(userId => {
-            response.homeserver.userId = userId;
-            return client.getFederationUrl();
-        }).then(url => {
-            response.homeserver.federationUrl = url;
-        }).then(() => response);
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionAppserviceAdminService.ts b/src/api/dimension/DimensionAppserviceAdminService.ts
index b253562..4467234 100644
--- a/src/api/dimension/DimensionAppserviceAdminService.ts
+++ b/src/api/dimension/DimensionAppserviceAdminService.ts
@@ -1,5 +1,4 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { DimensionAdminService } from "./DimensionAdminService";
 import AppService from "../../db/models/AppService";
 import { AppserviceStore } from "../../db/AppserviceStore";
@@ -33,49 +32,44 @@ export class DimensionAppserviceAdminService {
 
     @GET
     @Path("all")
-    public getAppservices(@QueryParam("scalar_token") scalarToken: string): Promise<AppserviceResponse[]> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return AppService.findAll();
-        }).then(appservices => {
-            return appservices.map(this.mapAppservice);
-        });
+    public async getAppservices(@QueryParam("scalar_token") scalarToken: string): Promise<AppserviceResponse[]> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return (await AppService.findAll()).map(a => this.mapAppservice(a));
     }
 
     @POST
     @Path("new")
-    public createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
+    public async createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
         // Trim off the @ sign if it's on the prefix
         if (request.userPrefix[0] === "@") {
             request.userPrefix = request.userPrefix.substring(1);
         }
 
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return AppserviceStore.getAllByUserPrefix(request.userPrefix);
-        }).then(appservices => {
-            if (appservices && appservices.length > 0) {
-                throw new ApiError(400, "User prefix is already in use");
-            }
+        const appservices = await AppserviceStore.getAllByUserPrefix(request.userPrefix);
+        if (appservices && appservices.length > 0) {
+            throw new ApiError(400, "User prefix is already in use");
+        }
 
-            return AppserviceStore.create(AppserviceStore.getSafeUserId(request.userPrefix));
-        }).then(this.mapAppservice);
+        const appservice = await AppserviceStore.create(AppserviceStore.getSafeUserId(request.userPrefix));
+        return this.mapAppservice(appservice);
     }
 
     @GET
     @Path(":appserviceId/users")
-    public getUsers(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<UserResponse[]> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return AppserviceStore.getUsers(asId);
-        }).then(users => {
-            return users.map(this.mapUser);
-        });
+    public async getUsers(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<UserResponse[]> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return (await AppserviceStore.getUsers(asId)).map(u => this.mapUser(u));
     }
 
     @POST
     @Path(":appserviceId/users/register")
-    public registerUser(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string, request: NewUserRequest): Promise<UserResponse> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return AppserviceStore.registerUser(asId, request.userId);
-        }).then(this.mapUser);
+    public async registerUser(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string, request: NewUserRequest): Promise<UserResponse> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const user = await AppserviceStore.registerUser(asId, request.userId);
+        return this.mapUser(user);
     }
 
     private mapAppservice(as: AppService): AppserviceResponse {
diff --git a/src/api/dimension/DimensionIntegrationsAdminService.ts b/src/api/dimension/DimensionIntegrationsAdminService.ts
index 50db610..3ed77eb 100644
--- a/src/api/dimension/DimensionIntegrationsAdminService.ts
+++ b/src/api/dimension/DimensionIntegrationsAdminService.ts
@@ -1,10 +1,9 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { ApiError } from "../ApiError";
 import { DimensionAdminService } from "./DimensionAdminService";
 import { DimensionIntegrationsService, IntegrationsResponse } from "./DimensionIntegrationsService";
 import { WidgetStore } from "../../db/WidgetStore";
-import { CACHE_INTEGRATIONS, Cache } from "../../MemoryCache";
+import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 
 interface SetEnabledRequest {
     enabled: boolean;
@@ -19,29 +18,33 @@ export class DimensionIntegrationsAdminService {
 
     @POST
     @Path(":category/:type/options")
-    public setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            if (category === "widget") {
-                return WidgetStore.setOptions(type, body.options);
-            } else throw new ApiError(400, "Unrecongized category");
-        }).then(() => Cache.for(CACHE_INTEGRATIONS).clear());
+    public async setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        if (category === "widget") await WidgetStore.setOptions(type, body.options);
+        else throw new ApiError(400, "Unrecognized category");
+
+        Cache.for(CACHE_INTEGRATIONS).clear();
+        return {}; // 200 OK
     }
 
+
     @POST
     @Path(":category/:type/enabled")
-    public setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            if (category === "widget") {
-                return WidgetStore.setEnabled(type, body.enabled);
-            } else throw new ApiError(400, "Unrecongized category");
-        }).then(() => Cache.for(CACHE_INTEGRATIONS).clear());
+    public async setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        if (category === "widget") await WidgetStore.setEnabled(type, body.enabled);
+        else throw new ApiError(400, "Unrecognized category");
+
+        Cache.for(CACHE_INTEGRATIONS).clear();
+        return {}; // 200 OK
     }
 
     @GET
     @Path("all")
-    public getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return DimensionIntegrationsService.getIntegrations(null);
-        });
+    public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return DimensionIntegrationsService.getIntegrations(null);
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index fd6617f..728852a 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -1,8 +1,7 @@
 import { GET, Path, PathParam, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { ScalarService } from "../scalar/ScalarService";
 import { Widget } from "../../integrations/Widget";
-import { CACHE_INTEGRATIONS, Cache } from "../../MemoryCache";
+import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
 import { ApiError } from "../ApiError";
 import { WidgetStore } from "../../db/WidgetStore";
@@ -14,34 +13,27 @@ export interface IntegrationsResponse {
 @Path("/api/v1/dimension/integrations")
 export class DimensionIntegrationsService {
 
-    public static getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
-        const cachedResponse = Cache.for(CACHE_INTEGRATIONS).get("integrations_" + isEnabledCheck);
-        if (cachedResponse) {
-            return cachedResponse;
+    public static async getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
+        const cachedWidgets = Cache.for(CACHE_INTEGRATIONS).get("integrations_" + isEnabledCheck);
+        if (cachedWidgets) {
+            return {widgets: cachedWidgets};
         }
-        const response = <IntegrationsResponse>{
-            widgets: [],
-        };
-        return Promise.resolve()
-            .then(() => WidgetStore.listAll(isEnabledCheck))
-            .then(widgets => response.widgets = widgets)
 
-            // Cache and return response
-            .then(() => Cache.for(CACHE_INTEGRATIONS).put("integrations_" + isEnabledCheck, response))
-            .then(() => response);
+        const widgets = await WidgetStore.listAll(isEnabledCheck);
+        Cache.for(CACHE_INTEGRATIONS).put("integrations_" + isEnabledCheck, widgets);
+        return {widgets: widgets};
     }
 
     @GET
     @Path("enabled")
-    public getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
-        return ScalarService.getTokenOwner(scalarToken).then(_userId => {
-            return DimensionIntegrationsService.getIntegrations(true);
-        }, ScalarService.invalidTokenErrorHandler);
+    public async getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
+        await ScalarService.getTokenOwner(scalarToken);
+        return DimensionIntegrationsService.getIntegrations(true);
     }
 
     @GET
     @Path("room/:roomId")
-    public getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string): Promise<IntegrationsResponse> {
+    public async getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string): Promise<IntegrationsResponse> {
         console.log(roomId);
         // TODO: Other integrations
         return this.getEnabledIntegrations(scalarToken);
@@ -49,18 +41,15 @@ export class DimensionIntegrationsService {
 
     @GET
     @Path(":category/:type")
-    public getIntegration(@PathParam("category") category: string, @PathParam("type") type: string): Promise<Integration> {
+    public async getIntegration(@PathParam("category") category: string, @PathParam("type") type: string): Promise<Integration> {
         // This is intentionally an unauthed endpoint to ensure we can use it in widgets
-        return DimensionIntegrationsService.getIntegrations(true).then(response => {
-            for (const key of Object.keys(response)) {
-                for (const integration of <Integration[]>response[key]) {
-                    if (integration.category === category && integration.type === type) {
-                        return integration;
-                    }
-                }
+        const integrationsResponse = await DimensionIntegrationsService.getIntegrations(true);
+        for (const key in integrationsResponse) {
+            for (const integration of integrationsResponse[key]) {
+                if (integration.category === category && integration.type === type) return integration;
             }
+        }
 
-            throw new ApiError(404, "Integration not found");
-        });
+        throw new ApiError(404, "Integration not found");
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionNebAdminService.ts b/src/api/dimension/DimensionNebAdminService.ts
index eeebc2b..aefa6e1 100644
--- a/src/api/dimension/DimensionNebAdminService.ts
+++ b/src/api/dimension/DimensionNebAdminService.ts
@@ -1,5 +1,4 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { DimensionAdminService } from "./DimensionAdminService";
 import { Cache, CACHE_NEB } from "../../MemoryCache";
 import { NebStore } from "../../db/NebStore";
@@ -26,66 +25,66 @@ export class DimensionNebAdminService {
 
     @GET
     @Path("all")
-    public getNebConfigs(@QueryParam("scalar_token") scalarToken: string): Promise<NebConfig[]> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            const cachedConfigs = Cache.for(CACHE_NEB).get("configurations");
-            if (cachedConfigs) return cachedConfigs;
+    public async getNebConfigs(@QueryParam("scalar_token") scalarToken: string): Promise<NebConfig[]> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
 
-            return NebStore.getAllConfigs().then(configs => {
-                Cache.for(CACHE_NEB).put("configurations", configs);
-                return configs;
-            });
-        });
+        const cachedConfigs = Cache.for(CACHE_NEB).get("configurations");
+        if (cachedConfigs) return cachedConfigs;
+
+        const configs = await NebStore.getAllConfigs();
+        Cache.for(CACHE_NEB).put("configurations", configs);
+        return configs;
     }
 
     @GET
     @Path(":id/config")
-    public getNebConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number): Promise<NebConfig> {
-        return this.getNebConfigs(scalarToken).then(configs => {
-            for (const config of configs) {
-                if (config.id === nebId) return config;
-            }
-
-            throw new ApiError(404, "Configuration not found");
-        });
+    public async getNebConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number): Promise<NebConfig> {
+        const configs = await this.getNebConfigs(scalarToken); // does auth for us
+        const firstConfig = configs.filter(c => c.id === nebId)[0];
+        if (!firstConfig) throw new ApiError(404, "Configuration not found");
+        return firstConfig;
     }
 
     @POST
     @Path(":id/integration/:type/enabled")
-    public setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return NebStore.getOrCreateIntegration(nebId, integrationType);
-        }).then(integration => {
-            integration.isEnabled = request.enabled;
-            return integration.save();
-        }).then(() => Cache.for(CACHE_NEB).clear());
+    public async setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const integration = await NebStore.getOrCreateIntegration(nebId, integrationType);
+        integration.isEnabled = request.enabled;
+        await integration.save();
+        Cache.for(CACHE_NEB).clear();
+
+        return {}; // 200 OK
     }
 
     @POST
     @Path("new/upstream")
-    public newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<NebConfig> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return NebStore.createForUpstream(request.upstreamId).catch(err => {
-                LogService.error("DimensionNebAdminService", err);
-                throw new ApiError(500, "Error creating go-neb instance");
-            });
-        }).then(config => {
+    public async newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<NebConfig> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        try {
+            const neb = await NebStore.createForUpstream(request.upstreamId);
             Cache.for(CACHE_NEB).clear();
-            return config;
-        });
+            return neb;
+        } catch (err) {
+            LogService.error("DimensionNebAdminService", err);
+            throw new ApiError(500, "Error creating go-neb instance");
+        }
     }
 
     @POST
     @Path("new/appservice")
-    public newConfigForAppservice(@QueryParam("scalar_token") scalarToken: string, request: CreateWithAppservice): Promise<NebConfig> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return NebStore.createForAppservice(request.appserviceId, request.adminUrl).catch(err => {
-                LogService.error("DimensionNebAdminService", err);
-                throw new ApiError(500, "Error creating go-neb instance");
-            });
-        }).then(config => {
+    public async newConfigForAppservice(@QueryParam("scalar_token") scalarToken: string, request: CreateWithAppservice): Promise<NebConfig> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        try {
+            const neb = await NebStore.createForAppservice(request.appserviceId, request.adminUrl);
             Cache.for(CACHE_NEB).clear();
-            return config;
-        });
+            return neb;
+        } catch (err) {
+            LogService.error("DimensionNebAdminService", err);
+            throw new ApiError(500, "Error creating go-neb instance");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionUpstreamAdminService.ts b/src/api/dimension/DimensionUpstreamAdminService.ts
index bc8fc6a..74408ca 100644
--- a/src/api/dimension/DimensionUpstreamAdminService.ts
+++ b/src/api/dimension/DimensionUpstreamAdminService.ts
@@ -1,5 +1,4 @@
 import { GET, Path, POST, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { DimensionAdminService } from "./DimensionAdminService";
 import { Cache, CACHE_UPSTREAM } from "../../MemoryCache";
 import Upstream from "../../db/models/Upstream";
@@ -24,33 +23,32 @@ export class DimensionUpstreamAdminService {
 
     @GET
     @Path("all")
-    public getUpstreams(@QueryParam("scalar_token") scalarToken: string): Promise<UpstreamRepsonse[]> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            const cachedUpstreams = Cache.for(CACHE_UPSTREAM).get("upstreams");
-            if (cachedUpstreams) return cachedUpstreams;
-            return Upstream.findAll().then(upstreams => {
-                const mapped = upstreams.map(this.mapUpstream);
-                Cache.for(CACHE_UPSTREAM).put("upstreams", mapped);
+    public async getUpstreams(@QueryParam("scalar_token") scalarToken: string): Promise<UpstreamRepsonse[]> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
 
-                return mapped;
-            });
-        });
+        const cachedUpstreams = Cache.for(CACHE_UPSTREAM).get("upstreams");
+        if (cachedUpstreams) return cachedUpstreams;
+
+        const upstreams = await Upstream.findAll();
+        const mapped = upstreams.map(u => this.mapUpstream(u));
+        Cache.for(CACHE_UPSTREAM).put("upstreams", mapped);
+        return mapped;
     }
 
     @POST
     @Path("new")
-    public createUpstream(@QueryParam("scalar_token") scalarToken: string, request: NewUpstreamRequest): Promise<UpstreamRepsonse> {
-        return DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken).then(_userId => {
-            return Upstream.create({
-                name: request.name,
-                type: request.type,
-                scalarUrl: request.scalarUrl,
-                apiUrl: request.apiUrl,
-            });
-        }).then(upstream => {
-            Cache.for(CACHE_UPSTREAM).clear();
-            return this.mapUpstream(upstream);
+    public async createUpstream(@QueryParam("scalar_token") scalarToken: string, request: NewUpstreamRequest): Promise<UpstreamRepsonse> {
+        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const upstream = await Upstream.create({
+            name: request.name,
+            type: request.type,
+            scalarUrl: request.scalarUrl,
+            apiUrl: request.apiUrl,
         });
+
+        Cache.for(CACHE_UPSTREAM).clear();
+        return this.mapUpstream(upstream);
     }
 
     private mapUpstream(upstream: Upstream): UpstreamRepsonse {
diff --git a/src/api/matrix/MatrixAppServiceApiService.ts b/src/api/matrix/MatrixAppServiceApiService.ts
index 505ad63..417b121 100644
--- a/src/api/matrix/MatrixAppServiceApiService.ts
+++ b/src/api/matrix/MatrixAppServiceApiService.ts
@@ -1,5 +1,4 @@
 import { GET, Path, PathParam, PUT, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { ApiError } from "../ApiError";
 import { LogService } from "matrix-js-snippets";
 import { SimplifiedMatrixEvent } from "../../models/MatrixEvent";
@@ -18,48 +17,58 @@ export class MatrixAppServiceApiService {
 
     @PUT
     @Path("/transactions/:txnId")
-    public onTransaction(@QueryParam("access_token") homeserverToken: string, @PathParam("txnId") txnId: string, _txn: AppServiceTransaction): Promise<any> {
-        return AppserviceStore.getByHomeserverToken(homeserverToken).then(appservice => {
+    public async onTransaction(@QueryParam("access_token") homeserverToken: string, @PathParam("txnId") txnId: string, _txn: AppServiceTransaction): Promise<any> {
+        try {
+            const appservice = await AppserviceStore.getByHomeserverToken(homeserverToken);
+
             // We don't handle the transaction at all - we just don't want the homeserver to consider us down
             LogService.verbose("MatrixAppServiceApiService", "Accepting transaction " + txnId + " for appservice " + appservice.id + " blindly");
             return {}; // 200 OK
-        }, err => {
+        } catch (err) {
             LogService.error("MatrixAppServiceApiService", err);
             throw new ApiError(403, {errcode: "M_FORBIDDEN"});
-        });
+        }
     }
 
     @GET
     @Path("/room/:alias")
-    public getRoom(@QueryParam("access_token") homeserverToken: string, @PathParam("alias") roomAlias: string): Promise<any> {
-        return AppserviceStore.getByHomeserverToken(homeserverToken).then(appservice => {
+    public async getRoom(@QueryParam("access_token") homeserverToken: string, @PathParam("alias") roomAlias: string): Promise<any> {
+        try {
+            const appservice = await AppserviceStore.getByHomeserverToken(homeserverToken);
+
             // We don't support room lookups
             LogService.verbose("MatrixAppServiceApiService", "404ing request for room " + roomAlias + " at appservice " + appservice.id);
             throw new ApiError(404, {errcode: "IO.T2BOT.DIMENSION.ROOMS_NOT_SUPPORTED"});
-        }, err => {
+        } catch (err) {
+            if (err instanceof ApiError) throw err;
             LogService.error("MatrixAppServiceApiService", err);
             throw new ApiError(403, {errcode: "M_FORBIDDEN"});
-        });
+        }
     }
 
     @GET
     @Path("/user/:userId")
-    public getUser(@QueryParam("access_token") homeserverToken: string, @PathParam("userId") userId: string): Promise<any> {
-        return AppserviceStore.getByHomeserverToken(homeserverToken).then(appservice => {
-            return AppserviceStore.getUser(appservice.id, userId).catch(err => {
+    public async getUser(@QueryParam("access_token") homeserverToken: string, @PathParam("userId") userId: string): Promise<any> {
+        try {
+            const appservice = await AppserviceStore.getByHomeserverToken(homeserverToken);
+
+            try {
+                const user = await AppserviceStore.getUser(appservice.id, userId);
+                return {
+                    userId: user.id,
+                    displayName: user.displayName,
+                    avatarUrl: user.avatarUrl,
+                }
+            } catch (err) {
                 LogService.error("MatrixAppServiceApiService", err);
                 throw new ApiError(404, {errcode: "IO.T2BOT.DIMENSION.USER_NOT_FOUND"});
-            });
-        }, err => {
+            }
+        } catch (err) {
+            if (err instanceof ApiError) throw err;
+
             LogService.error("MatrixAppServiceApiService", err);
             throw new ApiError(403, {errcode: "M_FORBIDDEN"});
-        }).then(appserviceUser => {
-            return {
-                userId: appserviceUser.id,
-                displayName: appserviceUser.displayName,
-                avatarUrl: appserviceUser.avatarUrl,
-            };
-        });
+        }
     }
 
 }
\ No newline at end of file
diff --git a/src/api/scalar/ScalarService.ts b/src/api/scalar/ScalarService.ts
index 3d7c467..758aa6a 100644
--- a/src/api/scalar/ScalarService.ts
+++ b/src/api/scalar/ScalarService.ts
@@ -1,5 +1,4 @@
 import { GET, Path, POST, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { MatrixOpenIdClient } from "../../matrix/MatrixOpenIdClient";
 import Upstream from "../../db/models/Upstream";
 import { ScalarClient } from "../../scalar/ScalarClient";
@@ -23,80 +22,62 @@ interface RegisterRequest {
 @Path("/api/v1/scalar")
 export class ScalarService {
 
-    public static getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<string> {
+    public static async getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<string> {
         const cachedUserId = Cache.for(CACHE_SCALAR_ACCOUNTS).get(scalarToken);
-        if (cachedUserId) return Promise.resolve(cachedUserId);
+        if (cachedUserId) return cachedUserId;
 
-        return ScalarStore.getTokenOwner(scalarToken, ignoreUpstreams).then(user => {
-            if (!user) return Promise.reject("Invalid token");
-            Cache.for(CACHE_SCALAR_ACCOUNTS).put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
-            return Promise.resolve(user.userId);
-        });
-    }
+        const user = await ScalarStore.getTokenOwner(scalarToken, ignoreUpstreams);
+        if (!user) throw new ApiError(401, "Invalid token");
 
-    public static invalidTokenErrorHandler(error: any): any {
-        if (error !== "Invalid token") {
-            LogService.error("ScalarWidgetService", "Error processing request");
-            LogService.error("ScalarWidgetService", error);
-        }
-        throw new ApiError(401, {message: "Invalid token"});
+        Cache.for(CACHE_SCALAR_ACCOUNTS).put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
+        return user.userId;
     }
 
     @POST
     @Path("register")
-    public register(request: RegisterRequest): Promise<ScalarRegisterResponse> {
-        let userId = null;
+    public async register(request: RegisterRequest): Promise<ScalarRegisterResponse> {
         const mxClient = new MatrixOpenIdClient(<OpenId>request);
-        return mxClient.getUserId().then(mxUserId => {
-            userId = mxUserId;
-            return User.findByPrimary(userId).then(user => {
-                if (!user) {
-                    // There's a small chance we'll get a validation error because of:
-                    // https://github.com/vector-im/riot-web/issues/5846
-                    LogService.verbose("ScalarService", "User " + userId + " never seen before - creating");
-                    return User.create({userId: userId});
-                }
-            });
-        }).then(() => {
-            return Upstream.findAll();
-        }).then(upstreams => {
-            return Promise.all(upstreams.map(u => {
-                return UserScalarToken.findAll({where: {userId: userId, upstreamId: u.id}}).then(tokens => {
-                    if (!tokens || tokens.length === 0) {
-                        LogService.info("ScalarService", "Registering " + userId + " for token at upstream " + u.id + " (" + u.name + ")");
-                        const client = new ScalarClient(u);
-                        return client.register(<OpenId>request).then(registerResponse => {
-                            return UserScalarToken.create({
-                                userId: userId,
-                                scalarToken: registerResponse.scalar_token,
-                                isDimensionToken: false,
-                                upstreamId: u.id,
-                            });
-                        });
-                    }
+        const mxUserId = await mxClient.getUserId();
+
+        const user = await User.findByPrimary(mxUserId);
+        if (!user) {
+            // There's a small chance we'll get a validation error because of:
+            // https://github.com/vector-im/riot-web/issues/5846
+            LogService.verbose("ScalarService", "User " + mxUserId + " never seen before - creating");
+            await User.create({userId: mxUserId});
+        }
+
+        const upstreams = await Upstream.findAll();
+        await Promise.all(upstreams.map(async upstream => {
+            const tokens = await UserScalarToken.findAll({where: {userId: mxUserId, upstreamId: upstream.id}});
+            if (!tokens || tokens.length === 0) {
+                LogService.info("ScalarService", "Registering " + mxUserId + " for a token at upstream " + upstream.id + " (" + upstream.name + ")");
+                const client = new ScalarClient(upstream);
+                const response = await client.register(<OpenId>request);
+                return UserScalarToken.create({
+                    userId: mxUserId,
+                    scalarToken: response.scalar_token,
+                    isDimensionToken: false,
+                    upstreamId: upstream.id,
                 });
-            }));
-        }).then(() => {
-            const dimensionToken = randomString({length: 25});
-            return UserScalarToken.create({
-                userId: userId,
-                scalarToken: dimensionToken,
-                isDimensionToken: true,
-            });
-        }).then(userToken => {
-            return {scalar_token: userToken.scalarToken};
-        }).catch(err => {
-            LogService.error("ScalarService", err);
-            throw new ApiError(401, {message: "Failed to authenticate user"});
+            }
+        }));
+
+        const dimensionToken = randomString({length: 25});
+        const dimensionScalarToken = await UserScalarToken.create({
+            userId: mxUserId,
+            scalarToken: dimensionToken,
+            isDimensionToken: true,
         });
+
+        return {scalar_token: dimensionScalarToken.scalarToken};
     }
 
     @GET
     @Path("account")
-    public getAccount(@QueryParam("scalar_token") scalarToken: string): Promise<ScalarAccountResponse> {
-        return ScalarService.getTokenOwner(scalarToken).then(userId => {
-            return {user_id: userId};
-        }, ScalarService.invalidTokenErrorHandler);
+    public async getAccount(@QueryParam("scalar_token") scalarToken: string): Promise<ScalarAccountResponse> {
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+        return {user_id: userId};
     }
 
 }
\ No newline at end of file
diff --git a/src/api/scalar/ScalarWidgetService.ts b/src/api/scalar/ScalarWidgetService.ts
index 46e40b8..dfca227 100644
--- a/src/api/scalar/ScalarWidgetService.ts
+++ b/src/api/scalar/ScalarWidgetService.ts
@@ -1,7 +1,6 @@
 import { GET, Path, QueryParam } from "typescript-rest";
-import * as Promise from "bluebird";
 import { LogService } from "matrix-js-snippets";
-import { CACHE_WIDGET_TITLES, Cache } from "../../MemoryCache";
+import { Cache, CACHE_WIDGET_TITLES } from "../../MemoryCache";
 import { MatrixLiteClient } from "../../matrix/MatrixLiteClient";
 import config from "../../config";
 import { ScalarService } from "./ScalarService";
@@ -22,15 +21,21 @@ interface UrlPreviewResponse {
 @Path("/api/v1/scalar/widgets")
 export class ScalarWidgetService {
 
-    private static getUrlTitle(url: string): Promise<UrlPreviewResponse> {
+    @GET
+    @Path("title_lookup")
+    public async titleLookup(@QueryParam("scalar_token") scalarToken: string, @QueryParam("curl") url: string): Promise<UrlPreviewResponse> {
+        await ScalarService.getTokenOwner(scalarToken);
+
         const cachedResult = Cache.for(CACHE_WIDGET_TITLES).get(url);
         if (cachedResult) {
             cachedResult.cached_response = true;
-            return Promise.resolve(cachedResult);
+            return cachedResult;
         }
 
         const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
-        return client.getUrlPreview(url).then(preview => {
+
+        try {
+            const preview = await client.getUrlPreview(url);
             const expirationTime = 60 * 80 * 1000; // 1 hour
             const expirationAsString = moment().add(expirationTime, "milliseconds").toISOString();
             const cachedItem = {
@@ -44,7 +49,7 @@ export class ScalarWidgetService {
             };
             Cache.for(CACHE_WIDGET_TITLES).put(url, cachedItem, expirationTime);
             return cachedItem;
-        }).catch(err => {
+        } catch (err) {
             LogService.error("ScalarWidgetService", "Error getting URL preview");
             LogService.error("ScalarWidgetService", err);
             return <UrlPreviewResponse>{
@@ -53,20 +58,12 @@ export class ScalarWidgetService {
                 page_title_cache_item: {
                     expires: null,
                     cached_response_err: "Failed to get URL preview",
-                    cached_title: null
+                    cached_title: null,
                 },
                 error: {
                     message: "Failed to get URL preview",
                 },
             };
-        })
-    }
-
-    @GET
-    @Path("title_lookup")
-    public titleLookup(@QueryParam("scalar_token") scalarToken: string, @QueryParam("curl") url: string): Promise<UrlPreviewResponse> {
-        return ScalarService.getTokenOwner(scalarToken).then(_userId => {
-            return ScalarWidgetService.getUrlTitle(url);
-        }, ScalarService.invalidTokenErrorHandler);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index c454270..fce1b91 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -1,14 +1,13 @@
 import AppService from "./models/AppService";
 import AppServiceUser from "./models/AppServiceUser";
 import * as randomString from "random-string";
-import * as Promise from "bluebird";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
 import { resolveIfExists } from "./DimensionStore";
 import config from "../config";
 
 export class AppserviceStore {
 
-    public static create(userPrefix: string): Promise<AppService> {
+    public static async create(userPrefix: string): Promise<AppService> {
         const id = "dimension-" + randomString({length: 25});
         const asToken = randomString({length: 100});
         const hsToken = randomString({length: 100});
@@ -21,15 +20,15 @@ export class AppserviceStore {
         });
     }
 
-    public static getUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
+    public static async getUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
         return AppServiceUser.findOne({where: {appserviceId: appserviceId, id: userId}}).then(resolveIfExists);
     }
 
-    public static getByHomeserverToken(hsToken: string): Promise<AppService> {
+    public static async getByHomeserverToken(hsToken: string): Promise<AppService> {
         return AppService.findOne({where: {hsToken: hsToken}}).then(resolveIfExists);
     }
 
-    public static getAllByUserPrefix(userPrefix: string): Promise<AppService[]> {
+    public static async getAllByUserPrefix(userPrefix: string): Promise<AppService[]> {
         return AppService.findAll({where: {userPrefix: userPrefix}});
     }
 
@@ -39,11 +38,11 @@ export class AppserviceStore {
         return userIdOrPrefix.toLowerCase().replace(/[^a-z0-9._\-=]/g, '.');
     }
 
-    public static getUsers(appserviceId: string): Promise<AppServiceUser[]> {
+    public static async getUsers(appserviceId: string): Promise<AppServiceUser[]> {
         return AppServiceUser.findAll({where: {appserviceId: appserviceId}});
     }
 
-    public static registerUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
+    public static async registerUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
         userId = AppserviceStore.getSafeUserId(userId);
         return AppService.findOne({where: {id: appserviceId}}).then(resolveIfExists).then(appservice => {
             const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index 34e7d2a..ecf05a3 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -4,7 +4,6 @@ import { LogService } from "matrix-js-snippets";
 import User from "./models/User";
 import UserScalarToken from "./models/UserScalarToken";
 import Upstream from "./models/Upstream";
-import * as Promise from "bluebird";
 import WidgetRecord from "./models/WidgetRecord";
 import * as path from "path";
 import * as Umzug from "umzug";
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index faf8849..0df0406 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -1,4 +1,3 @@
-import * as Promise from "bluebird";
 import { resolveIfExists } from "./DimensionStore";
 import { NebConfig } from "../models/neb";
 import NebConfiguration from "./models/NebConfiguration";
@@ -77,13 +76,13 @@ export class NebStore {
         },
     };
 
-    public static getAllConfigs(): Promise<NebConfig[]> {
+    public static async getAllConfigs(): Promise<NebConfig[]> {
         return NebConfiguration.findAll().then(configs => {
             return Promise.all((configs || []).map(c => NebStore.getConfig(c.id)));
         });
     }
 
-    public static getConfig(id: number): Promise<NebConfig> {
+    public static async getConfig(id: number): Promise<NebConfig> {
         let nebConfig: NebConfiguration;
         return NebConfiguration.findByPrimary(id).then(resolveIfExists).then(conf => {
             nebConfig = conf;
@@ -95,7 +94,7 @@ export class NebStore {
         });
     }
 
-    public static createForUpstream(upstreamId: number): Promise<NebConfig> {
+    public static async createForUpstream(upstreamId: number): Promise<NebConfig> {
         return Upstream.findByPrimary(upstreamId).then(resolveIfExists).then(upstream => {
             return NebConfiguration.create({
                 upstreamId: upstream.id,
@@ -105,7 +104,7 @@ export class NebStore {
         });
     }
 
-    public static createForAppservice(appserviceId: string, adminUrl: string): Promise<NebConfig> {
+    public static async createForAppservice(appserviceId: string, adminUrl: string): Promise<NebConfig> {
         return AppService.findByPrimary(appserviceId).then(resolveIfExists).then(appservice => {
             return NebConfiguration.create({
                 appserviceId: appservice.id,
@@ -116,7 +115,7 @@ export class NebStore {
         });
     }
 
-    public static getOrCreateIntegration(configurationId: number, integrationType: string): Promise<NebIntegration> {
+    public static async getOrCreateIntegration(configurationId: number, integrationType: string): Promise<NebIntegration> {
         if (!NebStore.INTEGRATIONS[integrationType]) return Promise.reject(new Error("Integration not supported"));
 
         return NebConfiguration.findByPrimary(configurationId).then(resolveIfExists).then(config => {
diff --git a/src/db/ScalarStore.ts b/src/db/ScalarStore.ts
index b34c5ea..99bb37a 100644
--- a/src/db/ScalarStore.ts
+++ b/src/db/ScalarStore.ts
@@ -1,4 +1,3 @@
-import * as Promise from "bluebird";
 import UserScalarToken from "./models/UserScalarToken";
 import { LogService } from "matrix-js-snippets";
 import Upstream from "./models/Upstream";
@@ -6,7 +5,7 @@ import User from "./models/User";
 
 export class ScalarStore {
 
-    public static doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
+    public static async doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
         let upstreamTokenIds: number[] = [];
         let hasDimensionToken = false;
         return UserScalarToken.findAll({where: {userId: userId}}).then(results => {
@@ -30,7 +29,7 @@ export class ScalarStore {
         });
     }
 
-    public static getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<User> {
+    public static async getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<User> {
         let user: User = null;
         return UserScalarToken.findAll({
             where: {isDimensionToken: true, scalarToken: scalarToken},
diff --git a/src/db/WidgetStore.ts b/src/db/WidgetStore.ts
index 4c22a5b..4a00ea8 100644
--- a/src/db/WidgetStore.ts
+++ b/src/db/WidgetStore.ts
@@ -1,24 +1,23 @@
-import * as Promise from "bluebird";
 import WidgetRecord from "./models/WidgetRecord";
 import { Widget } from "../integrations/Widget";
 import { resolveIfExists } from "./DimensionStore";
 
 export class WidgetStore {
 
-    public static listAll(isEnabled?: boolean): Promise<Widget[]> {
+    public static async listAll(isEnabled?: boolean): Promise<Widget[]> {
         let conditions = {};
         if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
         return WidgetRecord.findAll(conditions).then(widgets => widgets.map(w => new Widget(w)));
     }
 
-    public static setEnabled(type: string, isEnabled: boolean): Promise<any> {
+    public static async setEnabled(type: string, isEnabled: boolean): Promise<any> {
         return WidgetRecord.findOne({where: {type: type}}).then(resolveIfExists).then(widget => {
             widget.isEnabled = isEnabled;
             return widget.save();
         });
     }
 
-    public static setOptions(type: string, options: any): Promise<any> {
+    public static async setOptions(type: string, options: any): Promise<any> {
         const optionsJson = JSON.stringify(options);
         return WidgetRecord.findOne({where: {type: type}}).then(resolveIfExists).then(widget => {
             widget.optionsJson = optionsJson;
diff --git a/src/db/migrations/20171218203245-AddTables.ts b/src/db/migrations/20171218203245-AddTables.ts
index 2bb1847..d967582 100644
--- a/src/db/migrations/20171218203245-AddTables.ts
+++ b/src/db/migrations/20171218203245-AddTables.ts
@@ -1,6 +1,5 @@
 import { QueryInterface } from "sequelize";
 import { DataType } from "sequelize-typescript";
-import * as Promise from "bluebird";
 
 export default {
     up: (queryInterface: QueryInterface) => {
diff --git a/src/db/migrations/20171218203245-AddWidgets.ts b/src/db/migrations/20171218203245-AddWidgets.ts
index 7ad07fa..19b51c7 100644
--- a/src/db/migrations/20171218203245-AddWidgets.ts
+++ b/src/db/migrations/20171218203245-AddWidgets.ts
@@ -1,6 +1,5 @@
 import { QueryInterface } from "sequelize";
 import { DataType } from "sequelize-typescript";
-import * as Promise from "bluebird";
 
 export default {
     up: (queryInterface: QueryInterface) => {
diff --git a/src/db/migrations/20171224122045-AddAppservices.ts b/src/db/migrations/20171224122045-AddAppservices.ts
index cb22d08..d64f5b0 100644
--- a/src/db/migrations/20171224122045-AddAppservices.ts
+++ b/src/db/migrations/20171224122045-AddAppservices.ts
@@ -1,6 +1,5 @@
 import { QueryInterface } from "sequelize";
 import { DataType } from "sequelize-typescript";
-import * as Promise from "bluebird";
 
 export default {
     up: (queryInterface: QueryInterface) => {
diff --git a/src/db/migrations/20171224124645-AddAppserviceUsers.ts b/src/db/migrations/20171224124645-AddAppserviceUsers.ts
index 914d9db..4ae1877 100644
--- a/src/db/migrations/20171224124645-AddAppserviceUsers.ts
+++ b/src/db/migrations/20171224124645-AddAppserviceUsers.ts
@@ -1,6 +1,5 @@
 import { QueryInterface } from "sequelize";
 import { DataType } from "sequelize-typescript";
-import * as Promise from "bluebird";
 
 export default {
     up: (queryInterface: QueryInterface) => {
diff --git a/src/db/migrations/20171224140745-AddNeb.ts b/src/db/migrations/20171224140745-AddNeb.ts
index 4fcf944..42d1720 100644
--- a/src/db/migrations/20171224140745-AddNeb.ts
+++ b/src/db/migrations/20171224140745-AddNeb.ts
@@ -1,6 +1,5 @@
 import { QueryInterface } from "sequelize";
 import { DataType } from "sequelize-typescript";
-import * as Promise from "bluebird";
 
 export default {
     up: (queryInterface: QueryInterface) => {
diff --git a/src/matrix/MatrixAppserviceClient.ts b/src/matrix/MatrixAppserviceClient.ts
index 2d79560..4afefbc 100644
--- a/src/matrix/MatrixAppserviceClient.ts
+++ b/src/matrix/MatrixAppserviceClient.ts
@@ -1,4 +1,3 @@
-import * as Promise from "bluebird";
 import { doFederatedApiCall } from "./helpers";
 import AppService from "../db/models/AppService";
 
diff --git a/src/matrix/MatrixLiteClient.ts b/src/matrix/MatrixLiteClient.ts
index faf8782..e13958a 100644
--- a/src/matrix/MatrixLiteClient.ts
+++ b/src/matrix/MatrixLiteClient.ts
@@ -1,4 +1,3 @@
-import * as Promise from "bluebird";
 import { doFederatedApiCall, getFederationUrl as getFedUrl } from "./helpers";
 
 export interface MatrixUrlPreview {
diff --git a/src/matrix/MatrixOpenIdClient.ts b/src/matrix/MatrixOpenIdClient.ts
index beec738..7756083 100644
--- a/src/matrix/MatrixOpenIdClient.ts
+++ b/src/matrix/MatrixOpenIdClient.ts
@@ -1,4 +1,3 @@
-import * as Promise from "bluebird";
 import { doFederatedApiCall } from "./helpers";
 import { OpenId } from "../models/OpenId";
 
diff --git a/src/matrix/helpers.ts b/src/matrix/helpers.ts
index 4700890..2b3d2d2 100644
--- a/src/matrix/helpers.ts
+++ b/src/matrix/helpers.ts
@@ -1,5 +1,4 @@
 import * as dns from "dns-then";
-import * as Promise from "bluebird";
 import { LogService } from "matrix-js-snippets";
 import { Cache, CACHE_FEDERATION } from "../MemoryCache";
 import * as request from "request";
diff --git a/src/scalar/ScalarClient.ts b/src/scalar/ScalarClient.ts
index f064ab7..4cc86b6 100644
--- a/src/scalar/ScalarClient.ts
+++ b/src/scalar/ScalarClient.ts
@@ -1,6 +1,5 @@
 import { OpenId } from "../models/OpenId";
 import { ScalarRegisterResponse } from "../models/ScalarResponses";
-import * as Promise from "bluebird";
 import * as request from "request";
 import { LogService } from "matrix-js-snippets";
 import Upstream from "../db/models/Upstream";

From 7c757a79e65826bc47f107f603adb95f42cf121e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 21:26:14 -0600
Subject: [PATCH 058/111] Use async/await throughout the backend

---
 src/api/scalar/ScalarService.ts      | 13 ++--
 src/db/AppserviceStore.ts            | 31 ++++++----
 src/db/DimensionStore.ts             |  7 +--
 src/db/NebStore.ts                   | 88 ++++++++++++++--------------
 src/db/ScalarStore.ts                | 59 ++++++++-----------
 src/db/WidgetStore.ts                | 22 +++----
 src/matrix/MatrixAppserviceClient.ts |  2 +-
 src/matrix/MatrixLiteClient.ts       | 17 +++---
 src/matrix/MatrixOpenIdClient.ts     |  9 ++-
 src/matrix/helpers.ts                | 67 ++++++++++-----------
 10 files changed, 155 insertions(+), 160 deletions(-)

diff --git a/src/api/scalar/ScalarService.ts b/src/api/scalar/ScalarService.ts
index 758aa6a..1bc429b 100644
--- a/src/api/scalar/ScalarService.ts
+++ b/src/api/scalar/ScalarService.ts
@@ -26,11 +26,14 @@ export class ScalarService {
         const cachedUserId = Cache.for(CACHE_SCALAR_ACCOUNTS).get(scalarToken);
         if (cachedUserId) return cachedUserId;
 
-        const user = await ScalarStore.getTokenOwner(scalarToken, ignoreUpstreams);
-        if (!user) throw new ApiError(401, "Invalid token");
-
-        Cache.for(CACHE_SCALAR_ACCOUNTS).put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
-        return user.userId;
+        try {
+            const user = await ScalarStore.getTokenOwner(scalarToken, ignoreUpstreams);
+            Cache.for(CACHE_SCALAR_ACCOUNTS).put(scalarToken, user.userId, 30 * 60 * 1000); // 30 minutes
+            return user.userId;
+        } catch (err) {
+            LogService.error("ScalarService", err);
+            throw new ApiError(401, "Invalid token");
+        }
     }
 
     @POST
diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index fce1b91..ce4ea6c 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -2,7 +2,6 @@ import AppService from "./models/AppService";
 import AppServiceUser from "./models/AppServiceUser";
 import * as randomString from "random-string";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
-import { resolveIfExists } from "./DimensionStore";
 import config from "../config";
 
 export class AppserviceStore {
@@ -21,11 +20,15 @@ export class AppserviceStore {
     }
 
     public static async getUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
-        return AppServiceUser.findOne({where: {appserviceId: appserviceId, id: userId}}).then(resolveIfExists);
+        const user = await AppServiceUser.findOne({where: {appserviceId: appserviceId, id: userId}});
+        if (!user) throw new Error("User not found");
+        return user;
     }
 
     public static async getByHomeserverToken(hsToken: string): Promise<AppService> {
-        return AppService.findOne({where: {hsToken: hsToken}}).then(resolveIfExists);
+        const appservice = AppService.findOne({where: {hsToken: hsToken}});
+        if (!appservice) throw new Error("Appservice not found");
+        return appservice;
     }
 
     public static async getAllByUserPrefix(userPrefix: string): Promise<AppService[]> {
@@ -44,16 +47,18 @@ export class AppserviceStore {
 
     public static async registerUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
         userId = AppserviceStore.getSafeUserId(userId);
-        return AppService.findOne({where: {id: appserviceId}}).then(resolveIfExists).then(appservice => {
-            const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
-            const localpart = userId.substring(1).split(":")[0];
-            return client.registerUser(localpart);
-        }).then(response => {
-            return AppServiceUser.create({
-                id: userId,
-                appserviceId: appserviceId,
-                accessToken: response.access_token,
-            });
+
+        const appservice = await AppService.findOne({where: {id: appserviceId}});
+        if (!appservice) throw new Error("Appservice not found");
+
+        const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
+        const localpart = userId.substring(1).split(":")[0];
+        const response = await client.registerUser(localpart);
+
+        return AppServiceUser.create({
+            id: userId,
+            appserviceId: appserviceId,
+            accessToken: response.access_token,
         });
     }
 
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index ecf05a3..6a37bc3 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -56,9 +56,4 @@ class _DimensionStore {
     }
 }
 
-export const DimensionStore = new _DimensionStore();
-
-export function resolveIfExists<T>(record: T): Promise<T> {
-    if (!record) return Promise.reject("Record not found");
-    return Promise.resolve(record);
-}
\ No newline at end of file
+export const DimensionStore = new _DimensionStore();
\ No newline at end of file
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 0df0406..1ff89f4 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -1,4 +1,3 @@
-import { resolveIfExists } from "./DimensionStore";
 import { NebConfig } from "../models/neb";
 import NebConfiguration from "./models/NebConfiguration";
 import NebIntegration from "./models/NebIntegration";
@@ -77,66 +76,67 @@ export class NebStore {
     };
 
     public static async getAllConfigs(): Promise<NebConfig[]> {
-        return NebConfiguration.findAll().then(configs => {
-            return Promise.all((configs || []).map(c => NebStore.getConfig(c.id)));
-        });
+        const configs = await NebConfiguration.findAll();
+        return Promise.all((configs || []).map(c => NebStore.getConfig(c.id)));
     }
 
     public static async getConfig(id: number): Promise<NebConfig> {
-        let nebConfig: NebConfiguration;
-        return NebConfiguration.findByPrimary(id).then(resolveIfExists).then(conf => {
-            nebConfig = conf;
-            return NebIntegration.findAll({where: {nebId: id}});
-        }).then(integrations => {
-            return NebStore.getCompleteIntegrations(nebConfig, integrations);
-        }).then(integrations => {
-            return new NebConfig(nebConfig, integrations);
-        });
+        const config = await NebConfiguration.findByPrimary(id);
+        if (!config) throw new Error("Configuration not found");
+
+        const integrations = await NebIntegration.findAll({where: {nebId: id}});
+        const fullIntegrations = await NebStore.getCompleteIntegrations(config, integrations);
+
+        return new NebConfig(config, fullIntegrations);
     }
 
     public static async createForUpstream(upstreamId: number): Promise<NebConfig> {
-        return Upstream.findByPrimary(upstreamId).then(resolveIfExists).then(upstream => {
-            return NebConfiguration.create({
-                upstreamId: upstream.id,
-            });
-        }).then(config => {
-            return NebStore.getConfig(config.id);
+        const upstream = await Upstream.findByPrimary(upstreamId);
+        if (!upstream) throw new Error("Upstream not found");
+
+        const config = await NebConfiguration.create({
+            upstreamId: upstream.id,
         });
+
+        return NebStore.getConfig(config.id);
     }
 
     public static async createForAppservice(appserviceId: string, adminUrl: string): Promise<NebConfig> {
-        return AppService.findByPrimary(appserviceId).then(resolveIfExists).then(appservice => {
-            return NebConfiguration.create({
-                appserviceId: appservice.id,
-                adminUrl: adminUrl,
-            });
-        }).then(config => {
-            return NebStore.getConfig(config.id);
+        const appservice = await AppService.findByPrimary(appserviceId);
+        if (!appservice) throw new Error("Appservice not found");
+
+        const config = await NebConfiguration.create({
+            appserviceId: appservice.id,
+            adminUrl: adminUrl,
         });
+
+        return NebStore.getConfig(config.id);
     }
 
     public static async getOrCreateIntegration(configurationId: number, integrationType: string): Promise<NebIntegration> {
-        if (!NebStore.INTEGRATIONS[integrationType]) return Promise.reject(new Error("Integration not supported"));
+        if (!NebStore.INTEGRATIONS[integrationType]) throw new Error("Integration not supported");
 
-        return NebConfiguration.findByPrimary(configurationId).then(resolveIfExists).then(config => {
-            return NebIntegration.findOne({where: {nebId: config.id, type: integrationType}});
-        }).then(integration => {
-            if (!integration) {
-                LogService.info("NebStore", "Creating integration " + integrationType + " for NEB " + configurationId);
-                return NebIntegration.create({
-                    type: integrationType,
-                    name: NebStore.INTEGRATIONS[integrationType].name,
-                    avatarUrl: NebStore.INTEGRATIONS[integrationType].avatarUrl,
-                    description: NebStore.INTEGRATIONS[integrationType].description,
-                    isEnabled: false,
-                    isPublic: true,
-                    nebId: configurationId,
-                });
-            } else return Promise.resolve(integration);
-        });
+        const config = await NebConfiguration.findByPrimary(configurationId);
+        if (!config) throw new Error("Configuration not found");
+
+        let integration = await NebIntegration.findOne({where: {nebId: config.id, type: integrationType}});
+        if (!integration) {
+            LogService.info("NebStore", "Creating integration " + integrationType + " for NEB " + configurationId);
+            integration = await NebIntegration.create({
+                type: integrationType,
+                name: NebStore.INTEGRATIONS[integrationType].name,
+                avatarUrl: NebStore.INTEGRATIONS[integrationType].avatarUrl,
+                description: NebStore.INTEGRATIONS[integrationType].description,
+                isEnabled: false,
+                isPublic: true,
+                nebId: configurationId,
+            });
+        }
+
+        return integration;
     }
 
-    public static getCompleteIntegrations(nebConfig: NebConfiguration, knownIntegrations: NebIntegration[]): Promise<NebIntegration[]> {
+    public static async getCompleteIntegrations(nebConfig: NebConfiguration, knownIntegrations: NebIntegration[]): Promise<NebIntegration[]> {
         const supported = NebStore.getSupportedIntegrations(nebConfig);
         const notSupported: SupportedIntegration[] = [];
         for (const supportedIntegration of supported) {
diff --git a/src/db/ScalarStore.ts b/src/db/ScalarStore.ts
index 99bb37a..812e2bd 100644
--- a/src/db/ScalarStore.ts
+++ b/src/db/ScalarStore.ts
@@ -6,48 +6,41 @@ import User from "./models/User";
 export class ScalarStore {
 
     public static async doesUserHaveTokensForAllUpstreams(userId: string): Promise<boolean> {
-        let upstreamTokenIds: number[] = [];
-        let hasDimensionToken = false;
-        return UserScalarToken.findAll({where: {userId: userId}}).then(results => {
-            upstreamTokenIds = results.filter(t => !t.isDimensionToken).map(t => t.upstreamId);
-            hasDimensionToken = results.filter(t => t.isDimensionToken).length >= 1;
-            return Upstream.findAll();
-        }).then(upstreams => {
-            if (!hasDimensionToken) {
-                LogService.warn("DimensionStore", "User " + userId + " is missing a Dimension scalar token");
+        const scalarTokens = await UserScalarToken.findAll({where: {userId: userId}});
+        const upstreamTokenIds = scalarTokens.filter(t => !t.isDimensionToken).map(t => t.upstreamId);
+        const hasDimensionToken = scalarTokens.filter(t => t.isDimensionToken).length >= 1;
+
+        if (!hasDimensionToken) {
+            LogService.warn("ScalarStore", "User " + userId + " is missing a Dimension scalar token");
+            return false;
+        }
+
+        const upstreams = await Upstream.findAll();
+        for (const upstream of upstreams) {
+            if (upstreamTokenIds.indexOf(upstream.id) === -1) {
+                LogService.warn("ScalarStore", "user " + userId + " is missing a scalar token for upstream " + upstream.id + " (" + upstream.name + ")");
                 return false;
             }
+        }
 
-            for (const upstream of upstreams) {
-                if (upstreamTokenIds.indexOf(upstream.id) === -1) {
-                    LogService.warn("DimensionStore", "User " + userId + " is missing a scalar token for upstream " + upstream.id + " (" + upstream.name + ")");
-                    return false;
-                }
-            }
-
-            return true;
-        });
+        return true;
     }
 
     public static async getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<User> {
-        let user: User = null;
-        return UserScalarToken.findAll({
+        const tokens = await UserScalarToken.findAll({
             where: {isDimensionToken: true, scalarToken: scalarToken},
             include: [User]
-        }).then(tokens => {
-            if (!tokens || tokens.length === 0) {
-                return Promise.reject("Invalid token");
-            }
-
-            user = tokens[0].user;
-            if (ignoreUpstreams) return true; // they have all the upstreams as far as we're concerned
-            return ScalarStore.doesUserHaveTokensForAllUpstreams(user.userId);
-        }).then(hasUpstreams => {
-            if (!hasUpstreams) {
-                return Promise.reject("Invalid token"); // missing one or more upstreams == no validation
-            }
-            return Promise.resolve(user);
         });
+        if (!tokens || tokens.length === 0) throw new Error("Invalid token");
+
+        const user = tokens[0].user;
+        if (ignoreUpstreams) return user; // skip upstreams check
+
+        const hasAllTokens = await ScalarStore.doesUserHaveTokensForAllUpstreams(user.userId);
+        if (!hasAllTokens) {
+            throw new Error("Invalid token"); // They are missing an upstream, so we'll lie and say they are not authorized
+        }
+        return user;
     }
 
     private constructor() {
diff --git a/src/db/WidgetStore.ts b/src/db/WidgetStore.ts
index 4a00ea8..8626dd9 100644
--- a/src/db/WidgetStore.ts
+++ b/src/db/WidgetStore.ts
@@ -1,28 +1,30 @@
 import WidgetRecord from "./models/WidgetRecord";
 import { Widget } from "../integrations/Widget";
-import { resolveIfExists } from "./DimensionStore";
 
 export class WidgetStore {
 
     public static async listAll(isEnabled?: boolean): Promise<Widget[]> {
         let conditions = {};
         if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
-        return WidgetRecord.findAll(conditions).then(widgets => widgets.map(w => new Widget(w)));
+        return (await WidgetRecord.findAll(conditions)).map(w => new Widget(w));
     }
 
     public static async setEnabled(type: string, isEnabled: boolean): Promise<any> {
-        return WidgetRecord.findOne({where: {type: type}}).then(resolveIfExists).then(widget => {
-            widget.isEnabled = isEnabled;
-            return widget.save();
-        });
+        const widget = await WidgetRecord.findOne({where: {type: type}});
+        if (!widget) throw new Error("Widget not found");
+
+        widget.isEnabled = isEnabled;
+        return widget.save();
     }
 
     public static async setOptions(type: string, options: any): Promise<any> {
         const optionsJson = JSON.stringify(options);
-        return WidgetRecord.findOne({where: {type: type}}).then(resolveIfExists).then(widget => {
-            widget.optionsJson = optionsJson;
-            return widget.save();
-        });
+
+        const widget = await WidgetRecord.findOne({where: {type: type}});
+        if (!widget) throw new Error("Widget not found");
+
+        widget.optionsJson = optionsJson;
+        return await widget.save();
     }
 
     private constructor() {
diff --git a/src/matrix/MatrixAppserviceClient.ts b/src/matrix/MatrixAppserviceClient.ts
index 4afefbc..c6425af 100644
--- a/src/matrix/MatrixAppserviceClient.ts
+++ b/src/matrix/MatrixAppserviceClient.ts
@@ -13,7 +13,7 @@ export class MatrixAppserviceClient {
     constructor(private homeserverName: string, private appservice: AppService) {
     }
 
-    public registerUser(localpart: string): Promise<MatrixUserResponse> {
+    public async registerUser(localpart: string): Promise<MatrixUserResponse> {
         return doFederatedApiCall(
             "POST",
             this.homeserverName,
diff --git a/src/matrix/MatrixLiteClient.ts b/src/matrix/MatrixLiteClient.ts
index e13958a..4319bdf 100644
--- a/src/matrix/MatrixLiteClient.ts
+++ b/src/matrix/MatrixLiteClient.ts
@@ -10,29 +10,26 @@ export class MatrixLiteClient {
     constructor(private homeserverName: string, private accessToken: string) {
     }
 
-    public getFederationUrl(): Promise<string> {
+    public async getFederationUrl(): Promise<string> {
         return getFedUrl(this.homeserverName);
     }
 
-    public getUrlPreview(url: string): Promise<MatrixUrlPreview> {
+    public async getUrlPreview(url: string): Promise<MatrixUrlPreview> {
         return doFederatedApiCall(
             "GET",
             this.homeserverName,
             "/_matrix/media/r0/preview_url",
             {access_token: this.accessToken, url: url}
-        ).then(response => {
-            return response;
-        });
+        );
     }
 
-    public whoAmI(): Promise<string> {
-        return doFederatedApiCall(
+    public async whoAmI(): Promise<string> {
+        const response = await doFederatedApiCall(
             "GET",
             this.homeserverName,
             "/_matrix/client/r0/account/whoami",
             {access_token: this.accessToken}
-        ).then(response => {
-            return response["user_id"];
-        });
+        );
+        return response['user_id'];
     }
 }
diff --git a/src/matrix/MatrixOpenIdClient.ts b/src/matrix/MatrixOpenIdClient.ts
index 7756083..f71e84e 100644
--- a/src/matrix/MatrixOpenIdClient.ts
+++ b/src/matrix/MatrixOpenIdClient.ts
@@ -6,14 +6,13 @@ export class MatrixOpenIdClient {
     constructor(private openId: OpenId) {
     }
 
-    public getUserId(): Promise<string> {
-        return doFederatedApiCall(
+    public async getUserId(): Promise<string> {
+        const response = await doFederatedApiCall(
             "GET",
             this.openId.matrix_server_name,
             "/_matrix/federation/v1/openid/userinfo",
             {access_token: this.openId.access_token}
-        ).then(response => {
-            return response['sub'];
-        });
+        );
+        return response['sub'];
     }
 }
diff --git a/src/matrix/helpers.ts b/src/matrix/helpers.ts
index 2b3d2d2..81911fe 100644
--- a/src/matrix/helpers.ts
+++ b/src/matrix/helpers.ts
@@ -3,57 +3,58 @@ import { LogService } from "matrix-js-snippets";
 import { Cache, CACHE_FEDERATION } from "../MemoryCache";
 import * as request from "request";
 
-export function getFederationUrl(serverName: string): Promise<string> {
+export async function getFederationUrl(serverName: string): Promise<string> {
     const cachedUrl = Cache.for(CACHE_FEDERATION).get(serverName);
     if (cachedUrl) {
         LogService.verbose("matrix", "Cached federation URL for " + serverName + " is " + cachedUrl);
-        return Promise.resolve(cachedUrl);
+        return cachedUrl;
     }
 
     let serverUrl = null;
     let expirationMs = 4 * 60 * 60 * 1000; // default is 4 hours
-    const dnsPromise = dns.resolveSrv("_matrix._tcp." + serverName);
-    return Promise.resolve(dnsPromise).then(records => {
+
+    try {
+        const records = await dns.resolveSrv("_matrix._tcp." + serverName);
         if (records && records.length > 0) {
             serverUrl = "https://" + records[0].name + ":" + records[0].port;
             expirationMs = records[0].ttl * 1000;
         }
-    }, _err => {
+    } catch (err) {
         // Not having the SRV record isn't bad, it just means that the server operator decided to not use SRV records.
         // When there's no SRV record we default to port 8448 (as per the federation rules) in the lower .then()
         // People tend to think that the lack of an SRV record is bad, but in reality it's only a problem if one was set and
         // it's not being found. Most people don't set up the SRV record, but some do.
+        LogService.verbose("matrix", err);
         LogService.warn("matrix", "Could not find _matrix._tcp." + serverName + " DNS record. This is normal for most servers.");
-    }).then(() => {
-        if (!serverUrl) serverUrl = "https://" + serverName + ":8448";
-        LogService.verbose("matrix", "Federation URL for " + serverName + " is " + serverUrl + " - caching for " + expirationMs + " ms");
-        Cache.for(CACHE_FEDERATION).put(serverName, serverUrl, expirationMs);
-        return serverUrl;
-    });
+    }
+
+    if (!serverUrl) serverUrl = "https://" + serverName + ":8448";
+    LogService.verbose("matrix", "Federation URL for " + serverName + " is " + serverUrl + " - caching for " + expirationMs + " ms");
+    Cache.for(CACHE_FEDERATION).put(serverName, serverUrl, expirationMs);
+    return serverUrl;
 }
 
-export function doFederatedApiCall(method: string, serverName: string, endpoint: string, query?: object, body?: object): Promise<any> {
-    return getFederationUrl(serverName).then(federationUrl => {
-        return new Promise((resolve, reject) => {
-            request({
-                method: method,
-                url: federationUrl + endpoint,
-                qs: query,
-                json: body,
-                rejectUnauthorized: false, // allow self signed certs (for federation)
-            }, (err, res, _body) => {
-                if (err) {
-                    LogService.error("matrix", "Error calling " + endpoint);
-                    LogService.error("matrix", err);
-                    reject(err);
-                } else if (res.statusCode !== 200) {
-                    LogService.error("matrix", "Got status code " + res.statusCode + " while calling " + endpoint);
-                    reject(new Error("Error in request: invalid status code"));
-                } else {
-                    if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
-                    resolve(res.body);
-                }
-            });
+export async function doFederatedApiCall(method: string, serverName: string, endpoint: string, query?: object, body?: object): Promise<any> {
+    const federationUrl = await  getFederationUrl(serverName);
+    return new Promise((resolve, reject) => {
+        request({
+            method: method,
+            url: federationUrl + endpoint,
+            qs: query,
+            json: body,
+            rejectUnauthorized: false, // allow self signed certs (for federation)
+        }, (err, res, _body) => {
+            if (err) {
+                LogService.error("matrix", "Error calling " + endpoint);
+                LogService.error("matrix", err);
+                reject(err);
+            } else if (res.statusCode !== 200) {
+                LogService.error("matrix", "Got status code " + res.statusCode + " while calling " + endpoint);
+                reject(new Error("Error in request: invalid status code"));
+            } else {
+                if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
+                resolve(res.body);
+            }
         });
     });
 }
\ No newline at end of file

From 73acbb586f03c874fd8a98b47f6907ad6d629d28 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 21:29:48 -0600
Subject: [PATCH 059/111] Update linting to include the web project as well

---
 .travis.yml                              | 2 +-
 package.json                             | 5 +++--
 web/app/admin/neb/edit/edit.component.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ded455e..af5dd3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ install:
   - npm install
 script:
   - npm run build
-  - npm run lint:app
+  - npm run lint
diff --git a/package.json b/package.json
index 97afd29..4a4b387 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,9 @@
     "build": "rimraf build && npm run-script build:web && npm run-script build:app",
     "build:web": "webpack --progress --profile --bail",
     "build:app": "tsc -p tsconfig-app.json",
-    "lint": "npm run-script lint:app",
-    "lint:app": "tslint --project ./tsconfig-app.json -t stylish"
+    "lint": "npm run-script lint:app && npm run-script lint:web",
+    "lint:app": "tslint --project ./tsconfig-app.json -t stylish",
+    "lint:web": "tslint --project ./tsconfig.json -t stylish"
   },
   "repository": {
     "type": "git",
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 8d46437..aea5a7d 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -65,7 +65,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
         this.nebApi.getConfigurations().then(configs => {
             const handledTypes: string[] = [];
             for (const config of configs) {
-                if (config.id == nebId) {
+                if (config.id === nebId) {
                     this.nebConfig = config;
                 } else {
                     for (const type of config.integrations) {

From 7a2627ad76054feac34658e28d7d51f77faf8622 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 21:36:43 -0600
Subject: [PATCH 060/111] Move admin routes to their own API namespace

---
 package.json                                         |  6 +++---
 src/api/Webserver.ts                                 |  2 +-
 .../AdminAppserviceService.ts}                       | 12 ++++++------
 .../AdminIntegrationsService.ts}                     | 12 ++++++------
 .../AdminNebService.ts}                              | 12 ++++++------
 .../AdminService.ts}                                 | 10 +++++-----
 .../AdminUpstreamService.ts}                         |  8 ++++----
 7 files changed, 31 insertions(+), 31 deletions(-)
 rename src/api/{dimension/DimensionAppserviceAdminService.ts => admin/AdminAppserviceService.ts} (86%)
 rename src/api/{dimension/DimensionIntegrationsAdminService.ts => admin/AdminIntegrationsService.ts} (80%)
 rename src/api/{dimension/DimensionNebAdminService.ts => admin/AdminNebService.ts} (87%)
 rename src/api/{dimension/DimensionAdminService.ts => admin/AdminService.ts} (85%)
 rename src/api/{dimension/DimensionUpstreamAdminService.ts => admin/AdminUpstreamService.ts} (86%)

diff --git a/package.json b/package.json
index 4a4b387..70b7098 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
   "scripts": {
     "start:web": "webpack-dev-server --inline --progress --port 8080 --host 0.0.0.0",
     "start:app": "npm run-script build && node build/app/index.js",
-    "build": "rimraf build && npm run-script build:web && npm run-script build:app",
-    "build:web": "webpack --progress --profile --bail",
-    "build:app": "tsc -p tsconfig-app.json",
+    "build": "npm run-script build:web && npm run-script build:app",
+    "build:web": "rimraf build/web && webpack --progress --profile --bail",
+    "build:app": "rimraf build/app && tsc -p tsconfig-app.json",
     "lint": "npm run-script lint:app && npm run-script lint:web",
     "lint:app": "tslint --project ./tsconfig-app.json -t stylish",
     "lint:web": "tslint --project ./tsconfig.json -t stylish"
diff --git a/src/api/Webserver.ts b/src/api/Webserver.ts
index 814a3f0..61729fd 100644
--- a/src/api/Webserver.ts
+++ b/src/api/Webserver.ts
@@ -20,7 +20,7 @@ export default class Webserver {
     }
 
     private loadRoutes() {
-        const apis = ["scalar", "dimension", "matrix"].map(a => path.join(__dirname, a, "*.js"));
+        const apis = ["scalar", "dimension", "admin", "matrix"].map(a => path.join(__dirname, a, "*.js"));
         const router = express.Router();
         apis.forEach(a => Server.loadServices(router, [a]));
         const routes = _.uniq(router.stack.map(r => r.route.path));
diff --git a/src/api/dimension/DimensionAppserviceAdminService.ts b/src/api/admin/AdminAppserviceService.ts
similarity index 86%
rename from src/api/dimension/DimensionAppserviceAdminService.ts
rename to src/api/admin/AdminAppserviceService.ts
index 4467234..9a124da 100644
--- a/src/api/dimension/DimensionAppserviceAdminService.ts
+++ b/src/api/admin/AdminAppserviceService.ts
@@ -1,5 +1,5 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
-import { DimensionAdminService } from "./DimensionAdminService";
+import { AdminService } from "./AdminService";
 import AppService from "../../db/models/AppService";
 import { AppserviceStore } from "../../db/AppserviceStore";
 import { ApiError } from "../ApiError";
@@ -28,19 +28,19 @@ interface AppserviceCreateRequest {
 }
 
 @Path("/api/v1/dimension/admin/appservices")
-export class DimensionAppserviceAdminService {
+export class AdminAppserviceService {
 
     @GET
     @Path("all")
     public async getAppservices(@QueryParam("scalar_token") scalarToken: string): Promise<AppserviceResponse[]> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         return (await AppService.findAll()).map(a => this.mapAppservice(a));
     }
 
     @POST
     @Path("new")
     public async createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         // Trim off the @ sign if it's on the prefix
         if (request.userPrefix[0] === "@") {
@@ -59,14 +59,14 @@ export class DimensionAppserviceAdminService {
     @GET
     @Path(":appserviceId/users")
     public async getUsers(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<UserResponse[]> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         return (await AppserviceStore.getUsers(asId)).map(u => this.mapUser(u));
     }
 
     @POST
     @Path(":appserviceId/users/register")
     public async registerUser(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string, request: NewUserRequest): Promise<UserResponse> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const user = await AppserviceStore.registerUser(asId, request.userId);
         return this.mapUser(user);
diff --git a/src/api/dimension/DimensionIntegrationsAdminService.ts b/src/api/admin/AdminIntegrationsService.ts
similarity index 80%
rename from src/api/dimension/DimensionIntegrationsAdminService.ts
rename to src/api/admin/AdminIntegrationsService.ts
index 3ed77eb..5509734 100644
--- a/src/api/dimension/DimensionIntegrationsAdminService.ts
+++ b/src/api/admin/AdminIntegrationsService.ts
@@ -1,7 +1,7 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
 import { ApiError } from "../ApiError";
-import { DimensionAdminService } from "./DimensionAdminService";
-import { DimensionIntegrationsService, IntegrationsResponse } from "./DimensionIntegrationsService";
+import { AdminService } from "./AdminService";
+import { DimensionIntegrationsService, IntegrationsResponse } from "../dimension/DimensionIntegrationsService";
 import { WidgetStore } from "../../db/WidgetStore";
 import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 
@@ -14,12 +14,12 @@ interface SetOptionsRequest {
 }
 
 @Path("/api/v1/dimension/admin/integrations")
-export class DimensionIntegrationsAdminService {
+export class AdminIntegrationsService {
 
     @POST
     @Path(":category/:type/options")
     public async setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         if (category === "widget") await WidgetStore.setOptions(type, body.options);
         else throw new ApiError(400, "Unrecognized category");
@@ -32,7 +32,7 @@ export class DimensionIntegrationsAdminService {
     @POST
     @Path(":category/:type/enabled")
     public async setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         if (category === "widget") await WidgetStore.setEnabled(type, body.enabled);
         else throw new ApiError(400, "Unrecognized category");
@@ -44,7 +44,7 @@ export class DimensionIntegrationsAdminService {
     @GET
     @Path("all")
     public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         return DimensionIntegrationsService.getIntegrations(null);
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionNebAdminService.ts b/src/api/admin/AdminNebService.ts
similarity index 87%
rename from src/api/dimension/DimensionNebAdminService.ts
rename to src/api/admin/AdminNebService.ts
index aefa6e1..b4e79e5 100644
--- a/src/api/dimension/DimensionNebAdminService.ts
+++ b/src/api/admin/AdminNebService.ts
@@ -1,5 +1,5 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
-import { DimensionAdminService } from "./DimensionAdminService";
+import { AdminService } from "./AdminService";
 import { Cache, CACHE_NEB } from "../../MemoryCache";
 import { NebStore } from "../../db/NebStore";
 import { NebConfig } from "../../models/neb";
@@ -21,12 +21,12 @@ interface SetEnabledRequest {
 
 
 @Path("/api/v1/dimension/admin/neb")
-export class DimensionNebAdminService {
+export class AdminNebService {
 
     @GET
     @Path("all")
     public async getNebConfigs(@QueryParam("scalar_token") scalarToken: string): Promise<NebConfig[]> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const cachedConfigs = Cache.for(CACHE_NEB).get("configurations");
         if (cachedConfigs) return cachedConfigs;
@@ -48,7 +48,7 @@ export class DimensionNebAdminService {
     @POST
     @Path(":id/integration/:type/enabled")
     public async setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const integration = await NebStore.getOrCreateIntegration(nebId, integrationType);
         integration.isEnabled = request.enabled;
@@ -61,7 +61,7 @@ export class DimensionNebAdminService {
     @POST
     @Path("new/upstream")
     public async newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<NebConfig> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         try {
             const neb = await NebStore.createForUpstream(request.upstreamId);
@@ -76,7 +76,7 @@ export class DimensionNebAdminService {
     @POST
     @Path("new/appservice")
     public async newConfigForAppservice(@QueryParam("scalar_token") scalarToken: string, request: CreateWithAppservice): Promise<NebConfig> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         try {
             const neb = await NebStore.createForAppservice(request.appserviceId, request.adminUrl);
diff --git a/src/api/dimension/DimensionAdminService.ts b/src/api/admin/AdminService.ts
similarity index 85%
rename from src/api/dimension/DimensionAdminService.ts
rename to src/api/admin/AdminService.ts
index 6b84905..661e141 100644
--- a/src/api/dimension/DimensionAdminService.ts
+++ b/src/api/admin/AdminService.ts
@@ -20,7 +20,7 @@ interface DimensionConfigResponse {
 }
 
 @Path("/api/v1/dimension/admin")
-export class DimensionAdminService {
+export class AdminService {
 
     public static isAdmin(userId: string) {
         return config.admins.indexOf(userId) >= 0;
@@ -28,7 +28,7 @@ export class DimensionAdminService {
 
     public static async validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
         const userId = await ScalarService.getTokenOwner(scalarToken, true);
-        if (!DimensionAdminService.isAdmin(userId))
+        if (!AdminService.isAdmin(userId))
             throw new ApiError(401, "You must be an administrator to use this API");
         return userId;
     }
@@ -36,21 +36,21 @@ export class DimensionAdminService {
     @GET
     @Path("check")
     public async checkIfAdmin(@QueryParam("scalar_token") scalarToken: string): Promise<{}> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         return {}; // A 200 OK essentially means "you're an admin".
     }
 
     @GET
     @Path("version")
     public async getVersion(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionVersionResponse> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         return {version: CURRENT_VERSION};
     }
 
     @GET
     @Path("config")
     public async getConfig(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionConfigResponse> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
         return {
diff --git a/src/api/dimension/DimensionUpstreamAdminService.ts b/src/api/admin/AdminUpstreamService.ts
similarity index 86%
rename from src/api/dimension/DimensionUpstreamAdminService.ts
rename to src/api/admin/AdminUpstreamService.ts
index 74408ca..ea9ca6e 100644
--- a/src/api/dimension/DimensionUpstreamAdminService.ts
+++ b/src/api/admin/AdminUpstreamService.ts
@@ -1,5 +1,5 @@
 import { GET, Path, POST, QueryParam } from "typescript-rest";
-import { DimensionAdminService } from "./DimensionAdminService";
+import { AdminService } from "./AdminService";
 import { Cache, CACHE_UPSTREAM } from "../../MemoryCache";
 import Upstream from "../../db/models/Upstream";
 
@@ -19,12 +19,12 @@ interface NewUpstreamRequest {
 }
 
 @Path("/api/v1/dimension/admin/upstreams")
-export class DimensionUpstreamAdminService {
+export class AdminUpstreamService {
 
     @GET
     @Path("all")
     public async getUpstreams(@QueryParam("scalar_token") scalarToken: string): Promise<UpstreamRepsonse[]> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const cachedUpstreams = Cache.for(CACHE_UPSTREAM).get("upstreams");
         if (cachedUpstreams) return cachedUpstreams;
@@ -38,7 +38,7 @@ export class DimensionUpstreamAdminService {
     @POST
     @Path("new")
     public async createUpstream(@QueryParam("scalar_token") scalarToken: string, request: NewUpstreamRequest): Promise<UpstreamRepsonse> {
-        await DimensionAdminService.validateAndGetAdminTokenOwner(scalarToken);
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const upstream = await Upstream.create({
             name: request.name,

From 2e5530179b9632a61e9d195a58b11664c3272785 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 22:12:34 -0600
Subject: [PATCH 061/111] Add some animation to the iboxes

---
 web/app/app.animations.ts                 | 13 +++++++++++++
 web/app/elements/ibox/ibox.component.html |  2 +-
 web/app/elements/ibox/ibox.component.ts   |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 web/app/app.animations.ts

diff --git a/web/app/app.animations.ts b/web/app/app.animations.ts
new file mode 100644
index 0000000..26ff967
--- /dev/null
+++ b/web/app/app.animations.ts
@@ -0,0 +1,13 @@
+import { animate, style, transition, trigger } from "@angular/animations";
+
+export const ANIMATION_FADE_IN_NOT_OUT =
+    trigger('fadeInNotOutAnimation', [
+        transition(':enter', [
+            style({opacity: 0}),
+            animate('200ms', style({opacity: 1})),
+        ]),
+        // transition(':leave', [
+        //     style({opacity: 1}),
+        //     animate('100ms', style({opacity: 0})),
+        // ]),
+    ]);
\ No newline at end of file
diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index 93d6b83..1fe77fd 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -9,7 +9,7 @@
         <i class="ibox-icon fa" *ngIf="isCollapsible"
            [ngClass]="[collapsed ? 'fa-chevron-right' : 'fa-chevron-down']"></i>
     </div>
-    <div class="ibox-content" *ngIf="!collapsed">
+    <div class="ibox-content" *ngIf="!collapsed" [@fadeInNotOutAnimation]>
         <ng-content select=".my-ibox-content"></ng-content>
     </div>
 </div>
\ No newline at end of file
diff --git a/web/app/elements/ibox/ibox.component.ts b/web/app/elements/ibox/ibox.component.ts
index ce310bd..e37fb5c 100644
--- a/web/app/elements/ibox/ibox.component.ts
+++ b/web/app/elements/ibox/ibox.component.ts
@@ -1,9 +1,11 @@
 import { Component, Input, OnInit } from "@angular/core";
+import { ANIMATION_FADE_IN_NOT_OUT } from "../../app.animations";
 
 @Component({
     selector: "my-ibox",
     templateUrl: "./ibox.component.html",
     styleUrls: ["./ibox.component.scss"],
+    animations: [ANIMATION_FADE_IN_NOT_OUT],
 })
 export class IboxComponent implements OnInit {
     @Input() title: string;

From fa7fb651c011961057eafe94bfd46863d024cef7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 22:12:59 -0600
Subject: [PATCH 062/111] Bring the ibox chevron in a little bit, and always
 display it as a down arrow

---
 web/app/elements/ibox/ibox.component.html | 3 +--
 web/style/components/ibox.scss            | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index 1fe77fd..ba58e02 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -6,8 +6,7 @@
         </h5>
         <ng-content select=".my-ibox-title" *ngIf="!title"></ng-content>
         <ng-content select=".my-ibox-addl-title"></ng-content>
-        <i class="ibox-icon fa" *ngIf="isCollapsible"
-           [ngClass]="[collapsed ? 'fa-chevron-right' : 'fa-chevron-down']"></i>
+        <i class="ibox-icon fa fa-chevron-down" *ngIf="isCollapsible"></i>
     </div>
     <div class="ibox-content" *ngIf="!collapsed" [@fadeInNotOutAnimation]>
         <ng-content select=".my-ibox-content"></ng-content>
diff --git a/web/style/components/ibox.scss b/web/style/components/ibox.scss
index 43a9c84..417d0e1 100644
--- a/web/style/components/ibox.scss
+++ b/web/style/components/ibox.scss
@@ -24,6 +24,7 @@
 .ibox .ibox-title .ibox-icon {
   float: right;
   margin-top: 4px;
+  margin-right: 5px;
   cursor: pointer;
 }
 

From 656d2080598392890339e649712fa4822ad8547c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 23 Mar 2018 22:13:15 -0600
Subject: [PATCH 063/111] Minor styling improvements for widget configuration
 pages

---
 .../configs/widget/config_screen/config_screen.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/configs/widget/config_screen/config_screen.component.html b/web/app/configs/widget/config_screen/config_screen.component.html
index 67db24a..7439c7a 100644
--- a/web/app/configs/widget/config_screen/config_screen.component.html
+++ b/web/app/configs/widget/config_screen/config_screen.component.html
@@ -21,7 +21,7 @@
 
     <my-ibox *ngFor="let widget of widgetComponent.widgets trackById" [isCollapsible]="true" [defaultCollapsed]="widget.id !== widgetComponent.defaultExpandedWidgetId">
         <h5 class="my-ibox-title">
-            <i class="far fa-edit"></i> {{ widget.name || widget.url || widgetComponent.defaultName }}
+            <i class="fa fa-pencil-alt"></i> {{ widget.name || widget.url || widgetComponent.defaultName }}
             <span *ngIf="widget.data.title">- {{ widget.data.title }}</span>
         </h5>
         <div class="my-ibox-content">
@@ -32,7 +32,7 @@
                     <button type="submit" class="btn btn-sm btn-primary" [disabled]="widgetComponent.isUpdating">
                         <i class="far fa-save"></i> Save Widget
                     </button>
-                    <button type="button" class="btn btn-sm btn-danger" [disabled]="widgetComponent.isUpdating" (click)="widgetComponent.removeWidget(widget)">
+                    <button type="button" class="btn btn-sm btn-outline-danger" [disabled]="widgetComponent.isUpdating" (click)="widgetComponent.removeWidget(widget)">
                         <i class="far fa-trash-alt"></i> Remove Widget
                     </button>
                 </div>

From 62d81ed8420e9c2124bc2e092e28b21fd3e84a13 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 12:18:38 -0600
Subject: [PATCH 064/111] Show the appservice configuration after saving; Make
 the show config button work

Includes the ability to 'test' the appservice. This doesn't bother checking if the URL is set up correctly because we don't actually care about the transactions.
---
 src/api/admin/AdminAppserviceService.ts       | 30 ++++++++++
 src/db/AppserviceStore.ts                     |  6 ++
 src/matrix/MatrixAppserviceClient.ts          | 10 ++++
 .../add_selfhosted.component.ts               | 18 +++++-
 .../appservice-config.component.html          | 22 +++++++
 .../appservice-config.component.scss          |  6 ++
 .../appservice-config.component.ts            | 57 +++++++++++++++++++
 web/app/admin/neb/neb.component.ts            | 15 ++++-
 web/app/app.module.ts                         |  3 +
 .../admin/admin-appservice-api.service.ts     |  8 +++
 10 files changed, 170 insertions(+), 5 deletions(-)
 create mode 100644 web/app/admin/neb/appservice-config/appservice-config.component.html
 create mode 100644 web/app/admin/neb/appservice-config/appservice-config.component.scss
 create mode 100644 web/app/admin/neb/appservice-config/appservice-config.component.ts

diff --git a/src/api/admin/AdminAppserviceService.ts b/src/api/admin/AdminAppserviceService.ts
index 9a124da..c622b89 100644
--- a/src/api/admin/AdminAppserviceService.ts
+++ b/src/api/admin/AdminAppserviceService.ts
@@ -4,6 +4,9 @@ import AppService from "../../db/models/AppService";
 import { AppserviceStore } from "../../db/AppserviceStore";
 import { ApiError } from "../ApiError";
 import AppServiceUser from "../../db/models/AppServiceUser";
+import { MatrixAppserviceClient } from "../../matrix/MatrixAppserviceClient";
+import config from "../../config";
+import { LogService } from "matrix-js-snippets";
 
 interface AppserviceResponse {
     id: string;
@@ -37,6 +40,20 @@ export class AdminAppserviceService {
         return (await AppService.findAll()).map(a => this.mapAppservice(a));
     }
 
+    @GET
+    @Path(":appserviceId")
+    public async getAppservice(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<AppserviceResponse> {
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        try {
+            const appservice = await AppserviceStore.getAppservice(asId);
+            return this.mapAppservice(appservice);
+        } catch (err) {
+            LogService.error("AdminAppserviceService", err);
+            throw new ApiError(404, "Appservice not found");
+        }
+    }
+
     @POST
     @Path("new")
     public async createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
@@ -72,6 +89,19 @@ export class AdminAppserviceService {
         return this.mapUser(user);
     }
 
+    @POST
+    @Path(":appserviceId/test")
+    public async test(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<any> {
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const appservice = await AppserviceStore.getAppservice(asId);
+        const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
+        const userId = await client.whoAmI();
+
+        if (userId.startsWith("@" + appservice.userPrefix)) return {}; // 200 OK
+        throw new ApiError(500, "User ID does not match the application service");
+    }
+
     private mapAppservice(as: AppService): AppserviceResponse {
         return {
             id: as.id,
diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index ce4ea6c..b389f74 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -62,6 +62,12 @@ export class AppserviceStore {
         });
     }
 
+    public static async getAppservice(id: string): Promise<AppService> {
+        const appservice = await AppService.findByPrimary(id);
+        if (!appservice) throw new Error("Appservice not found");
+        return appservice;
+    }
+
     private constructor() {
     }
 }
\ No newline at end of file
diff --git a/src/matrix/MatrixAppserviceClient.ts b/src/matrix/MatrixAppserviceClient.ts
index c6425af..5d3fd2e 100644
--- a/src/matrix/MatrixAppserviceClient.ts
+++ b/src/matrix/MatrixAppserviceClient.ts
@@ -22,4 +22,14 @@ export class MatrixAppserviceClient {
             {type: "m.login.application_service", username: localpart},
         );
     }
+
+    public async whoAmI(): Promise<string> {
+        const response = await doFederatedApiCall(
+            "GET",
+            this.homeserverName,
+            "/_matrix/client/r0/account/whoami",
+            {access_token: this.appservice.asToken},
+        );
+        return response['user_id'];
+    }
 }
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
index 1ccd6d0..e639698 100644
--- a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
+++ b/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
@@ -3,6 +3,11 @@ import { AdminAppserviceApiService } from "../../../shared/services/admin/admin-
 import { AdminNebApiService } from "../../../shared/services/admin/admin-neb-api.service";
 import { ToasterService } from "angular2-toaster";
 import { ActivatedRoute, Router } from "@angular/router";
+import { Modal, overlayConfigFactory } from "ngx-modialog";
+import {
+    AdminNebAppserviceConfigComponent,
+    AppserviceConfigDialogContext
+} from "../appservice-config/appservice-config.component";
 
 
 @Component({
@@ -19,16 +24,23 @@ export class AdminAddSelfhostedNebComponent {
                 private nebApi: AdminNebApiService,
                 private toaster: ToasterService,
                 private router: Router,
-                private activatedRoute: ActivatedRoute) {
+                private activatedRoute: ActivatedRoute,
+                private modal: Modal) {
     }
 
     public save(): void {
         this.isSaving = true;
         this.asApi.createAppservice(this.userPrefix).then(appservice => {
             return this.nebApi.newAppserviceConfiguration(this.adminUrl, appservice);
-        }).then(() => {
+        }).then(neb => {
             this.toaster.pop("success", "New go-neb created");
-            this.router.navigate(["../.."], {relativeTo: this.activatedRoute});
+
+            this.modal.open(AdminNebAppserviceConfigComponent, overlayConfigFactory({
+                neb: neb,
+
+                isBlocking: true,
+                size: 'lg',
+            }, AppserviceConfigDialogContext)).result.then(() => this.router.navigate(["../.."], {relativeTo: this.activatedRoute}));
         }).catch(err => {
             console.error(err);
             this.isSaving = false;
diff --git a/web/app/admin/neb/appservice-config/appservice-config.component.html b/web/app/admin/neb/appservice-config/appservice-config.component.html
new file mode 100644
index 0000000..97b9433
--- /dev/null
+++ b/web/app/admin/neb/appservice-config/appservice-config.component.html
@@ -0,0 +1,22 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>go-neb appservice configuration</h4>
+    </div>
+    <div class="dialog-content" *ngIf="isLoading">
+        <my-spinner></my-spinner>
+    </div>
+    <div class="dialog-content" *ngIf="!isLoading">
+        Copy and paste this configuration to <code>appservice-{{appservice.id}}.yaml</code> on your homeserver and
+        register it as an application service.
+        <br/>
+        <pre>{{appserviceConfig}}</pre>
+    </div>
+    <div class="dialog-footer" *ngIf="!isLoading">
+        <button type="button" (click)="dialog.close()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-times-circle"></i> Close
+        </button>
+        <button type="button" (click)="test()" title="close" class="btn btn-secondary btn-sm">
+            <i class="fa fa-exchange-alt"></i> Test Configuration
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/appservice-config/appservice-config.component.scss b/web/app/admin/neb/appservice-config/appservice-config.component.scss
new file mode 100644
index 0000000..779f17d
--- /dev/null
+++ b/web/app/admin/neb/appservice-config/appservice-config.component.scss
@@ -0,0 +1,6 @@
+pre {
+  margin-top: 10px;
+  padding: 5px;
+  border: 1px solid #ccc;
+  background-color: #eee;
+}
\ No newline at end of file
diff --git a/web/app/admin/neb/appservice-config/appservice-config.component.ts b/web/app/admin/neb/appservice-config/appservice-config.component.ts
new file mode 100644
index 0000000..5a25d47
--- /dev/null
+++ b/web/app/admin/neb/appservice-config/appservice-config.component.ts
@@ -0,0 +1,57 @@
+import { Component } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { FE_Appservice, FE_NebConfiguration } from "../../../shared/models/admin_responses";
+import { AdminAppserviceApiService } from "../../../shared/services/admin/admin-appservice-api.service";
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+
+export class AppserviceConfigDialogContext extends BSModalContext {
+    public neb: FE_NebConfiguration;
+}
+
+@Component({
+    templateUrl: "./appservice-config.component.html",
+    styleUrls: ["./appservice-config.component.scss"],
+})
+export class AdminNebAppserviceConfigComponent implements ModalComponent<AppserviceConfigDialogContext> {
+
+    public isLoading = true;
+    public neb: FE_NebConfiguration;
+    public appservice: FE_Appservice;
+
+    constructor(public dialog: DialogRef<AppserviceConfigDialogContext>, private adminAppserviceApi: AdminAppserviceApiService, private toaster: ToasterService) {
+        this.neb = dialog.context.neb;
+
+        this.adminAppserviceApi.getAppservice(this.neb.appserviceId).then(appservice => {
+            this.appservice = appservice;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Could not load appservice configuration");
+        });
+    }
+
+    public get appserviceConfig(): string {
+        return `` +
+            `id: ${this.appservice.id}\n` +
+            `url: ${window.location.origin}/_matrix/appservice/r0\n` +
+            `as_token: ${this.appservice.asToken}\n` +
+            `hs_token: ${this.appservice.hsToken}\n` +
+            `sender_localpart: ${this.appservice.userPrefix}\n` +
+            `namespaces:\n` +
+            `  users:\n` +
+            `    - exclusive: true\n` +
+            `      regex: '@${this.appservice.userPrefix}.*'\n` +
+            `  aliases: []\n` +
+            `  rooms: []`;
+    }
+
+    public test() {
+        this.adminAppserviceApi.test(this.neb.appserviceId).then(() => {
+            this.toaster.pop("success", "The appservice appears to be correctly set up");
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "The appservice is not correctly set up");
+        });
+    }
+}
diff --git a/web/app/admin/neb/neb.component.ts b/web/app/admin/neb/neb.component.ts
index a52e5e1..ebd48cd 100644
--- a/web/app/admin/neb/neb.component.ts
+++ b/web/app/admin/neb/neb.component.ts
@@ -5,6 +5,11 @@ import { AdminUpstreamApiService } from "../../shared/services/admin/admin-upstr
 import { AdminAppserviceApiService } from "../../shared/services/admin/admin-appservice-api.service";
 import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../shared/models/admin_responses";
 import { ActivatedRoute, Router } from "@angular/router";
+import {
+    AdminNebAppserviceConfigComponent,
+    AppserviceConfigDialogContext
+} from "./appservice-config/appservice-config.component";
+import { Modal, overlayConfigFactory } from "ngx-modialog";
 
 @Component({
     templateUrl: "./neb.component.html",
@@ -24,7 +29,8 @@ export class AdminNebComponent {
                 private appserviceApi: AdminAppserviceApiService,
                 private toaster: ToasterService,
                 private router: Router,
-                private activatedRoute: ActivatedRoute) {
+                private activatedRoute: ActivatedRoute,
+                private modal: Modal) {
 
         this.reload().then(() => this.isLoading = false).catch(error => {
             console.error(error);
@@ -68,7 +74,12 @@ export class AdminNebComponent {
     }
 
     public showAppserviceConfig(neb: FE_NebConfiguration) {
-        console.log(neb);
+        this.modal.open(AdminNebAppserviceConfigComponent, overlayConfigFactory({
+            neb: neb,
+
+            isBlocking: true,
+            size: 'lg',
+        }, AppserviceConfigDialogContext));
     }
 
     public getEnabledBotsString(neb: FE_NebConfiguration): string {
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 61e51c1..d7f2e21 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -53,6 +53,7 @@ import { AdminUpstreamApiService } from "./shared/services/admin/admin-upstream-
 import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_selfhosted.component";
+import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config/appservice-config.component";
 
 @NgModule({
     imports: [
@@ -100,6 +101,7 @@ import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_s
         AdminNebComponent,
         AdminEditNebComponent,
         AdminAddSelfhostedNebComponent,
+        AdminNebAppserviceConfigComponent,
 
         // Vendor
     ],
@@ -122,6 +124,7 @@ import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_s
     entryComponents: [
         AdminWidgetEtherpadConfigComponent,
         AdminWidgetJitsiConfigComponent,
+        AdminNebAppserviceConfigComponent,
     ]
 })
 export class AppModule {
diff --git a/web/app/shared/services/admin/admin-appservice-api.service.ts b/web/app/shared/services/admin/admin-appservice-api.service.ts
index 5263036..2f749cd 100644
--- a/web/app/shared/services/admin/admin-appservice-api.service.ts
+++ b/web/app/shared/services/admin/admin-appservice-api.service.ts
@@ -13,7 +13,15 @@ export class AdminAppserviceApiService extends AuthedApi {
         return this.authedGet("/api/v1/dimension/admin/appservices/all").map(r => r.json()).toPromise();
     }
 
+    public getAppservice(appserviceId: string): Promise<FE_Appservice> {
+        return this.authedGet("/api/v1/dimension/admin/appservices/" + appserviceId).map(r => r.json()).toPromise();
+    }
+
     public createAppservice(userPrefix: string): Promise<FE_Appservice> {
         return this.authedPost("/api/v1/dimension/admin/appservices/new", {userPrefix: userPrefix}).map(r => r.json()).toPromise();
     }
+
+    public test(appserviceId: string): Promise<any> {
+        return this.authedPost("/api/v1/dimension/admin/appservices/" + appserviceId + "/test").map(r => r.json()).toPromise();
+    }
 }

From 51810cce8f70a3a59149505c4209e40cec66b009 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 12:19:29 -0600
Subject: [PATCH 065/111] Fix not being able to edit go-neb instances

The linter required us to use === later on, but this breaks the navigation. We now cast the parameter.
---
 web/app/admin/neb/edit/edit.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index aea5a7d..c269b0b 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -26,7 +26,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
 
     public ngOnInit() {
         this.subscription = this.route.params.subscribe(params => {
-            this.loadNeb(params["nebId"]);
+            this.loadNeb(Number(params["nebId"]));
         });
     }
 

From bebcfa1bba94508874de8e5f910bd2da116664ad Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 12:20:20 -0600
Subject: [PATCH 066/111] Fix appservice transactions throwing errors

We weren't awaiting the appservice, so the truthy check passes and we get "cannot read property id of undefined" in the REST handler.
---
 src/db/AppserviceStore.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index b389f74..337e177 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -26,7 +26,7 @@ export class AppserviceStore {
     }
 
     public static async getByHomeserverToken(hsToken: string): Promise<AppService> {
-        const appservice = AppService.findOne({where: {hsToken: hsToken}});
+        const appservice = await AppService.findOne({where: {hsToken: hsToken}});
         if (!appservice) throw new Error("Appservice not found");
         return appservice;
     }

From 58f8ca833506073465fc5d6938b1568bfa0da6df Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 14:54:12 -0600
Subject: [PATCH 067/111] Support provisioning bots in go-neb

This is so far only possible for the bots that don't require additional configuration in go-neb.
---
 src/api/admin/AdminNebService.ts              | 18 +++--
 src/db/AppserviceStore.ts                     | 10 ++-
 src/db/NebStore.ts                            | 77 +++++++++++++++++--
 src/neb/NebClient.ts                          | 77 +++++++++++++++++++
 src/neb/models/client.ts                      | 13 ++++
 src/neb/models/service.ts                     | 13 ++++
 tsconfig.json                                 |  2 +-
 web/app/admin/neb/edit/edit.component.ts      | 26 ++++++-
 .../services/admin/admin-neb-api.service.ts   |  8 ++
 9 files changed, 226 insertions(+), 18 deletions(-)
 create mode 100644 src/neb/NebClient.ts
 create mode 100644 src/neb/models/client.ts
 create mode 100644 src/neb/models/service.ts

diff --git a/src/api/admin/AdminNebService.ts b/src/api/admin/AdminNebService.ts
index b4e79e5..278e86d 100644
--- a/src/api/admin/AdminNebService.ts
+++ b/src/api/admin/AdminNebService.ts
@@ -49,13 +49,21 @@ export class AdminNebService {
     @Path(":id/integration/:type/enabled")
     public async setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return NebStore.setIntegrationEnabled(nebId, integrationType, request.enabled);
+    }
 
-        const integration = await NebStore.getOrCreateIntegration(nebId, integrationType);
-        integration.isEnabled = request.enabled;
-        await integration.save();
-        Cache.for(CACHE_NEB).clear();
+    @POST
+    @Path(":id/integration/:type/config")
+    public async setIntegrationConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, newConfig: any): Promise<any> {
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return NebStore.setIntegrationConfig(nebId, integrationType, newConfig);
+    }
 
-        return {}; // 200 OK
+    @GET
+    @Path(":id/integration/:type/config")
+    public async getIntegrationConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string): Promise<any> {
+        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        return NebStore.getIntegrationConfig(nebId, integrationType);
     }
 
     @POST
diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index 337e177..4ee32e8 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -46,13 +46,11 @@ export class AppserviceStore {
     }
 
     public static async registerUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
-        userId = AppserviceStore.getSafeUserId(userId);
-
         const appservice = await AppService.findOne({where: {id: appserviceId}});
         if (!appservice) throw new Error("Appservice not found");
 
         const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
-        const localpart = userId.substring(1).split(":")[0];
+        const localpart = AppserviceStore.getSafeUserId(userId.substring(1).split(":")[0]);
         const response = await client.registerUser(localpart);
 
         return AppServiceUser.create({
@@ -62,6 +60,12 @@ export class AppserviceStore {
         });
     }
 
+    public static async getOrCreateUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
+        const user = await AppServiceUser.findOne({where: {appserviceId: appserviceId, id: userId}});
+        if (!user) return AppserviceStore.registerUser(appserviceId, userId);
+        return user;
+    }
+
     public static async getAppservice(id: string): Promise<AppService> {
         const appservice = await AppService.findByPrimary(id);
         if (!appservice) throw new Error("Appservice not found");
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 1ff89f4..32583cd 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -4,6 +4,11 @@ import NebIntegration from "./models/NebIntegration";
 import Upstream from "./models/Upstream";
 import AppService from "./models/AppService";
 import { LogService } from "matrix-js-snippets";
+import { NebClient } from "../neb/NebClient";
+import NebBotUser from "./models/NebBotUser";
+import NebNotificationUser from "./models/NebNotificationUser";
+import { AppserviceStore } from "./AppserviceStore";
+import config from "../config";
 
 export interface SupportedIntegration {
     type: string;
@@ -37,11 +42,12 @@ export class NebStore {
             avatarUrl: "/img/avatars/guggy.png",
             description: "Send a reaction GIF using !guggy <query>",
         },
-        "github": {
-            name: "Github",
-            avatarUrl: "/img/avatars/github.png",
-            description: "Github issue management and announcements for a repository",
-        },
+        // TODO: Support Github
+        // "github": {
+        //     name: "Github",
+        //     avatarUrl: "/img/avatars/github.png",
+        //     description: "Github issue management and announcements for a repository",
+        // },
         "google": {
             name: "Google",
             avatarUrl: "/img/avatars/google.png",
@@ -173,6 +179,67 @@ export class NebStore {
         return result;
     }
 
+    public static async setIntegrationEnabled(configurationId: number, integrationType: string, isEnabled: boolean): Promise<any> {
+        const integration = await this.getOrCreateIntegration(configurationId, integrationType);
+        integration.isEnabled = isEnabled;
+        await integration.save();
+
+        const neb = await this.getConfig(configurationId);
+        if (!neb.appserviceId) return; // Done - nothing to do from here
+        const client = new NebClient(neb);
+
+        const botUsers = await NebBotUser.findAll({where: {integrationId: integration.id}});
+        for (const user of botUsers) {
+            await client.updateUser(user.appserviceUserId, isEnabled, true);
+        }
+
+        const notificationUsers = await NebNotificationUser.findAll({where: {integrationId: integration.id}});
+        for (const user of notificationUsers) {
+            await client.updateUser(user.appserviceUserId, isEnabled, false);
+        }
+    }
+
+    public static async getOrCreateBotUser(configurationId: number, integrationType: string): Promise<NebBotUser> {
+        const neb = await NebStore.getConfig(configurationId);
+        if (!neb.appserviceId) throw new Error("Instance not bound to an appservice");
+
+        const integration = await this.getOrCreateIntegration(configurationId, integrationType);
+        const users = await NebBotUser.findAll({where: {integrationId: integration.id}});
+        if (!users || users.length === 0) {
+            const appservice = await AppserviceStore.getAppservice(neb.appserviceId);
+            const userId = "@" + appservice.userPrefix + "_" + integrationType + ":" + config.homeserver.name;
+            const appserviceUser = await AppserviceStore.getOrCreateUser(neb.appserviceId, userId);
+
+            const client = new NebClient(neb);
+            await client.updateUser(userId, integration.isEnabled, true); // creates the user in go-neb
+
+            const serviceId = appservice.id + "_integration_" + integrationType;
+            return NebBotUser.create({
+                serviceId: serviceId,
+                appserviceUserId: appserviceUser.id,
+                integrationId: integration.id,
+            });
+        }
+
+        return users[0];
+    }
+
+    public static async setIntegrationConfig(configurationId: number, integrationType: string, newConfig: any): Promise<any> {
+        const botUser = await NebStore.getOrCreateBotUser(configurationId, integrationType);
+        const neb = await NebStore.getConfig(configurationId);
+        const client = new NebClient(neb);
+
+        return client.setServiceConfig(botUser.serviceId, botUser.appserviceUserId, integrationType, newConfig);
+    }
+
+    public static async getIntegrationConfig(configurationId: number, integrationType: string): Promise<any> {
+        const botUser = await NebStore.getOrCreateBotUser(configurationId, integrationType);
+        const neb = await NebStore.getConfig(configurationId);
+        const client = new NebClient(neb);
+
+        return client.getServiceConfig(botUser.serviceId);
+    }
+
     private constructor() {
     }
 }
\ No newline at end of file
diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
new file mode 100644
index 0000000..7905a80
--- /dev/null
+++ b/src/neb/NebClient.ts
@@ -0,0 +1,77 @@
+import { NebConfig } from "../models/neb";
+import { AppserviceStore } from "../db/AppserviceStore";
+import { Client } from "./models/client";
+import config from "../config";
+import { getFederationUrl } from "../matrix/helpers";
+import { LogService } from "matrix-js-snippets";
+import { Service } from "./models/service";
+import * as request from "request";
+
+export class NebClient {
+    constructor(private neb: NebConfig) {
+    }
+
+    private async getAccessToken(userId: string): Promise<string> {
+        const user = await AppserviceStore.getOrCreateUser(this.neb.appserviceId, userId);
+        return user.accessToken;
+    }
+
+    public async updateUser(userId: string, isEnabled: boolean, sync = true, autoAcceptInvites = true): Promise<any> {
+        const request: Client = {
+            UserID: userId,
+            HomeserverURL: await getFederationUrl(config.homeserver.name),
+            AccessToken: (isEnabled ? await this.getAccessToken(userId) : "DISABLED"),
+            Sync: isEnabled ? sync : false,
+            AutoJoinRooms: autoAcceptInvites
+        };
+
+        return this.doRequest("/admin/configureClient", request);
+    }
+
+    public async setServiceConfig(serviceId: string, userId: string, type: string, config: any): Promise<any> {
+        const request: Service = {
+            ID: serviceId,
+            Type: type,
+            UserID: userId,
+            Config: config,
+        };
+
+        return this.doRequest("/admin/configureService", request);
+    }
+
+    public async getServiceConfig(serviceId: string): Promise<any> {
+        const request = {ID: serviceId};
+
+        try {
+            const service = await this.doRequest<Service>("/admin/getService", request);
+            return service.Config;
+        } catch (err) {
+            LogService.error("NebClient", err);
+            return {};
+        }
+    }
+
+    private doRequest<T>(endpoint: string, body: any): Promise<T> {
+        const adminUrl = (this.neb.adminUrl.endsWith("/") ? this.neb.adminUrl.substring(0, this.neb.adminUrl.length - 1) : this.neb.adminUrl);
+        if (!endpoint.startsWith("/")) endpoint = "/" + endpoint;
+
+        return new Promise((resolve, reject) => {
+            request({
+                method: "POST",
+                url: adminUrl + endpoint,
+                json: body,
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("NebClient", "Error performing request");
+                    LogService.error("NebClient", err);
+                    reject(err);
+                } else if (res.statusCode !== 200) {
+                    LogService.error("NebClient", "Got status code " + res.statusCode + " while performing request");
+                    reject(new Error("Request error"));
+                } else {
+                    resolve(res.body);
+                }
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/neb/models/client.ts b/src/neb/models/client.ts
new file mode 100644
index 0000000..bf8218c
--- /dev/null
+++ b/src/neb/models/client.ts
@@ -0,0 +1,13 @@
+export interface Client {
+    UserID: string;
+    HomeserverURL: string;
+    AccessToken: string;
+    Sync: boolean;
+    AutoJoinRooms?: boolean;
+    DisplayName?: string;
+}
+
+export interface ConfigureClientResponse {
+    OldClient?: Client;
+    NewClient: Client;
+}
\ No newline at end of file
diff --git a/src/neb/models/service.ts b/src/neb/models/service.ts
new file mode 100644
index 0000000..1d17210
--- /dev/null
+++ b/src/neb/models/service.ts
@@ -0,0 +1,13 @@
+export interface Service {
+    ID: string;
+    UserID: string;
+    Type: string;
+    Config: any;
+}
+
+export interface ConfigureServiceResponse {
+    ID: string;
+    Type: string;
+    OldConfig?: any;
+    NewConfig: any;
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index a7251c2..93d5851 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "sourceMap": true,
-    "noEmitHelpers": true,
+    "noEmitHelpers": false,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "lib": ["es2015", "dom"]
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index c269b0b..ce32dea 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -42,18 +42,36 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
         return NEB_HAS_CONFIG.indexOf(bot.type) !== -1;
     }
 
-    public toggleBot(bot: FE_Integration) {
+    public async toggleBot(bot: FE_Integration) {
         bot.isEnabled = !bot.isEnabled;
         this.isUpdating = true;
-        this.nebApi.toggleIntegration(this.nebConfig.id, bot.type, bot.isEnabled).then(() => {
+
+        try {
+            await this.nebApi.toggleIntegration(this.nebConfig.id, bot.type, bot.isEnabled);
             this.isUpdating = false;
             this.toaster.pop("success", "Integration updated");
-        }).catch(err => {
+        } catch (err) {
             console.error(err);
             bot.isEnabled = !bot.isEnabled; // revert change
             this.isUpdating = false;
             this.toaster.pop("error", "Error updating integration");
-        });
+            return;
+        }
+
+        // Only update the service configuration if
+        if (bot.isEnabled) {
+            if (this.hasConfig(bot)) {
+                this.editBot(bot);
+            } else {
+                try {
+                    await this.nebApi.setIntegrationConfiguration(this.nebConfig.id, bot.type, {});
+                } catch (err) {
+                    console.error(err);
+                    this.toaster.pop("warning", "Failed to configure the integration", "Manual troubleshooting may be requred");
+                    return;
+                }
+            }
+        }
     }
 
     public editBot(bot: FE_Integration) {
diff --git a/web/app/shared/services/admin/admin-neb-api.service.ts b/web/app/shared/services/admin/admin-neb-api.service.ts
index eb2f5e0..55fa09a 100644
--- a/web/app/shared/services/admin/admin-neb-api.service.ts
+++ b/web/app/shared/services/admin/admin-neb-api.service.ts
@@ -31,4 +31,12 @@ export class AdminNebApiService extends AuthedApi {
     public toggleIntegration(nebId: number, integrationType: string, setEnabled: boolean): Promise<any> {
         return this.authedPost("/api/v1/dimension/admin/neb/" + nebId + "/integration/" + integrationType + "/enabled", {enabled: setEnabled}).map(r => r.json()).toPromise();
     }
+
+    public setIntegrationConfiguration(nebId: number, integrationType: string, configuration: any): Promise<any> {
+        return this.authedPost("/api/v1/dimension/admin/neb/" + nebId + "/integration/" + integrationType + "/config", configuration).map(r => r.json()).toPromise();
+    }
+
+    public getIntegrationConfiguration(nebId: number, integrationType: string): Promise<any> {
+        return this.authedGet("/api/v1/dimension/admin/neb/" + nebId + "/integration/" + integrationType + "/config").map(r => r.json()).toPromise();
+    }
 }

From bc4319da7d135c4fbc955f100fc534c729358b6e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 14:54:20 -0600
Subject: [PATCH 068/111] Remove unused APIs

---
 src/api/admin/AdminAppserviceService.ts | 37 -------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/api/admin/AdminAppserviceService.ts b/src/api/admin/AdminAppserviceService.ts
index c622b89..efdc667 100644
--- a/src/api/admin/AdminAppserviceService.ts
+++ b/src/api/admin/AdminAppserviceService.ts
@@ -3,7 +3,6 @@ import { AdminService } from "./AdminService";
 import AppService from "../../db/models/AppService";
 import { AppserviceStore } from "../../db/AppserviceStore";
 import { ApiError } from "../ApiError";
-import AppServiceUser from "../../db/models/AppServiceUser";
 import { MatrixAppserviceClient } from "../../matrix/MatrixAppserviceClient";
 import config from "../../config";
 import { LogService } from "matrix-js-snippets";
@@ -15,17 +14,6 @@ interface AppserviceResponse {
     userPrefix: string;
 }
 
-interface UserResponse {
-    userId: string;
-    accessToken: string;
-    displayName: string;
-    avatarUrl: string;
-}
-
-interface NewUserRequest {
-    userId: string;
-}
-
 interface AppserviceCreateRequest {
     userPrefix: string;
 }
@@ -73,22 +61,6 @@ export class AdminAppserviceService {
         return this.mapAppservice(appservice);
     }
 
-    @GET
-    @Path(":appserviceId/users")
-    public async getUsers(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<UserResponse[]> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
-        return (await AppserviceStore.getUsers(asId)).map(u => this.mapUser(u));
-    }
-
-    @POST
-    @Path(":appserviceId/users/register")
-    public async registerUser(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string, request: NewUserRequest): Promise<UserResponse> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
-
-        const user = await AppserviceStore.registerUser(asId, request.userId);
-        return this.mapUser(user);
-    }
-
     @POST
     @Path(":appserviceId/test")
     public async test(@QueryParam("scalar_token") scalarToken: string, @PathParam("appserviceId") asId: string): Promise<any> {
@@ -110,13 +82,4 @@ export class AdminAppserviceService {
             userPrefix: as.userPrefix,
         };
     }
-
-    private mapUser(user: AppServiceUser): UserResponse {
-        return {
-            userId: user.id,
-            accessToken: user.accessToken,
-            displayName: user.displayName,
-            avatarUrl: user.avatarUrl,
-        };
-    }
 }
\ No newline at end of file

From cc921779ae11facf6e07757a6abb6610253946f3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 15:05:26 -0600
Subject: [PATCH 069/111] Appease the linter

---
 src/db/NebStore.ts   | 28 ++++++++++++++--------------
 src/neb/NebClient.ts | 16 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 32583cd..367a347 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -87,45 +87,45 @@ export class NebStore {
     }
 
     public static async getConfig(id: number): Promise<NebConfig> {
-        const config = await NebConfiguration.findByPrimary(id);
-        if (!config) throw new Error("Configuration not found");
+        const nebConfig = await NebConfiguration.findByPrimary(id);
+        if (!nebConfig) throw new Error("Configuration not found");
 
         const integrations = await NebIntegration.findAll({where: {nebId: id}});
-        const fullIntegrations = await NebStore.getCompleteIntegrations(config, integrations);
+        const fullIntegrations = await NebStore.getCompleteIntegrations(nebConfig, integrations);
 
-        return new NebConfig(config, fullIntegrations);
+        return new NebConfig(nebConfig, fullIntegrations);
     }
 
     public static async createForUpstream(upstreamId: number): Promise<NebConfig> {
         const upstream = await Upstream.findByPrimary(upstreamId);
         if (!upstream) throw new Error("Upstream not found");
 
-        const config = await NebConfiguration.create({
+        const nebConfig = await NebConfiguration.create({
             upstreamId: upstream.id,
         });
 
-        return NebStore.getConfig(config.id);
+        return NebStore.getConfig(nebConfig.id);
     }
 
     public static async createForAppservice(appserviceId: string, adminUrl: string): Promise<NebConfig> {
         const appservice = await AppService.findByPrimary(appserviceId);
         if (!appservice) throw new Error("Appservice not found");
 
-        const config = await NebConfiguration.create({
+        const nebConfig = await NebConfiguration.create({
             appserviceId: appservice.id,
             adminUrl: adminUrl,
         });
 
-        return NebStore.getConfig(config.id);
+        return NebStore.getConfig(nebConfig.id);
     }
 
     public static async getOrCreateIntegration(configurationId: number, integrationType: string): Promise<NebIntegration> {
         if (!NebStore.INTEGRATIONS[integrationType]) throw new Error("Integration not supported");
 
-        const config = await NebConfiguration.findByPrimary(configurationId);
-        if (!config) throw new Error("Configuration not found");
+        const nebConfig = await NebConfiguration.findByPrimary(configurationId);
+        if (!nebConfig) throw new Error("Configuration not found");
 
-        let integration = await NebIntegration.findOne({where: {nebId: config.id, type: integrationType}});
+        let integration = await NebIntegration.findOne({where: {nebId: nebConfig.id, type: integrationType}});
         if (!integration) {
             LogService.info("NebStore", "Creating integration " + integrationType + " for NEB " + configurationId);
             integration = await NebIntegration.create({
@@ -171,9 +171,9 @@ export class NebStore {
         for (const type of Object.keys(NebStore.INTEGRATIONS)) {
             if (nebConfig.upstreamId && NebStore.INTEGRATIONS_MODULAR_SUPPORTED.indexOf(type) === -1) continue;
 
-            const config = JSON.parse(JSON.stringify(NebStore.INTEGRATIONS[type]));
-            config["type"] = type;
-            result.push(config);
+            const integrationConfig = JSON.parse(JSON.stringify(NebStore.INTEGRATIONS[type]));
+            integrationConfig["type"] = type;
+            result.push(integrationConfig);
         }
 
         return result;
diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
index 7905a80..6a606ba 100644
--- a/src/neb/NebClient.ts
+++ b/src/neb/NebClient.ts
@@ -17,7 +17,7 @@ export class NebClient {
     }
 
     public async updateUser(userId: string, isEnabled: boolean, sync = true, autoAcceptInvites = true): Promise<any> {
-        const request: Client = {
+        const nebRequest: Client = {
             UserID: userId,
             HomeserverURL: await getFederationUrl(config.homeserver.name),
             AccessToken: (isEnabled ? await this.getAccessToken(userId) : "DISABLED"),
@@ -25,25 +25,25 @@ export class NebClient {
             AutoJoinRooms: autoAcceptInvites
         };
 
-        return this.doRequest("/admin/configureClient", request);
+        return this.doRequest("/admin/configureClient", nebRequest);
     }
 
-    public async setServiceConfig(serviceId: string, userId: string, type: string, config: any): Promise<any> {
-        const request: Service = {
+    public async setServiceConfig(serviceId: string, userId: string, type: string, serviceConfig: any): Promise<any> {
+        const nebRequest: Service = {
             ID: serviceId,
             Type: type,
             UserID: userId,
-            Config: config,
+            Config: serviceConfig,
         };
 
-        return this.doRequest("/admin/configureService", request);
+        return this.doRequest("/admin/configureService", nebRequest);
     }
 
     public async getServiceConfig(serviceId: string): Promise<any> {
-        const request = {ID: serviceId};
+        const nebRequest = {ID: serviceId};
 
         try {
-            const service = await this.doRequest<Service>("/admin/getService", request);
+            const service = await this.doRequest<Service>("/admin/getService", nebRequest);
             return service.Config;
         } catch (err) {
             LogService.error("NebClient", err);

From 8cdae3359dc846ce28d18b1ffcedef4270f33c31 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 17:09:34 -0600
Subject: [PATCH 070/111] Support explicit setting of the federation/client
 URLs

The client/server URL is needed for go-neb to work correctly, and to remove our complete dependence on federation.

The federation URL is also configurable so servers that don't wish to federate can specify a local address.
---
 config/default.yaml                      | 24 +++++++++++---
 src/api/admin/AdminAppserviceService.ts  |  3 +-
 src/api/admin/AdminService.ts            |  7 +++--
 src/api/scalar/ScalarWidgetService.ts    |  2 +-
 src/config.ts                            |  2 ++
 src/db/AppserviceStore.ts                |  3 +-
 src/matrix/MatrixAppserviceClient.ts     | 10 +++---
 src/matrix/MatrixLiteClient.ts           | 14 +++------
 src/matrix/MatrixOpenIdClient.ts         |  2 ++
 src/matrix/helpers.ts                    | 40 +++++++++++++++++++++++-
 src/neb/NebClient.ts                     |  3 +-
 web/app/admin/home/home.component.html   |  5 ++-
 web/app/shared/models/admin_responses.ts |  1 +
 13 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/config/default.yaml b/config/default.yaml
index 200af3d..2c60a7c 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -3,9 +3,23 @@ web:
   port: 8184
   address: '0.0.0.0'
 
-# Homeserver configuration (used to proxy some requests to the homeserver for processing)
+# Homeserver configuration
 homeserver:
+  # The domain name of the homeserver. This is used in many places, such as with go-neb
+  # setups, to identify the homeserver.
   name: "t2bot.io"
+
+  # The URL that Dimension, go-neb, and other services provisioned by Dimension should
+  # use to access the homeserver with.
+  clientServerUrl: "https://t2bot.io"
+
+  # The URL that Dimension should use when trying to communicate with federated APIs on
+  # the homeserver. If not supplied or left empty Dimension will try to resolve the address
+  # through the normal federation process.
+  #federationUrl: "https://t2bot.io:8448"
+
+  # The access token Dimension should use for miscellaneous access to the homeserver. This
+  # should be for a valid user.
   accessToken: "something"
 
 # These users can modify the integrations this Dimension supports.
@@ -16,10 +30,10 @@ admins:
 # IPs and CIDR ranges listed here will be blocked from being widgets.
 # Note: Widgets may still be embedded with restricted content, although not through Dimension directly.
 widgetBlacklist:
-- 10.0.0.0/8
-- 172.16.0.0/12
-- 192.168.0.0/16
-- 127.0.0.0/8
+  - 10.0.0.0/8
+  - 172.16.0.0/12
+  - 192.168.0.0/16
+  - 127.0.0.0/8
 
 # Where the database for Dimension is
 database:
diff --git a/src/api/admin/AdminAppserviceService.ts b/src/api/admin/AdminAppserviceService.ts
index efdc667..16aac81 100644
--- a/src/api/admin/AdminAppserviceService.ts
+++ b/src/api/admin/AdminAppserviceService.ts
@@ -4,7 +4,6 @@ import AppService from "../../db/models/AppService";
 import { AppserviceStore } from "../../db/AppserviceStore";
 import { ApiError } from "../ApiError";
 import { MatrixAppserviceClient } from "../../matrix/MatrixAppserviceClient";
-import config from "../../config";
 import { LogService } from "matrix-js-snippets";
 
 interface AppserviceResponse {
@@ -67,7 +66,7 @@ export class AdminAppserviceService {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const appservice = await AppserviceStore.getAppservice(asId);
-        const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
+        const client = new MatrixAppserviceClient(appservice);
         const userId = await client.whoAmI();
 
         if (userId.startsWith("@" + appservice.userPrefix)) return {}; // 200 OK
diff --git a/src/api/admin/AdminService.ts b/src/api/admin/AdminService.ts
index 661e141..1652358 100644
--- a/src/api/admin/AdminService.ts
+++ b/src/api/admin/AdminService.ts
@@ -4,6 +4,7 @@ import config from "../../config";
 import { ApiError } from "../ApiError";
 import { MatrixLiteClient } from "../../matrix/MatrixLiteClient";
 import { CURRENT_VERSION } from "../../version";
+import { getFederationUrl } from "../../matrix/helpers";
 
 interface DimensionVersionResponse {
     version: string;
@@ -16,6 +17,7 @@ interface DimensionConfigResponse {
         name: string;
         userId: string;
         federationUrl: string;
+        clientServerUrl: string;
     };
 }
 
@@ -52,14 +54,15 @@ export class AdminService {
     public async getConfig(@QueryParam("scalar_token") scalarToken: string): Promise<DimensionConfigResponse> {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
-        const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
+        const client = new MatrixLiteClient(config.homeserver.accessToken);
         return {
             admins: config.admins,
             widgetBlacklist: config.widgetBlacklist,
             homeserver: {
                 name: config.homeserver.name,
                 userId: await client.whoAmI(),
-                federationUrl: await client.getFederationUrl(),
+                federationUrl: await getFederationUrl(config.homeserver.name),
+                clientServerUrl: config.homeserver.clientServerUrl,
             },
         };
     }
diff --git a/src/api/scalar/ScalarWidgetService.ts b/src/api/scalar/ScalarWidgetService.ts
index dfca227..ef3c6d3 100644
--- a/src/api/scalar/ScalarWidgetService.ts
+++ b/src/api/scalar/ScalarWidgetService.ts
@@ -32,7 +32,7 @@ export class ScalarWidgetService {
             return cachedResult;
         }
 
-        const client = new MatrixLiteClient(config.homeserver.name, config.homeserver.accessToken);
+        const client = new MatrixLiteClient(config.homeserver.accessToken);
 
         try {
             const preview = await client.getUrlPreview(url);
diff --git a/src/config.ts b/src/config.ts
index 7149e0a..cca6074 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -9,6 +9,8 @@ export interface DimensionConfig {
     homeserver: {
         name: string;
         accessToken: string;
+        clientServerUrl: string;
+        federationUrl: string;
     };
     widgetBlacklist: string[];
     database: {
diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index 4ee32e8..c4fe326 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -2,7 +2,6 @@ import AppService from "./models/AppService";
 import AppServiceUser from "./models/AppServiceUser";
 import * as randomString from "random-string";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
-import config from "../config";
 
 export class AppserviceStore {
 
@@ -49,7 +48,7 @@ export class AppserviceStore {
         const appservice = await AppService.findOne({where: {id: appserviceId}});
         if (!appservice) throw new Error("Appservice not found");
 
-        const client = new MatrixAppserviceClient(config.homeserver.name, appservice);
+        const client = new MatrixAppserviceClient(appservice);
         const localpart = AppserviceStore.getSafeUserId(userId.substring(1).split(":")[0]);
         const response = await client.registerUser(localpart);
 
diff --git a/src/matrix/MatrixAppserviceClient.ts b/src/matrix/MatrixAppserviceClient.ts
index 5d3fd2e..cf1aa1e 100644
--- a/src/matrix/MatrixAppserviceClient.ts
+++ b/src/matrix/MatrixAppserviceClient.ts
@@ -1,4 +1,4 @@
-import { doFederatedApiCall } from "./helpers";
+import { doClientApiCall } from "./helpers";
 import AppService from "../db/models/AppService";
 
 export interface MatrixUserResponse {
@@ -10,13 +10,12 @@ export interface MatrixUserResponse {
 
 export class MatrixAppserviceClient {
 
-    constructor(private homeserverName: string, private appservice: AppService) {
+    constructor(private appservice: AppService) {
     }
 
     public async registerUser(localpart: string): Promise<MatrixUserResponse> {
-        return doFederatedApiCall(
+        return doClientApiCall(
             "POST",
-            this.homeserverName,
             "/_matrix/client/r0/register",
             {access_token: this.appservice.asToken},
             {type: "m.login.application_service", username: localpart},
@@ -24,9 +23,8 @@ export class MatrixAppserviceClient {
     }
 
     public async whoAmI(): Promise<string> {
-        const response = await doFederatedApiCall(
+        const response = await doClientApiCall(
             "GET",
-            this.homeserverName,
             "/_matrix/client/r0/account/whoami",
             {access_token: this.appservice.asToken},
         );
diff --git a/src/matrix/MatrixLiteClient.ts b/src/matrix/MatrixLiteClient.ts
index 4319bdf..9470914 100644
--- a/src/matrix/MatrixLiteClient.ts
+++ b/src/matrix/MatrixLiteClient.ts
@@ -1,4 +1,4 @@
-import { doFederatedApiCall, getFederationUrl as getFedUrl } from "./helpers";
+import { doClientApiCall } from "./helpers";
 
 export interface MatrixUrlPreview {
     // This is really the only parameter we care about
@@ -7,26 +7,20 @@ export interface MatrixUrlPreview {
 
 export class MatrixLiteClient {
 
-    constructor(private homeserverName: string, private accessToken: string) {
-    }
-
-    public async getFederationUrl(): Promise<string> {
-        return getFedUrl(this.homeserverName);
+    constructor(private accessToken: string) {
     }
 
     public async getUrlPreview(url: string): Promise<MatrixUrlPreview> {
-        return doFederatedApiCall(
+        return doClientApiCall(
             "GET",
-            this.homeserverName,
             "/_matrix/media/r0/preview_url",
             {access_token: this.accessToken, url: url}
         );
     }
 
     public async whoAmI(): Promise<string> {
-        const response = await doFederatedApiCall(
+        const response = await doClientApiCall(
             "GET",
-            this.homeserverName,
             "/_matrix/client/r0/account/whoami",
             {access_token: this.accessToken}
         );
diff --git a/src/matrix/MatrixOpenIdClient.ts b/src/matrix/MatrixOpenIdClient.ts
index f71e84e..cae3d3e 100644
--- a/src/matrix/MatrixOpenIdClient.ts
+++ b/src/matrix/MatrixOpenIdClient.ts
@@ -7,6 +7,8 @@ export class MatrixOpenIdClient {
     }
 
     public async getUserId(): Promise<string> {
+        // TODO: Implement/prefer https://github.com/matrix-org/matrix-doc/issues/1115
+        // #1115 also means this should become a client API call, not a federated one (finally)
         const response = await doFederatedApiCall(
             "GET",
             this.openId.matrix_server_name,
diff --git a/src/matrix/helpers.ts b/src/matrix/helpers.ts
index 81911fe..8a5fe4c 100644
--- a/src/matrix/helpers.ts
+++ b/src/matrix/helpers.ts
@@ -2,6 +2,7 @@ import * as dns from "dns-then";
 import { LogService } from "matrix-js-snippets";
 import { Cache, CACHE_FEDERATION } from "../MemoryCache";
 import * as request from "request";
+import config from "../config";
 
 export async function getFederationUrl(serverName: string): Promise<string> {
     const cachedUrl = Cache.for(CACHE_FEDERATION).get(serverName);
@@ -10,6 +11,17 @@ export async function getFederationUrl(serverName: string): Promise<string> {
         return cachedUrl;
     }
 
+    if (serverName === config.homeserver.name && config.homeserver.federationUrl) {
+        let url = config.homeserver.federationUrl;
+        if (url.endsWith("/")) {
+            url = url.substring(0, url.length - 1);
+        }
+
+        LogService.info("matrix", "Using configured federation URL for " + serverName);
+        Cache.for(CACHE_FEDERATION).put(serverName, url);
+        return url;
+    }
+
     let serverUrl = null;
     let expirationMs = 4 * 60 * 60 * 1000; // default is 4 hours
 
@@ -49,7 +61,33 @@ export async function doFederatedApiCall(method: string, serverName: string, end
                 LogService.error("matrix", err);
                 reject(err);
             } else if (res.statusCode !== 200) {
-                LogService.error("matrix", "Got status code " + res.statusCode + " while calling " + endpoint);
+                LogService.error("matrix", "Got status code " + res.statusCode + " while calling federated endpoint " + endpoint);
+                reject(new Error("Error in request: invalid status code"));
+            } else {
+                if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
+                resolve(res.body);
+            }
+        });
+    });
+}
+
+export async function doClientApiCall(method: string, endpoint: string, query?: object, body?: object): Promise<any> {
+    let url = config.homeserver.clientServerUrl;
+    if (url.endsWith("/")) url = url.substring(0, url.length - 1);
+
+    return new Promise((resolve, reject) => {
+        request({
+            method: method,
+            url: url + endpoint,
+            qs: query,
+            json: body,
+        }, (err, res, _body) => {
+            if (err) {
+                LogService.error("matrix", "Error calling " + endpoint);
+                LogService.error("matrix", err);
+                reject(err);
+            } else if (res.statusCode !== 200) {
+                LogService.error("matrix", "Got status code " + res.statusCode + " while calling client endpoint " + endpoint);
                 reject(new Error("Error in request: invalid status code"));
             } else {
                 if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
index 6a606ba..634af7f 100644
--- a/src/neb/NebClient.ts
+++ b/src/neb/NebClient.ts
@@ -2,7 +2,6 @@ import { NebConfig } from "../models/neb";
 import { AppserviceStore } from "../db/AppserviceStore";
 import { Client } from "./models/client";
 import config from "../config";
-import { getFederationUrl } from "../matrix/helpers";
 import { LogService } from "matrix-js-snippets";
 import { Service } from "./models/service";
 import * as request from "request";
@@ -19,7 +18,7 @@ export class NebClient {
     public async updateUser(userId: string, isEnabled: boolean, sync = true, autoAcceptInvites = true): Promise<any> {
         const nebRequest: Client = {
             UserID: userId,
-            HomeserverURL: await getFederationUrl(config.homeserver.name),
+            HomeserverURL: config.homeserver.clientServerUrl,
             AccessToken: (isEnabled ? await this.getAccessToken(userId) : "DISABLED"),
             Sync: isEnabled ? sync : false,
             AutoJoinRooms: autoAcceptInvites
diff --git a/web/app/admin/home/home.component.html b/web/app/admin/home/home.component.html
index 98c9a8a..6d035ff 100644
--- a/web/app/admin/home/home.component.html
+++ b/web/app/admin/home/home.component.html
@@ -23,9 +23,8 @@
                     <strong>Homeserver</strong><br />
                     Name: {{ config.homeserver.name }}<br />
                     Federation URL: {{ config.homeserver.federationUrl }}<br />
-                    <!-- Dimension makes no distinction for the csapi -->
-                    Client/Server URL: {{ config.homeserver.federationUrl }}<br />
-                    User ID: {{ config.homeserver.userId }}
+                    Client/Server URL: {{ config.homeserver.clientServerUrl }}<br />
+                    Utility User ID: {{ config.homeserver.userId }}
                 </div>
             </div>
         </div>
diff --git a/web/app/shared/models/admin_responses.ts b/web/app/shared/models/admin_responses.ts
index 134ae51..dc7f93f 100644
--- a/web/app/shared/models/admin_responses.ts
+++ b/web/app/shared/models/admin_responses.ts
@@ -7,6 +7,7 @@ export interface FE_DimensionConfig {
         name: string;
         userId: string;
         federationUrl: string;
+        clientServerUrl: string;
     };
 }
 

From 5d00c729720197638af7c8b2f936bd05916bc3a3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 17:10:06 -0600
Subject: [PATCH 071/111] Disable Circle CI support for now

When the PR gets merged to go-neb, this can be uncommented and implemented.
---
 src/db/NebStore.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 367a347..18cf81f 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -22,11 +22,12 @@ export class NebStore {
     private static INTEGRATIONS_MODULAR_SUPPORTED = ["giphy", "guggy", "github", "google", "imgur", "rss", "travisci", "wikipedia"];
 
     private static INTEGRATIONS = {
-        "circleci": {
-            name: "Circle CI",
-            avatarUrl: "/img/avatars/circleci.png",
-            description: "Announces build results from Circle CI to the room.",
-        },
+        // TODO: Support Circle CI
+        // "circleci": {
+        //     name: "Circle CI",
+        //     avatarUrl: "/img/avatars/circleci.png",
+        //     description: "Announces build results from Circle CI to the room.",
+        // },
         "echo": {
             name: "Echo",
             avatarUrl: "/img/avatars/echo.png", // TODO: Make this image

From 0d520a763f1f290fb6a7ed3520c0dbfb043378a9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 17:16:52 -0600
Subject: [PATCH 072/111] Update webapp to match naming angular naming
 conventions

---
 web/app/admin/home/home.component.ts           |  2 +-
 .../add-selfhosted.component.html}             |  0
 .../add-selfhosted.component.scss}             |  0
 .../add-selfhosted.component.ts}               |  4 ++--
 .../appservice-config.component.ts             |  2 +-
 web/app/admin/neb/edit/edit.component.ts       |  2 +-
 web/app/admin/neb/neb.component.ts             |  2 +-
 web/app/app.module.ts                          | 18 +++++++++---------
 web/app/app.routing.ts                         | 14 +++++++-------
 .../config-screen.component.html}              |  0
 .../config-screen.widget.component.scss}       |  0
 .../config-screen.widget.component.ts}         |  4 ++--
 .../gcal.widget.component.html                 |  0
 .../gcal.widget.component.scss                 |  0
 .../gcal.widget.component.ts                   |  0
 .../gdoc.widget.component.html                 |  0
 .../gdoc.widget.component.scss                 |  0
 .../gdoc.widget.component.ts                   |  0
 web/app/configs/widget/widget.component.ts     |  2 +-
 .../{admin_responses.ts => admin-responses.ts} |  0
 ...ion_responses.ts => dimension-responses.ts} |  0
 ...responses.ts => scalar-server-responses.ts} |  0
 ...responses.ts => server-client-responses.ts} |  0
 web/app/shared/models/widget.ts                |  2 +-
 .../{ServiceLocator.ts => locator.service.ts}  |  0
 .../shared/services/admin/admin-api.service.ts |  4 ++--
 .../admin/admin-appservice-api.service.ts      |  4 ++--
 .../admin/admin-integrations-api.service.ts    |  4 ++--
 .../services/admin/admin-neb-api.service.ts    |  4 ++--
 .../admin/admin-upstream-api.service.ts        |  4 ++--
 .../services/{AuthedApi.ts => authed-api.ts}   |  0
 .../integrations/integrations-api.service.ts   |  4 ++--
 .../integrations/widget-api.service.ts         |  2 +-
 .../scalar/scalar-client-api.service.ts        |  2 +-
 .../scalar/scalar-server-api.service.ts        |  4 ++--
 .../fullpage-iframe.component.html             |  0
 .../fullpage-iframe.component.scss             |  0
 .../gcal/gcal.component.ts                     |  0
 .../generic/generic.component.html             |  0
 .../generic/generic.component.scss             |  0
 .../generic/generic.component.ts               |  0
 .../jitsi/jitsi.component.html                 |  0
 .../jitsi/jitsi.component.scss                 |  0
 .../jitsi/jitsi.component.ts                   |  0
 .../video/video.component.ts                   |  0
 45 files changed, 42 insertions(+), 42 deletions(-)
 rename web/app/admin/neb/{add_selfhosted/add_selfhosted.component.html => add-selfhosted/add-selfhosted.component.html} (100%)
 rename web/app/admin/neb/{add_selfhosted/add_selfhosted.component.scss => add-selfhosted/add-selfhosted.component.scss} (100%)
 rename web/app/admin/neb/{add_selfhosted/add_selfhosted.component.ts => add-selfhosted/add-selfhosted.component.ts} (94%)
 rename web/app/configs/widget/{config_screen/config_screen.component.html => config-screen/config-screen.component.html} (100%)
 rename web/app/configs/widget/{config_screen/config_screen.widget.component.scss => config-screen/config-screen.widget.component.scss} (100%)
 rename web/app/configs/widget/{config_screen/config_screen.widget.component.ts => config-screen/config-screen.widget.component.ts} (78%)
 rename web/app/configs/widget/{google_calendar => google-calendar}/gcal.widget.component.html (100%)
 rename web/app/configs/widget/{google_calendar => google-calendar}/gcal.widget.component.scss (100%)
 rename web/app/configs/widget/{google_calendar => google-calendar}/gcal.widget.component.ts (100%)
 rename web/app/configs/widget/{google_docs => google-docs}/gdoc.widget.component.html (100%)
 rename web/app/configs/widget/{google_docs => google-docs}/gdoc.widget.component.scss (100%)
 rename web/app/configs/widget/{google_docs => google-docs}/gdoc.widget.component.ts (100%)
 rename web/app/shared/models/{admin_responses.ts => admin-responses.ts} (100%)
 rename web/app/shared/models/{dimension_responses.ts => dimension-responses.ts} (100%)
 rename web/app/shared/models/{scalar_server_responses.ts => scalar-server-responses.ts} (100%)
 rename web/app/shared/models/{scalar_client_responses.ts => server-client-responses.ts} (100%)
 rename web/app/shared/registry/{ServiceLocator.ts => locator.service.ts} (100%)
 rename web/app/shared/services/{AuthedApi.ts => authed-api.ts} (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/fullpage-iframe/fullpage-iframe.component.html (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/fullpage-iframe/fullpage-iframe.component.scss (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/gcal/gcal.component.ts (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/generic/generic.component.html (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/generic/generic.component.scss (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/generic/generic.component.ts (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/jitsi/jitsi.component.html (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/jitsi/jitsi.component.scss (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/jitsi/jitsi.component.ts (100%)
 rename web/app/{widget_wrappers => widget-wrappers}/video/video.component.ts (100%)

diff --git a/web/app/admin/home/home.component.ts b/web/app/admin/home/home.component.ts
index 081e4db..4e3d3aa 100644
--- a/web/app/admin/home/home.component.ts
+++ b/web/app/admin/home/home.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { AdminApiService } from "../../shared/services/admin/admin-api.service";
-import { FE_DimensionConfig } from "../../shared/models/admin_responses";
+import { FE_DimensionConfig } from "../../shared/models/admin-responses";
 
 @Component({
     templateUrl: "./home.component.html",
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.html b/web/app/admin/neb/add-selfhosted/add-selfhosted.component.html
similarity index 100%
rename from web/app/admin/neb/add_selfhosted/add_selfhosted.component.html
rename to web/app/admin/neb/add-selfhosted/add-selfhosted.component.html
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.scss b/web/app/admin/neb/add-selfhosted/add-selfhosted.component.scss
similarity index 100%
rename from web/app/admin/neb/add_selfhosted/add_selfhosted.component.scss
rename to web/app/admin/neb/add-selfhosted/add-selfhosted.component.scss
diff --git a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts b/web/app/admin/neb/add-selfhosted/add-selfhosted.component.ts
similarity index 94%
rename from web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
rename to web/app/admin/neb/add-selfhosted/add-selfhosted.component.ts
index e639698..d2a7dbc 100644
--- a/web/app/admin/neb/add_selfhosted/add_selfhosted.component.ts
+++ b/web/app/admin/neb/add-selfhosted/add-selfhosted.component.ts
@@ -11,8 +11,8 @@ import {
 
 
 @Component({
-    templateUrl: "./add_selfhosted.component.html",
-    styleUrls: ["./add_selfhosted.component.scss"],
+    templateUrl: "./add-selfhosted.component.html",
+    styleUrls: ["./add-selfhosted.component.scss"],
 })
 export class AdminAddSelfhostedNebComponent {
 
diff --git a/web/app/admin/neb/appservice-config/appservice-config.component.ts b/web/app/admin/neb/appservice-config/appservice-config.component.ts
index 5a25d47..a9693f7 100644
--- a/web/app/admin/neb/appservice-config/appservice-config.component.ts
+++ b/web/app/admin/neb/appservice-config/appservice-config.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { ToasterService } from "angular2-toaster";
 import { DialogRef, ModalComponent } from "ngx-modialog";
-import { FE_Appservice, FE_NebConfiguration } from "../../../shared/models/admin_responses";
+import { FE_Appservice, FE_NebConfiguration } from "../../../shared/models/admin-responses";
 import { AdminAppserviceApiService } from "../../../shared/services/admin/admin-appservice-api.service";
 import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
 
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index ce32dea..151307c 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { FE_NebConfiguration } from "../../../shared/models/admin_responses";
+import { FE_NebConfiguration } from "../../../shared/models/admin-responses";
 import { AdminNebApiService } from "../../../shared/services/admin/admin-neb-api.service";
 import { ActivatedRoute } from "@angular/router";
 import { ToasterService } from "angular2-toaster";
diff --git a/web/app/admin/neb/neb.component.ts b/web/app/admin/neb/neb.component.ts
index ebd48cd..a75f625 100644
--- a/web/app/admin/neb/neb.component.ts
+++ b/web/app/admin/neb/neb.component.ts
@@ -3,7 +3,7 @@ import { ToasterService } from "angular2-toaster";
 import { AdminNebApiService } from "../../shared/services/admin/admin-neb-api.service";
 import { AdminUpstreamApiService } from "../../shared/services/admin/admin-upstream-api.service";
 import { AdminAppserviceApiService } from "../../shared/services/admin/admin-appservice-api.service";
-import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../shared/models/admin_responses";
+import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../shared/models/admin-responses";
 import { ActivatedRoute, Router } from "@angular/router";
 import {
     AdminNebAppserviceConfigComponent,
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index d7f2e21..72f7e25 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -15,12 +15,12 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { ScalarCloseComponent } from "./riot/scalar-close/scalar-close.component";
 import { BootstrapModalModule } from "ngx-modialog/plugins/bootstrap";
 import { ModalModule } from "ngx-modialog";
-import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic.component";
+import { GenericWidgetWrapperComponent } from "./widget-wrappers/generic/generic.component";
 import { ToggleFullscreenDirective } from "./shared/directives/toggle-fullscreen.directive";
 import { FullscreenButtonComponent } from "./elements/fullscreen-button/fullscreen-button.component";
-import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component";
-import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
-import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
+import { VideoWidgetWrapperComponent } from "./widget-wrappers/video/video.component";
+import { JitsiWidgetWrapperComponent } from "./widget-wrappers/jitsi/jitsi.component";
+import { GCalWidgetWrapperComponent } from "./widget-wrappers/gcal/gcal.component";
 import { PageHeaderComponent } from "./page-header/page-header.component";
 import { SpinnerComponent } from "./elements/spinner/spinner.component";
 import { BreadcrumbsModule } from "ng2-breadcrumbs";
@@ -28,14 +28,14 @@ import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { IntegrationBagComponent } from "./integration-bag/integration-bag.component";
 import { ScalarServerApiService } from "./shared/services/scalar/scalar-server-api.service";
 import { AdminApiService } from "./shared/services/admin/admin-api.service";
-import { ServiceLocator } from "./shared/registry/ServiceLocator";
+import { ServiceLocator } from "./shared/registry/locator.service";
 import { IboxComponent } from "./elements/ibox/ibox.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
-import { ConfigScreenWidgetComponent } from "./configs/widget/config_screen/config_screen.widget.component";
+import { ConfigScreenWidgetComponent } from "./configs/widget/config-screen/config-screen.widget.component";
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
 import { NameService } from "./shared/services/name.service";
-import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
-import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
+import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google-calendar/gcal.widget.component";
+import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google-docs/gdoc.widget.component";
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
@@ -52,7 +52,7 @@ import { AdminNebApiService } from "./shared/services/admin/admin-neb-api.servic
 import { AdminUpstreamApiService } from "./shared/services/admin/admin-upstream-api.service";
 import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
-import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_selfhosted.component";
+import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
 import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config/appservice-config.component";
 
 @NgModule({
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index fe80441..029e0ad 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -1,15 +1,15 @@
 import { RouterModule, Routes } from "@angular/router";
 import { HomeComponent } from "./home/home.component";
 import { RiotComponent } from "./riot/riot.component";
-import { GenericWidgetWrapperComponent } from "./widget_wrappers/generic/generic.component";
-import { VideoWidgetWrapperComponent } from "./widget_wrappers/video/video.component";
-import { JitsiWidgetWrapperComponent } from "./widget_wrappers/jitsi/jitsi.component";
-import { GCalWidgetWrapperComponent } from "./widget_wrappers/gcal/gcal.component";
+import { GenericWidgetWrapperComponent } from "./widget-wrappers/generic/generic.component";
+import { VideoWidgetWrapperComponent } from "./widget-wrappers/video/video.component";
+import { JitsiWidgetWrapperComponent } from "./widget-wrappers/jitsi/jitsi.component";
+import { GCalWidgetWrapperComponent } from "./widget-wrappers/gcal/gcal.component";
 import { RiotHomeComponent } from "./riot/riot-home/home.component";
 import { CustomWidgetConfigComponent } from "./configs/widget/custom/custom.widget.component";
 import { EtherpadWidgetConfigComponent } from "./configs/widget/etherpad/etherpad.widget.component";
-import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google_calendar/gcal.widget.component";
-import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google_docs/gdoc.widget.component";
+import { GoogleCalendarWidgetConfigComponent } from "./configs/widget/google-calendar/gcal.widget.component";
+import { GoogleDocsWidgetConfigComponent } from "./configs/widget/google-docs/gdoc.widget.component";
 import { JitsiWidgetConfigComponent } from "./configs/widget/jitsi/jitsi.widget.component";
 import { TwitchWidgetConfigComponent } from "./configs/widget/twitch/twitch.widget.component";
 import { YoutubeWidgetConfigComponent } from "./configs/widget/youtube/youtube.widget.component";
@@ -18,7 +18,7 @@ import { AdminHomeComponent } from "./admin/home/home.component";
 import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
 import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
-import { AdminAddSelfhostedNebComponent } from "./admin/neb/add_selfhosted/add_selfhosted.component";
+import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
diff --git a/web/app/configs/widget/config_screen/config_screen.component.html b/web/app/configs/widget/config-screen/config-screen.component.html
similarity index 100%
rename from web/app/configs/widget/config_screen/config_screen.component.html
rename to web/app/configs/widget/config-screen/config-screen.component.html
diff --git a/web/app/configs/widget/config_screen/config_screen.widget.component.scss b/web/app/configs/widget/config-screen/config-screen.widget.component.scss
similarity index 100%
rename from web/app/configs/widget/config_screen/config_screen.widget.component.scss
rename to web/app/configs/widget/config-screen/config-screen.widget.component.scss
diff --git a/web/app/configs/widget/config_screen/config_screen.widget.component.ts b/web/app/configs/widget/config-screen/config-screen.widget.component.ts
similarity index 78%
rename from web/app/configs/widget/config_screen/config_screen.widget.component.ts
rename to web/app/configs/widget/config-screen/config-screen.widget.component.ts
index 4f0b67b..8b33dfe 100644
--- a/web/app/configs/widget/config_screen/config_screen.widget.component.ts
+++ b/web/app/configs/widget/config-screen/config-screen.widget.component.ts
@@ -3,8 +3,8 @@ import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
 
 @Component({
     selector: "my-widget-config",
-    templateUrl: "config_screen.component.html",
-    styleUrls: ["config_screen.widget.component.scss"],
+    templateUrl: "config-screen.component.html",
+    styleUrls: ["config-screen.widget.component.scss"],
 })
 export class ConfigScreenWidgetComponent {
 
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.html b/web/app/configs/widget/google-calendar/gcal.widget.component.html
similarity index 100%
rename from web/app/configs/widget/google_calendar/gcal.widget.component.html
rename to web/app/configs/widget/google-calendar/gcal.widget.component.html
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.scss b/web/app/configs/widget/google-calendar/gcal.widget.component.scss
similarity index 100%
rename from web/app/configs/widget/google_calendar/gcal.widget.component.scss
rename to web/app/configs/widget/google-calendar/gcal.widget.component.scss
diff --git a/web/app/configs/widget/google_calendar/gcal.widget.component.ts b/web/app/configs/widget/google-calendar/gcal.widget.component.ts
similarity index 100%
rename from web/app/configs/widget/google_calendar/gcal.widget.component.ts
rename to web/app/configs/widget/google-calendar/gcal.widget.component.ts
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.html b/web/app/configs/widget/google-docs/gdoc.widget.component.html
similarity index 100%
rename from web/app/configs/widget/google_docs/gdoc.widget.component.html
rename to web/app/configs/widget/google-docs/gdoc.widget.component.html
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.scss b/web/app/configs/widget/google-docs/gdoc.widget.component.scss
similarity index 100%
rename from web/app/configs/widget/google_docs/gdoc.widget.component.scss
rename to web/app/configs/widget/google-docs/gdoc.widget.component.scss
diff --git a/web/app/configs/widget/google_docs/gdoc.widget.component.ts b/web/app/configs/widget/google-docs/gdoc.widget.component.ts
similarity index 100%
rename from web/app/configs/widget/google_docs/gdoc.widget.component.ts
rename to web/app/configs/widget/google-docs/gdoc.widget.component.ts
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 842c7f3..adcdbfc 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,7 +1,7 @@
 import { convertScalarWidgetsToDtos, EditableWidget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
 import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
-import { ServiceLocator } from "../../shared/registry/ServiceLocator";
+import { ServiceLocator } from "../../shared/registry/locator.service";
 import { SessionStorage } from "../../shared/SessionStorage";
 import { OnInit } from "@angular/core";
 
diff --git a/web/app/shared/models/admin_responses.ts b/web/app/shared/models/admin-responses.ts
similarity index 100%
rename from web/app/shared/models/admin_responses.ts
rename to web/app/shared/models/admin-responses.ts
diff --git a/web/app/shared/models/dimension_responses.ts b/web/app/shared/models/dimension-responses.ts
similarity index 100%
rename from web/app/shared/models/dimension_responses.ts
rename to web/app/shared/models/dimension-responses.ts
diff --git a/web/app/shared/models/scalar_server_responses.ts b/web/app/shared/models/scalar-server-responses.ts
similarity index 100%
rename from web/app/shared/models/scalar_server_responses.ts
rename to web/app/shared/models/scalar-server-responses.ts
diff --git a/web/app/shared/models/scalar_client_responses.ts b/web/app/shared/models/server-client-responses.ts
similarity index 100%
rename from web/app/shared/models/scalar_client_responses.ts
rename to web/app/shared/models/server-client-responses.ts
diff --git a/web/app/shared/models/widget.ts b/web/app/shared/models/widget.ts
index fb707a3..787bd93 100644
--- a/web/app/shared/models/widget.ts
+++ b/web/app/shared/models/widget.ts
@@ -1,4 +1,4 @@
-import { WidgetsResponse } from "./scalar_client_responses";
+import { WidgetsResponse } from "./server-client-responses";
 
 export const WIDGET_CUSTOM = ["customwidget", "dimension-customwidget"];
 export const WIDGET_ETHERPAD = ["etherpad", "dimension-etherpad"];
diff --git a/web/app/shared/registry/ServiceLocator.ts b/web/app/shared/registry/locator.service.ts
similarity index 100%
rename from web/app/shared/registry/ServiceLocator.ts
rename to web/app/shared/registry/locator.service.ts
diff --git a/web/app/shared/services/admin/admin-api.service.ts b/web/app/shared/services/admin/admin-api.service.ts
index b79b2d4..a0f4b0b 100644
--- a/web/app/shared/services/admin/admin-api.service.ts
+++ b/web/app/shared/services/admin/admin-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
-import { FE_DimensionConfig, FE_DimensionVersion } from "../../models/admin_responses";
+import { AuthedApi } from "../authed-api";
+import { FE_DimensionConfig, FE_DimensionVersion } from "../../models/admin-responses";
 
 @Injectable()
 export class AdminApiService extends AuthedApi {
diff --git a/web/app/shared/services/admin/admin-appservice-api.service.ts b/web/app/shared/services/admin/admin-appservice-api.service.ts
index 2f749cd..e81c202 100644
--- a/web/app/shared/services/admin/admin-appservice-api.service.ts
+++ b/web/app/shared/services/admin/admin-appservice-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
-import { FE_Appservice } from "../../models/admin_responses";
+import { AuthedApi } from "../authed-api";
+import { FE_Appservice } from "../../models/admin-responses";
 
 @Injectable()
 export class AdminAppserviceApiService extends AuthedApi {
diff --git a/web/app/shared/services/admin/admin-integrations-api.service.ts b/web/app/shared/services/admin/admin-integrations-api.service.ts
index b639685..b1933a1 100644
--- a/web/app/shared/services/admin/admin-integrations-api.service.ts
+++ b/web/app/shared/services/admin/admin-integrations-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
-import { FE_IntegrationsResponse } from "../../models/dimension_responses";
+import { AuthedApi } from "../authed-api";
+import { FE_IntegrationsResponse } from "../../models/dimension-responses";
 
 @Injectable()
 export class AdminIntegrationsApiService extends AuthedApi {
diff --git a/web/app/shared/services/admin/admin-neb-api.service.ts b/web/app/shared/services/admin/admin-neb-api.service.ts
index 55fa09a..4e2e52c 100644
--- a/web/app/shared/services/admin/admin-neb-api.service.ts
+++ b/web/app/shared/services/admin/admin-neb-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
-import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../models/admin_responses";
+import { AuthedApi } from "../authed-api";
+import { FE_Appservice, FE_NebConfiguration, FE_Upstream } from "../../models/admin-responses";
 
 @Injectable()
 export class AdminNebApiService extends AuthedApi {
diff --git a/web/app/shared/services/admin/admin-upstream-api.service.ts b/web/app/shared/services/admin/admin-upstream-api.service.ts
index 800d06f..da6581b 100644
--- a/web/app/shared/services/admin/admin-upstream-api.service.ts
+++ b/web/app/shared/services/admin/admin-upstream-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
-import { FE_Upstream } from "../../models/admin_responses";
+import { AuthedApi } from "../authed-api";
+import { FE_Upstream } from "../../models/admin-responses";
 
 @Injectable()
 export class AdminUpstreamApiService extends AuthedApi {
diff --git a/web/app/shared/services/AuthedApi.ts b/web/app/shared/services/authed-api.ts
similarity index 100%
rename from web/app/shared/services/AuthedApi.ts
rename to web/app/shared/services/authed-api.ts
diff --git a/web/app/shared/services/integrations/integrations-api.service.ts b/web/app/shared/services/integrations/integrations-api.service.ts
index 81a493c..0923ef9 100644
--- a/web/app/shared/services/integrations/integrations-api.service.ts
+++ b/web/app/shared/services/integrations/integrations-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
-import { FE_IntegrationsResponse } from "../../models/dimension_responses";
+import { AuthedApi } from "../authed-api";
+import { FE_IntegrationsResponse } from "../../models/dimension-responses";
 import { FE_Integration, FE_Widget } from "../../models/integration";
 
 @Injectable()
diff --git a/web/app/shared/services/integrations/widget-api.service.ts b/web/app/shared/services/integrations/widget-api.service.ts
index d8aa2b6..06518e7 100644
--- a/web/app/shared/services/integrations/widget-api.service.ts
+++ b/web/app/shared/services/integrations/widget-api.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { AuthedApi } from "../AuthedApi";
+import { AuthedApi } from "../authed-api";
 import { FE_Widget } from "../../models/integration";
 import { IntegrationsApiService } from "./integrations-api.service";
 
diff --git a/web/app/shared/services/scalar/scalar-client-api.service.ts b/web/app/shared/services/scalar/scalar-client-api.service.ts
index 0e82340..ad111ce 100644
--- a/web/app/shared/services/scalar/scalar-client-api.service.ts
+++ b/web/app/shared/services/scalar/scalar-client-api.service.ts
@@ -6,7 +6,7 @@ import {
     MembershipStateResponse, RoomEncryptionStatusResponse,
     ScalarSuccessResponse,
     WidgetsResponse
-} from "../../models/scalar_client_responses";
+} from "../../models/server-client-responses";
 import { EditableWidget } from "../../models/widget";
 
 @Injectable()
diff --git a/web/app/shared/services/scalar/scalar-server-api.service.ts b/web/app/shared/services/scalar/scalar-server-api.service.ts
index 95a1818..765e709 100644
--- a/web/app/shared/services/scalar/scalar-server-api.service.ts
+++ b/web/app/shared/services/scalar/scalar-server-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
-import { FE_ScalarAccountResponse } from "../../models/scalar_server_responses";
-import { AuthedApi } from "../AuthedApi";
+import { FE_ScalarAccountResponse } from "../../models/scalar-server-responses";
+import { AuthedApi } from "../authed-api";
 
 @Injectable()
 export class ScalarServerApiService extends AuthedApi {
diff --git a/web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.html b/web/app/widget-wrappers/fullpage-iframe/fullpage-iframe.component.html
similarity index 100%
rename from web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.html
rename to web/app/widget-wrappers/fullpage-iframe/fullpage-iframe.component.html
diff --git a/web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.scss b/web/app/widget-wrappers/fullpage-iframe/fullpage-iframe.component.scss
similarity index 100%
rename from web/app/widget_wrappers/fullpage-iframe/fullpage-iframe.component.scss
rename to web/app/widget-wrappers/fullpage-iframe/fullpage-iframe.component.scss
diff --git a/web/app/widget_wrappers/gcal/gcal.component.ts b/web/app/widget-wrappers/gcal/gcal.component.ts
similarity index 100%
rename from web/app/widget_wrappers/gcal/gcal.component.ts
rename to web/app/widget-wrappers/gcal/gcal.component.ts
diff --git a/web/app/widget_wrappers/generic/generic.component.html b/web/app/widget-wrappers/generic/generic.component.html
similarity index 100%
rename from web/app/widget_wrappers/generic/generic.component.html
rename to web/app/widget-wrappers/generic/generic.component.html
diff --git a/web/app/widget_wrappers/generic/generic.component.scss b/web/app/widget-wrappers/generic/generic.component.scss
similarity index 100%
rename from web/app/widget_wrappers/generic/generic.component.scss
rename to web/app/widget-wrappers/generic/generic.component.scss
diff --git a/web/app/widget_wrappers/generic/generic.component.ts b/web/app/widget-wrappers/generic/generic.component.ts
similarity index 100%
rename from web/app/widget_wrappers/generic/generic.component.ts
rename to web/app/widget-wrappers/generic/generic.component.ts
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.html b/web/app/widget-wrappers/jitsi/jitsi.component.html
similarity index 100%
rename from web/app/widget_wrappers/jitsi/jitsi.component.html
rename to web/app/widget-wrappers/jitsi/jitsi.component.html
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.scss b/web/app/widget-wrappers/jitsi/jitsi.component.scss
similarity index 100%
rename from web/app/widget_wrappers/jitsi/jitsi.component.scss
rename to web/app/widget-wrappers/jitsi/jitsi.component.scss
diff --git a/web/app/widget_wrappers/jitsi/jitsi.component.ts b/web/app/widget-wrappers/jitsi/jitsi.component.ts
similarity index 100%
rename from web/app/widget_wrappers/jitsi/jitsi.component.ts
rename to web/app/widget-wrappers/jitsi/jitsi.component.ts
diff --git a/web/app/widget_wrappers/video/video.component.ts b/web/app/widget-wrappers/video/video.component.ts
similarity index 100%
rename from web/app/widget_wrappers/video/video.component.ts
rename to web/app/widget-wrappers/video/video.component.ts

From e5aa16f98c39d15967e55f43f2afad7727a2d6c6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 17:17:25 -0600
Subject: [PATCH 073/111] Update todo.txt

---
 src/temp_todo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index 8785980..701bef5 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -1,7 +1,7 @@
 * dimension apis
 * integration management
 * admin ui
-* delete old src
 * import from old db/config (script)
 * document how to add integrations (as a dev)
 * update readme
+* Update avatar/displayname of go-neb instances

From 03f71a6b0f67c8e52c0d9949fc2e8dd925db8b03 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 19:58:01 -0600
Subject: [PATCH 074/111] Update the homepage and branding

---
 README.md                                     |  25 ++---
 config/default.yaml                           |   3 +-
 package-lock.json                             |   8 +-
 package.json                                  |   1 +
 web/app/home/home.component.html              |  92 +++++++++++++++---
 web/app/home/home.component.scss              |  28 ++++--
 web/app/home/home.component.ts                |  24 ++++-
 web/public/img/infrastructure.png             | Bin 0 -> 12990 bytes
 web/public/img/logo/banner-sm.png             | Bin 6473 -> 3635 bytes
 .../logo/favicon/android-chrome-192x192.png   | Bin 0 -> 2387 bytes
 .../logo/favicon/android-chrome-512x512.png   | Bin 0 -> 7593 bytes
 .../img/logo/favicon/android-icon-144x144.png | Bin 10125 -> 0 bytes
 .../img/logo/favicon/android-icon-192x192.png | Bin 11930 -> 0 bytes
 .../img/logo/favicon/android-icon-36x36.png   | Bin 2342 -> 0 bytes
 .../img/logo/favicon/android-icon-48x48.png   | Bin 3223 -> 0 bytes
 .../img/logo/favicon/android-icon-72x72.png   | Bin 4631 -> 0 bytes
 .../img/logo/favicon/android-icon-96x96.png   | Bin 6344 -> 0 bytes
 .../img/logo/favicon/apple-icon-114x114.png   | Bin 7758 -> 0 bytes
 .../img/logo/favicon/apple-icon-120x120.png   | Bin 8238 -> 0 bytes
 .../img/logo/favicon/apple-icon-144x144.png   | Bin 10125 -> 0 bytes
 .../img/logo/favicon/apple-icon-152x152.png   | Bin 10676 -> 0 bytes
 .../img/logo/favicon/apple-icon-180x180.png   | Bin 13164 -> 0 bytes
 .../img/logo/favicon/apple-icon-57x57.png     | Bin 3595 -> 0 bytes
 .../img/logo/favicon/apple-icon-60x60.png     | Bin 3854 -> 0 bytes
 .../img/logo/favicon/apple-icon-72x72.png     | Bin 4631 -> 0 bytes
 .../img/logo/favicon/apple-icon-76x76.png     | Bin 4962 -> 0 bytes
 .../logo/favicon/apple-icon-precomposed.png   | Bin 12504 -> 0 bytes
 web/public/img/logo/favicon/apple-icon.png    | Bin 12504 -> 0 bytes
 .../img/logo/favicon/apple-touch-icon.png     | Bin 0 -> 2227 bytes
 web/public/img/logo/favicon/browserconfig.xml |   9 +-
 web/public/img/logo/favicon/favicon-16x16.png | Bin 1306 -> 837 bytes
 web/public/img/logo/favicon/favicon-32x32.png | Bin 2220 -> 1076 bytes
 web/public/img/logo/favicon/favicon-96x96.png | Bin 6344 -> 0 bytes
 web/public/img/logo/favicon/favicon.ico       | Bin 1150 -> 15086 bytes
 web/public/img/logo/favicon/manifest.json     |  41 --------
 .../img/logo/favicon/ms-icon-144x144.png      | Bin 10125 -> 0 bytes
 .../img/logo/favicon/ms-icon-150x150.png      | Bin 10640 -> 0 bytes
 .../img/logo/favicon/ms-icon-310x310.png      | Bin 28700 -> 0 bytes
 web/public/img/logo/favicon/ms-icon-70x70.png | Bin 4416 -> 0 bytes
 .../img/logo/favicon/mstile-150x150.png       | Bin 0 -> 2105 bytes
 .../img/logo/favicon/safari-pinned-tab.svg    |  15 +++
 web/public/img/logo/favicon/site.webmanifest  |  19 ++++
 web/public/index.html                         |  24 ++---
 43 files changed, 185 insertions(+), 104 deletions(-)
 create mode 100644 web/public/img/infrastructure.png
 create mode 100644 web/public/img/logo/favicon/android-chrome-192x192.png
 create mode 100644 web/public/img/logo/favicon/android-chrome-512x512.png
 delete mode 100644 web/public/img/logo/favicon/android-icon-144x144.png
 delete mode 100644 web/public/img/logo/favicon/android-icon-192x192.png
 delete mode 100644 web/public/img/logo/favicon/android-icon-36x36.png
 delete mode 100644 web/public/img/logo/favicon/android-icon-48x48.png
 delete mode 100644 web/public/img/logo/favicon/android-icon-72x72.png
 delete mode 100644 web/public/img/logo/favicon/android-icon-96x96.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-114x114.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-120x120.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-144x144.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-152x152.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-180x180.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-57x57.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-60x60.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-72x72.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-76x76.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon-precomposed.png
 delete mode 100644 web/public/img/logo/favicon/apple-icon.png
 create mode 100644 web/public/img/logo/favicon/apple-touch-icon.png
 delete mode 100644 web/public/img/logo/favicon/favicon-96x96.png
 delete mode 100644 web/public/img/logo/favicon/manifest.json
 delete mode 100644 web/public/img/logo/favicon/ms-icon-144x144.png
 delete mode 100644 web/public/img/logo/favicon/ms-icon-150x150.png
 delete mode 100644 web/public/img/logo/favicon/ms-icon-310x310.png
 delete mode 100644 web/public/img/logo/favicon/ms-icon-70x70.png
 create mode 100644 web/public/img/logo/favicon/mstile-150x150.png
 create mode 100644 web/public/img/logo/favicon/safari-pinned-tab.svg
 create mode 100644 web/public/img/logo/favicon/site.webmanifest

diff --git a/README.md b/README.md
index 443ef20..b6b31e4 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![TravisCI badge](https://travis-ci.org/turt2live/matrix-dimension.svg?branch=master)](https://travis-ci.org/turt2live/matrix-dimension)
 [![#dimension:t2bot.io](https://img.shields.io/badge/matrix-%23dimension:t2bot.io-brightgreen.svg)](https://matrix.to/#/#dimension:t2bot.io)
 
-An alternative integrations manager for [Riot.im](https://riot.im).
+An open source integrations manager for matrix clients, like Riot.
 
 # Configuring Riot to use Dimension
 
@@ -23,8 +23,7 @@ The remaining settings should be tailored for your Riot deployment. If you're se
 Prerequisites:
 * [NodeJS](https://nodejs.org/en/download/) 8 or higher
 * npm 5 or higher (`npm install -g npm@latest`)
-* TypeScript 2.6 or higher (`npm install -g typescript`)
-* A webserver running Riot
+* A webserver running Riot or another supported client
 
 ```bash
 # Download dimension 
@@ -68,36 +67,26 @@ That button should open Dimension. If you've configured everything correctly, yo
 
 1. **Check that federation is enabled and working on your homeserver.** Even in a private, or non-federated environment, the federation API still needs to be accessible. If federation is a major concern, limit the servers that can use the API by IP or install Dimension on the same server as your homeserver, only exposing federation to localhost.
 2. **Check your SRV records.** If you are using SRV records to point to your federation port, make sure that the hostname and port are correct, and that HTTPS is listening on that port. Dimension will use the first record it sees and will only communicate over HTTPS.
-3. **Log out of Riot and log back in.** When switching from the default integrations manager (Scalar) to Dimension the authentication tokens can change. Logging out and back in will reset this token, allowing Dimension to work. More advanced users can delete the "mx_scalar_token" localstorage key.
+3. **Verify the homeserver information in your configuration.** The name, access token, and client/server API URL all need to be set to point towards your homeserver. It may also be necessary to set the federation URL if you're running a private server.
 
 # Development
 
-For information on how to run Dimension in a local environment, and for information about how the project is structured, see DEVELOPMENT.md
+For more information about working on Dimension, see DEVELOPMENT.md.
 
 # Do I need an integrations manager?
 
 Integration managers aim to ease a user's interaction with the various services a homeserver may provide. Often times the integrations manager provided by Riot.im, named Modular, is more than suitable. However, there are a few cases where running your own makes more sense:
 
-* Wanting to self-host all aspects of your Riot install
+* Wanting to self-host all aspects of your services (client, homeserver, and integrations)
 * Wanting to advertise custom bots specific to your homeserver
-* Corporate or closed environments where Modular's integrations won't work
+* Corporate or closed environments where the default integration manager won't work
 
 # How do integration managers work?
 
 Integration managers sit between your users and your integrations (bots, bridges, etc). It helps guide users through the configuration of your integrations for their rooms. The integrations manager can only manage integrations it is configured for. For example, Modular can only provide configuration for the bridges and bots running on matrix.org, while Dimension can provide configuration for your own bots and bridges.
 
 The infrastructure diagram looks something like this:
-```
-+-----------+         +----------------------+                          +--------------------+
-|           |========>|                      |=========================>|                    |
-|           |         | Integrations Manager |                          | Bots, bridges, etc |
-|           |         |     (Dimension)      |    +-------------+       | (go-neb, irc, etc) |
-|  Clients  |         |                      |===>|             |<=====>|                    |
-|  (Riot)   |         +----------------------+    |  Homeserver |       +--------------------+
-|           |                                     |  (synapse)  |
-|           |============client/server API=======>|             |
-+-----------+                                     +-------------+
-```
+![infrastructure](https://t2bot.io/_matrix/media/v1/download/t2l.io/9c8ae7d5dfc9f0959c4764873e940416)
 
 # License
 
diff --git a/config/default.yaml b/config/default.yaml
index 2c60a7c..cdf4eec 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -1,4 +1,5 @@
-# The web settings for the service (API and UI)
+# The web settings for the service (API and UI).
+# It is best to have this run on localhost and use a reverse proxy to access Dimension.
 web:
   port: 8184
   address: '0.0.0.0'
diff --git a/package-lock.json b/package-lock.json
index ec68714..deb2654 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4824,7 +4824,7 @@
       "requires": {
         "chalk": "2.3.0",
         "moment": "2.20.0",
-        "typescript": "2.6.2",
+        "typescript": "2.7.2",
         "winston": "2.4.0"
       },
       "dependencies": {
@@ -11495,9 +11495,9 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typescript": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q="
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz",
+      "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw=="
     },
     "typescript-rest": {
       "version": "1.3.0",
diff --git a/package.json b/package.json
index 70b7098..1e470bc 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "sequelize": "^4.37.3",
     "sequelize-typescript": "^0.6.3",
     "sqlite3": "^3.1.13",
+    "typescript": "^2.7.2",
     "typescript-rest": "^1.3.0",
     "umzug": "^2.1.0",
     "url": "^0.11.0"
diff --git a/web/app/home/home.component.html b/web/app/home/home.component.html
index 17c4e9a..23e6251 100644
--- a/web/app/home/home.component.html
+++ b/web/app/home/home.component.html
@@ -1,16 +1,84 @@
 <div class="header">
     <img src="/img/logo/banner-sm.png">
 </div>
-<div class="wrapper">
-    <div class="center">
-        <h3>A self-hosted integrations manager for Riot</h3>
-        <p>Dimension gives rooms the option of using self-hosted bots, bridges, and widgets.</p>
-        <br/>
-        <p>Point your Riot <code>config.json</code> to Dimension to start using it:</p>
-        <pre>{{ integrationsConfig }}</pre>
-        <br/>
-        <br/>
-        <p>Learn more on <a href="https://github.com/turt2live/matrix-dimension">Github</a> or on [matrix] at <a
-                href="https://matrix.to/#/#dimension:t2bot.io">#dimension:t2bot.io</a></p>
-    </div>
+<div class="wrapper" *ngIf="showPromoPage">
+    <h3>An open source integration manager for matrix clients, like Riot</h3>
+    <p>
+        View the source on <a href="https://github.com/turt2live/matrix-dimension">Github</a>. Visit the community in
+        <a href="https://matrix.to/#/#dimension:t2bot.io">#dimension:t2bot.io</a> on matrix.
+    </p>
+
+    <h4>Try it out</h4>
+    <p>
+        The easiest way to see it in action is to log in to your matrix account at <a href="https://t2bot.io/riot">t2bot.io/riot</a>
+        (be sure to change the server URL to match your homeserver). The other option is to point your Riot <code>config.json</code>
+        at our servers:</p>
+    <pre>{{ integrationsConfig }}</pre>
+
+    <h4>Running your own</h4>
+    <p class="info">
+        You'll need NodeJS 8 or higher, npm 5 or higher, and Riot (or another supported client). For help getting Dimension set up,
+        please see the <a href="https://github.com/turt2live/matrix-dimension/blob/master/README.md">README</a> or visit us in
+        <a href="https://matrix.to/#/#dimension:t2bot.io">#dimension:t2bot.io</a> on matrix.
+    </p>
+    <pre>{{ downloadInstructions }}</pre>
+    <p>
+        If you didn't change the default settings for the webserver, Dimension should now be running on port 8184 of your
+        server. It is best at this point to set up your reverse proxy to access Dimension. Use a hostname that is not the
+        same as your Riot address (eg: dimension.t2bot.io). Visit the public address for Dimension (eg: dimension.t2bot.io)
+        and follow the instructions.
+    </p>
+
+    <h4>Do I need an integration manager?</h4>
+    <p>
+        Riot, and other clients, come with an integration manager already configured to get you started. This integration manager
+        is not compatible with private homeservers and isn't open source, however. Dimension fills this gap by providing a self-hosted,
+        open source, integration manager that uses your infrastructure instead of someone else's.
+    </p>
+    <p>
+        If you're looking to use an open source or self-hosted integration manager on Riot or another client, Dimension is for you.
+    </p>
+
+    <h4>What is an integration manager?</h4>
+    <p>
+        Integration managers are the part of your client that help you configure the various bots, bridges, and widgets for your
+        room and account. Many bots, brides, and widgets ('integrations') have manual, text-based, ways to configure them however for
+        most users that can be too complicated or confusing. Dimension, and other integration managers, aim to provide an easy-to-use
+        interface for setting up integrations.
+    </p>
+    <p>
+        The infrastructure ends up looking something like this:<br />
+        <img src="img/infrastructure.png" />
+    </p>
+</div>
+<div class="wrapper" *ngIf="!showPromoPage">
+    <h3>Welcome to your new Dimension instance!</h3>
+    <p>
+        If you haven't already, join <a href="https://matrix.to/#/#dimension:t2bot.io">#dimension:t2bot.io</a> on
+        matrix and star the repository on <a href="https://github.com/turt2live/matrix-dimension">Github</a>.
+    </p>
+
+    <h4>Configuring Riot</h4>
+    <p>Update your Riot <code>config.json</code> file to have the following options:</p>
+    <pre>{{ integrationsConfig }}</pre>
+
+    <h4>Configuring bots, bridges, and widgets</h4>
+    <p>All of the bots, bridges, and widgets Dimension offers can be turned on and off and configured from within Riot.</p>
+    <ol>
+        <li>Open the integrations manager (the 3x3 grid in the top right of any room).</li>
+        <li>If you're an admin, you'll see a gear (<i class="fa fa-cog"></i>) icon in the top right. To add yourself as an admin, put your user ID in the Dimension configuration and restart Dimension.</li>
+        <li>Click the gear icon and go through the different areas on the left to configure your integrations.</li>
+    </ol>
+
+    <h4>"Could not contact integrations server" error</h4>
+    <p>
+        When Riot cannot reach Dimension or Dimension is unable to reach your homeserver an error saying "Could not contact integrations
+        server" shows up in every room. Before visiting us in <a href="https://matrix.to/#/#dimension:t2bot.io">#dimension:t2bot.io</a>
+        on matrix, here's a few things to check:
+    </p>
+    <ul>
+        <li><strong>Verify the homeserver configuration in Dimension.</strong> The name, client/server URL, and access token all need to be valid and directed at your homeserver.</li>
+        <li><strong>Verify federation is enabled on your homeserver.</strong> Even in a private, or non-federated, environment federation needs to be enabled so Dimension can work correctly. Dimension should still work okay if federation on your homeserver is bound to a private interface instead of being public - just be sure to set the federation URL in your configuration.</li>
+        <li><strong>Verify that federation is working on your homeserver.</strong> Using tools like the <a href="https://matrix.org/federationtester/api/report?server_name=YOUR_SERVER_HERE.com">federation tester</a>, make sure that federation is working on your homeserver.</li>
+    </ul>
 </div>
\ No newline at end of file
diff --git a/web/app/home/home.component.scss b/web/app/home/home.component.scss
index 7eedcc5..12620e6 100644
--- a/web/app/home/home.component.scss
+++ b/web/app/home/home.component.scss
@@ -1,10 +1,10 @@
 // component styles are encapsulated and only applied to their components
 .header {
   text-align: center;
-  background-color: #fff;
+  background-color: #ea6424;
   margin-top: 30px;
-  border-top: 1px solid #e7eaec;
-  border-bottom: 1px solid #e7eaec;
+  border-top: 1px solid #ea4000;
+  border-bottom: 1px solid #ea4000;
 }
 
 .header img {
@@ -12,9 +12,25 @@
 }
 
 .wrapper {
-  margin-top: 20px;
+  min-width: 700px;
+  max-width: 1000px;
+  margin: auto;
+  padding: 20px;
+  background-color: white;
+  border-left: 1px solid #ea6424aa;
+  border-right: 1px solid #ea6424aa;
+  border-bottom: 1px solid #ea6424aa;
 }
 
-.center {
-  text-align: center;
+pre {
+  border: 1px solid #ea6424;
+  border-radius: 3px;
+  padding: 5px;
+  width: 600px;
+  background-color: #fff;
+}
+
+h4 {
+  padding-top: 15px;
+  font-size: 1.45em;
 }
\ No newline at end of file
diff --git a/web/app/home/home.component.ts b/web/app/home/home.component.ts
index b353465..7173adb 100644
--- a/web/app/home/home.component.ts
+++ b/web/app/home/home.component.ts
@@ -8,11 +8,25 @@ import { Component } from "@angular/core";
 export class HomeComponent {
 
     public hostname: string = window.location.origin;
-    public integrationsConfig = `
-    "integrations_ui_url": "${this.hostname}/riot",
-    "integrations_rest_url": "${this.hostname}/api/v1/scalar",
-    "integrations_widgets_urls": ["${this.hostname}/widgets"],
-    `;
+    public showPromoPage = this.hostname === "https://dimension.t2bot.io";
+
+    public integrationsConfig = `` +
+        `"integrations_ui_url": "${this.hostname}/riot",\n` +
+        `"integrations_rest_url": "${this.hostname}/api/v1/scalar",\n` +
+        `"integrations_widgets_urls": ["${this.hostname}/widgets"],\n`;
+
+    public downloadInstructions = "" +
+        "# Download Dimension\n" +
+        "git clone https://github.com/turt2live/matrix-dimension.git\n" +
+        "cd matrix-dimension\n" +
+        "\n" +
+        "# Edit the configuration to your needs\n" +
+        "# Be sure to add yourself as an admin!\n" +
+        "cp config/default.yaml config/production.yaml\n" +
+        "nano config/production.yaml\n" +
+        "\n" +
+        "# Run\n" +
+        "NODE_ENV=production npm run start:app";
 
     constructor() {
         // Do stuff
diff --git a/web/public/img/infrastructure.png b/web/public/img/infrastructure.png
new file mode 100644
index 0000000000000000000000000000000000000000..b59e7dc1fc354104654d91e79d872f005c82a51f
GIT binary patch
literal 12990
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/banner-sm.png b/web/public/img/logo/banner-sm.png
index fe4b3764cd8a0378886bd9da4daf3f8ffbe2fbc1..02650a76af9cd72c8d8275e2fee3f00378f73d2d 100644
GIT binary patch
literal 3635
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
Q2NVccU4>r3nR?#&Z!FXBLjV8(

literal 6473
zcmX9@c|6qJ_y5?F@T8EvZ;YL(ks%T#F=S80*uvO%*|Qd&vSl#S*k#C)eP_m!C(?{1
zgt1HZU6?GB-{*OLe|$cldEM7N=iGDeJ@0eQdtMtEXtST^KMw!^J3{Ba2>{ST!QbiU
zn8Ej3e*SRq!|JVL?gs#DT>n0FL(}1>0C435asTe4psdYl^#sA?u<l(aM*FNE8wHt>
z_w1b6N)cTJ@nzTi%!Z_tqc4`|bfyb7@!h@cuPdgZt#R*F)6TcKw6sHAsq1yJ*F@8?
z0rXwScRio9$XCsoS?}Y2Kt2}XE^oI6hW1Qn2RbgFg{ybmz2+4_UHlVv7#6YZMG!-b
zIHYz=raZrEGVmu$DVw&Dgm%&Dq6YxQ-HglD;!%NjO|H6Vo7fC33O@0(8A`!d<9D|t
zgDpmW1Aqq2l@prUvEIvwiQ0=vze$B8iY30o(E)ihS5|01EGlo0o&@8ButV5!Dd1?f
zG&?w*&B4*!^HD$nX*v~`$TzC?7XZvv?C;oNW0((@3r)OabM0}c!k5#=zK^K30MOxD
z7{jYdg1voCOcRjo(L}Jo6kxJ4biklSOf2@iqq(qd1}8TW?HNb80s#D_Z+A>S$&#wc
zkC!Q!<pMK>|G{q_I5a$=LagMR1-WW(0KiS%t^ek@H`v#y>ONSvOquQ*!Afy(h<Q}1
zsW{pLfb%QzeBmo|OehSA9Xl^umR3btZ6m*nW3mzf0Pmldt(T5#HcH-^V|rkEH_{K0
zxb-<zqZ@j9Ju0-ohipxEzyr5K1>qR2ZI)iP{mmCosUdj>rX{d7wbhTKD%Eh;P48co
z31emj0NHa;2)X8F+g$xzVO5XH<_}f5xnt1jtkfO5ff>RFJ127svnh*v7x%(&Cz1bp
zc>V_j@g6b9ZuZdG<y1CaMpdBpgPp7WmLC80OAJ8AF=5vF$<<YoV&$?CdkM;X%+lB^
z&#sk0L~pIpMf^MvDSjMFj(aX#zi~yHB(}pWeW!{%iMg4>IK!cE9RPk(*>U}K!Geg8
ziKRK%*jZumg8-KX)SKWF?kOGs$o@$?Z0WYBtSB)1+zfF~>0i+2pP~ca8eW`7&1hzO
zUh*U-kS&EsId~G24Xv6iJ3>wxa`F-0PC{FEE&zb7=w%`6C85&DUzf`Z=EOsPZS`hd
z_k9uG(92vHhEOuCSWs**VgTM+;pS0G)dtw~BFIb<-Xx@+JT<)fTGZ4jT|BB$V)cUz
z$E_(L$jj(%W}u^6hYd<aoezmWPe(;z($8-*n0{gvElh|)b-pXI2%oKf&Io95xXdq(
zZb?#dk>OIVPYnL2)#mrP5tN5;U#Svwv}qg0Ph16ni8%pz7Rr*}0{y^Of}ClbuRT{#
zZTJn*F%)Dn6*YZ>OuEgiy^uD$tt`j@087e!1leOP1TqPmgKGw_i+%Q1g0x3GRcr^7
z+kgzIXR~@u2Na`+$)sxmv37<-)=>xIV-Txc#u-G_+mdFfH9^gxH<640kO2)0!a2R{
z_#!XEzA>Oed(?nx;Q!#E6ks-51BOTO)Bnw*x_NSibyVIl&Ln}`QtC{MnE5E#bV(us
z6n~IEkIE?*<<m*e+V=*Jp}(dol?8}Ql9D5kYnONVFyk5(X3I}9hRZ@h5USIMfZ9eg
zH}oc;#r_eKPUa#0oB$BnP;!$%&RiE#D2w+|bFo7@nS&8d=gJ0E2<Ubw9!3>bW1vz(
zx)W}zvTOh#*}>+|X`5s9IHN+@LD!oOu&q^;CV=YkC1I3eR(Hb;4U^eF-%SzPFg3d(
zMRrg`wyJvmGczU%lbgBPLN4KC&e8?VE{zxO*s(=Bsb*Rplil@>eYt`vFM@IJ9GiF!
z%9N$Nr{Ne12lv4ILsvYz9E(MJ=C&S)SoxI~0N`MK!&7v!ld8uZ$R8bkcMLp~(Lu`2
zHPbN@JR6e@7_49NN%JvPbbtnn|1CmOi0o<uUIx8YsqFb7V;(eareal<`NOD)bvo#f
zH?;%le_P=e2oN1bu~=klfkXS&U2xLIQ#go+<@bW<z;{gv=>agv7rsI}I?Y{>JX&t)
zrhgQ*Ll4N!$IZl}+n}|ods+xAMo{TwRst<d$+h`xyjL9k%u`l<-x^Z~Sq;_W2o_)E
zL<@uCA8Vrg|C&cJ{LZIh(G?Xc;z{U68GcecI(*K1rB+$@4m9+(NzsikA?@BLsAO&Q
z>0qnW>Y}u#Ta30(+Em4l*p19TecW+`C;OR1QkdoUbvthL{RS~w4B7Abv!~|s?`gqW
zL&)$IwUqsIeB}?xqn5#_rMbA7>@>}`(lteF&y>C2=RfYKrj1JoPKSGom0$Vhk4>yI
z2gJf2b-Dd&KL^d6H$+)K)%P|YLdvro=TrT)plgOd5A%04mJ-{~L(6U@n{zkR9nT6N
zT8wu*;D7EMYHqXR#^Qg)*}b8xZ_BCg-$~yO?o$9<sAn&AAEcy+ggkM$N2*t>Sb9%9
zRaD>4K^)&ZP#2EJ6X8_Q>W)Vd5#A^{u9Zska?;XWh?_}HqfN?|2KI6iIoE{mo1G4Z
ze&Zx+BDRa0=6q+6XpT)KH|45ik_39onFx+x$P2rECpjbHWA0xnF3&URH$W6*OwONd
z_PX$#OZ4vJRKqS3AJ;y!D|WqipoIv8&xc!KiOI1rJ#Q2RjpKGh7Qgtgw##MRpE0Ti
z++H@}o4vnb;qTIUuCSR>qjd0a<Kco(y3%CL7Ytd}$!UAcpJLulHJe`WMQpOA2X36W
zLe4>*^w)&}o)A($`tmA+*$G{gojc+f|5d5?joA@huyvux9gk-(^-}ciS2*U^$k93K
z6~W87Uh&pxJrj8v5Y|90u}NEhucGYcsE)6BweN%ums>SG`PG1LuRc4A!AFpkU&-N&
zILo@{V3qoGMKu#Q0|fHr9KAknm-|5iTu-y_J$R*JwX3=9XohT-`C+mD`~J{0H}Y@8
zfR(;_y5CU`SM+|p5eb0~b1pfwdgjdSb^IZRw2)sIeo(Wm8C4)|$ITRAZp)9I4xU(1
zkW;Ks=hP?QzKeRD@v8a_r+Z-r9Qc#dOIE$oDo^sMdA({dOUm2%y{N-@W!<dC!U=2n
zK-%DmrMO_Zv{A&>OK&p%G-3PYP1|$kuNjI>r>|0K+{=FTHf%Q=9konhS=GUnK454x
zftrMjUnAss%v6`$8Hl$toTl*5idor5_~*hVIg2+%n&dy%aMmzlgAW<DD?~!thkh}2
z)(#GR$&ofA{e~>#@P@VF`6|59>Tf4uhg#{wriHSFv2w1~gAYU;$|FD{C#4aa{GTUH
zl9n|YnqOgC*Ju7_53U_Nxj)q7lSa_@zO}&KELRN%%b`kk$AV-qk9Kb;`c44hOFb7H
znpQY6aq|<~#0r|M^p`}yn?u@O?8^)*lRyjuR$AJ298mbX;Afn^C((vQAleEOpQF=a
zJd%(bCTPj<Ff(J^s=8h?MwF0OUO}N;=FR=v<C_&#mrXTww1|P^jtbUX-R2&6^r^YQ
zJ@RN|eozJ#C=4B6M{Quh4S5~D8DzP($^ff7i+I0*)cYpug*sPPKKy<$8t!-WmR9$1
zhgZATs+q`HFIUVvV~O607C*N1q;o`JrxG^LW>fbgl6u}Z>#B=9Mp)jtKvglC9DWM_
zUG%->cFCMOm4&0HuH4XUzTV{(@6GSpu;E%4o}4>Z?N82fZzRr~Hxx{AabvN@F3&;`
z7Zt7-`ZU{&$!8eYyJZfoWj631-uA}HN!P&>ccLHEtoK&1ukvKy>8PijRm%JpkFk3J
zS>@&EK}oN8(zp7L9x%)$srk$bWF;3H&FUS|YR|J}S$Rr$5X@BGPX21F`geo*N#P7W
zQnsl}Z5~d}XJ_{}S8+hsf&N}bm~b5e^H&(6$aH^@lNhn5xt$~uA_79EsQP|52x{p(
z{dd00mBah%c`DDzC-P?A{B;eHKjlbbE731N2=U7$p<4qULpEbnkfuZ#>fu?;_Lbtn
zM%^5E_~<`{b;`OqNBPv0seZyKs5in{k26(Sx2+~h#!d9IoLq3&?|h~8e@-=qwkLdT
z9`)_k@3#)I*in{`7|O$E-5z;hg?@#?D*JBMau95miE7|QnX^Y|7DhZJUZZ-6dQ|!~
zi!~~}CJ3+8;miyEG2Z*aNlb>&vb*MUK@YlkVjhjzF1hl!SA2P~keyB56=8)rH8Dn&
z&O(J<4o+}-qC{OVUvzL1bERl(KR?3d$R`sHlyiwr!_96C5^I+5NVVK=yc}_!h&Q^z
z2G5pM<}ln14Gt>$v*5j7mQz9cP)xe?*lhw#avAie%$;VDR+#b8Qho47a>HIcEzIvP
z6y4w}v~uK>Kgu7=;2`+X6>YR>@}i2iw~a)Gb>vBp5;Mc9@0j$~yT}T7#HyqBr(0N_
zH76`4^UzR&kVe{ItN7}`XcJAO@?FvCLRvMA%HNo2Hu3c9<HdF}-%#rpp`Ej|a{R2$
z@#C+kh>f_J_HN@nPQQpJ)G$IC`*o#_{)BeSz64}uDiA_ki<?>ZNjq)(XVN@ivP?FF
zOxp2K+-`n*Laf>H89&ChV~;-J4ku1ui-er<Y4>_9{gL0SKT>~%?c32;T#i|VVZ17S
zPluwr(G7l6hpkdx{VvdV5d%J%!QW|}7XQDX+thbG#(V8xCQqMov~Anb+}0I@Xde#v
z&-RqK_k3>+Utt$xLRVme{LX&F%@_zmhPk{J2;}5oM8kK&@~4*V^!g;xB=jr@ftL`u
zx2C$G{c2Q`*?4pKy|Qu6oZIVo>JLeuRm<0y>VemRLYyK;`GNW5-L(HDp`QstqVU@~
zA^Jmd2r5K~H%MU;7PIRdo6~i}kR<$%$`46C-Ih)7l?J>qW?h_+=fA=B!#XzpHs+=z
z>bf(dz(Y<UjxYq@tXQU468eKrTEY)WN^${SM7x&>r}3-QK(jCZVO8%!Y4&30t?-ot
z>9*dH$;?bG_m9fDhhl2amG^5zLNv$LQIvBYif^Bb{d$%r{&xZX+pLkVGUkYiE!_2b
z!?uB#NO^v1v8gP4#orMOt;U|iWT$AHNJtoNu_$T^YkOE1tZ>~l&OSgeS>~%jOru#t
z8#xSnC`bScq4CA@VAd!EW9m4cSCTk7KMjAO+B+|qgbts6>CAPKb>&OB_*&5$D_<A9
zvTirJJA7r6^a{->Bp*QGBwBy2hx%u#2o67~uMME3%`RtKl}$~Z96*IQ&K^28yntX5
z2Q4`2IYye@uYjtQg{{qQIB#zF4!4o_(DC8H1unt@dqewr!riRu`vGZxPTjv_VWA?e
zqeX@N#h0uHUEx`>$ISP#NwIGV9K;&0btc-YYk1xgoRA3=OH6x=^`XSRk-h-po>@?e
z!AxcCh>W~e&|O}}kZ{(#cz=0shj>P$Lb>$~Eai**cVrX4s-WpH<?E(rQ&d;Jhum$E
zFXfSekWXwD1F>ngTa_&q%hB#UF%yq>G%IZ$8&`)B@zc=qNdxQ1{H_~H((l43rpM@S
z#D?%&wF|<|ePiPDOxb^F_bMlG4g4`$j;3USWvGwCe4O<FCo$#WvjzQDWbp+7)9r<?
z;qwT&%Vw`ttKF~rN|k!9e~ic1ANyxtC5*UPP=QE!(s)M&9A0+;LW}DU_$I_N{b-=t
zrnjiyvgO5Y?@01L>0wz`_j;>0{lB~N@sG>h4=Nd}+oA)ku=!C|i~TVe0XB|cgkzas
z3Z3KZ{JY2Uh|9K;jf)8aTFh5YekU!CHkK+VkU&YbxE*@iOFzR?WzB8kHAw^#jIOA0
zE0J<X*`-mUnY%I|$;x#q@b+n}NQhgm=O=k~gY+3oV;IRIn-%)l=GK~xvk6O`=>S|<
zX1I=Rcz6gWZm#WWMAR09Xr3q+g)Ownu72U!6?TvttrMxL&|gauI>~u%A_!rD|7?Es
zdL3O9EX*tLfV#*d?sPa|QQZ2ln>j$@98^P<DAvgN-hb*z+{8aU#;|%3U7JxgjNjp6
zz|yn_uII&oym^9$VP>Ikj&Ppa?8dJvUuYW#wLOcP>ib(1l2GsS&O5C9@Q?crj{Nk^
zF$KYKF3Ew&&&DvY#<fDI`x7tBGj(+TUEuIDZbmL$<TQ&y!A9ZBl6WbYTf|O%^?kA0
zwCietWG2*^cN%%0)*Xjc)=fGcoJ>U)X9ZgMF^wJWN`2Ba8?-Mn2<R@WtYuo)GyY`)
zHunc>!VHnM?wO}WidD!D5`B8GPNzQ-hTbVEO|mIiD_B_Vmd_VP?4Q`%@(i~|i!NG!
z{SIc+B2R6`HJ&f!AG9G$AwwgSN8430iUwLP8j%$I9J(Y*Xui;rXx2U@<k5YJ%Q=I|
z3g_k&I<#+Q7<nt9z`>|%6Q09<y|VPUXVFODvZbS?!1%w4k-M$kFV-30DPgJZpK3Z-
zRf}>;k)tY@eeq6|V(Uri2iIdJA-xbVyLJ{aVfnDk0k5#W2Tx8tExug=WS`B734HI6
z{|}}1QPE~N8($8{!Bc5pdl76DS@t2{{NB^0gjr(6mh{(a<xxVdiT!JpzpZi@32Thj
z3xZ=Tc|l-W{Z7!TD6Go2Yq%u!c0oSjax$u+opV7F$KxF)(9{2Ee{*zM4cF6MsIUd2
zIvB8BpBTYmxQ}5r`?-@f20^#V8h-@h-ndCbH5PnVqnDN$t#6e%ENdZ}ZLqah(OzoR
z%!2hZ!oK8Q_5j;Sl<^@h+AlNa$|~MV&&H9!yAgpU4v-s+L@2pF!}NNBki-{I?`PX2
zHC&r2Xccv6vwF0-R!hk!q4725^Vu?3XR@hYxnwQdS{`f`(x377@Ebac3**&GCwE~L
z!B>=fm~qegy2d3(2w4+`M>OSygYxsx<UsAdV`h-3K>lSdrXM|$nl7}R#I=m$YIUe{
zrM*~)uLgTrw*{~TmUofMtBp;pQ(Id|7-Io|kBJ;0sWyq7Y?e7xuyisk`;TrJXJ!F3
ztTQdDLZ5L3i8gzv5wffApwt(sT^Gif0HB{Tvg13v+tl+FzCJXzX3qN>>|i@A;2{*r
z&(-*jgHz4aj@G<=Ti-A8qF_(08Dzfk)I^=cA&Q$rkD`3kw<E#6_-;_}j6Ldtd}@b)
zG%;M<Z4>OspW2$bS!04FFIi@_t{Tv9YpnXq<6NCUM$7jV*0eED8(|TFQP@b(v+z#A
z-^FNv>;*=Y@a`CM7c(Q%pge}^)`I0bXZg8<q+pglCrIo>lSU5c8(61x$|lcpEh9!L
zf&fruf$bta8v4%N-d?Y&dsu6kzqtS#+A|#-2rb@M&|?516Iuw9&NhyS6+#@k;^#T}
z6Lh!~6%2wMUI1uX-5`^;Bykh9s@r;Nly>3GB=k$!F@>=g{fm$2xjLDENE3fJK}Wnp
zhyN#$z^*P@sFa)eza{`Ms;NU2s3DiDeZ-@b-tKE`buNOu-o{^+ARqF?B8Y<7*F$bs
zUj$jx&O@&w*{;ts(;!Rb`vCNEiFmaaRW#Rym`n7aX**F+@2jVd8+D4V{?;8;;RgxB
zSvHuWkbH%1Mu0z`3s+FoLvNqe*=soA8^i<&FHnJ7$g{w-3lJd{;n`l4SZMfr=wbuA
z1xT()l9_-!W~dIje5@&b-Z%T{gPH?5ZM3I~_0Ok6Zswu?fJgNs>+;3~=g%kgP1Tdv
zYEk&d0V(w)8`Ea!CAGA=)I~uZ0LTk+3J{=NI(O)>cFPjvVTR;e>mGD_HV>`BS6p0P
zf((d3&ZIO^RX1lV3EhSdRInWAL(B<LQhDGQD{+3k<H6l)J?I$+ftvu(S6w#{Km8|E
zYskK5y+wAlxP+t=Ah4hEIQOH^%tz!_Roz`WAd>tTUQ#<587MaGM`(K>FRD-PWk_jR
zoJnPscYnzY<UKPP@Nj5kV1WatBfBA96Vc;&{VEq*1=cjS^q0kk<r<CWK~^bCS5>X!
zb%UJfH#uG)($kj%Y7&Y`*+6jjyhqA|jAg16K}VuBg<kQw5}I8%_qAs;06aHY+JOz%
zq3|Hou3*>z4eBBXbSQ+Rqm^UP!TkRJRrMof2s%gD6tP4P<4p_q#wl3|GlG62c-9kc
zn>(;nKRy@tcsB)P0dmVaXA-2I`i!0irS!{+3aMB-Acvg5uy8bgP@@1h{cmN73lN0K
zSMEu^bcSZ=^6j*nt>hXbU%esIW+hVU!?zRmN*4iO+Q<SdIUIFjeW7@@hBGUkpd=7U
zFSabw1A{jTV|k?l<Nx@pVQwkX=`RDo%DbU1(!(Sap0Gt?<i)%ONAkXYicfRnlPW{r
z%w_=cCPBvC#D%2O1FMx=ps&0Ha$81=^QfW@6rKWi{#RlgsE^?-d5gkN{wrWxdwBvc
zFViYe45bzYDAcA(bAkSjU$5^6nM8>vg3@7ptND1k$viq>{NaCtPC+v%tP&)_uOp5B
zhQYW|A}$!G#7bbmDHsk2lInhoj4E6MfWga&7og~ytb`nV4sGFLD`+`VjHbT1C?{<i
TR|@`F0ssgtgZmZtY@`1VmqeKp

diff --git a/web/public/img/logo/favicon/android-chrome-192x192.png b/web/public/img/logo/favicon/android-chrome-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..749d86c2b6d7cbd8c9d8b7d22a6dfd4990f1a7a2
GIT binary patch
literal 2387
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-chrome-512x512.png b/web/public/img/logo/favicon/android-chrome-512x512.png
new file mode 100644
index 0000000000000000000000000000000000000000..4259cd53e26f9529bd99ff799d4022e37f2fc42a
GIT binary patch
literal 7593
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

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/android-icon-144x144.png b/web/public/img/logo/favicon/android-icon-144x144.png
deleted file mode 100644
index b61c2bbed57e32c1ba364dc9e23cf6fa17603b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10125
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
YgA2}|gf?<3oB{wUqb&VX(j@qQ0Z(=~(*OVf

diff --git a/web/public/img/logo/favicon/android-icon-192x192.png b/web/public/img/logo/favicon/android-icon-192x192.png
deleted file mode 100644
index ee495aaa16077acb912c4fe6abd7f9e137fef3fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11930
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

diff --git a/web/public/img/logo/favicon/android-icon-36x36.png b/web/public/img/logo/favicon/android-icon-36x36.png
deleted file mode 100644
index efa2d020393f9b476cc07fdc4ffbdee719d07799..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2342
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
PpaVcOw<T2JDT)6EC0Oiq

diff --git a/web/public/img/logo/favicon/android-icon-48x48.png b/web/public/img/logo/favicon/android-icon-48x48.png
deleted file mode 100644
index 712035bc565413a529f497619525f3214997629a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3223
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
SuW&ox0dR3RVP9{Hz3@++(VO@H

diff --git a/web/public/img/logo/favicon/android-icon-72x72.png b/web/public/img/logo/favicon/android-icon-72x72.png
deleted file mode 100644
index 7afde54d5f6ac1f6d0044bce0af14d9b52bec9f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4631
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
ac}j#lWq!JLv~MXH0Jy%nUM0*W>c0Siw`Yz3

diff --git a/web/public/img/logo/favicon/android-icon-96x96.png b/web/public/img/logo/favicon/android-icon-96x96.png
deleted file mode 100644
index 1c866fb8f69121a545016a37f5bb8a409f69e504..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6344
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
P1wd0xPxYe;Eb_kq2UE!Y

diff --git a/web/public/img/logo/favicon/apple-icon-114x114.png b/web/public/img/logo/favicon/apple-icon-114x114.png
deleted file mode 100644
index ece1d37c5a991e8a0f0d8a3cca99ac8abcaa311c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7758
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
Sgf=JxKu$_ovP#_K^M3*T>7D`r

diff --git a/web/public/img/logo/favicon/apple-icon-120x120.png b/web/public/img/logo/favicon/apple-icon-120x120.png
deleted file mode 100644
index eac0d7188a2d030c8a603d47dceaa351d8a39e7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8238
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
X3Ll@CHgY>$13*?vNwQkpIQYK+*WhIw

diff --git a/web/public/img/logo/favicon/apple-icon-144x144.png b/web/public/img/logo/favicon/apple-icon-144x144.png
deleted file mode 100644
index b61c2bbed57e32c1ba364dc9e23cf6fa17603b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10125
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
YgA2}|gf?<3oB{wUqb&VX(j@qQ0Z(=~(*OVf

diff --git a/web/public/img/logo/favicon/apple-icon-152x152.png b/web/public/img/logo/favicon/apple-icon-152x152.png
deleted file mode 100644
index f870d582cfade5550a37957f8ad981fad5bfd800..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10676
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

diff --git a/web/public/img/logo/favicon/apple-icon-180x180.png b/web/public/img/logo/favicon/apple-icon-180x180.png
deleted file mode 100644
index d28a3884cac29f6ac5d2315af93d5fb9c943c123..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13164
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

diff --git a/web/public/img/logo/favicon/apple-icon-57x57.png b/web/public/img/logo/favicon/apple-icon-57x57.png
deleted file mode 100644
index fb91931c282f2729fde88210f2a51f293f8bfbb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3595
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
ZF*9Jy{&elZt;`C5iQz?qT0Pf<e*uCRR`UP=

diff --git a/web/public/img/logo/favicon/apple-icon-60x60.png b/web/public/img/logo/favicon/apple-icon-60x60.png
deleted file mode 100644
index 5a716207a181fcb808b9394b509b9291320dc21e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3854
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
bkdr1?NR!v6VMYC(>;UNBFw(Blbcp;H_XYT6

diff --git a/web/public/img/logo/favicon/apple-icon-72x72.png b/web/public/img/logo/favicon/apple-icon-72x72.png
deleted file mode 100644
index 7afde54d5f6ac1f6d0044bce0af14d9b52bec9f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4631
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
ac}j#lWq!JLv~MXH0Jy%nUM0*W>c0Siw`Yz3

diff --git a/web/public/img/logo/favicon/apple-icon-76x76.png b/web/public/img/logo/favicon/apple-icon-76x76.png
deleted file mode 100644
index 38193e23e9bd9f84a72357d15fdc030f353d0ced..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4962
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

diff --git a/web/public/img/logo/favicon/apple-icon-precomposed.png b/web/public/img/logo/favicon/apple-icon-precomposed.png
deleted file mode 100644
index 4c9cef55b9690029608e71c8184f77dba62cf643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12504
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

diff --git a/web/public/img/logo/favicon/apple-icon.png b/web/public/img/logo/favicon/apple-icon.png
deleted file mode 100644
index 4c9cef55b9690029608e71c8184f77dba62cf643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12504
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

diff --git a/web/public/img/logo/favicon/apple-touch-icon.png b/web/public/img/logo/favicon/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..654b3954c703ec3f35953ce63521d0479915c9a8
GIT binary patch
literal 2227
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
JXo6qL`WNBakP83+

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/browserconfig.xml b/web/public/img/logo/favicon/browserconfig.xml
index c554148..56456ba 100644
--- a/web/public/img/logo/favicon/browserconfig.xml
+++ b/web/public/img/logo/favicon/browserconfig.xml
@@ -1,2 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="img/logo/favicon/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/web/public/img/logo/favicon/favicon-16x16.png b/web/public/img/logo/favicon/favicon-16x16.png
index e3c044134354261b4f2fb252ff78c9e7cc5ee6cc..c9ef462b23f9b2986f1a9871510a2de32b0132f9 100644
GIT binary patch
delta 756
zcmbQmb(C#_$wWt;de#7+5ZAZ)MsHG8KD33rNm2gL7W_8P@J))+y9$So6O%tqNc=b<
z=}o%&yGn<*x%xov+dPA}xduRykNxo<S^_@yCw!cc03<&&`vV2v=I8-sKla9c?2G@{
z7x%Fz`fY&;P}!&HIlpe6`1kYszaQWJ{r>s$!k%9@Pkx?NU+`sR%hxrXU)Og3`|<V5
z%GPgNru@2g^w-tHzpftnb^X}awOzli9QyzN|F0_t|Ns5{@8`FFzkdEWx%tzKoX-oZ
zeqP%DZR@nJ8z=t0edhD*!hc^se%m(v`=0rq=a&5a`1;$fxt}Jbd|6WaZOhdEfB*h{
z_x$(03qQ~A`aCQD*OkLR&+Yp6{d4`l?_d6Yc=@5(kAZ<fyV`L*kWwfK@(TviK=2c&
z?Qj3@3BNB)ocJ5a{QbLc!udbHfB*iuEW*1EsDLra+ubFMi}z(Gki%Kv5n0T@=%Ww9
zj1BvyRsaRrOFVsD*&i`WGAMH`p894oP-v#7i(`ny<>Z9q=k*U-nDkil*xcCUTvby=
zIRZi-rzWL62)=&dN)tmaZylo}o1$#2Z7nm0fk}`s8<)iF8HXDA)IARH%x>7(sv6<I
zqLz@Fo7}zV(7AgDFLG)qa0wTb6&95`hdq4v@a0opGiM&92aBJqW-<)9bKaieWRxHq
zr>CZ~NV&nL4{TcOj`fZO9VX1mt6f&~=<u94$;@EzKzsXFwsjkT&QvXNjVMV;EJ?LW
zE=mPb3`Pcq7P<z;x<;lU1_oBfrdEaq+6IPJ1_np3RB)nb$jwj5OsmALVN2(Mtw0Uo
zRaqesB|(Yh3I#>^X_+~x3MG{VsS23|CCLm76>}bc;^8O^)6h8OfBKB)(;x<BWp2G>
zZee9%@5v&}!U`@8CWlj)l{bedoW618#E~;cWR9?(Ztz&(rN{6}T(IPmlj&5T9SokX
KelF{r5}E+FmueCK

literal 1306
zcmZ{hdrVt(6vxknme*V;vcWK$!E8=iXnXH%xrI9;gMiRTd6bTa@sGZ4OJ!}Lz0fg}
z$u^jSEn@)`+#`Ufor}Zq3S&ewkf^Z9vlQgvU=*gt&H0!bCDC8eC@wMiz0UW1&f}L;
zot2TgHRy>T0N5%|OID(r=iLFm=!_Bu=b(#YOjINSbkuHH*Km=I*_EkD&_25JYh*;~
z(v%8-!+QZLDgk~&QpHyQr8vMhY5=+kAiVg(_3UR+9GjJ{N<jdZ58El8zre>o+84di
z^5p{-1wI>#!-v2a4u_8+5h+|g#uZ?Q@k5Ud_@C2HfCa>G{?ZYQ0+A~$8d4}<ODa#B
zw1ptxF#&9g0mDA*av?eCtp4)TzWILV&=Eyln!jA;6C?m1K2RhKm&m5iXxz?|v)vb6
z=Sp3T*10QZhbr@gxVJad#%S}ai|z^cd#A^bWq#3rX|}g@ae8dLtumhU7NrQdeP?z4
z=78&hW2U`+tUPh1y<x1aDvm_DXMW@(*ZDHHvwEtQnXJ{joi&qZbTe1#KW{!FC1A9r
zV!G}4m?L4nx3$ZWwll{2kz4gex0jaYM{c;zv2!;*n7vdpP*tFyxx8qwrUu_^v@HyF
zEDUs9w(O%Nm_Hxnah%SV$y-*k=D@B<A^1jtKn$4_@B}cN33<!Y2Jfs`Wrla40RCxC
z&$`DMQGfq_eWzcY{GM~=_fBLX@#5GXG)KU+FQg{Fk~!J4j*P(Kv;sSTXt#G`hu%pj
zL*kk|IZ?G^N~cz<^^ETBlE-t$pkwsN)UGYB=47dqx!J4XOB#b#y&R&-nHhIYx+kWm
z!aW)d?{Ny3k`xgu>Al+B85XAHh4c{JJzb7s)>c;16S7^yvv-yBK78=g4?lnZ@W<Yg
zP#w=dki+rgzINz1XDDKi+NV{G1*T(7Z(MzF^0TP3VJ)pECiWj~n!WaGWpYdF{-U<J
zx*X-yq=Z~tsBi}bK4W0+dfr`I4Zqgchwb`gaQB<}`Kp(cFB(?X_6D+aXjembdU*=-
zde8aO-P^|P>hDes+eU^@9sMvE!rzv*u6#V_LO*_*P045V8kV7THU?cl;)F~{kU~<T
zA|*5~qoqVNj?*}99ULwAPk`B~HyO(RKj6vcvQ-rDytjhgYG5528v}B)#>gl%Mw6~6
zk`l>8al-gWR8lI$V^P(}Y=Vj`WZ7a`EOs~?B9oU!8_^=G&A4#l9!dy1yct!6rDiQn
zCtG!;X2!zObQVJGKsf*C7eB&m)THS`#$+sHfruxA!B&Ns@J)ICX7WsWw$O`Az5i4I
zLLxRH3X_>(%ZnM<=t^8{F(!28W;~Kdp+Xc8v4j+t;Zlld46XbHA;FvS<d_aKfF~t2
zy!G6-$d$XvbwDWxgXtiHzArXg*n?K1*q|vh>8uvJ_}{^Z2`R<sBn(B!4DkeMki|(Q
jT0BmRQ+hq2$0>;jMTk&;iFw@Xr~=4SGLqYq)W`k=4f4Z)

diff --git a/web/public/img/logo/favicon/favicon-32x32.png b/web/public/img/logo/favicon/favicon-32x32.png
index 3a9d182980bdea10ec0201b9fe45f1678a2061ea..4ce18e075079eaa4e9679760b337344e4e5407a4 100644
GIT binary patch
delta 992
zcmZ1@xP@baBnLAC1B1(wu45Awg(o^{*E5y`_=LE=NmT&~14%Gaev_o|CQ1HHvJy;0
z<xPq*R0=2vlubdB0_p;Cp$M!jSrKf40@MVcUZ4ovG#~@07-Ww8n|iRew*@Aj=M;Tj
zRP}jb<(Ea(AKHT77Mi@xH~PA9!oOcX{{R2~ZP(n-vkSj%nesMQ|Ley7&-2Uw|Ni+l
z*Wl~guHSdh|GsnX_q~f>mN$K#U-tj^udf^W-=wR*&DMRBq4E3Pg||6+pQfaL-@EYp
zp84PREcnnK@@?0ge?Pu{+dB2jlKQ$YOKQI?ZTS28@!wBx-`BXluXBH2?ff=V>qBec
zpJ#X8*SdXZ_WS$x*^eWuKePt@`~Kx)U)=xy|K8Vo{QL6ZV^`$I?x=sizQ3>Y_<j4#
z?+2H^ZJ+TbP4#V_!OwHMejHu%>-zD3KfZiu3HY{S*0-IrzbtF`Jg@Zg+~Uu3OMv11
zKwPkX5|Gv`3GxeOVEFV42!6jc{r=JH`^WEJlFcnG{(b%Y`Q5MIf4;x^^zolb;+J1P
zzW;EHQ{e|{VodUOcVYa`q<as@;VkfoEM{Qz(FbA1hJ8~jfP(BLp1!W^kC-JHl(`m9
zeKQ%TN5Ip?F~s6@azavC;!(C6H!SNdBqbyzC3l!?-BMa&*f`J5oIiqbedEH38#%=i
zPO%3b$WO~l%<S=RoVs;q@7lSxRs{tj0wO|UVu=sRjS9;OOAoWWTa@(Zk<cUsRyDbK
zarf+A91v&uvt$9+AKwkkvDX$ZaF{iLNz#OsvC;9MqTRwBYdN^fdpml%`VOvDFw?WE
z*Ex7ru)pbuitytnFH~ak7_>bu`uQGy%Dthf;Y*Ltov@VD=MipCAMvzrxMFj-#{8|p
zoQDZ96D9;ig!EW1@Zir1W4k%&(x#&F;5&ti>gSg$EXe4(&E=;kr<y7nd?&2o6C1z0
zBkMmk%?Ji3#&S<rRkHxmm0V#5G?y<s*Dso3V9m&IQ~FAo<?JFYV2G)fxJHzuB$lLF
zB^RXvDF!10LknF4V_hTD5Ca1%V^b?b18oCCD+7b0S1LFszhx7z$1c64^T1Z1dEr$d
z5hX#1<q8Ew`DvLssR|{P1*r;|1trN03>9-8f8yaN4Aam!<$wB&=hGktW@T=@WNu+)
zVeiQz%)$yT4JL<En3Xq&D4f1=<;0OQM`Vt$pKkD2;HAg#N?fqylauLG1_mw$22WQ%
Jmvv4FO#ma(+0Xz0

literal 2220
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

diff --git a/web/public/img/logo/favicon/favicon-96x96.png b/web/public/img/logo/favicon/favicon-96x96.png
deleted file mode 100644
index 1c866fb8f69121a545016a37f5bb8a409f69e504..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6344
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
P1wd0xPxYe;Eb_kq2UE!Y

diff --git a/web/public/img/logo/favicon/favicon.ico b/web/public/img/logo/favicon/favicon.ico
index 6fbfd3670598bd587c118e5ac70d210d28477ae5..9b2104119cbe6f58bb48cdf7024e8f6e609bad14 100644
GIT binary patch
literal 15086
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

literal 1150
zcmbu8&1(~35XNV-y9s_EIcTAXQ1FsXLbXv7+a44_njESp5s!XS6dL>@o@x~WTBJ&I
zC@Nz8z|=w&Q$eJlDHNnun_7}IHr7^+$L1gK@Hn%ZZWE|_kTAQO_nqIo^Ulmer0~z}
zCVn<hhelLKL>@L?;uUM1UqrmOwb3&3fAz!Ai45Jv7G_J5p_a(w_(g`srkAWWb5DG1
za#Kq^IlL~?{A=nJuQS1WW%8(?ZC+6DAjs<m$70jP%Hkuw!U(JSY&OMbv5yPd?g#>>
zM-Yg9#Fj%nAb$fmm*p7X7%7P%EXQ<O=Q8VaV?$dM=lUn{V(bgf-_Dxv*3Ka)J6ddB
za;fC%<nIXEk{Q2gC(a~3;M?K?-o7v50`t$)bLbf?;7EK7dUJbqjHL?8wc@);et{6W
z2QnyqU%;D*A}-#^;_Aa3_QW!H@T!P#Y=rN!nPbR3&3Xv?qnhu!KUKqDOXhLBcLsgK
zvyeS%+ErZ(VWmIz`K$3KZd!c&@igbyT+Ivnzx?0xf0D<^Kc6pbP5mVQpIpE6WD&8u
zS@Yg|FJ+K;Hj7pA7j~t8T>r}hQ}~ph$Bn0X9Jn%#!O_oL`vNk#dBh*d{do?oSz7L2
zWqzc8L4?ju;An3SQuli=3uX_a{aM@^p2OkzIB0t#_fECvXJvl%6!|woX+4EN#}KY3
zXYl&nS0qP^Xzv<_Gu#J9D8hPJ%dBqCZ;gHojrF6J$yWz8xF7DePORH^jC<b1+<M8o
xtQdNYerzGu=vPgWN3rxP8umC?znauawC!TEu|<|pS|#dM?4^Hxh_5ih{suy^pgRBn

diff --git a/web/public/img/logo/favicon/manifest.json b/web/public/img/logo/favicon/manifest.json
deleted file mode 100644
index 013d4a6..0000000
--- a/web/public/img/logo/favicon/manifest.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "App",
- "icons": [
-  {
-   "src": "\/android-icon-36x36.png",
-   "sizes": "36x36",
-   "type": "image\/png",
-   "density": "0.75"
-  },
-  {
-   "src": "\/android-icon-48x48.png",
-   "sizes": "48x48",
-   "type": "image\/png",
-   "density": "1.0"
-  },
-  {
-   "src": "\/android-icon-72x72.png",
-   "sizes": "72x72",
-   "type": "image\/png",
-   "density": "1.5"
-  },
-  {
-   "src": "\/android-icon-96x96.png",
-   "sizes": "96x96",
-   "type": "image\/png",
-   "density": "2.0"
-  },
-  {
-   "src": "\/android-icon-144x144.png",
-   "sizes": "144x144",
-   "type": "image\/png",
-   "density": "3.0"
-  },
-  {
-   "src": "\/android-icon-192x192.png",
-   "sizes": "192x192",
-   "type": "image\/png",
-   "density": "4.0"
-  }
- ]
-}
\ No newline at end of file
diff --git a/web/public/img/logo/favicon/ms-icon-144x144.png b/web/public/img/logo/favicon/ms-icon-144x144.png
deleted file mode 100644
index b61c2bbed57e32c1ba364dc9e23cf6fa17603b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10125
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
YgA2}|gf?<3oB{wUqb&VX(j@qQ0Z(=~(*OVf

diff --git a/web/public/img/logo/favicon/ms-icon-150x150.png b/web/public/img/logo/favicon/ms-icon-150x150.png
deleted file mode 100644
index 71053bc909ddfe4bf5b60cd75e7536f6abda18ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10640
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
XaKh&&sfXMF9|52!t0q$`WfJl~GdwF6

diff --git a/web/public/img/logo/favicon/ms-icon-310x310.png b/web/public/img/logo/favicon/ms-icon-310x310.png
deleted file mode 100644
index 02cf9992481df126149b075f1cb76ecc037384b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28700
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
Zj^G8(@6{X3R$vAcC3$tZDw(&T{|mjw2zdYi

diff --git a/web/public/img/logo/favicon/ms-icon-70x70.png b/web/public/img/logo/favicon/ms-icon-70x70.png
deleted file mode 100644
index 45d91c09e4ccc3c4abdf63536fee98d8d8396a45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4416
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
K)2Y>Ri~Bcx9PQ-*

diff --git a/web/public/img/logo/favicon/mstile-150x150.png b/web/public/img/logo/favicon/mstile-150x150.png
new file mode 100644
index 0000000000000000000000000000000000000000..552a68ffa31768951373cac938f4d168c2f4d70c
GIT binary patch
literal 2105
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
LA%6FLqt5*SzAQOl

literal 0
HcmV?d00001

diff --git a/web/public/img/logo/favicon/safari-pinned-tab.svg b/web/public/img/logo/favicon/safari-pinned-tab.svg
new file mode 100644
index 0000000..d945d9b
--- /dev/null
+++ b/web/public/img/logo/favicon/safari-pinned-tab.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="513.000000pt" height="513.000000pt" viewBox="0 0 513.000000 513.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,513.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M0 2565 l0 -2565 2565 0 2565 0 0 2565 0 2565 -2565 0 -2565 0 0
+-2565z"/>
+</g>
+</svg>
diff --git a/web/public/img/logo/favicon/site.webmanifest b/web/public/img/logo/favicon/site.webmanifest
new file mode 100644
index 0000000..1edcfef
--- /dev/null
+++ b/web/public/img/logo/favicon/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/web/public/index.html b/web/public/index.html
index 4ce0ddd..dc9fa64 100644
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -6,22 +6,14 @@
 
     <title>Dimension</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="/img/logo/favicon/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/img/logo/favicon//apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/img/logo/favicon//apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/img/logo/favicon//apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/img/logo/favicon//apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/img/logo/favicon//apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/img/logo/favicon//apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/img/logo/favicon//apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/img/logo/favicon//apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192"  href="/img/logo/favicon//android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/img/logo/favicon//favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="/img/logo/favicon//favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/img/logo/favicon//favicon-16x16.png">
-    <link rel="manifest" href="/img/logo/favicon//manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="/img/logo/favicon//ms-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="img/logo/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="img/logo/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="img/logo/favicon/favicon-16x16.png">
+    <link rel="manifest" href="img/logo/favicon/site.webmanifest">
+    <link rel="mask-icon" href="img/logo/favicon/safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="shortcut icon" href="img/logo/favicon/favicon.ico">
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="msapplication-config" content="img/logo/favicon/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" rel="stylesheet" type="text/css" />

From 4f8e94e3d2b644df62a5245de6bc72894dac1d35 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 20:00:46 -0600
Subject: [PATCH 075/111] Update banner image in README

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b6b31e4..c565f81 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![dimension](https://t2bot.io/_matrix/media/v1/download/t2l.io/GJYlwewrUhDpoBchfmBhxzZe)
+![dimension](https://t2bot.io/_matrix/media/r0/download/t2l.io/b3101d429588673087f457a4bdd52f45)
 
 
 [![TravisCI badge](https://travis-ci.org/turt2live/matrix-dimension.svg?branch=master)](https://travis-ci.org/turt2live/matrix-dimension)
@@ -45,7 +45,7 @@ In your Riot `config.json`, set the integration manager to be your Dimension URL
 
 After Riot has been configured to use Dimension, refresh Riot and click the "Integrations" button in the top right of the room. It should be an icon that looks like this:
 
-![3x3 square](https://t2bot.io/_matrix/media/v1/thumbnail/t2l.io/gOgboDPEMfiYOQryYwvvHkFz?width=800&height=600)
+![3x3 square](https://t2bot.io/_matrix/media/r0/download/t2l.io/gOgboDPEMfiYOQryYwvvHkFz)
 
 That button should open Dimension. If you've configured everything correctly, you'll see a gear icon in the top right of the window - click this to start editing your integrations.
 
@@ -86,7 +86,7 @@ Integration managers aim to ease a user's interaction with the various services
 Integration managers sit between your users and your integrations (bots, bridges, etc). It helps guide users through the configuration of your integrations for their rooms. The integrations manager can only manage integrations it is configured for. For example, Modular can only provide configuration for the bridges and bots running on matrix.org, while Dimension can provide configuration for your own bots and bridges.
 
 The infrastructure diagram looks something like this:
-![infrastructure](https://t2bot.io/_matrix/media/v1/download/t2l.io/9c8ae7d5dfc9f0959c4764873e940416)
+![infrastructure](https://t2bot.io/_matrix/media/r0/download/t2l.io/9c8ae7d5dfc9f0959c4764873e940416)
 
 # License
 

From 18a2d63b6f276b4a3354ba327a8ee882105957fb Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 20:03:20 -0600
Subject: [PATCH 076/111] Update the infrastructure diagram

---
 README.md                         |   2 +-
 web/public/img/infrastructure.png | Bin 12990 -> 13328 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c565f81..c66e91e 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ Integration managers aim to ease a user's interaction with the various services
 Integration managers sit between your users and your integrations (bots, bridges, etc). It helps guide users through the configuration of your integrations for their rooms. The integrations manager can only manage integrations it is configured for. For example, Modular can only provide configuration for the bridges and bots running on matrix.org, while Dimension can provide configuration for your own bots and bridges.
 
 The infrastructure diagram looks something like this:
-![infrastructure](https://t2bot.io/_matrix/media/r0/download/t2l.io/9c8ae7d5dfc9f0959c4764873e940416)
+![infrastructure](https://t2bot.io/_matrix/media/r0/download/t2l.io/3bb5674d85ee22c070e36be0d9582b4d)
 
 # License
 
diff --git a/web/public/img/infrastructure.png b/web/public/img/infrastructure.png
index b59e7dc1fc354104654d91e79d872f005c82a51f..f79d72f74976a250400bad21d114cc7224f17290 100644
GIT binary patch
literal 13328
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

literal 12990
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


From 21aba80f549d8188ad9812cd5947edfbcc4f4678 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 21:17:44 -0600
Subject: [PATCH 077/111] Add the configuration screen for Giphy

---
 src/api/admin/AdminNebService.ts              |  8 ++-
 web/app/admin/neb/config/config-context.ts    |  8 +++
 web/app/admin/neb/config/config-dialog.scss   |  3 ++
 .../neb/config/giphy/giphy.component.html     | 33 ++++++++++++
 .../neb/config/giphy/giphy.component.scss     |  0
 .../admin/neb/config/giphy/giphy.component.ts | 54 +++++++++++++++++++
 web/app/admin/neb/edit/edit.component.html    |  2 +-
 web/app/admin/neb/edit/edit.component.ts      | 20 +++++--
 web/app/app.module.ts                         |  3 ++
 9 files changed, 124 insertions(+), 7 deletions(-)
 create mode 100644 web/app/admin/neb/config/config-context.ts
 create mode 100644 web/app/admin/neb/config/config-dialog.scss
 create mode 100644 web/app/admin/neb/config/giphy/giphy.component.html
 create mode 100644 web/app/admin/neb/config/giphy/giphy.component.scss
 create mode 100644 web/app/admin/neb/config/giphy/giphy.component.ts

diff --git a/src/api/admin/AdminNebService.ts b/src/api/admin/AdminNebService.ts
index 278e86d..91121c9 100644
--- a/src/api/admin/AdminNebService.ts
+++ b/src/api/admin/AdminNebService.ts
@@ -49,14 +49,18 @@ export class AdminNebService {
     @Path(":id/integration/:type/enabled")
     public async setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
-        return NebStore.setIntegrationEnabled(nebId, integrationType, request.enabled);
+        await NebStore.setIntegrationEnabled(nebId, integrationType, request.enabled);
+        Cache.for(CACHE_NEB).clear();
+        return {}; // 200 OK
     }
 
     @POST
     @Path(":id/integration/:type/config")
     public async setIntegrationConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, newConfig: any): Promise<any> {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
-        return NebStore.setIntegrationConfig(nebId, integrationType, newConfig);
+        await NebStore.setIntegrationConfig(nebId, integrationType, newConfig);
+        Cache.for(CACHE_NEB).clear();
+        return {}; // 200 OK
     }
 
     @GET
diff --git a/web/app/admin/neb/config/config-context.ts b/web/app/admin/neb/config/config-context.ts
new file mode 100644
index 0000000..a5f6d7f
--- /dev/null
+++ b/web/app/admin/neb/config/config-context.ts
@@ -0,0 +1,8 @@
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+import { FE_Integration } from "../../../shared/models/integration";
+import { FE_NebConfiguration } from "../../../shared/models/admin-responses";
+
+export class NebBotConfigurationDialogContext extends BSModalContext {
+    public integration: FE_Integration;
+    public neb: FE_NebConfiguration;
+}
\ No newline at end of file
diff --git a/web/app/admin/neb/config/config-dialog.scss b/web/app/admin/neb/config/config-dialog.scss
new file mode 100644
index 0000000..0cb632f
--- /dev/null
+++ b/web/app/admin/neb/config/config-dialog.scss
@@ -0,0 +1,3 @@
+.label-block {
+  margin-bottom: 15px;
+}
\ No newline at end of file
diff --git a/web/app/admin/neb/config/giphy/giphy.component.html b/web/app/admin/neb/config/giphy/giphy.component.html
new file mode 100644
index 0000000..828ca1f
--- /dev/null
+++ b/web/app/admin/neb/config/giphy/giphy.component.html
@@ -0,0 +1,33 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Giphy Configuration</h4>
+    </div>
+    <div class="dialog-content" *ngIf="isLoading">
+        <my-spinner></my-spinner>
+    </div>
+    <div class="dialog-content" *ngIf="!isLoading">
+        <label class="label-block">
+            Api Key
+            <span class="text-muted ">The API key from <a href="https://developers.giphy.com/" target="_blank">developers.giphy.com</a>.</span>
+            <input type="text" class="form-control"
+                   placeholder="your_api_key_here"
+                   [(ngModel)]="config.api_key" [disabled]="isUpdating"/>
+        </label>
+        <label class="label-block">
+            Image Size
+            <span class="text-muted ">GIFs can be large, and sometimes it is more desirable to have them downsized.</span>
+            <label class="checkbox">
+                <input type="checkbox" [(ngModel)]="config.use_downsized" [disabled]="isUpdating" />
+                Use downsized images
+            </label>
+        </label>
+    </div>
+    <div class="dialog-footer" *ngIf="!isLoading">
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/config/giphy/giphy.component.scss b/web/app/admin/neb/config/giphy/giphy.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/neb/config/giphy/giphy.component.ts b/web/app/admin/neb/config/giphy/giphy.component.ts
new file mode 100644
index 0000000..eaee6ce
--- /dev/null
+++ b/web/app/admin/neb/config/giphy/giphy.component.ts
@@ -0,0 +1,54 @@
+import { Component, OnInit } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { NebBotConfigurationDialogContext } from "../config-context";
+import { AdminNebApiService } from "../../../../shared/services/admin/admin-neb-api.service";
+import { FE_NebConfiguration } from "../../../../shared/models/admin-responses";
+import { FE_Integration } from "../../../../shared/models/integration";
+
+interface GiphyConfig {
+    api_key: string;
+    use_downsized: boolean;
+}
+
+@Component({
+    templateUrl: "./giphy.component.html",
+    styleUrls: ["./giphy.component.scss", "../config-dialog.scss"],
+})
+export class AdminNebGiphyConfigComponent implements ModalComponent<NebBotConfigurationDialogContext>, OnInit {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public config: GiphyConfig;
+    public integration: FE_Integration;
+    public neb: FE_NebConfiguration;
+
+    constructor(public dialog: DialogRef<NebBotConfigurationDialogContext>,
+                private adminNebApi: AdminNebApiService,
+                private toaster: ToasterService) {
+        this.neb = dialog.context.neb;
+        this.integration = dialog.context.integration;
+    }
+
+    public ngOnInit() {
+        this.adminNebApi.getIntegrationConfiguration(this.neb.id, this.integration.type).then(config => {
+            this.config = config;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Error loading configuration");
+        });
+    }
+
+    public save() {
+        this.isUpdating = true;
+        this.adminNebApi.setIntegrationConfiguration(this.neb.id, this.integration.type, this.config).then(() => {
+            this.toaster.pop("success", "Configuration updated");
+            this.dialog.close();
+        }).catch(err => {
+            this.isUpdating = false;
+            console.error(err);
+            this.toaster.pop("error", "Error updating integration");
+        });
+    }
+}
diff --git a/web/app/admin/neb/edit/edit.component.html b/web/app/admin/neb/edit/edit.component.html
index 1fb290b..3d50063 100644
--- a/web/app/admin/neb/edit/edit.component.html
+++ b/web/app/admin/neb/edit/edit.component.html
@@ -20,7 +20,7 @@
                     <td>{{ bot.displayName }}</td>
                     <td>{{ bot.description }}</td>
                     <td class="text-right">
-                        <span class="editButton" (click)="editBot(widget)"
+                        <span class="editButton" (click)="editBot(bot)"
                               *ngIf="bot.isEnabled && hasConfig(bot) && !isUpstream">
                             <i class="fa fa-pencil-alt"></i>
                         </span>
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 151307c..b6f45ff 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -5,6 +5,9 @@ import { ActivatedRoute } from "@angular/router";
 import { ToasterService } from "angular2-toaster";
 import { FE_Integration } from "../../../shared/models/integration";
 import { NEB_HAS_CONFIG } from "../../../shared/models/neb";
+import { Modal, overlayConfigFactory } from "ngx-modialog";
+import { AdminNebGiphyConfigComponent } from "../config/giphy/giphy.component";
+import { NebBotConfigurationDialogContext } from "../config/config-context";
 
 
 @Component({
@@ -21,7 +24,10 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
     private subscription: any;
     private overlappingTypes: string[] = [];
 
-    constructor(private nebApi: AdminNebApiService, private route: ActivatedRoute, private toaster: ToasterService) {
+    constructor(private nebApi: AdminNebApiService,
+                private route: ActivatedRoute,
+                private modal: Modal,
+                private toaster: ToasterService) {
     }
 
     public ngOnInit() {
@@ -39,7 +45,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
     }
 
     public hasConfig(bot: FE_Integration): boolean {
-        return NEB_HAS_CONFIG.indexOf(bot.type) !== -1;
+        return NEB_HAS_CONFIG.indexOf(bot.type) !== -1 && !this.isUpstream;
     }
 
     public async toggleBot(bot: FE_Integration) {
@@ -59,7 +65,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
         }
 
         // Only update the service configuration if
-        if (bot.isEnabled) {
+        if (bot.isEnabled && !this.isUpstream) {
             if (this.hasConfig(bot)) {
                 this.editBot(bot);
             } else {
@@ -75,7 +81,13 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
     }
 
     public editBot(bot: FE_Integration) {
-        console.log(bot);
+        this.modal.open(AdminNebGiphyConfigComponent, overlayConfigFactory({
+            neb: this.nebConfig,
+            integration: bot,
+
+            isBlocking: true,
+            size: 'lg',
+        }, NebBotConfigurationDialogContext));
     }
 
     private loadNeb(nebId: number) {
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 72f7e25..44f4530 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -54,6 +54,7 @@ import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
 import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config/appservice-config.component";
+import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.component";
 
 @NgModule({
     imports: [
@@ -102,6 +103,7 @@ import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config
         AdminEditNebComponent,
         AdminAddSelfhostedNebComponent,
         AdminNebAppserviceConfigComponent,
+        AdminNebGiphyConfigComponent,
 
         // Vendor
     ],
@@ -125,6 +127,7 @@ import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config
         AdminWidgetEtherpadConfigComponent,
         AdminWidgetJitsiConfigComponent,
         AdminNebAppserviceConfigComponent,
+        AdminNebGiphyConfigComponent,
     ]
 })
 export class AppModule {

From d00058cbff8c8b56b5ce9519aaddcb629f8bfa7a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 21:44:05 -0600
Subject: [PATCH 078/111] Add the configuration screen for Guggy

---
 web/app/admin/neb/config/config-context.ts    |  2 +-
 .../neb/config/guggy/guggy.component.html     | 25 +++++++++
 .../neb/config/guggy/guggy.component.scss     |  0
 .../admin/neb/config/guggy/guggy.component.ts | 53 +++++++++++++++++++
 web/app/admin/neb/edit/edit.component.ts      |  9 +++-
 web/app/app.module.ts                         |  3 ++
 ...ml => config-screen.widget.component.html} |  0
 .../config-screen.widget.component.ts         |  2 +-
 8 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 web/app/admin/neb/config/guggy/guggy.component.html
 create mode 100644 web/app/admin/neb/config/guggy/guggy.component.scss
 create mode 100644 web/app/admin/neb/config/guggy/guggy.component.ts
 rename web/app/configs/widget/config-screen/{config-screen.component.html => config-screen.widget.component.html} (100%)

diff --git a/web/app/admin/neb/config/config-context.ts b/web/app/admin/neb/config/config-context.ts
index a5f6d7f..cc3299e 100644
--- a/web/app/admin/neb/config/config-context.ts
+++ b/web/app/admin/neb/config/config-context.ts
@@ -1,6 +1,6 @@
 import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
-import { FE_Integration } from "../../../shared/models/integration";
 import { FE_NebConfiguration } from "../../../shared/models/admin-responses";
+import { FE_Integration } from "../../../shared/models/integration";
 
 export class NebBotConfigurationDialogContext extends BSModalContext {
     public integration: FE_Integration;
diff --git a/web/app/admin/neb/config/guggy/guggy.component.html b/web/app/admin/neb/config/guggy/guggy.component.html
new file mode 100644
index 0000000..a868714
--- /dev/null
+++ b/web/app/admin/neb/config/guggy/guggy.component.html
@@ -0,0 +1,25 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Guggy Configuration</h4>
+    </div>
+    <div class="dialog-content" *ngIf="isLoading">
+        <my-spinner></my-spinner>
+    </div>
+    <div class="dialog-content" *ngIf="!isLoading">
+        <label class="label-block">
+            Api Key
+            <span class="text-muted ">The API key for <a href="http://docs.guggy.com/" target="_blank">Guggy's API</a>.</span>
+            <input type="text" class="form-control"
+                   placeholder="your_api_key_here"
+                   [(ngModel)]="config.api_key" [disabled]="isUpdating"/>
+        </label>
+    </div>
+    <div class="dialog-footer" *ngIf="!isLoading">
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/config/guggy/guggy.component.scss b/web/app/admin/neb/config/guggy/guggy.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/neb/config/guggy/guggy.component.ts b/web/app/admin/neb/config/guggy/guggy.component.ts
new file mode 100644
index 0000000..9517de2
--- /dev/null
+++ b/web/app/admin/neb/config/guggy/guggy.component.ts
@@ -0,0 +1,53 @@
+import { Component, OnInit } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { NebBotConfigurationDialogContext } from "../config-context";
+import { AdminNebApiService } from "../../../../shared/services/admin/admin-neb-api.service";
+import { FE_NebConfiguration } from "../../../../shared/models/admin-responses";
+import { FE_Integration } from "../../../../shared/models/integration";
+
+interface GuggyConfig {
+    api_key: string;
+}
+
+@Component({
+    templateUrl: "./guggy.component.html",
+    styleUrls: ["./guggy.component.scss", "../config-dialog.scss"],
+})
+export class AdminNebGuggyConfigComponent implements ModalComponent<NebBotConfigurationDialogContext>, OnInit {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public config: GuggyConfig;
+    public integration: FE_Integration;
+    public neb: FE_NebConfiguration;
+
+    constructor(public dialog: DialogRef<NebBotConfigurationDialogContext>,
+                private adminNebApi: AdminNebApiService,
+                private toaster: ToasterService) {
+        this.neb = dialog.context.neb;
+        this.integration = dialog.context.integration;
+    }
+
+    public ngOnInit() {
+        this.adminNebApi.getIntegrationConfiguration(this.neb.id, this.integration.type).then(config => {
+            this.config = config;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Error loading configuration");
+        });
+    }
+
+    public save() {
+        this.isUpdating = true;
+        this.adminNebApi.setIntegrationConfiguration(this.neb.id, this.integration.type, this.config).then(() => {
+            this.toaster.pop("success", "Configuration updated");
+            this.dialog.close();
+        }).catch(err => {
+            this.isUpdating = false;
+            console.error(err);
+            this.toaster.pop("error", "Error updating integration");
+        });
+    }
+}
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index b6f45ff..9431915 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -8,6 +8,8 @@ import { NEB_HAS_CONFIG } from "../../../shared/models/neb";
 import { Modal, overlayConfigFactory } from "ngx-modialog";
 import { AdminNebGiphyConfigComponent } from "../config/giphy/giphy.component";
 import { NebBotConfigurationDialogContext } from "../config/config-context";
+import { ContainerContent } from "ngx-modialog/src/models/tokens";
+import { AdminNebGuggyConfigComponent } from "../config/guggy/guggy.component";
 
 
 @Component({
@@ -81,7 +83,12 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
     }
 
     public editBot(bot: FE_Integration) {
-        this.modal.open(AdminNebGiphyConfigComponent, overlayConfigFactory({
+        let component: ContainerContent;
+
+        if (bot.type === "giphy") component = AdminNebGiphyConfigComponent;
+        if (bot.type === "guggy") component = AdminNebGuggyConfigComponent;
+
+        this.modal.open(component, overlayConfigFactory({
             neb: this.nebConfig,
             integration: bot,
 
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 44f4530..56b4799 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -55,6 +55,7 @@ import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
 import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config/appservice-config.component";
 import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.component";
+import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.component";
 
 @NgModule({
     imports: [
@@ -104,6 +105,7 @@ import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.com
         AdminAddSelfhostedNebComponent,
         AdminNebAppserviceConfigComponent,
         AdminNebGiphyConfigComponent,
+        AdminNebGuggyConfigComponent,
 
         // Vendor
     ],
@@ -128,6 +130,7 @@ import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.com
         AdminWidgetJitsiConfigComponent,
         AdminNebAppserviceConfigComponent,
         AdminNebGiphyConfigComponent,
+        AdminNebGuggyConfigComponent,
     ]
 })
 export class AppModule {
diff --git a/web/app/configs/widget/config-screen/config-screen.component.html b/web/app/configs/widget/config-screen/config-screen.widget.component.html
similarity index 100%
rename from web/app/configs/widget/config-screen/config-screen.component.html
rename to web/app/configs/widget/config-screen/config-screen.widget.component.html
diff --git a/web/app/configs/widget/config-screen/config-screen.widget.component.ts b/web/app/configs/widget/config-screen/config-screen.widget.component.ts
index 8b33dfe..cfbd7df 100644
--- a/web/app/configs/widget/config-screen/config-screen.widget.component.ts
+++ b/web/app/configs/widget/config-screen/config-screen.widget.component.ts
@@ -3,7 +3,7 @@ import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
 
 @Component({
     selector: "my-widget-config",
-    templateUrl: "config-screen.component.html",
+    templateUrl: "config-screen.widget.component.html",
     styleUrls: ["config-screen.widget.component.scss"],
 })
 export class ConfigScreenWidgetComponent {

From 0ccd0cbb81662dd4db31ba8cf00c5a83ba292dd3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 21:50:30 -0600
Subject: [PATCH 079/111] Add the configuration screen for Google

---
 .../neb/config/google/google.component.html   | 32 +++++++++++
 .../neb/config/google/google.component.scss   |  0
 .../neb/config/google/google.component.ts     | 54 +++++++++++++++++++
 web/app/admin/neb/edit/edit.component.ts      |  3 ++
 web/app/app.module.ts                         |  3 ++
 5 files changed, 92 insertions(+)
 create mode 100644 web/app/admin/neb/config/google/google.component.html
 create mode 100644 web/app/admin/neb/config/google/google.component.scss
 create mode 100644 web/app/admin/neb/config/google/google.component.ts

diff --git a/web/app/admin/neb/config/google/google.component.html b/web/app/admin/neb/config/google/google.component.html
new file mode 100644
index 0000000..1ce043f
--- /dev/null
+++ b/web/app/admin/neb/config/google/google.component.html
@@ -0,0 +1,32 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Google Configuration</h4>
+    </div>
+    <div class="dialog-content" *ngIf="isLoading">
+        <my-spinner></my-spinner>
+    </div>
+    <div class="dialog-content" *ngIf="!isLoading">
+        <label class="label-block">
+            Api Key
+            <span class="text-muted ">The API key for your Google Application.</span>
+            <input type="text" class="form-control"
+                   placeholder="your_api_key_here"
+                   [(ngModel)]="config.api_key" [disabled]="isUpdating"/>
+        </label>
+        <label class="label-block">
+            Search Engine ID
+            <span class="text-muted ">The search engine ID</span>
+            <input type="text" class="form-control"
+                   placeholder="your_cx_id_here"
+                   [(ngModel)]="config.cx" [disabled]="isUpdating"/>
+        </label>
+    </div>
+    <div class="dialog-footer" *ngIf="!isLoading">
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/config/google/google.component.scss b/web/app/admin/neb/config/google/google.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/neb/config/google/google.component.ts b/web/app/admin/neb/config/google/google.component.ts
new file mode 100644
index 0000000..6126c69
--- /dev/null
+++ b/web/app/admin/neb/config/google/google.component.ts
@@ -0,0 +1,54 @@
+import { Component, OnInit } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { NebBotConfigurationDialogContext } from "../config-context";
+import { AdminNebApiService } from "../../../../shared/services/admin/admin-neb-api.service";
+import { FE_NebConfiguration } from "../../../../shared/models/admin-responses";
+import { FE_Integration } from "../../../../shared/models/integration";
+
+interface GoogleConfig {
+    api_key: string;
+    cx: string; // search engine id
+}
+
+@Component({
+    templateUrl: "./google.component.html",
+    styleUrls: ["./google.component.scss", "../config-dialog.scss"],
+})
+export class AdminNebGoogleConfigComponent implements ModalComponent<NebBotConfigurationDialogContext>, OnInit {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public config: GoogleConfig;
+    public integration: FE_Integration;
+    public neb: FE_NebConfiguration;
+
+    constructor(public dialog: DialogRef<NebBotConfigurationDialogContext>,
+                private adminNebApi: AdminNebApiService,
+                private toaster: ToasterService) {
+        this.neb = dialog.context.neb;
+        this.integration = dialog.context.integration;
+    }
+
+    public ngOnInit() {
+        this.adminNebApi.getIntegrationConfiguration(this.neb.id, this.integration.type).then(config => {
+            this.config = config;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Error loading configuration");
+        });
+    }
+
+    public save() {
+        this.isUpdating = true;
+        this.adminNebApi.setIntegrationConfiguration(this.neb.id, this.integration.type, this.config).then(() => {
+            this.toaster.pop("success", "Configuration updated");
+            this.dialog.close();
+        }).catch(err => {
+            this.isUpdating = false;
+            console.error(err);
+            this.toaster.pop("error", "Error updating integration");
+        });
+    }
+}
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 9431915..4f032b0 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -10,6 +10,7 @@ import { AdminNebGiphyConfigComponent } from "../config/giphy/giphy.component";
 import { NebBotConfigurationDialogContext } from "../config/config-context";
 import { ContainerContent } from "ngx-modialog/src/models/tokens";
 import { AdminNebGuggyConfigComponent } from "../config/guggy/guggy.component";
+import { AdminNebGoogleConfigComponent } from "../config/google/google.component";
 
 
 @Component({
@@ -87,7 +88,9 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
 
         if (bot.type === "giphy") component = AdminNebGiphyConfigComponent;
         if (bot.type === "guggy") component = AdminNebGuggyConfigComponent;
+        if (bot.type === "google") component = AdminNebGoogleConfigComponent;
 
+        if (!component) throw new Error("No config component for " + bot.type);
         this.modal.open(component, overlayConfigFactory({
             neb: this.nebConfig,
             integration: bot,
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 56b4799..6b3d1b4 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -56,6 +56,7 @@ import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-s
 import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config/appservice-config.component";
 import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.component";
 import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.component";
+import { AdminNebGoogleConfigComponent } from "./admin/neb/config/google/google.component";
 
 @NgModule({
     imports: [
@@ -106,6 +107,7 @@ import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.com
         AdminNebAppserviceConfigComponent,
         AdminNebGiphyConfigComponent,
         AdminNebGuggyConfigComponent,
+        AdminNebGoogleConfigComponent,
 
         // Vendor
     ],
@@ -131,6 +133,7 @@ import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.com
         AdminNebAppserviceConfigComponent,
         AdminNebGiphyConfigComponent,
         AdminNebGuggyConfigComponent,
+        AdminNebGoogleConfigComponent,
     ]
 })
 export class AppModule {

From 6b4f33de24f60e3d164ce17d8adddc80c68f11cc Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 21:55:35 -0600
Subject: [PATCH 080/111] Add the configuration screen for Imgur

---
 .../neb/config/imgur/imgur.component.html     | 32 +++++++++++
 .../neb/config/imgur/imgur.component.scss     |  0
 .../admin/neb/config/imgur/imgur.component.ts | 54 +++++++++++++++++++
 web/app/admin/neb/edit/edit.component.ts      |  2 +
 web/app/app.module.ts                         |  3 ++
 5 files changed, 91 insertions(+)
 create mode 100644 web/app/admin/neb/config/imgur/imgur.component.html
 create mode 100644 web/app/admin/neb/config/imgur/imgur.component.scss
 create mode 100644 web/app/admin/neb/config/imgur/imgur.component.ts

diff --git a/web/app/admin/neb/config/imgur/imgur.component.html b/web/app/admin/neb/config/imgur/imgur.component.html
new file mode 100644
index 0000000..ed4e138
--- /dev/null
+++ b/web/app/admin/neb/config/imgur/imgur.component.html
@@ -0,0 +1,32 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Imgur Configuration</h4>
+    </div>
+    <div class="dialog-content" *ngIf="isLoading">
+        <my-spinner></my-spinner>
+    </div>
+    <div class="dialog-content" *ngIf="!isLoading">
+        <label class="label-block">
+            Client ID
+            <span class="text-muted ">The client ID of your <a href="https://apidocs.imgur.com/" target="_blank">Imgur Application</a>.</span>
+            <input type="text" class="form-control"
+                   placeholder="your_client_id"
+                   [(ngModel)]="config.client_id" [disabled]="isUpdating"/>
+        </label>
+        <label class="label-block">
+            Client Secret
+            <span class="text-muted ">The client secret of your <a href="https://apidocs.imgur.com/" target="_blank">Imgur Application</a>.</span>
+            <input type="text" class="form-control"
+                   placeholder="your_client_secret"
+                   [(ngModel)]="config.client_secret" [disabled]="isUpdating"/>
+        </label>
+    </div>
+    <div class="dialog-footer" *ngIf="!isLoading">
+        <button type="button" (click)="save()" title="save" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/neb/config/imgur/imgur.component.scss b/web/app/admin/neb/config/imgur/imgur.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/neb/config/imgur/imgur.component.ts b/web/app/admin/neb/config/imgur/imgur.component.ts
new file mode 100644
index 0000000..ac7c404
--- /dev/null
+++ b/web/app/admin/neb/config/imgur/imgur.component.ts
@@ -0,0 +1,54 @@
+import { Component, OnInit } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { NebBotConfigurationDialogContext } from "../config-context";
+import { AdminNebApiService } from "../../../../shared/services/admin/admin-neb-api.service";
+import { FE_NebConfiguration } from "../../../../shared/models/admin-responses";
+import { FE_Integration } from "../../../../shared/models/integration";
+
+interface ImgurConfig {
+    client_id: string;
+    client_secret: string;
+}
+
+@Component({
+    templateUrl: "./imgur.component.html",
+    styleUrls: ["./imgur.component.scss", "../config-dialog.scss"],
+})
+export class AdminNebImgurConfigComponent implements ModalComponent<NebBotConfigurationDialogContext>, OnInit {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public config: ImgurConfig;
+    public integration: FE_Integration;
+    public neb: FE_NebConfiguration;
+
+    constructor(public dialog: DialogRef<NebBotConfigurationDialogContext>,
+                private adminNebApi: AdminNebApiService,
+                private toaster: ToasterService) {
+        this.neb = dialog.context.neb;
+        this.integration = dialog.context.integration;
+    }
+
+    public ngOnInit() {
+        this.adminNebApi.getIntegrationConfiguration(this.neb.id, this.integration.type).then(config => {
+            this.config = config;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Error loading configuration");
+        });
+    }
+
+    public save() {
+        this.isUpdating = true;
+        this.adminNebApi.setIntegrationConfiguration(this.neb.id, this.integration.type, this.config).then(() => {
+            this.toaster.pop("success", "Configuration updated");
+            this.dialog.close();
+        }).catch(err => {
+            this.isUpdating = false;
+            console.error(err);
+            this.toaster.pop("error", "Error updating integration");
+        });
+    }
+}
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 4f032b0..1facf5f 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -11,6 +11,7 @@ import { NebBotConfigurationDialogContext } from "../config/config-context";
 import { ContainerContent } from "ngx-modialog/src/models/tokens";
 import { AdminNebGuggyConfigComponent } from "../config/guggy/guggy.component";
 import { AdminNebGoogleConfigComponent } from "../config/google/google.component";
+import { AdminNebImgurConfigComponent } from "../config/imgur/imgur.component";
 
 
 @Component({
@@ -89,6 +90,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
         if (bot.type === "giphy") component = AdminNebGiphyConfigComponent;
         if (bot.type === "guggy") component = AdminNebGuggyConfigComponent;
         if (bot.type === "google") component = AdminNebGoogleConfigComponent;
+        if (bot.type === "imgur") component = AdminNebImgurConfigComponent;
 
         if (!component) throw new Error("No config component for " + bot.type);
         this.modal.open(component, overlayConfigFactory({
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 6b3d1b4..aa0a86e 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -57,6 +57,7 @@ import { AdminNebAppserviceConfigComponent } from "./admin/neb/appservice-config
 import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.component";
 import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.component";
 import { AdminNebGoogleConfigComponent } from "./admin/neb/config/google/google.component";
+import { AdminNebImgurConfigComponent } from "./admin/neb/config/imgur/imgur.component";
 
 @NgModule({
     imports: [
@@ -108,6 +109,7 @@ import { AdminNebGoogleConfigComponent } from "./admin/neb/config/google/google.
         AdminNebGiphyConfigComponent,
         AdminNebGuggyConfigComponent,
         AdminNebGoogleConfigComponent,
+        AdminNebImgurConfigComponent,
 
         // Vendor
     ],
@@ -134,6 +136,7 @@ import { AdminNebGoogleConfigComponent } from "./admin/neb/config/google/google.
         AdminNebGiphyConfigComponent,
         AdminNebGuggyConfigComponent,
         AdminNebGoogleConfigComponent,
+        AdminNebImgurConfigComponent,
     ]
 })
 export class AppModule {

From a5173fff8536be9a0686d0d648980f82931a7b3d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 21:57:14 -0600
Subject: [PATCH 081/111] Remove wikipedia from the list of bots with a
 configuration screen

Wikipedia doesn't have any additional configuration in go-neb
---
 web/app/shared/models/neb.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/app/shared/models/neb.ts b/web/app/shared/models/neb.ts
index 33a98e6..3bbeacc 100644
--- a/web/app/shared/models/neb.ts
+++ b/web/app/shared/models/neb.ts
@@ -4,5 +4,4 @@ export const NEB_HAS_CONFIG = [
     "github",
     "google",
     "imgur",
-    "wikipedia",
 ];
\ No newline at end of file

From dcda2fa46ec6824005156eee82fe297aa2eeeb82 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 24 Mar 2018 22:02:40 -0600
Subject: [PATCH 082/111] Translate the Dimension integration types to go-neb
 types

This only applies to Travis CI and the RSS Bot.
---
 src/neb/NebClient.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
index 634af7f..4b6755f 100644
--- a/src/neb/NebClient.ts
+++ b/src/neb/NebClient.ts
@@ -15,6 +15,13 @@ export class NebClient {
         return user.accessToken;
     }
 
+    private getNebType(type: string): string {
+        if (type === "rss") return "rssbot";
+        if (type === "travisci") return "travis-ci";
+
+        return type;
+    }
+
     public async updateUser(userId: string, isEnabled: boolean, sync = true, autoAcceptInvites = true): Promise<any> {
         const nebRequest: Client = {
             UserID: userId,
@@ -30,7 +37,7 @@ export class NebClient {
     public async setServiceConfig(serviceId: string, userId: string, type: string, serviceConfig: any): Promise<any> {
         const nebRequest: Service = {
             ID: serviceId,
-            Type: type,
+            Type: this.getNebType(type),
             UserID: userId,
             Config: serviceConfig,
         };

From 947ecd43cd6ae12cce726b10b90c8e62fac2ced1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 00:45:57 -0600
Subject: [PATCH 083/111] Early support for managing bots in the room

Known drawbacks:
* Cannot remove bots
* Cannot use upstream neb instances
---
 .../dimension/DimensionIntegrationsService.ts |  17 ++++++----
 src/db/NebStore.ts                            |  31 ++++++++++++++++++
 src/integrations/Integration.ts               |   2 +-
 src/integrations/SimpleBot.ts                 |  13 ++++++++
 src/models/neb.ts                             |   2 ++
 web/app/riot/riot-home/home.component.ts      |  21 ++++++++----
 web/app/shared/models/integration.ts          |   4 +++
 web/public/img/avatars/echo.png               | Bin 0 -> 4506 bytes
 8 files changed, 76 insertions(+), 14 deletions(-)
 create mode 100644 src/integrations/SimpleBot.ts
 create mode 100644 web/public/img/avatars/echo.png

diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 728852a..6cb11fc 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -5,6 +5,7 @@ import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
 import { ApiError } from "../ApiError";
 import { WidgetStore } from "../../db/WidgetStore";
+import { NebStore } from "../../db/NebStore";
 
 export interface IntegrationsResponse {
     widgets: Widget[],
@@ -14,14 +15,18 @@ export interface IntegrationsResponse {
 export class DimensionIntegrationsService {
 
     public static async getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
-        const cachedWidgets = Cache.for(CACHE_INTEGRATIONS).get("integrations_" + isEnabledCheck);
-        if (cachedWidgets) {
-            return {widgets: cachedWidgets};
+        const cachedIntegrations = Cache.for(CACHE_INTEGRATIONS).get("integrations_" + isEnabledCheck);
+        if (cachedIntegrations) {
+            return cachedIntegrations;
         }
 
-        const widgets = await WidgetStore.listAll(isEnabledCheck);
-        Cache.for(CACHE_INTEGRATIONS).put("integrations_" + isEnabledCheck, widgets);
-        return {widgets: widgets};
+        const integrations = {
+            widgets: await WidgetStore.listAll(isEnabledCheck),
+            bots: await NebStore.listSimpleBots(), // No enabled check - managed internally
+        };
+
+        Cache.for(CACHE_INTEGRATIONS).put("integrations_" + isEnabledCheck, integrations);
+        return integrations;
     }
 
     @GET
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 18cf81f..745a00e 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -9,6 +9,7 @@ import NebBotUser from "./models/NebBotUser";
 import NebNotificationUser from "./models/NebNotificationUser";
 import { AppserviceStore } from "./AppserviceStore";
 import config from "../config";
+import { SimpleBot } from "../integrations/SimpleBot";
 
 export interface SupportedIntegration {
     type: string;
@@ -32,16 +33,19 @@ export class NebStore {
             name: "Echo",
             avatarUrl: "/img/avatars/echo.png", // TODO: Make this image
             description: "Repeats text given to it from !echo",
+            simple: true,
         },
         "giphy": {
             name: "Giphy",
             avatarUrl: "/img/avatars/giphy.png",
             description: "Posts a GIF from Giphy using !giphy <query>",
+            simple: true,
         },
         "guggy": {
             name: "Guggy",
             avatarUrl: "/img/avatars/guggy.png",
             description: "Send a reaction GIF using !guggy <query>",
+            simple: true,
         },
         // TODO: Support Github
         // "github": {
@@ -53,11 +57,13 @@ export class NebStore {
             name: "Google",
             avatarUrl: "/img/avatars/google.png",
             description: "Searches Google Images using !google image <query>",
+            simple: true,
         },
         "imgur": {
             name: "Imgur",
             avatarUrl: "/img/avatars/imgur.png",
             description: "Searches and posts images from Imgur using !imgur <query>",
+            simple: true,
         },
         // TODO: Support JIRA
         // "jira": {
@@ -79,9 +85,34 @@ export class NebStore {
             name: "Wikipedia",
             avatarUrl: "/img/avatars/wikipedia.png",
             description: "Searches wikipedia using !wikipedia <query>",
+            simple: true,
         },
     };
 
+    public static async listSimpleBots(): Promise<SimpleBot[]> {
+        const configs = await NebStore.getAllConfigs();
+        const integrations: { integration: NebIntegration, userId: string }[] = [];
+        const hasTypes: string[] = [];
+
+        for (const config of configs) {
+            for (const integration of config.dbIntegrations) {
+                if (!integration.isEnabled) continue;
+
+                const metadata = NebStore.INTEGRATIONS[integration.type];
+                if (!metadata || !metadata.simple) continue;
+                if (hasTypes.indexOf(integration.type) !== -1) continue;
+
+                // TODO: Handle case of upstream bots
+                const user = await NebStore.getOrCreateBotUser(config.id, integration.type);
+
+                integrations.push({integration: integration, userId: user.appserviceUserId});
+                hasTypes.push(integration.type);
+            }
+        }
+
+        return integrations.map(i => new SimpleBot(i.integration, i.userId));
+    }
+
     public static async getAllConfigs(): Promise<NebConfig[]> {
         const configs = await NebConfiguration.findAll();
         return Promise.all((configs || []).map(c => NebStore.getConfig(c.id)));
diff --git a/src/integrations/Integration.ts b/src/integrations/Integration.ts
index 38e74ec..c30a071 100644
--- a/src/integrations/Integration.ts
+++ b/src/integrations/Integration.ts
@@ -25,7 +25,7 @@ export class Integration {
 }
 
 export interface IntegrationRequirement {
-    condition: "publicRoom" | "canSendEventTypes";
+    condition: "publicRoom" | "canSendEventTypes" | "userInRoom";
     argument: any;
 
     // For publicRoom this is true or false (boolean)
diff --git a/src/integrations/SimpleBot.ts b/src/integrations/SimpleBot.ts
new file mode 100644
index 0000000..1e3b0e2
--- /dev/null
+++ b/src/integrations/SimpleBot.ts
@@ -0,0 +1,13 @@
+import { Integration } from "./Integration";
+import NebIntegration from "../db/models/NebIntegration";
+
+export class SimpleBot extends Integration {
+    constructor(bot: NebIntegration, public userId: string) {
+        super(bot);
+        this.category = "bot";
+        this.requirements = [];
+
+        // We're going to go ahead and claim that none of the bots are supported in e2e rooms
+        this.isEncryptionSupported = false;
+    }
+}
\ No newline at end of file
diff --git a/src/models/neb.ts b/src/models/neb.ts
index ea94eba..e2c2f74 100644
--- a/src/models/neb.ts
+++ b/src/models/neb.ts
@@ -8,6 +8,7 @@ export class NebConfig {
     public appserviceId?: string;
     public upstreamId?: number;
     public integrations: Integration[];
+    public dbIntegrations: NebIntegration[];
 
     public constructor(config: NebConfiguration, integrations: NebIntegration[]) {
         this.id = config.id;
@@ -15,5 +16,6 @@ export class NebConfig {
         this.appserviceId = config.appserviceId;
         this.upstreamId = config.upstreamId;
         this.integrations = integrations.map(i => new Integration(i));
+        this.dbIntegrations = integrations;
     }
 }
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index e45783a..ea699b2 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
 import * as _ from "lodash";
 import { ScalarServerApiService } from "../../shared/services/scalar/scalar-server-api.service";
-import { FE_Integration, FE_IntegrationRequirement } from "../../shared/models/integration";
+import { FE_Integration, FE_IntegrationRequirement, FE_SimpleBot } from "../../shared/models/integration";
 import { IntegrationsRegistry } from "../../shared/registry/integrations.registry";
 import { SessionStorage } from "../../shared/SessionStorage";
 import { AdminApiService } from "../../shared/services/admin/admin-api.service";
@@ -129,13 +129,15 @@ export class RiotHomeComponent {
 
         if (integration.category === "bot") {
             // It's a bot
+            const bot = <FE_SimpleBot>integration;
             // TODO: "Are you sure?" dialog
 
-            // let promise = null;
-            const promise = Promise.resolve();
-            // if (!integration._inRoom) {
-            //     promise = this.scalar.inviteUser(this.roomId, integration.userId);
-            // } else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
+            let promise:Promise<any> = Promise.resolve();
+            if (!integration._inRoom) {
+                promise = this.scalar.inviteUser(this.roomId, bot.userId);
+            }
+            // TODO: Handle removal of bots
+            // else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
             // We set this ahead of the promise for debouncing
 
             integration._inRoom = !integration._inRoom;
@@ -228,11 +230,16 @@ export class RiotHomeComponent {
         console.log("Failed to find integration component for category=" + category + " type=" + type);
     }
 
-    private updateIntegrationState(integration: FE_Integration) {
+    private async updateIntegrationState(integration: FE_Integration) {
         if (!integration.requirements) return;
 
         let promises = integration.requirements.map(r => this.checkRequirement(r));
 
+        if (integration.category === "bot") {
+            const state = await this.scalar.getMembershipState(this.roomId, (<FE_SimpleBot>integration).userId);
+            integration._inRoom = ["join", "invite"].indexOf(state.response.membership) !== -1;
+        }
+
         return Promise.all(promises).then(() => {
             integration._isSupported = true;
             integration._notSupportedReason = null;
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index 4bab96d..f32cd54 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -16,6 +16,10 @@ export interface FE_Integration {
     _notSupportedReason: string;
 }
 
+export interface FE_SimpleBot extends FE_Integration {
+    userId: string;
+}
+
 export interface FE_Widget extends FE_Integration {
     options: any;
 }
diff --git a/web/public/img/avatars/echo.png b/web/public/img/avatars/echo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cf2573af38dec945ed6e2f6e84a284d49c174fb
GIT binary patch
literal 4506
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

literal 0
HcmV?d00001


From d4166477f0cf2a3cf23bf50a7926d2e4b4cd84d6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 13:11:41 -0600
Subject: [PATCH 084/111] Add a log statement to identify Dimension in Riot's
 logs

---
 web/app/app.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/app/app.component.ts b/web/app/app.component.ts
index 6e2f07f..01abfa2 100644
--- a/web/app/app.component.ts
+++ b/web/app/app.component.ts
@@ -9,5 +9,6 @@ import "../style/app.scss";
 export class AppComponent {
 
     constructor() {
+        console.log("Dimension AppComponent constructed");
     }
 }

From 04bfccc95fede08afddfc6fea3a565144ddcaff6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 13:12:00 -0600
Subject: [PATCH 085/111] Consider the lack of membership event as not being in
 the room

---
 web/app/riot/riot-home/home.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index ea699b2..7cb5e6d 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -237,7 +237,9 @@ export class RiotHomeComponent {
 
         if (integration.category === "bot") {
             const state = await this.scalar.getMembershipState(this.roomId, (<FE_SimpleBot>integration).userId);
-            integration._inRoom = ["join", "invite"].indexOf(state.response.membership) !== -1;
+            if (state && state.response && state.response.membership) {
+                integration._inRoom = ["join", "invite"].indexOf(state.response.membership) !== -1;
+            } else integration._inRoom = false;
         }
 
         return Promise.all(promises).then(() => {

From 009b5107792283b2bf5a72e315e9d50180ebcf6c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 13:13:50 -0600
Subject: [PATCH 086/111] Special case each integration, forcing simple bots to
 go through an NebProxy

This is so the different needs of each can be accounted for. For example, widgets are fairly unrestricted, so nothing really needs to prevent them. Bots on the other hand require an upstream token otherwise we can't get the bot IDs from Modular.
---
 src/api/admin/AdminIntegrationsService.ts     | 11 ++--
 src/api/admin/AdminNebService.ts              |  6 +-
 .../dimension/DimensionIntegrationsService.ts | 46 ++++++++-----
 src/db/NebStore.ts                            | 12 ++--
 src/models/ModularResponses.ts                |  3 +
 src/neb/NebClient.ts                          |  4 +-
 src/neb/NebProxy.ts                           | 66 +++++++++++++++++++
 web/app/admin/widgets/widgets.component.ts    |  2 +-
 .../admin/admin-integrations-api.service.ts   |  4 +-
 9 files changed, 122 insertions(+), 32 deletions(-)
 create mode 100644 src/models/ModularResponses.ts
 create mode 100644 src/neb/NebProxy.ts

diff --git a/src/api/admin/AdminIntegrationsService.ts b/src/api/admin/AdminIntegrationsService.ts
index 5509734..47beddd 100644
--- a/src/api/admin/AdminIntegrationsService.ts
+++ b/src/api/admin/AdminIntegrationsService.ts
@@ -1,9 +1,10 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
 import { ApiError } from "../ApiError";
 import { AdminService } from "./AdminService";
-import { DimensionIntegrationsService, IntegrationsResponse } from "../dimension/DimensionIntegrationsService";
+import { DimensionIntegrationsService } from "../dimension/DimensionIntegrationsService";
 import { WidgetStore } from "../../db/WidgetStore";
 import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
+import { Integration } from "../../integrations/Integration";
 
 interface SetEnabledRequest {
     enabled: boolean;
@@ -42,9 +43,11 @@ export class AdminIntegrationsService {
     }
 
     @GET
-    @Path("all")
-    public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
+    @Path(":category/all")
+    public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string, @QueryParam("category") category: string): Promise<Integration[]> {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
-        return DimensionIntegrationsService.getIntegrations(null);
+
+        if (category === "widget") return await DimensionIntegrationsService.getWidgets(false);
+        else throw new ApiError(400, "Unrecongized category");
     }
 }
\ No newline at end of file
diff --git a/src/api/admin/AdminNebService.ts b/src/api/admin/AdminNebService.ts
index 91121c9..06d1911 100644
--- a/src/api/admin/AdminNebService.ts
+++ b/src/api/admin/AdminNebService.ts
@@ -1,6 +1,6 @@
 import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
 import { AdminService } from "./AdminService";
-import { Cache, CACHE_NEB } from "../../MemoryCache";
+import { Cache, CACHE_INTEGRATIONS, CACHE_NEB } from "../../MemoryCache";
 import { NebStore } from "../../db/NebStore";
 import { NebConfig } from "../../models/neb";
 import { LogService } from "matrix-js-snippets";
@@ -51,6 +51,7 @@ export class AdminNebService {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         await NebStore.setIntegrationEnabled(nebId, integrationType, request.enabled);
         Cache.for(CACHE_NEB).clear();
+        Cache.for(CACHE_INTEGRATIONS).clear();
         return {}; // 200 OK
     }
 
@@ -60,6 +61,7 @@ export class AdminNebService {
         await AdminService.validateAndGetAdminTokenOwner(scalarToken);
         await NebStore.setIntegrationConfig(nebId, integrationType, newConfig);
         Cache.for(CACHE_NEB).clear();
+        Cache.for(CACHE_INTEGRATIONS).clear();
         return {}; // 200 OK
     }
 
@@ -78,6 +80,7 @@ export class AdminNebService {
         try {
             const neb = await NebStore.createForUpstream(request.upstreamId);
             Cache.for(CACHE_NEB).clear();
+            Cache.for(CACHE_INTEGRATIONS).clear();
             return neb;
         } catch (err) {
             LogService.error("DimensionNebAdminService", err);
@@ -93,6 +96,7 @@ export class AdminNebService {
         try {
             const neb = await NebStore.createForAppservice(request.appserviceId, request.adminUrl);
             Cache.for(CACHE_NEB).clear();
+            Cache.for(CACHE_INTEGRATIONS).clear();
             return neb;
         } catch (err) {
             LogService.error("DimensionNebAdminService", err);
diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 6cb11fc..9367c87 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -5,35 +5,43 @@ import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
 import { ApiError } from "../ApiError";
 import { WidgetStore } from "../../db/WidgetStore";
+import { SimpleBot } from "../../integrations/SimpleBot";
 import { NebStore } from "../../db/NebStore";
 
 export interface IntegrationsResponse {
     widgets: Widget[],
+    bots: SimpleBot[],
 }
 
 @Path("/api/v1/dimension/integrations")
 export class DimensionIntegrationsService {
 
-    public static async getIntegrations(isEnabledCheck?: boolean): Promise<IntegrationsResponse> {
-        const cachedIntegrations = Cache.for(CACHE_INTEGRATIONS).get("integrations_" + isEnabledCheck);
-        if (cachedIntegrations) {
-            return cachedIntegrations;
-        }
+    public static async getWidgets(enabledOnly: boolean): Promise<Widget[]> {
+        const cached = Cache.for(CACHE_INTEGRATIONS).get("widgets");
+        if (cached) return cached;
 
-        const integrations = {
-            widgets: await WidgetStore.listAll(isEnabledCheck),
-            bots: await NebStore.listSimpleBots(), // No enabled check - managed internally
-        };
+        const widgets = await WidgetStore.listAll(enabledOnly ? true : null);
+        Cache.for(CACHE_INTEGRATIONS).put("widgets", widgets);
+        return widgets;
+    }
 
-        Cache.for(CACHE_INTEGRATIONS).put("integrations_" + isEnabledCheck, integrations);
-        return integrations;
+    public static async getSimpleBots(userId: string): Promise<SimpleBot[]> {
+        const cached = Cache.for(CACHE_INTEGRATIONS).get("simple_bots");
+        if (cached) return cached;
+
+        const bots = await NebStore.listSimpleBots(userId);
+        Cache.for(CACHE_INTEGRATIONS).put("simple_bots", bots);
+        return bots;
     }
 
     @GET
     @Path("enabled")
     public async getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
-        await ScalarService.getTokenOwner(scalarToken);
-        return DimensionIntegrationsService.getIntegrations(true);
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+        return {
+            widgets: await DimensionIntegrationsService.getWidgets(true),
+            bots: await DimensionIntegrationsService.getSimpleBots(userId),
+        };
     }
 
     @GET
@@ -48,10 +56,14 @@ export class DimensionIntegrationsService {
     @Path(":category/:type")
     public async getIntegration(@PathParam("category") category: string, @PathParam("type") type: string): Promise<Integration> {
         // This is intentionally an unauthed endpoint to ensure we can use it in widgets
-        const integrationsResponse = await DimensionIntegrationsService.getIntegrations(true);
-        for (const key in integrationsResponse) {
-            for (const integration of integrationsResponse[key]) {
-                if (integration.category === category && integration.type === type) return integration;
+
+        let integrations: Integration[] = [];
+        if (category === "widget") integrations = await DimensionIntegrationsService.getWidgets(true);
+        else throw new ApiError(400, "Unsupported category");
+
+        for (const integration of integrations) {
+            if (integration.category === category && integration.type === type) {
+                return integration;
             }
         }
 
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 745a00e..f782d6f 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -10,6 +10,7 @@ import NebNotificationUser from "./models/NebNotificationUser";
 import { AppserviceStore } from "./AppserviceStore";
 import config from "../config";
 import { SimpleBot } from "../integrations/SimpleBot";
+import { NebProxy } from "../neb/NebProxy";
 
 export interface SupportedIntegration {
     type: string;
@@ -89,7 +90,7 @@ export class NebStore {
         },
     };
 
-    public static async listSimpleBots(): Promise<SimpleBot[]> {
+    public static async listSimpleBots(requestingUserId: string): Promise<SimpleBot[]> {
         const configs = await NebStore.getAllConfigs();
         const integrations: { integration: NebIntegration, userId: string }[] = [];
         const hasTypes: string[] = [];
@@ -102,10 +103,11 @@ export class NebStore {
                 if (!metadata || !metadata.simple) continue;
                 if (hasTypes.indexOf(integration.type) !== -1) continue;
 
-                // TODO: Handle case of upstream bots
-                const user = await NebStore.getOrCreateBotUser(config.id, integration.type);
-
-                integrations.push({integration: integration, userId: user.appserviceUserId});
+                const proxy = new NebProxy(config, requestingUserId);
+                integrations.push({
+                    integration: integration,
+                    userId: await proxy.getBotUserId(integration),
+                });
                 hasTypes.push(integration.type);
             }
         }
diff --git a/src/models/ModularResponses.ts b/src/models/ModularResponses.ts
new file mode 100644
index 0000000..01c0720
--- /dev/null
+++ b/src/models/ModularResponses.ts
@@ -0,0 +1,3 @@
+export interface ModularIntegrationInfoResponse {
+    bot_user_id: string;
+}
\ No newline at end of file
diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
index 4b6755f..18208a0 100644
--- a/src/neb/NebClient.ts
+++ b/src/neb/NebClient.ts
@@ -15,7 +15,7 @@ export class NebClient {
         return user.accessToken;
     }
 
-    private getNebType(type: string): string {
+    public static getNebType(type: string): string {
         if (type === "rss") return "rssbot";
         if (type === "travisci") return "travis-ci";
 
@@ -37,7 +37,7 @@ export class NebClient {
     public async setServiceConfig(serviceId: string, userId: string, type: string, serviceConfig: any): Promise<any> {
         const nebRequest: Service = {
             ID: serviceId,
-            Type: this.getNebType(type),
+            Type: NebClient.getNebType(type),
             UserID: userId,
             Config: serviceConfig,
         };
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
new file mode 100644
index 0000000..e5e8de9
--- /dev/null
+++ b/src/neb/NebProxy.ts
@@ -0,0 +1,66 @@
+import { NebConfig } from "../models/neb";
+import NebIntegration from "../db/models/NebIntegration";
+import { NebStore } from "../db/NebStore";
+import { LogService } from "matrix-js-snippets";
+import * as request from "request";
+import Upstream from "../db/models/Upstream";
+import UserScalarToken from "../db/models/UserScalarToken";
+import { NebClient } from "./NebClient";
+import { ModularIntegrationInfoResponse } from "../models/ModularResponses";
+
+export class NebProxy {
+    constructor(private neb: NebConfig, private requestingUserId: string) {
+
+    }
+
+    public async getBotUserId(integration: NebIntegration) {
+        if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
+
+        if (this.neb.upstreamId) {
+            try {
+                const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/" + NebClient.getNebType(integration.type));
+                return response.bot_user_id;
+            } catch (err) {
+                LogService.error("NebProxy", err);
+                return null;
+            }
+        } else {
+            return (await NebStore.getOrCreateBotUser(this.neb.id, integration.type)).appserviceUserId;
+        }
+    }
+
+    private async doUpstreamRequest<T>(endpoint: string, body?: any): Promise<T> {
+        const upstream = await Upstream.findByPrimary(this.neb.upstreamId);
+        const token = await UserScalarToken.findOne({
+            where: {
+                upstreamId: upstream.id,
+                isDimensionToken: false,
+                userId: this.requestingUserId,
+            },
+        });
+
+        const apiUrl = upstream.apiUrl.endsWith("/") ? upstream.apiUrl.substring(0, upstream.apiUrl.length - 1) : upstream.apiUrl;
+        const url = apiUrl + (endpoint.startsWith("/") ? endpoint : "/" + endpoint);
+
+        return new Promise<T>((resolve, reject) => {
+            request({
+                method: "POST",
+                url: url,
+                qs: {scalar_token: token.scalarToken},
+                json: body,
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("NebProxy", "Error calling" + url);
+                    LogService.error("NebProxy", err);
+                    reject(err);
+                } else if (res.statusCode !== 200) {
+                    LogService.error("NebProxy", "Got status code " + res.statusCode + " when calling " + url);
+                    reject(new Error("Request failed"));
+                } else {
+                    if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
+                    resolve(res.body);
+                }
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/web/app/admin/widgets/widgets.component.ts b/web/app/admin/widgets/widgets.component.ts
index 24b341c..3a98c00 100644
--- a/web/app/admin/widgets/widgets.component.ts
+++ b/web/app/admin/widgets/widgets.component.ts
@@ -22,7 +22,7 @@ export class AdminWidgetsComponent {
     public widgets: FE_Widget[];
 
     constructor(private adminIntegrationsApi: AdminIntegrationsApiService, private toaster: ToasterService, private modal: Modal) {
-        this.adminIntegrationsApi.getAllIntegrations().then(integrations => {
+        this.adminIntegrationsApi.getAllWidgets().then(integrations => {
             this.isLoading = false;
             this.widgets = integrations.widgets;
         });
diff --git a/web/app/shared/services/admin/admin-integrations-api.service.ts b/web/app/shared/services/admin/admin-integrations-api.service.ts
index b1933a1..633a368 100644
--- a/web/app/shared/services/admin/admin-integrations-api.service.ts
+++ b/web/app/shared/services/admin/admin-integrations-api.service.ts
@@ -9,8 +9,8 @@ export class AdminIntegrationsApiService extends AuthedApi {
         super(http);
     }
 
-    public getAllIntegrations(): Promise<FE_IntegrationsResponse> {
-        return this.authedGet("/api/v1/dimension/admin/integrations/all").map(r => r.json()).toPromise();
+    public getAllWidgets(): Promise<FE_IntegrationsResponse> {
+        return this.authedGet("/api/v1/dimension/admin/integrations/widget/all").map(r => r.json()).toPromise();
     }
 
     public toggleIntegration(category: string, type: string, enabled: boolean): Promise<any> {

From 7bfbf626b2ac7ee3df56a303c767fbf078b083b5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 13:17:51 -0600
Subject: [PATCH 087/111] Appease the linter

---
 src/db/NebStore.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index f782d6f..4075dc3 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -91,19 +91,19 @@ export class NebStore {
     };
 
     public static async listSimpleBots(requestingUserId: string): Promise<SimpleBot[]> {
-        const configs = await NebStore.getAllConfigs();
+        const nebConfigs = await NebStore.getAllConfigs();
         const integrations: { integration: NebIntegration, userId: string }[] = [];
         const hasTypes: string[] = [];
 
-        for (const config of configs) {
-            for (const integration of config.dbIntegrations) {
+        for (const neb of nebConfigs) {
+            for (const integration of neb.dbIntegrations) {
                 if (!integration.isEnabled) continue;
 
                 const metadata = NebStore.INTEGRATIONS[integration.type];
                 if (!metadata || !metadata.simple) continue;
                 if (hasTypes.indexOf(integration.type) !== -1) continue;
 
-                const proxy = new NebProxy(config, requestingUserId);
+                const proxy = new NebProxy(neb, requestingUserId);
                 integrations.push({
                     integration: integration,
                     userId: await proxy.getBotUserId(integration),

From 017f5e00cdfa29b43f7f338f9500f7ae0d1347f9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 13:21:53 -0600
Subject: [PATCH 088/111] Appease the linter

---
 web/app/riot/riot-home/home.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 7cb5e6d..364f4a3 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -132,7 +132,7 @@ export class RiotHomeComponent {
             const bot = <FE_SimpleBot>integration;
             // TODO: "Are you sure?" dialog
 
-            let promise:Promise<any> = Promise.resolve();
+            let promise: Promise<any> = Promise.resolve();
             if (!integration._inRoom) {
                 promise = this.scalar.inviteUser(this.roomId, bot.userId);
             }

From de766ab945ae365ac68397f2723747519fb303e0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 15:44:08 -0600
Subject: [PATCH 089/111] Update the todo list to match the current state of
 affairs

---
 src/temp_todo.txt | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index 701bef5..0326ceb 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -1,7 +1,8 @@
-* dimension apis
-* integration management
-* admin ui
-* import from old db/config (script)
-* document how to add integrations (as a dev)
-* update readme
-* Update avatar/displayname of go-neb instances
+Release checklist:
+* Remove bots from rooms
+* Manage custom bots (not sure if anyone actually uses this?)
+* RSS bot
+* Travis CI
+* Update documentation
+* Configuration migration (if possible)
+* Final testing (widgets, bots, etc)
\ No newline at end of file

From 87121150cce343212ce7ea9642a0e4cabea6ac04 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 16:20:15 -0600
Subject: [PATCH 090/111] Support removing simple bots from rooms

---
 .../dimension/DimensionIntegrationsService.ts | 14 ++++++++-
 src/db/NebStore.ts                            | 29 ++++++++++++++-----
 src/matrix/MatrixAppserviceClient.ts          |  9 ++++++
 src/neb/NebProxy.ts                           | 14 +++++++++
 src/temp_todo.txt                             |  1 -
 web/app/riot/riot-home/home.component.ts      |  4 +--
 web/app/shared/services/authed-api.ts         |  6 ++++
 .../integrations/integrations-api.service.ts  |  4 +++
 8 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 9367c87..1738b31 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -1,4 +1,4 @@
-import { GET, Path, PathParam, QueryParam } from "typescript-rest";
+import { DELETE, GET, Path, PathParam, QueryParam } from "typescript-rest";
 import { ScalarService } from "../scalar/ScalarService";
 import { Widget } from "../../integrations/Widget";
 import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
@@ -52,6 +52,18 @@ export class DimensionIntegrationsService {
         return this.getEnabledIntegrations(scalarToken);
     }
 
+    @DELETE
+    @Path("room/:roomId/integrations/:category/:type")
+    public async removeIntegrationInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string, @PathParam("category") category: string, @PathParam("type") integrationType: string): Promise<any> {
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+
+        if (category === "widget") throw new ApiError(400, "Widgets should be removed client-side");
+        else if (category === "bot") await NebStore.removeSimpleBot(integrationType, roomId, userId);
+        else throw new ApiError(400, "Unrecognized category");
+
+        return {}; // 200 OK
+    }
+
     @GET
     @Path(":category/:type")
     public async getIntegration(@PathParam("category") category: string, @PathParam("type") type: string): Promise<Integration> {
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index 4075dc3..ebf0289 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -90,9 +90,9 @@ export class NebStore {
         },
     };
 
-    public static async listSimpleBots(requestingUserId: string): Promise<SimpleBot[]> {
+    public static async listEnabledNebSimpleBots(): Promise<{neb: NebConfig, integration: NebIntegration}[]>{
         const nebConfigs = await NebStore.getAllConfigs();
-        const integrations: { integration: NebIntegration, userId: string }[] = [];
+        const integrations: {neb: NebConfig, integration: NebIntegration}[] = [];
         const hasTypes: string[] = [];
 
         for (const neb of nebConfigs) {
@@ -103,16 +103,29 @@ export class NebStore {
                 if (!metadata || !metadata.simple) continue;
                 if (hasTypes.indexOf(integration.type) !== -1) continue;
 
-                const proxy = new NebProxy(neb, requestingUserId);
-                integrations.push({
-                    integration: integration,
-                    userId: await proxy.getBotUserId(integration),
-                });
+                integrations.push({neb, integration});
                 hasTypes.push(integration.type);
             }
         }
 
-        return integrations.map(i => new SimpleBot(i.integration, i.userId));
+        return integrations;
+    }
+
+    public static async listSimpleBots(requestingUserId: string): Promise<SimpleBot[]> {
+        const rawIntegrations = await NebStore.listEnabledNebSimpleBots();
+        return Promise.all(rawIntegrations.map(async i => {
+           const proxy = new NebProxy(i.neb, requestingUserId);
+           return new SimpleBot(i.integration, await proxy.getBotUserId(i.integration));
+        }));
+    }
+
+    public static async removeSimpleBot(type: string, roomId: string, requestingUserId: string): Promise<any> {
+        const rawIntegrations = await NebStore.listEnabledNebSimpleBots();
+        const integration = rawIntegrations.find(i => i.integration.type === type);
+        if (!integration) throw new Error("Integration not found");
+
+        const proxy = new NebProxy(integration.neb, requestingUserId);
+        return proxy.removeBotFromRoom(integration.integration, roomId);
     }
 
     public static async getAllConfigs(): Promise<NebConfig[]> {
diff --git a/src/matrix/MatrixAppserviceClient.ts b/src/matrix/MatrixAppserviceClient.ts
index cf1aa1e..996c9ec 100644
--- a/src/matrix/MatrixAppserviceClient.ts
+++ b/src/matrix/MatrixAppserviceClient.ts
@@ -30,4 +30,13 @@ export class MatrixAppserviceClient {
         );
         return response['user_id'];
     }
+
+    public async leaveRoom(virtualUserId: string, roomId: string): Promise<any> {
+        return doClientApiCall(
+            "POST",
+            "/_matrix/client/r0/rooms/" + encodeURIComponent(roomId) + "/leave",
+            {access_token: this.appservice.asToken, user_id: virtualUserId},
+            {},
+        );
+    }
 }
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index e5e8de9..e274de4 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -7,6 +7,8 @@ import Upstream from "../db/models/Upstream";
 import UserScalarToken from "../db/models/UserScalarToken";
 import { NebClient } from "./NebClient";
 import { ModularIntegrationInfoResponse } from "../models/ModularResponses";
+import { AppserviceStore } from "../db/AppserviceStore";
+import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
 
 export class NebProxy {
     constructor(private neb: NebConfig, private requestingUserId: string) {
@@ -29,6 +31,18 @@ export class NebProxy {
         }
     }
 
+    public async removeBotFromRoom(integration: NebIntegration, roomId: string) {
+        if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
+
+        if (this.neb.upstreamId) {
+            await this.doUpstreamRequest("/removeIntegration", {type: integration.type, room_id: roomId});
+        } else {
+            const appservice = await AppserviceStore.getAppservice(this.neb.appserviceId);
+            const client = new MatrixAppserviceClient(appservice);
+            await client.leaveRoom(await this.getBotUserId(integration), roomId);
+        }
+    }
+
     private async doUpstreamRequest<T>(endpoint: string, body?: any): Promise<T> {
         const upstream = await Upstream.findByPrimary(this.neb.upstreamId);
         const token = await UserScalarToken.findOne({
diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index 0326ceb..88457e6 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -1,5 +1,4 @@
 Release checklist:
-* Remove bots from rooms
 * Manage custom bots (not sure if anyone actually uses this?)
 * RSS bot
 * Travis CI
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 364f4a3..3e9bdb4 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -135,9 +135,7 @@ export class RiotHomeComponent {
             let promise: Promise<any> = Promise.resolve();
             if (!integration._inRoom) {
                 promise = this.scalar.inviteUser(this.roomId, bot.userId);
-            }
-            // TODO: Handle removal of bots
-            // else promise = this.api.removeIntegration(this.roomId, integration.type, integration.integrationType, this.scalarToken);
+            } else promise = this.integrationsApi.removeIntegration(integration.category, integration.type, this.roomId);
             // We set this ahead of the promise for debouncing
 
             integration._inRoom = !integration._inRoom;
diff --git a/web/app/shared/services/authed-api.ts b/web/app/shared/services/authed-api.ts
index 8334134..06782f9 100644
--- a/web/app/shared/services/authed-api.ts
+++ b/web/app/shared/services/authed-api.ts
@@ -17,4 +17,10 @@ export class AuthedApi {
         const qs = {scalar_token: SessionStorage.scalarToken};
         return this.http.post(url, body, {params: qs});
     }
+
+    protected authedDelete(url: string, qs?: any): Observable<Response> {
+        if (!qs) qs = {};
+        qs["scalar_token"] = SessionStorage.scalarToken;
+        return this.http.delete(url, {params: qs});
+    }
 }
diff --git a/web/app/shared/services/integrations/integrations-api.service.ts b/web/app/shared/services/integrations/integrations-api.service.ts
index 0923ef9..ee8a5b1 100644
--- a/web/app/shared/services/integrations/integrations-api.service.ts
+++ b/web/app/shared/services/integrations/integrations-api.service.ts
@@ -26,4 +26,8 @@ export class IntegrationsApiService extends AuthedApi {
         return this.http.get("/api/v1/dimension/widgets/embeddable", {params: {url: url}})
             .map(r => r.json()).toPromise();
     }
+
+    public removeIntegration(category: string, type: string, roomId: string): Promise<any> {
+        return this.authedDelete("/api/v1/dimension/integrations/room/" + roomId + "/integrations/" + category + "/" + type).map(r => r.json()).toPromise();
+    }
 }

From b5aec06c04c5a83dacaa8041211a72a1357d750a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 19:17:09 -0600
Subject: [PATCH 091/111] Add a dialog for configuring simple bots

---
 web/app/app.module.ts                         |  3 +
 .../simple-bot/simple-bot.component.html      | 14 +++++
 .../simple-bot/simple-bot.component.scss      |  0
 .../simple-bot/simple-bot.component.ts        | 59 +++++++++++++++++++
 web/app/riot/riot-home/home.component.ts      | 40 ++++---------
 5 files changed, 86 insertions(+), 30 deletions(-)
 create mode 100644 web/app/configs/simple-bot/simple-bot.component.html
 create mode 100644 web/app/configs/simple-bot/simple-bot.component.scss
 create mode 100644 web/app/configs/simple-bot/simple-bot.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index aa0a86e..c1717e1 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -58,6 +58,7 @@ import { AdminNebGiphyConfigComponent } from "./admin/neb/config/giphy/giphy.com
 import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.component";
 import { AdminNebGoogleConfigComponent } from "./admin/neb/config/google/google.component";
 import { AdminNebImgurConfigComponent } from "./admin/neb/config/imgur/imgur.component";
+import { ConfigSimpleBotComponent } from "./configs/simple-bot/simple-bot.component";
 
 @NgModule({
     imports: [
@@ -110,6 +111,7 @@ import { AdminNebImgurConfigComponent } from "./admin/neb/config/imgur/imgur.com
         AdminNebGuggyConfigComponent,
         AdminNebGoogleConfigComponent,
         AdminNebImgurConfigComponent,
+        ConfigSimpleBotComponent,
 
         // Vendor
     ],
@@ -137,6 +139,7 @@ import { AdminNebImgurConfigComponent } from "./admin/neb/config/imgur/imgur.com
         AdminNebGuggyConfigComponent,
         AdminNebGoogleConfigComponent,
         AdminNebImgurConfigComponent,
+        ConfigSimpleBotComponent,
     ]
 })
 export class AppModule {
diff --git a/web/app/configs/simple-bot/simple-bot.component.html b/web/app/configs/simple-bot/simple-bot.component.html
new file mode 100644
index 0000000..1804363
--- /dev/null
+++ b/web/app/configs/simple-bot/simple-bot.component.html
@@ -0,0 +1,14 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>{{ bot.displayName }}</h4>
+    </div>
+    <div class="dialog-content" style="text-align: center;">
+        <p>{{ bot.description }}</p>
+        <ui-switch [checked]="bot._inRoom" [disabled]="bot._isUpdating" (change)="toggle()"></ui-switch>
+    </div>
+    <div class="dialog-footer">
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Close
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/configs/simple-bot/simple-bot.component.scss b/web/app/configs/simple-bot/simple-bot.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/simple-bot/simple-bot.component.ts b/web/app/configs/simple-bot/simple-bot.component.ts
new file mode 100644
index 0000000..658814f
--- /dev/null
+++ b/web/app/configs/simple-bot/simple-bot.component.ts
@@ -0,0 +1,59 @@
+import { Component } from "@angular/core";
+import { FE_SimpleBot } from "../../shared/models/integration";
+import { ToasterService } from "angular2-toaster";
+import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
+import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+import { DialogRef } from "ngx-modialog";
+
+export class SimpleBotConfigDialogContext extends BSModalContext {
+    public bot: FE_SimpleBot;
+    public roomId: string;
+}
+
+@Component({
+    templateUrl: "simple-bot.component.html",
+    styleUrls: ["simple-bot.component.scss"],
+})
+export class ConfigSimpleBotComponent {
+
+    public bot: FE_SimpleBot;
+
+    private roomId: string;
+
+    constructor(public dialog: DialogRef<SimpleBotConfigDialogContext>,
+                private toaster: ToasterService,
+                private scalar: ScalarClientApiService,
+                private integrationsApi: IntegrationsApiService) {
+        this.bot = dialog.context.bot;
+        this.roomId = dialog.context.roomId;
+
+        this.bot._isUpdating = false;
+    }
+
+    public toggle() {
+        let promise: Promise<any> = Promise.resolve();
+        if (!this.bot._inRoom) {
+            promise = this.scalar.inviteUser(this.roomId, this.bot.userId);
+        } else promise = this.integrationsApi.removeIntegration(this.bot.category, this.bot.type, this.roomId);
+
+        this.bot._inRoom = !this.bot._inRoom;
+        this.bot._isUpdating = true;
+        promise.then(() => {
+            this.bot._isUpdating = false;
+            if (this.bot._inRoom) this.toaster.pop("success", this.bot.displayName + " was invited to the room");
+            else this.toaster.pop("success", this.bot.displayName + " was removed from the room");
+        }).catch(err => {
+            this.bot._inRoom = !this.bot._inRoom; // revert the status change
+            this.bot._isUpdating = false;
+            console.error(err);
+
+            let errorMessage = null;
+            if (err.json) errorMessage = err.json().error;
+            if (err.response && err.response.error) errorMessage = err.response.error.message;
+            if (!errorMessage) errorMessage = "Could not update integration status";
+
+            this.toaster.pop("error", errorMessage);
+        });
+    }
+}
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 3e9bdb4..5f5b807 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -1,5 +1,4 @@
 import { Component } from "@angular/core";
-import { ToasterService } from "angular2-toaster";
 import { ActivatedRoute, Router } from "@angular/router";
 import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
 import * as _ from "lodash";
@@ -9,6 +8,8 @@ import { IntegrationsRegistry } from "../../shared/registry/integrations.registr
 import { SessionStorage } from "../../shared/SessionStorage";
 import { AdminApiService } from "../../shared/services/admin/admin-api.service";
 import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
+import { Modal, overlayConfigFactory } from "ngx-modialog";
+import { ConfigSimpleBotComponent, SimpleBotConfigDialogContext } from "../../configs/simple-bot/simple-bot.component";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -39,8 +40,8 @@ export class RiotHomeComponent {
                 private scalar: ScalarClientApiService,
                 private integrationsApi: IntegrationsApiService,
                 private adminApi: AdminApiService,
-                private toaster: ToasterService,
-                private router: Router) {
+                private router: Router,
+                private modal: Modal) {
         let params: any = this.activatedRoute.snapshot.queryParams;
 
         this.requestedScreen = params.screen;
@@ -128,34 +129,13 @@ export class RiotHomeComponent {
         console.log(this.userId + " is trying to modify " + integration.displayName);
 
         if (integration.category === "bot") {
-            // It's a bot
-            const bot = <FE_SimpleBot>integration;
-            // TODO: "Are you sure?" dialog
+            this.modal.open(ConfigSimpleBotComponent, overlayConfigFactory({
+                bot: <FE_SimpleBot>integration,
+                roomId: this.roomId,
 
-            let promise: Promise<any> = Promise.resolve();
-            if (!integration._inRoom) {
-                promise = this.scalar.inviteUser(this.roomId, bot.userId);
-            } else promise = this.integrationsApi.removeIntegration(integration.category, integration.type, this.roomId);
-            // We set this ahead of the promise for debouncing
-
-            integration._inRoom = !integration._inRoom;
-            integration._isUpdating = true;
-            promise.then(() => {
-                integration._isUpdating = false;
-                if (integration._inRoom) this.toaster.pop("success", integration.displayName + " was invited to the room");
-                else this.toaster.pop("success", integration.displayName + " was removed from the room");
-            }).catch(err => {
-                integration._inRoom = !integration._inRoom; // revert the status change
-                integration._isUpdating = false;
-                console.error(err);
-
-                let errorMessage = null;
-                if (err.json) errorMessage = err.json().error;
-                if (err.response && err.response.error) errorMessage = err.response.error.message;
-                if (!errorMessage) errorMessage = "Could not update integration status";
-
-                this.toaster.pop("error", errorMessage);
-            });
+                isBlocking: true,
+                size: 'lg',
+            }, SimpleBotConfigDialogContext));
         } else {
             console.log("Navigating to edit screen for " + integration.category + " " + integration.type);
             this.router.navigate(['riot-app', integration.category, integration.type]);

From 2c1366d9d7ffbfb5a23222891cf32fb784be53c0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 25 Mar 2018 21:01:05 -0600
Subject: [PATCH 092/111] Very early support for configuring complex bots

Using the RSS Bot as an example. Notably missing features:
* Configuration (feeds) not retrieved
* No actual configuration page
---
 .../dimension/DimensionIntegrationsService.ts | 37 +++++++----
 src/db/NebStore.ts                            | 62 +++++++++++++++++--
 src/integrations/ComplexBot.ts                | 13 ++++
 src/neb/NebProxy.ts                           | 26 +++++++-
 src/temp_todo.txt                             | 11 +++-
 web/app/admin/neb/edit/edit.component.ts      |  4 +-
 web/app/app.module.ts                         |  4 ++
 web/app/app.routing.ts                        | 11 ++++
 .../complex-bot/complex-bot.component.ts      | 54 ++++++++++++++++
 .../config-screen.complex-bot.component.html  | 21 +++++++
 .../config-screen.complex-bot.component.scss  |  0
 .../config-screen.complex-bot.component.ts    | 16 +++++
 .../rss/rss.complex-bot.component.html        |  5 ++
 .../rss/rss.complex-bot.component.scss        |  0
 .../rss/rss.complex-bot.component.ts          | 18 ++++++
 web/app/riot/riot-home/home.component.ts      |  2 +-
 web/app/shared/models/integration.ts          |  6 ++
 web/app/shared/models/neb.ts                  |  5 ++
 .../integrations/integrations-api.service.ts  |  4 ++
 19 files changed, 276 insertions(+), 23 deletions(-)
 create mode 100644 src/integrations/ComplexBot.ts
 create mode 100644 web/app/configs/complex-bot/complex-bot.component.ts
 create mode 100644 web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html
 create mode 100644 web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.scss
 create mode 100644 web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.ts
 create mode 100644 web/app/configs/complex-bot/rss/rss.complex-bot.component.html
 create mode 100644 web/app/configs/complex-bot/rss/rss.complex-bot.component.scss
 create mode 100644 web/app/configs/complex-bot/rss/rss.complex-bot.component.ts

diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 1738b31..102ce36 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -7,10 +7,12 @@ import { ApiError } from "../ApiError";
 import { WidgetStore } from "../../db/WidgetStore";
 import { SimpleBot } from "../../integrations/SimpleBot";
 import { NebStore } from "../../db/NebStore";
+import { ComplexBot } from "../../integrations/ComplexBot";
 
 export interface IntegrationsResponse {
     widgets: Widget[],
     bots: SimpleBot[],
+    complexBots: ComplexBot[],
 }
 
 @Path("/api/v1/dimension/integrations")
@@ -34,22 +36,35 @@ export class DimensionIntegrationsService {
         return bots;
     }
 
-    @GET
-    @Path("enabled")
-    public async getEnabledIntegrations(@QueryParam("scalar_token") scalarToken: string): Promise<IntegrationsResponse> {
-        const userId = await ScalarService.getTokenOwner(scalarToken);
-        return {
-            widgets: await DimensionIntegrationsService.getWidgets(true),
-            bots: await DimensionIntegrationsService.getSimpleBots(userId),
-        };
+    public static async getComplexBots(userId: string, roomId: string): Promise<ComplexBot[]> {
+        const cached = Cache.for(CACHE_INTEGRATIONS).get("complex_bots_" + roomId);
+        if (cached) return cached;
+
+        const bots = await NebStore.listComplexBots(userId, roomId);
+        Cache.for(CACHE_INTEGRATIONS).put("complex_bots_" + roomId, bots);
+        return bots;
     }
 
     @GET
     @Path("room/:roomId")
     public async getIntegrationsInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string): Promise<IntegrationsResponse> {
-        console.log(roomId);
-        // TODO: Other integrations
-        return this.getEnabledIntegrations(scalarToken);
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+        return {
+            widgets: await DimensionIntegrationsService.getWidgets(true),
+            bots: await DimensionIntegrationsService.getSimpleBots(userId),
+            complexBots: await DimensionIntegrationsService.getComplexBots(userId, roomId),
+        };
+    }
+
+    @GET
+    @Path("room/:roomId/integrations/:category/:type")
+    public async getIntegrationInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string, @PathParam("category") category: string, @PathParam("type") integrationType: string): Promise<any> {
+        const roomConfig = await this.getIntegrationsInRoom(scalarToken, roomId); // does auth for us
+
+        if (category === "widget") return roomConfig.widgets.find(i => i.type === integrationType);
+        else if (category === "bot") return roomConfig.bots.find(i => i.type === integrationType);
+        else if (category === "complex-bot") return roomConfig.complexBots.find(i => i.type === integrationType);
+        else throw new ApiError(400, "Unrecognized category");
     }
 
     @DELETE
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index ebf0289..aafabe9 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -11,6 +11,7 @@ import { AppserviceStore } from "./AppserviceStore";
 import config from "../config";
 import { SimpleBot } from "../integrations/SimpleBot";
 import { NebProxy } from "../neb/NebProxy";
+import { ComplexBot } from "../integrations/ComplexBot";
 
 export interface SupportedIntegration {
     type: string;
@@ -29,6 +30,7 @@ export class NebStore {
         //     name: "Circle CI",
         //     avatarUrl: "/img/avatars/circleci.png",
         //     description: "Announces build results from Circle CI to the room.",
+        //     simple: false,
         // },
         "echo": {
             name: "Echo",
@@ -53,6 +55,7 @@ export class NebStore {
         //     name: "Github",
         //     avatarUrl: "/img/avatars/github.png",
         //     description: "Github issue management and announcements for a repository",
+        //     simple: false,
         // },
         "google": {
             name: "Google",
@@ -71,16 +74,19 @@ export class NebStore {
         //     name: "Jira",
         //     avatarUrl: "/img/avatars/jira.png",
         //     description: "Jira issue management and announcements for a project",
+        //     simple: false,
         // },
         "rss": {
             name: "RSS",
             avatarUrl: "/img/avatars/rssbot.png",
             description: "Announces changes to RSS feeds in the room",
+            simple: false,
         },
         "travisci": {
             name: "Travis CI",
             avatarUrl: "/img/avatars/travisci.png",
             description: "Announces build results from Travis CI to the room",
+            simple: false,
         },
         "wikipedia": {
             name: "Wikipedia",
@@ -90,9 +96,9 @@ export class NebStore {
         },
     };
 
-    public static async listEnabledNebSimpleBots(): Promise<{neb: NebConfig, integration: NebIntegration}[]>{
+    private static async listEnabledNebBots(simple: boolean): Promise<{ neb: NebConfig, integration: NebIntegration }[]> {
         const nebConfigs = await NebStore.getAllConfigs();
-        const integrations: {neb: NebConfig, integration: NebIntegration}[] = [];
+        const integrations: { neb: NebConfig, integration: NebIntegration }[] = [];
         const hasTypes: string[] = [];
 
         for (const neb of nebConfigs) {
@@ -100,7 +106,7 @@ export class NebStore {
                 if (!integration.isEnabled) continue;
 
                 const metadata = NebStore.INTEGRATIONS[integration.type];
-                if (!metadata || !metadata.simple) continue;
+                if (!metadata || metadata.simple !== simple) continue;
                 if (hasTypes.indexOf(integration.type) !== -1) continue;
 
                 integrations.push({neb, integration});
@@ -111,11 +117,30 @@ export class NebStore {
         return integrations;
     }
 
+    public static async listEnabledNebSimpleBots(): Promise<{ neb: NebConfig, integration: NebIntegration }[]> {
+        return NebStore.listEnabledNebBots(true);
+    }
+
+    public static async listEnabledNebComplexBots(): Promise<{ neb: NebConfig, integration: NebIntegration }[]> {
+        return NebStore.listEnabledNebBots(false);
+    }
+
     public static async listSimpleBots(requestingUserId: string): Promise<SimpleBot[]> {
         const rawIntegrations = await NebStore.listEnabledNebSimpleBots();
         return Promise.all(rawIntegrations.map(async i => {
-           const proxy = new NebProxy(i.neb, requestingUserId);
-           return new SimpleBot(i.integration, await proxy.getBotUserId(i.integration));
+            const proxy = new NebProxy(i.neb, requestingUserId);
+            return new SimpleBot(i.integration, await proxy.getBotUserId(i.integration));
+        }));
+    }
+
+    public static async listComplexBots(requestingUserId: string, roomId: string): Promise<ComplexBot[]> {
+        const rawIntegrations = await NebStore.listEnabledNebComplexBots();
+        return Promise.all(rawIntegrations.map(async i => {
+            const proxy = new NebProxy(i.neb, requestingUserId);
+            const notifUserId = await proxy.getNotificationUserId(i.integration, roomId, requestingUserId);
+            const botUserId = null; // TODO: For github
+            // TODO: Get configuration
+            return new ComplexBot(i.integration, notifUserId, botUserId);
         }));
     }
 
@@ -271,6 +296,33 @@ export class NebStore {
         return users[0];
     }
 
+    public static async getOrCreateNotificationUser(configurationId: number, integrationType: string, forUserId: string): Promise<NebNotificationUser> {
+        const neb = await NebStore.getConfig(configurationId);
+        if (!neb.appserviceId) throw new Error("Instance not bound to an appservice");
+
+        const integration = await this.getOrCreateIntegration(configurationId, integrationType);
+        const users = await NebNotificationUser.findAll({where: {integrationId: integration.id, ownerId: forUserId}});
+        if (!users || users.length === 0) {
+            const safeUserId = AppserviceStore.getSafeUserId(forUserId);
+            const appservice = await AppserviceStore.getAppservice(neb.appserviceId);
+            const userId = "@" + appservice.userPrefix + "_" + integrationType + "_notifications_" + safeUserId + ":" + config.homeserver.name;
+            const appserviceUser = await AppserviceStore.getOrCreateUser(neb.appserviceId, userId);
+
+            const client = new NebClient(neb);
+            await client.updateUser(userId, integration.isEnabled, false); // creates the user in go-neb
+
+            const serviceId = appservice.id + "_integration_" + integrationType + "_notifications_" + safeUserId;
+            return NebNotificationUser.create({
+                serviceId: serviceId,
+                appserviceUserId: appserviceUser.id,
+                integrationId: integration.id,
+                ownerId: forUserId,
+            });
+        }
+
+        return users[0];
+    }
+
     public static async setIntegrationConfig(configurationId: number, integrationType: string, newConfig: any): Promise<any> {
         const botUser = await NebStore.getOrCreateBotUser(configurationId, integrationType);
         const neb = await NebStore.getConfig(configurationId);
diff --git a/src/integrations/ComplexBot.ts b/src/integrations/ComplexBot.ts
new file mode 100644
index 0000000..686b48e
--- /dev/null
+++ b/src/integrations/ComplexBot.ts
@@ -0,0 +1,13 @@
+import { Integration } from "./Integration";
+import NebIntegration from "../db/models/NebIntegration";
+
+export class ComplexBot extends Integration {
+    constructor(bot: NebIntegration, public notificationUserId: string, public botUserId?: string) {
+        super(bot);
+        this.category = "complex-bot";
+        this.requirements = [];
+
+        // Notification bots are technically supported in e2e rooms
+        this.isEncryptionSupported = true;
+    }
+}
\ No newline at end of file
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index e274de4..b83da62 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -15,7 +15,7 @@ export class NebProxy {
 
     }
 
-    public async getBotUserId(integration: NebIntegration) {
+    public async getBotUserId(integration: NebIntegration): Promise<string> {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
 
         if (this.neb.upstreamId) {
@@ -31,7 +31,29 @@ export class NebProxy {
         }
     }
 
-    public async removeBotFromRoom(integration: NebIntegration, roomId: string) {
+    public async getNotificationUserId(integration: NebIntegration, inRoomId: string, forUserId: string): Promise<string> {
+        if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
+
+        if (this.neb.upstreamId) {
+            try {
+                const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/" + NebClient.getNebType(integration.type), {
+                    room_id: inRoomId,
+                });
+                return response.bot_user_id;
+            } catch (err) {
+                LogService.error("NebProxy", err);
+                return null;
+            }
+        } else {
+            return (await NebStore.getOrCreateNotificationUser(this.neb.id, integration.type, forUserId)).appserviceUserId;
+        }
+    }
+
+    // public async getComplexBotConfiguration(integration: NebIntegration, roomId: string): Promise<any> {
+    //
+    // }
+
+    public async removeBotFromRoom(integration: NebIntegration, roomId: string): Promise<any> {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
 
         if (this.neb.upstreamId) {
diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index 88457e6..c69e768 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -1,7 +1,14 @@
 Release checklist:
-* Manage custom bots (not sure if anyone actually uses this?)
 * RSS bot
 * Travis CI
+* IRC Bridge
 * Update documentation
 * Configuration migration (if possible)
-* Final testing (widgets, bots, etc)
\ No newline at end of file
+* Lots of logging
+* Final testing (widgets, bots, etc)
+
+After release:
+* Manage custom bots
+* Github
+* Circle CI
+* Avatars/display names for managed go-neb bots
\ No newline at end of file
diff --git a/web/app/admin/neb/edit/edit.component.ts b/web/app/admin/neb/edit/edit.component.ts
index 1facf5f..2b1e2a5 100644
--- a/web/app/admin/neb/edit/edit.component.ts
+++ b/web/app/admin/neb/edit/edit.component.ts
@@ -4,7 +4,7 @@ import { AdminNebApiService } from "../../../shared/services/admin/admin-neb-api
 import { ActivatedRoute } from "@angular/router";
 import { ToasterService } from "angular2-toaster";
 import { FE_Integration } from "../../../shared/models/integration";
-import { NEB_HAS_CONFIG } from "../../../shared/models/neb";
+import { NEB_HAS_CONFIG, NEB_IS_COMPLEX } from "../../../shared/models/neb";
 import { Modal, overlayConfigFactory } from "ngx-modialog";
 import { AdminNebGiphyConfigComponent } from "../config/giphy/giphy.component";
 import { NebBotConfigurationDialogContext } from "../config/config-context";
@@ -72,7 +72,7 @@ export class AdminEditNebComponent implements OnInit, OnDestroy {
         if (bot.isEnabled && !this.isUpstream) {
             if (this.hasConfig(bot)) {
                 this.editBot(bot);
-            } else {
+            } else if (NEB_IS_COMPLEX.indexOf(bot.type) === -1) {
                 try {
                     await this.nebApi.setIntegrationConfiguration(this.nebConfig.id, bot.type, {});
                 } catch (err) {
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index c1717e1..40620b7 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -59,6 +59,8 @@ import { AdminNebGuggyConfigComponent } from "./admin/neb/config/guggy/guggy.com
 import { AdminNebGoogleConfigComponent } from "./admin/neb/config/google/google.component";
 import { AdminNebImgurConfigComponent } from "./admin/neb/config/imgur/imgur.component";
 import { ConfigSimpleBotComponent } from "./configs/simple-bot/simple-bot.component";
+import { ConfigScreenComplexBotComponent } from "./configs/complex-bot/config-screen/config-screen.complex-bot.component";
+import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.complex-bot.component";
 
 @NgModule({
     imports: [
@@ -112,6 +114,8 @@ import { ConfigSimpleBotComponent } from "./configs/simple-bot/simple-bot.compon
         AdminNebGoogleConfigComponent,
         AdminNebImgurConfigComponent,
         ConfigSimpleBotComponent,
+        ConfigScreenComplexBotComponent,
+        RssComplexBotConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index 029e0ad..b9083be 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -19,6 +19,7 @@ import { AdminWidgetsComponent } from "./admin/widgets/widgets.component";
 import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
+import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.complex-bot.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -108,6 +109,16 @@ const routes: Routes = [
                     },
                 ],
             },
+            {
+                path: "complex-bot",
+                children: [
+                    {
+                        path: "rss",
+                        component: RssComplexBotConfigComponent,
+                        data: {breadcrumb: "RSS Bot Configuration", name: "RSS Bot Configuration"}
+                    },
+                ],
+            },
         ],
     },
     {
diff --git a/web/app/configs/complex-bot/complex-bot.component.ts b/web/app/configs/complex-bot/complex-bot.component.ts
new file mode 100644
index 0000000..7f3122e
--- /dev/null
+++ b/web/app/configs/complex-bot/complex-bot.component.ts
@@ -0,0 +1,54 @@
+import { OnDestroy, OnInit } from "@angular/core";
+import { FE_ComplexBot } from "../../shared/models/integration";
+import { ActivatedRoute } from "@angular/router";
+import { Subscription } from "rxjs/Subscription";
+import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
+import { ToasterService } from "angular2-toaster";
+import { ServiceLocator } from "../../shared/registry/locator.service";
+
+export class ComplexBotComponent<T> implements OnInit, OnDestroy {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public bot: FE_ComplexBot<T>;
+    public newConfig: T;
+
+    private roomId: string;
+
+    private routeQuerySubscription: Subscription;
+
+    protected toaster = ServiceLocator.injector.get(ToasterService);
+    protected integrationsApi = ServiceLocator.injector.get(IntegrationsApiService);
+    protected route = ServiceLocator.injector.get(ActivatedRoute);
+
+    constructor(private integrationType: string) {
+        this.isLoading = true;
+        this.isUpdating = false;
+    }
+
+    public ngOnInit(): void {
+        this.routeQuerySubscription = this.route.queryParams.subscribe(params => {
+            this.roomId = params['roomId'];
+            this.loadBot();
+        });
+    }
+
+    public ngOnDestroy(): void {
+        if (this.routeQuerySubscription) this.routeQuerySubscription.unsubscribe();
+    }
+
+    private loadBot() {
+        this.isLoading = true;
+        this.isUpdating = false;
+
+        this.newConfig = <T>{};
+
+        this.integrationsApi.getIntegrationInRoom("complex-bot", this.integrationType, this.roomId).then(i => {
+            this.bot = <FE_ComplexBot<T>>i;
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Failed to load configuration");
+        });
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html
new file mode 100644
index 0000000..34caaba
--- /dev/null
+++ b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html
@@ -0,0 +1,21 @@
+<div *ngIf="botComponent.isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!botComponent.isLoading">
+    <my-ibox>
+        <h5 class="my-ibox-title">
+            {{ botComponent.bot.displayName }} configuration
+        </h5>
+        <div class="my-ibox-content">
+            <form (submit)="botComponent.save()" novalidate name="saveForm">
+                <ng-container *ngTemplateOutlet="botParamsTemplate"></ng-container>
+
+                <div style="margin-top: 25px">
+                    <button type="submit" class="btn btn-sm btn-success" [disabled]="botComponent.isUpdating">
+                        <i class="far fa-save"></i> Save
+                    </button>
+                </div>
+            </form>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.scss b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.ts b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.ts
new file mode 100644
index 0000000..8a94728
--- /dev/null
+++ b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.ts
@@ -0,0 +1,16 @@
+import { ComplexBotComponent } from "../complex-bot.component";
+import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
+
+@Component({
+    selector: "my-complex-bot-config",
+    templateUrl: "config-screen.complex-bot.component.html",
+    styleUrls: ["config-screen.complex-bot.component.scss"],
+})
+export class ConfigScreenComplexBotComponent {
+
+    @Input() botComponent: ComplexBotComponent<any>;
+    @ContentChild(TemplateRef) botParamsTemplate: TemplateRef<any>;
+
+    constructor() {
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/rss/rss.complex-bot.component.html b/web/app/configs/complex-bot/rss/rss.complex-bot.component.html
new file mode 100644
index 0000000..5607fb2
--- /dev/null
+++ b/web/app/configs/complex-bot/rss/rss.complex-bot.component.html
@@ -0,0 +1,5 @@
+<my-complex-bot-config [botComponent]="this">
+    <ng-template #botParamsTemplate>
+        <p>{{ bot | json }}</p>
+    </ng-template>
+</my-complex-bot-config>
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/rss/rss.complex-bot.component.scss b/web/app/configs/complex-bot/rss/rss.complex-bot.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts b/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts
new file mode 100644
index 0000000..04587f1
--- /dev/null
+++ b/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts
@@ -0,0 +1,18 @@
+import { ComplexBotComponent } from "../complex-bot.component";
+import { Component } from "@angular/core";
+
+interface RssConfig {
+    feeds: {
+        [feedUrl: string]: {}; // No options currently
+    };
+}
+
+@Component({
+    templateUrl: "rss.complex-bot.component.html",
+    styleUrls: ["rss.complex-bot.component.scss"],
+})
+export class RssComplexBotConfigComponent extends ComplexBotComponent<RssConfig> {
+    constructor() {
+        super("rss");
+    }
+}
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 5f5b807..50e9b8c 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -138,7 +138,7 @@ export class RiotHomeComponent {
             }, SimpleBotConfigDialogContext));
         } else {
             console.log("Navigating to edit screen for " + integration.category + " " + integration.type);
-            this.router.navigate(['riot-app', integration.category, integration.type]);
+            this.router.navigate(['riot-app', integration.category, integration.type], {queryParams: {roomId: this.roomId}});
         }
     }
 
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index f32cd54..0576099 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -20,6 +20,12 @@ export interface FE_SimpleBot extends FE_Integration {
     userId: string;
 }
 
+export interface FE_ComplexBot<T> extends FE_Integration {
+    notificationUserId: string;
+    botUserId?: string;
+    config: T;
+}
+
 export interface FE_Widget extends FE_Integration {
     options: any;
 }
diff --git a/web/app/shared/models/neb.ts b/web/app/shared/models/neb.ts
index 3bbeacc..0091153 100644
--- a/web/app/shared/models/neb.ts
+++ b/web/app/shared/models/neb.ts
@@ -4,4 +4,9 @@ export const NEB_HAS_CONFIG = [
     "github",
     "google",
     "imgur",
+];
+
+export const NEB_IS_COMPLEX = [
+    "rss",
+    "travisci",
 ];
\ No newline at end of file
diff --git a/web/app/shared/services/integrations/integrations-api.service.ts b/web/app/shared/services/integrations/integrations-api.service.ts
index ee8a5b1..21bd353 100644
--- a/web/app/shared/services/integrations/integrations-api.service.ts
+++ b/web/app/shared/services/integrations/integrations-api.service.ts
@@ -18,6 +18,10 @@ export class IntegrationsApiService extends AuthedApi {
         return this.http.get("/api/v1/dimension/integrations/" + category + "/" + type).map(r => r.json()).toPromise();
     }
 
+    public getIntegrationInRoom(category: string, type: string, roomId: string): Promise<FE_Integration> {
+        return this.authedGet("/api/v1/dimension/integrations/room/" + roomId + "/integrations/" + category + "/" + type).map(r => r.json()).toPromise();
+    }
+
     public getWidget(type: string): Promise<FE_Widget> {
         return this.getIntegration("widget", type).then(i => <FE_Widget>i);
     }

From 1233be85e97bcc8b3174bde06f3ddcded0e0c551 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 26 Mar 2018 18:46:08 -0600
Subject: [PATCH 093/111] Add a health endpoint

For monitoring
---
 src/api/dimension/DimensionHealthService.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/api/dimension/DimensionHealthService.ts

diff --git a/src/api/dimension/DimensionHealthService.ts b/src/api/dimension/DimensionHealthService.ts
new file mode 100644
index 0000000..154600c
--- /dev/null
+++ b/src/api/dimension/DimensionHealthService.ts
@@ -0,0 +1,11 @@
+import { GET, Path } from "typescript-rest";
+
+@Path("/api/v1/dimension/health")
+export class DimensionHealthService {
+
+    @GET
+    @Path("heartbeat")
+    public async heartbeat(): Promise<any> {
+        return {}; // 200 OK
+    }
+}
\ No newline at end of file

From 18597db5407e1b30e3a52cf9b4936551305ae0d2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 26 Mar 2018 21:48:44 -0600
Subject: [PATCH 094/111] Add self-service configuration for the RSS bot

Fixes #14
---
 .../dimension/DimensionIntegrationsService.ts |  16 ++-
 src/db/DimensionStore.ts                      |   2 +
 src/db/NebStore.ts                            |  15 +-
 .../20180326185545-AddNebIntegrationConfig.ts |  22 +++
 src/db/models/NebIntegrationConfig.ts         |  24 ++++
 src/integrations/ComplexBot.ts                |  10 +-
 src/models/ModularResponses.ts                |   1 +
 src/neb/NebClient.ts                          |   1 +
 src/neb/NebProxy.ts                           | 132 +++++++++++++++++-
 .../complex-bot/complex-bot.component.ts      |  20 ++-
 .../config-screen.complex-bot.component.html  |  17 +--
 .../rss/rss.complex-bot.component.html        |  55 +++++++-
 .../rss/rss.complex-bot.component.scss        |   4 +
 .../rss/rss.complex-bot.component.ts          |  50 ++++++-
 .../integrations/integrations-api.service.ts  |   4 +
 15 files changed, 343 insertions(+), 30 deletions(-)
 create mode 100644 src/db/migrations/20180326185545-AddNebIntegrationConfig.ts
 create mode 100644 src/db/models/NebIntegrationConfig.ts

diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 102ce36..0589360 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -1,4 +1,4 @@
-import { DELETE, GET, Path, PathParam, QueryParam } from "typescript-rest";
+import { DELETE, GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
 import { ScalarService } from "../scalar/ScalarService";
 import { Widget } from "../../integrations/Widget";
 import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
@@ -67,6 +67,18 @@ export class DimensionIntegrationsService {
         else throw new ApiError(400, "Unrecognized category");
     }
 
+    @POST
+    @Path("room/:roomId/integrations/:category/:type/config")
+    public async setIntegrationConfigurationInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string, @PathParam("category") category: string, @PathParam("type") integrationType: string, newConfig: any): Promise<any> {
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+
+        if (category === "complex-bot") await NebStore.setComplexBotConfig(userId, integrationType, roomId, newConfig);
+        else throw new ApiError(400, "Unrecognized category");
+
+        Cache.for(CACHE_INTEGRATIONS).clear(); // TODO: Improve which cache we invalidate
+        return {}; // 200 OK
+    }
+
     @DELETE
     @Path("room/:roomId/integrations/:category/:type")
     public async removeIntegrationInRoom(@QueryParam("scalar_token") scalarToken: string, @PathParam("roomId") roomId: string, @PathParam("category") category: string, @PathParam("type") integrationType: string): Promise<any> {
@@ -74,8 +86,10 @@ export class DimensionIntegrationsService {
 
         if (category === "widget") throw new ApiError(400, "Widgets should be removed client-side");
         else if (category === "bot") await NebStore.removeSimpleBot(integrationType, roomId, userId);
+        else if (category === "complex-bot") throw new ApiError(400, "Complex bots should be removed automatically");
         else throw new ApiError(400, "Unrecognized category");
 
+        Cache.for(CACHE_INTEGRATIONS).clear(); // TODO: Improve which cache we invalidate
         return {}; // 200 OK
     }
 
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index 6a37bc3..bb958c4 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -13,6 +13,7 @@ import NebConfiguration from "./models/NebConfiguration";
 import NebIntegration from "./models/NebIntegration";
 import NebBotUser from "./models/NebBotUser";
 import NebNotificationUser from "./models/NebNotificationUser";
+import NebIntegrationConfig from "./models/NebIntegrationConfig";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -37,6 +38,7 @@ class _DimensionStore {
             NebIntegration,
             NebBotUser,
             NebNotificationUser,
+            NebIntegrationConfig,
         ]);
     }
 
diff --git a/src/db/NebStore.ts b/src/db/NebStore.ts
index aafabe9..45a2fe0 100644
--- a/src/db/NebStore.ts
+++ b/src/db/NebStore.ts
@@ -137,13 +137,22 @@ export class NebStore {
         const rawIntegrations = await NebStore.listEnabledNebComplexBots();
         return Promise.all(rawIntegrations.map(async i => {
             const proxy = new NebProxy(i.neb, requestingUserId);
-            const notifUserId = await proxy.getNotificationUserId(i.integration, roomId, requestingUserId);
+            const notifUserId = await proxy.getNotificationUserId(i.integration, roomId);
             const botUserId = null; // TODO: For github
-            // TODO: Get configuration
-            return new ComplexBot(i.integration, notifUserId, botUserId);
+            const botConfig = await proxy.getServiceConfiguration(i.integration, roomId);
+            return new ComplexBot(i.integration, notifUserId, botUserId, botConfig);
         }));
     }
 
+    public static async setComplexBotConfig(requestingUserId: string, type: string, roomId: string, newConfig: any): Promise<any> {
+        const rawIntegrations = await NebStore.listEnabledNebComplexBots();
+        const integration = rawIntegrations.find(i => i.integration.type === type);
+        if (!integration) throw new Error("Integration not found");
+
+        const proxy = new NebProxy(integration.neb, requestingUserId);
+        return proxy.setServiceConfiguration(integration.integration, roomId, newConfig);
+    }
+
     public static async removeSimpleBot(type: string, roomId: string, requestingUserId: string): Promise<any> {
         const rawIntegrations = await NebStore.listEnabledNebSimpleBots();
         const integration = rawIntegrations.find(i => i.integration.type === type);
diff --git a/src/db/migrations/20180326185545-AddNebIntegrationConfig.ts b/src/db/migrations/20180326185545-AddNebIntegrationConfig.ts
new file mode 100644
index 0000000..e2f6a86
--- /dev/null
+++ b/src/db/migrations/20180326185545-AddNebIntegrationConfig.ts
@@ -0,0 +1,22 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_neb_integration_config", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "integrationId": {
+                    type: DataType.INTEGER, allowNull: false,
+                    references: {model: "dimension_neb_integrations", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "roomId": {type: DataType.STRING, allowNull: false},
+                "jsonContent": {type: DataType.STRING, allowNull: false},
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.dropTable("dimension_neb_integration_config"));
+    }
+}
\ No newline at end of file
diff --git a/src/db/models/NebIntegrationConfig.ts b/src/db/models/NebIntegrationConfig.ts
new file mode 100644
index 0000000..dc6b6c9
--- /dev/null
+++ b/src/db/models/NebIntegrationConfig.ts
@@ -0,0 +1,24 @@
+import { AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import NebIntegration from "./NebIntegration";
+
+@Table({
+    tableName: "dimension_neb_integration_config",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class NebIntegrationConfig extends Model<NebIntegrationConfig> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    @ForeignKey(() => NebIntegration)
+    integrationId: string;
+
+    @Column
+    roomId: string;
+
+    @Column
+    jsonContent: string;
+}
\ No newline at end of file
diff --git a/src/integrations/ComplexBot.ts b/src/integrations/ComplexBot.ts
index 686b48e..4530ec7 100644
--- a/src/integrations/ComplexBot.ts
+++ b/src/integrations/ComplexBot.ts
@@ -2,7 +2,7 @@ import { Integration } from "./Integration";
 import NebIntegration from "../db/models/NebIntegration";
 
 export class ComplexBot extends Integration {
-    constructor(bot: NebIntegration, public notificationUserId: string, public botUserId?: string) {
+    constructor(bot: NebIntegration, public notificationUserId: string, public botUserId: string, public config: any) {
         super(bot);
         this.category = "complex-bot";
         this.requirements = [];
@@ -10,4 +10,12 @@ export class ComplexBot extends Integration {
         // Notification bots are technically supported in e2e rooms
         this.isEncryptionSupported = true;
     }
+}
+
+export interface RssBotConfiguration {
+    feeds: {
+        [url: string]: {
+            addedByUserId: string;
+        };
+    };
 }
\ No newline at end of file
diff --git a/src/models/ModularResponses.ts b/src/models/ModularResponses.ts
index 01c0720..8d18f22 100644
--- a/src/models/ModularResponses.ts
+++ b/src/models/ModularResponses.ts
@@ -1,3 +1,4 @@
 export interface ModularIntegrationInfoResponse {
     bot_user_id: string;
+    integrations?: any[];
 }
\ No newline at end of file
diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
index 18208a0..af8ae51 100644
--- a/src/neb/NebClient.ts
+++ b/src/neb/NebClient.ts
@@ -73,6 +73,7 @@ export class NebClient {
                     reject(err);
                 } else if (res.statusCode !== 200) {
                     LogService.error("NebClient", "Got status code " + res.statusCode + " while performing request");
+                    LogService.error("NebClient", res.body);
                     reject(new Error("Request error"));
                 } else {
                     resolve(res.body);
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index b83da62..f5e9137 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -9,6 +9,8 @@ import { NebClient } from "./NebClient";
 import { ModularIntegrationInfoResponse } from "../models/ModularResponses";
 import { AppserviceStore } from "../db/AppserviceStore";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
+import NebIntegrationConfig from "../db/models/NebIntegrationConfig";
+import { RssBotConfiguration } from "../integrations/ComplexBot";
 
 export class NebProxy {
     constructor(private neb: NebConfig, private requestingUserId: string) {
@@ -31,7 +33,7 @@ export class NebProxy {
         }
     }
 
-    public async getNotificationUserId(integration: NebIntegration, inRoomId: string, forUserId: string): Promise<string> {
+    public async getNotificationUserId(integration: NebIntegration, inRoomId: string): Promise<string> {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
 
         if (this.neb.upstreamId) {
@@ -45,13 +47,133 @@ export class NebProxy {
                 return null;
             }
         } else {
-            return (await NebStore.getOrCreateNotificationUser(this.neb.id, integration.type, forUserId)).appserviceUserId;
+            return (await NebStore.getOrCreateNotificationUser(this.neb.id, integration.type, this.requestingUserId)).appserviceUserId;
         }
     }
 
-    // public async getComplexBotConfiguration(integration: NebIntegration, roomId: string): Promise<any> {
-    //
-    // }
+    public async getServiceConfiguration(integration: NebIntegration, inRoomId: string): Promise<any> {
+        if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
+
+        if (this.neb.upstreamId) {
+            // TODO: Verify
+            try {
+                const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/" + NebClient.getNebType(integration.type), {
+                    room_id: inRoomId,
+                });
+
+                if (integration.type === "rss") return this.parseUpstreamRssConfiguration(response.integrations);
+                else return {};
+            } catch (err) {
+                LogService.error("NebProxy", err);
+                return {};
+            }
+        } else {
+            const serviceConfig = await NebIntegrationConfig.findOne({
+                where: {
+                    integrationId: integration.id,
+                    roomId: inRoomId,
+                },
+            });
+            return serviceConfig ? JSON.parse(serviceConfig.jsonContent) : {};
+        }
+    }
+
+    public async setServiceConfiguration(integration: NebIntegration, inRoomId: string, newConfig: any): Promise<any> {
+        if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
+
+        if (!this.neb.upstreamId) {
+            const serviceConfig = await NebIntegrationConfig.findOne({
+                where: {
+                    integrationId: integration.id,
+                    roomId: inRoomId,
+                },
+            });
+            if (serviceConfig) {
+                serviceConfig.jsonContent = JSON.stringify(newConfig);
+                await serviceConfig.save();
+            } else {
+                await NebIntegrationConfig.create({
+                    integrationId: integration.id,
+                    roomId: inRoomId,
+                    jsonContent: JSON.stringify(newConfig),
+                });
+            }
+        }
+
+        if (integration.type === "rss") await this.updateRssConfiguration(inRoomId, newConfig);
+        else throw new Error("Cannot update go-neb: unrecognized type");
+    }
+
+    private parseUpstreamRssConfiguration(integrations: any[]): any {
+        if (!integrations) return {};
+
+        const result: RssBotConfiguration = {feeds: {}};
+        for (const integration of integrations) {
+            const userId = integration.user_id;
+            const feeds = integration.config ? integration.config.feeds : {};
+            if (!userId || !feeds) continue;
+
+            const urls = Object.keys(feeds);
+            urls.forEach(u => result.feeds[u] = {addedByUserId: userId});
+        }
+
+        return result;
+    }
+
+    private async updateRssConfiguration(roomId: string, newOpts: RssBotConfiguration): Promise<any> {
+        const feedUrls = Object.keys(newOpts.feeds).filter(f => newOpts.feeds[f].addedByUserId === this.requestingUserId);
+        const newConfig = {feeds: {}};
+        let currentConfig = {feeds: {}};
+
+        if (this.neb.upstreamId) {
+            const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/rssbot", {room_id: roomId});
+            currentConfig = await this.parseUpstreamRssConfiguration(response.integrations);
+        } else {
+            const client = new NebClient(this.neb);
+            const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "rss", this.requestingUserId);
+            currentConfig = await client.getServiceConfig(notifUser.serviceId);
+
+            if (feedUrls.length === 0) {
+                const client = new MatrixAppserviceClient(await AppserviceStore.getAppservice(this.neb.appserviceId));
+                await client.leaveRoom(notifUser.appserviceUserId, roomId);
+            }
+        }
+
+        if (!currentConfig || !currentConfig.feeds) currentConfig = {feeds: {}};
+
+        const allUrls = feedUrls.concat(Object.keys(currentConfig.feeds));
+        for (const feedUrl of allUrls) {
+            let feed = currentConfig.feeds[feedUrl];
+            if (!feed) feed = {poll_interval_mins: 60, rooms: []};
+
+            const hasRoom = feed.rooms.indexOf(roomId) !== -1;
+            const isEnabled = feedUrls.indexOf(feedUrl) !== -1;
+
+            if (hasRoom && !isEnabled) {
+                feed.rooms.splice(feed.rooms.indexOf(roomId), 1);
+            } else if (!hasRoom && isEnabled) {
+                feed.rooms.push(roomId);
+            }
+
+            if (feed.rooms.length > 0) {
+                newConfig.feeds[feedUrl] = {
+                    poll_interval_mins: feed.poll_interval_mins,
+                    rooms: feed.rooms,
+                };
+            }
+        }
+
+        if (this.neb.upstreamId) {
+            await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/rssbot/configureService", {
+                room_id: roomId,
+                feeds: newConfig.feeds,
+            });
+        } else {
+            const client = new NebClient(this.neb);
+            const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "rss", this.requestingUserId);
+            await client.setServiceConfig(notifUser.serviceId, notifUser.appserviceUserId, "rssbot", newConfig);
+        }
+    }
 
     public async removeBotFromRoom(integration: NebIntegration, roomId: string): Promise<any> {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
diff --git a/web/app/configs/complex-bot/complex-bot.component.ts b/web/app/configs/complex-bot/complex-bot.component.ts
index 7f3122e..c463b98 100644
--- a/web/app/configs/complex-bot/complex-bot.component.ts
+++ b/web/app/configs/complex-bot/complex-bot.component.ts
@@ -5,6 +5,7 @@ import { Subscription } from "rxjs/Subscription";
 import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
 import { ToasterService } from "angular2-toaster";
 import { ServiceLocator } from "../../shared/registry/locator.service";
+import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
 
 export class ComplexBotComponent<T> implements OnInit, OnDestroy {
 
@@ -12,14 +13,14 @@ export class ComplexBotComponent<T> implements OnInit, OnDestroy {
     public isUpdating = false;
     public bot: FE_ComplexBot<T>;
     public newConfig: T;
-
-    private roomId: string;
+    public roomId: string;
 
     private routeQuerySubscription: Subscription;
 
     protected toaster = ServiceLocator.injector.get(ToasterService);
     protected integrationsApi = ServiceLocator.injector.get(IntegrationsApiService);
     protected route = ServiceLocator.injector.get(ActivatedRoute);
+    protected scalarClientApi = ServiceLocator.injector.get(ScalarClientApiService);
 
     constructor(private integrationType: string) {
         this.isLoading = true;
@@ -45,10 +46,25 @@ export class ComplexBotComponent<T> implements OnInit, OnDestroy {
 
         this.integrationsApi.getIntegrationInRoom("complex-bot", this.integrationType, this.roomId).then(i => {
             this.bot = <FE_ComplexBot<T>>i;
+            this.newConfig = JSON.parse(JSON.stringify(this.bot.config));
             this.isLoading = false;
         }).catch(err => {
             console.error(err);
             this.toaster.pop("error", "Failed to load configuration");
         });
     }
+
+    public save(): void {
+        this.isUpdating = true;
+        this.integrationsApi.setIntegrationConfiguration("complex-bot", this.integrationType, this.roomId, this.newConfig).then(() => {
+            this.toaster.pop("success", "Configuration updated");
+            this.bot.config = this.newConfig;
+            this.newConfig = JSON.parse(JSON.stringify(this.bot.config));
+            this.isUpdating = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Error updating configuration");
+            this.isUpdating = false;
+        });
+    }
 }
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html
index 34caaba..0ebd50e 100644
--- a/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html
+++ b/web/app/configs/complex-bot/config-screen/config-screen.complex-bot.component.html
@@ -2,20 +2,5 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!botComponent.isLoading">
-    <my-ibox>
-        <h5 class="my-ibox-title">
-            {{ botComponent.bot.displayName }} configuration
-        </h5>
-        <div class="my-ibox-content">
-            <form (submit)="botComponent.save()" novalidate name="saveForm">
-                <ng-container *ngTemplateOutlet="botParamsTemplate"></ng-container>
-
-                <div style="margin-top: 25px">
-                    <button type="submit" class="btn btn-sm btn-success" [disabled]="botComponent.isUpdating">
-                        <i class="far fa-save"></i> Save
-                    </button>
-                </div>
-            </form>
-        </div>
-    </my-ibox>
+    <ng-container *ngTemplateOutlet="botParamsTemplate"></ng-container>
 </div>
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/rss/rss.complex-bot.component.html b/web/app/configs/complex-bot/rss/rss.complex-bot.component.html
index 5607fb2..e588d65 100644
--- a/web/app/configs/complex-bot/rss/rss.complex-bot.component.html
+++ b/web/app/configs/complex-bot/rss/rss.complex-bot.component.html
@@ -1,5 +1,58 @@
 <my-complex-bot-config [botComponent]="this">
     <ng-template #botParamsTemplate>
-        <p>{{ bot | json }}</p>
+        <my-ibox>
+            <h5 class="my-ibox-title">
+                Feeds
+            </h5>
+            <div class="my-ibox-content">
+                <form (submit)="interceptSave()" novalidate name="saveForm">
+                    <table class="table table-striped table-condensed table-bordered">
+                        <thead>
+                        <tr>
+                            <th>URL</th>
+                            <th>Added by</th>
+                            <th class="actions-col">Actions</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr *ngFor="let feed of getFeeds()">
+                            <td>{{ feed.url }}</td>
+                            <td>{{ feed.addedByUserId }}</td>
+                            <td class="actions-col">
+                               <button type="button" class="btn btn-sm btn-outline-danger"
+                                       [disabled]="isUpdating || !feed.isSelf"
+                                       (click)="removeFeed(feed)">
+                                   <i class="far fa-trash-alt"></i> Remove
+                               </button>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="3">
+                                <div class="input-group input-group-sm">
+                                    <input type="text" class="form-control"
+                                           [(ngModel)]="newFeedUrl"
+                                           placeholder="https://example.org/feed.atom"
+                                           name="newFeedUrl"
+                                           title="New feed URL" />
+                                    <span class="input-group-btn">
+                                        <button type="button" class="btn btn-outline-success"
+                                                [disabled]="isUpdating"
+                                                (click)="addFeed()">
+                                            <i class="fa fa-plus"></i> Add
+                                        </button>
+                                    </span>
+                                </div>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <div style="margin-top: 25px">
+                        <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
+                            <i class="far fa-save"></i> Save
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </my-ibox>
     </ng-template>
 </my-complex-bot-config>
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/rss/rss.complex-bot.component.scss b/web/app/configs/complex-bot/rss/rss.complex-bot.component.scss
index e69de29..7c9eeab 100644
--- a/web/app/configs/complex-bot/rss/rss.complex-bot.component.scss
+++ b/web/app/configs/complex-bot/rss/rss.complex-bot.component.scss
@@ -0,0 +1,4 @@
+.actions-col {
+  width: 120px;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts b/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts
index 04587f1..0dfe578 100644
--- a/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts
+++ b/web/app/configs/complex-bot/rss/rss.complex-bot.component.ts
@@ -1,18 +1,66 @@
 import { ComplexBotComponent } from "../complex-bot.component";
 import { Component } from "@angular/core";
+import { SessionStorage } from "../../../shared/SessionStorage";
 
 interface RssConfig {
     feeds: {
-        [feedUrl: string]: {}; // No options currently
+        [feedUrl: string]: {
+            addedByUserId: string;
+        };
     };
 }
 
+interface LocalFeed {
+    url: string;
+    addedByUserId: string;
+    isSelf: boolean;
+}
+
 @Component({
     templateUrl: "rss.complex-bot.component.html",
     styleUrls: ["rss.complex-bot.component.scss"],
 })
 export class RssComplexBotConfigComponent extends ComplexBotComponent<RssConfig> {
+
+    public newFeedUrl = "";
+
     constructor() {
         super("rss");
     }
+
+    public addFeed(): void {
+        if (!this.newFeedUrl.trim()) {
+            this.toaster.pop('warning', 'Please enter a feed URL');
+            return;
+        }
+
+        this.newConfig.feeds[this.newFeedUrl] = {addedByUserId: SessionStorage.userId};
+        this.newFeedUrl = "";
+    }
+
+    public getFeeds(): LocalFeed[] {
+        if (!this.newConfig.feeds) this.newConfig.feeds = {};
+        return Object.keys(this.newConfig.feeds).map(url => {
+            return {
+                url: url,
+                addedByUserId: this.newConfig.feeds[url].addedByUserId,
+                isSelf: SessionStorage.userId === this.newConfig.feeds[url].addedByUserId,
+            };
+        });
+    }
+
+    public removeFeed(feed: LocalFeed): void {
+        delete this.newConfig.feeds[feed.url];
+    }
+
+    public async interceptSave(): Promise<any> {
+        const memberEvent = await this.scalarClientApi.getMembershipState(this.roomId, this.bot.notificationUserId);
+        const isJoined = memberEvent && memberEvent.response && ["join", "invite"].indexOf(memberEvent.response.membership) !== -1;
+
+        if (!isJoined) {
+            await this.scalarClientApi.inviteUser(this.roomId, this.bot.notificationUserId);
+        }
+
+        super.save();
+    }
 }
\ No newline at end of file
diff --git a/web/app/shared/services/integrations/integrations-api.service.ts b/web/app/shared/services/integrations/integrations-api.service.ts
index 21bd353..ecde3f4 100644
--- a/web/app/shared/services/integrations/integrations-api.service.ts
+++ b/web/app/shared/services/integrations/integrations-api.service.ts
@@ -22,6 +22,10 @@ export class IntegrationsApiService extends AuthedApi {
         return this.authedGet("/api/v1/dimension/integrations/room/" + roomId + "/integrations/" + category + "/" + type).map(r => r.json()).toPromise();
     }
 
+    public setIntegrationConfiguration(category: string, type: string, roomId: string, newConfig: any): Promise<any> {
+        return this.authedPost("/api/v1/dimension/integrations/room/" + roomId + "/integrations/" + category + "/" + type + "/config", newConfig).map(r => r.json()).toPromise();
+    }
+
     public getWidget(type: string): Promise<FE_Widget> {
         return this.getIntegration("widget", type).then(i => <FE_Widget>i);
     }

From 71de7987c6e62aa82551407bfef95a49b88c6c4d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 26 Mar 2018 21:50:19 -0600
Subject: [PATCH 095/111] Appease the linter

---
 src/neb/NebProxy.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index f5e9137..555e332 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -134,8 +134,8 @@ export class NebProxy {
             currentConfig = await client.getServiceConfig(notifUser.serviceId);
 
             if (feedUrls.length === 0) {
-                const client = new MatrixAppserviceClient(await AppserviceStore.getAppservice(this.neb.appserviceId));
-                await client.leaveRoom(notifUser.appserviceUserId, roomId);
+                const appserviceClient = new MatrixAppserviceClient(await AppserviceStore.getAppservice(this.neb.appserviceId));
+                await appserviceClient.leaveRoom(notifUser.appserviceUserId, roomId);
             }
         }
 

From 606b6d9f56f2de1aa2ad51665408c06ae0b101d2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 28 Mar 2018 22:18:33 -0600
Subject: [PATCH 096/111] Front end for travis-ci self-service management

TODO:
* Backend (needs research)
* Webhook URL (probably proxy this)
---
 web/app/app.module.ts                         |  2 +
 web/app/app.routing.ts                        | 24 ++++---
 .../travisci.complex-bot.component.html       | 62 ++++++++++++++++
 .../travisci.complex-bot.component.scss       |  9 +++
 .../travisci.complex-bot.component.ts         | 70 +++++++++++++++++++
 5 files changed, 158 insertions(+), 9 deletions(-)
 create mode 100644 web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html
 create mode 100644 web/app/configs/complex-bot/travisci/travisci.complex-bot.component.scss
 create mode 100644 web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts

diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 40620b7..128633e 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -61,6 +61,7 @@ import { AdminNebImgurConfigComponent } from "./admin/neb/config/imgur/imgur.com
 import { ConfigSimpleBotComponent } from "./configs/simple-bot/simple-bot.component";
 import { ConfigScreenComplexBotComponent } from "./configs/complex-bot/config-screen/config-screen.complex-bot.component";
 import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.complex-bot.component";
+import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisci/travisci.complex-bot.component";
 
 @NgModule({
     imports: [
@@ -116,6 +117,7 @@ import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.comp
         ConfigSimpleBotComponent,
         ConfigScreenComplexBotComponent,
         RssComplexBotConfigComponent,
+        TravisCiComplexBotConfigComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index b9083be..a47411d 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -20,6 +20,7 @@ import { AdminNebComponent } from "./admin/neb/neb.component";
 import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
 import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.complex-bot.component";
+import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisci/travisci.complex-bot.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -64,7 +65,7 @@ const routes: Routes = [
                                 path: "new/selfhosted",
                                 component: AdminAddSelfhostedNebComponent,
                                 data: {breadcrumb: "Add self-hosted go-neb", name: "Add self-hosted go-neb"},
-                            }
+                            },
                         ]
                     },
                 ],
@@ -75,37 +76,37 @@ const routes: Routes = [
                     {
                         path: "custom",
                         component: CustomWidgetConfigComponent,
-                        data: {breadcrumb: "Custom Widgets", name: "Custom Widgets"}
+                        data: {breadcrumb: "Custom Widgets", name: "Custom Widgets"},
                     },
                     {
                         path: "etherpad",
                         component: EtherpadWidgetConfigComponent,
-                        data: {breadcrumb: "Etherpad Widgets", name: "Etherpad Widgets"}
+                        data: {breadcrumb: "Etherpad Widgets", name: "Etherpad Widgets"},
                     },
                     {
                         path: "googlecalendar",
                         component: GoogleCalendarWidgetConfigComponent,
-                        data: {breadcrumb: "Google Calendar Widgets", name: "Google Calendar Widgets"}
+                        data: {breadcrumb: "Google Calendar Widgets", name: "Google Calendar Widgets"},
                     },
                     {
                         path: "googledocs",
                         component: GoogleDocsWidgetConfigComponent,
-                        data: {breadcrumb: "Google Doc Widgets", name: "Google Doc Widgets"}
+                        data: {breadcrumb: "Google Doc Widgets", name: "Google Doc Widgets"},
                     },
                     {
                         path: "jitsi",
                         component: JitsiWidgetConfigComponent,
-                        data: {breadcrumb: "Jitsi Widgets", name: "Jitsi Widgets"}
+                        data: {breadcrumb: "Jitsi Widgets", name: "Jitsi Widgets"},
                     },
                     {
                         path: "twitch",
                         component: TwitchWidgetConfigComponent,
-                        data: {breadcrumb: "Twitch Livestream Widgets", name: "Twitch Livestream Widgets"}
+                        data: {breadcrumb: "Twitch Livestream Widgets", name: "Twitch Livestream Widgets"},
                     },
                     {
                         path: "youtube",
                         component: YoutubeWidgetConfigComponent,
-                        data: {breadcrumb: "Youtube Video Widgets", name: "Youtube Video Widgets"}
+                        data: {breadcrumb: "Youtube Video Widgets", name: "Youtube Video Widgets"},
                     },
                 ],
             },
@@ -115,7 +116,12 @@ const routes: Routes = [
                     {
                         path: "rss",
                         component: RssComplexBotConfigComponent,
-                        data: {breadcrumb: "RSS Bot Configuration", name: "RSS Bot Configuration"}
+                        data: {breadcrumb: "RSS Bot Configuration", name: "RSS Bot Configuration"},
+                    },
+                    {
+                        path: "travisci",
+                        component: TravisCiComplexBotConfigComponent,
+                        data: {breadcrumb: "Travis CI Configuration", name: "Travis CI Configuration"},
                     },
                 ],
             },
diff --git a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html
new file mode 100644
index 0000000..5901432
--- /dev/null
+++ b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html
@@ -0,0 +1,62 @@
+<my-complex-bot-config [botComponent]="this">
+    <ng-template #botParamsTemplate>
+        <my-ibox>
+            <h5 class="my-ibox-title">
+                Repositories
+            </h5>
+            <div class="my-ibox-content">
+                <form (submit)="interceptSave()" novalidate name="saveForm">
+                    <table class="table table-striped table-condensed table-bordered">
+                        <thead>
+                        <tr>
+                            <th>Repository</th>
+                            <th>Template</th>
+                            <th>Added by</th>
+                            <th class="actions-col">Actions</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr *ngFor="let repo of getRepos()">
+                            <td>{{ repo.repoKey }}</td>
+                            <td>
+                                <textarea title="Repository Template" class="repo-template form-control" rows="3" (change)="repo.template = $event.target.value">{{ repo.template }}</textarea>
+                            </td>
+                            <td>{{ repo.addedByUserId }}</td>
+                            <td class="actions-col">
+                               <button type="button" class="btn btn-sm btn-outline-danger"
+                                       [disabled]="isUpdating || !repo.isSelf"
+                                       (click)="removeRepo(repo)">
+                                   <i class="far fa-trash-alt"></i> Remove
+                               </button>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="4">
+                                <div class="input-group input-group-sm">
+                                    <input type="text" class="form-control"
+                                           [(ngModel)]="newRepoKey"
+                                           placeholder="matrix-org/synapse"
+                                           name="newRepoKey"
+                                           title="New repository name" />
+                                    <span class="input-group-btn">
+                                        <button type="button" class="btn btn-outline-success"
+                                                [disabled]="isUpdating"
+                                                (click)="addRepo()">
+                                            <i class="fa fa-plus"></i> Add
+                                        </button>
+                                    </span>
+                                </div>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <div style="margin-top: 25px">
+                        <button type="submit" class="btn btn-sm btn-primary" [disabled]="isUpdating">
+                            <i class="far fa-save"></i> Save
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </my-ibox>
+    </ng-template>
+</my-complex-bot-config>
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.scss b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.scss
new file mode 100644
index 0000000..8a5c835
--- /dev/null
+++ b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.scss
@@ -0,0 +1,9 @@
+.actions-col {
+  width: 120px;
+  text-align: center;
+}
+
+.repo-template {
+  white-space: nowrap; // Force scrollbars
+  width: 100%;
+}
\ No newline at end of file
diff --git a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts
new file mode 100644
index 0000000..42fe035
--- /dev/null
+++ b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts
@@ -0,0 +1,70 @@
+import { ComplexBotComponent } from "../complex-bot.component";
+import { Component } from "@angular/core";
+import { SessionStorage } from "../../../shared/SessionStorage";
+
+interface TravisCiConfig {
+    webhookUrl: string; // TODO: Display webhook URL somewhere
+    repos: {
+        [repoKey: string]: { // "turt2live/matrix-dimension"
+            addedByUserId: string;
+            template: string;
+        };
+    };
+}
+
+interface LocalRepo {
+    repoKey: string;
+    template: string;
+    addedByUserId: string;
+    isSelf: boolean;
+}
+
+@Component({
+    templateUrl: "travisci.complex-bot.component.html",
+    styleUrls: ["travisci.complex-bot.component.scss"],
+})
+export class TravisCiComplexBotConfigComponent extends ComplexBotComponent<TravisCiConfig> {
+
+    public newRepoKey = "";
+
+    constructor() {
+        super("travisci");
+    }
+
+    public addRepo(): void {
+        if (!this.newRepoKey.trim()) {
+            this.toaster.pop('warning', 'Please enter a repository');
+            return;
+        }
+
+        this.newConfig.repos[this.newRepoKey] = {addedByUserId: SessionStorage.userId, template: "TODO: Default template"};
+        this.newRepoKey = "";
+    }
+
+    public getRepos(): LocalRepo[] {
+        if (!this.newConfig.repos) this.newConfig.repos = {};
+        return Object.keys(this.newConfig.repos).map(r => {
+            return {
+                repoKey: r,
+                template: this.newConfig.repos[r].template,
+                addedByUserId: this.newConfig.repos[r].addedByUserId,
+                isSelf: SessionStorage.userId === this.newConfig.repos[r].addedByUserId,
+            };
+        });
+    }
+
+    public removeRepo(repo: LocalRepo): void {
+        delete this.newConfig.repos[repo.repoKey];
+    }
+
+    public async interceptSave(): Promise<any> {
+        const memberEvent = await this.scalarClientApi.getMembershipState(this.roomId, this.bot.notificationUserId);
+        const isJoined = memberEvent && memberEvent.response && ["join", "invite"].indexOf(memberEvent.response.membership) !== -1;
+
+        if (!isJoined) {
+            await this.scalarClientApi.inviteUser(this.roomId, this.bot.notificationUserId);
+        }
+
+        super.save();
+    }
+}
\ No newline at end of file

From 3a8167a57ae446c59091e414a4626a39c4af55a3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 29 Mar 2018 20:51:49 -0600
Subject: [PATCH 097/111] Support saving of travis-ci configuration

For both upstream and self-hosted. What's left is:
* Webhooks (magic proxy through Dimension)
* More instructions on the frontend.
---
 src/integrations/ComplexBot.ts | 10 ++++
 src/neb/NebProxy.ts            | 86 ++++++++++++++++++++++++++++++++--
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/src/integrations/ComplexBot.ts b/src/integrations/ComplexBot.ts
index 4530ec7..51c0096 100644
--- a/src/integrations/ComplexBot.ts
+++ b/src/integrations/ComplexBot.ts
@@ -18,4 +18,14 @@ export interface RssBotConfiguration {
             addedByUserId: string;
         };
     };
+}
+
+export interface TravisCiConfiguration {
+    webhookUrl: string;
+    repos: {
+        [repoKey: string]: {
+            addedByUserId: string;
+            template: string;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index 555e332..8ef4f18 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -10,7 +10,18 @@ import { ModularIntegrationInfoResponse } from "../models/ModularResponses";
 import { AppserviceStore } from "../db/AppserviceStore";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
 import NebIntegrationConfig from "../db/models/NebIntegrationConfig";
-import { RssBotConfiguration } from "../integrations/ComplexBot";
+import { RssBotConfiguration, TravisCiConfiguration } from "../integrations/ComplexBot";
+
+interface InternalTravisCiConfig {
+    webhookUrl: string;
+    rooms: {
+        [roomId: string]: {
+            [repoKey: string]: {
+                template: string;
+            };
+        };
+    };
+}
 
 export class NebProxy {
     constructor(private neb: NebConfig, private requestingUserId: string) {
@@ -55,13 +66,13 @@ export class NebProxy {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
 
         if (this.neb.upstreamId) {
-            // TODO: Verify
             try {
                 const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/" + NebClient.getNebType(integration.type), {
                     room_id: inRoomId,
                 });
 
                 if (integration.type === "rss") return this.parseUpstreamRssConfiguration(response.integrations);
+                else if (integration.type === "travisci") return this.parseUpstreamTravisCiConfiguration(response.integrations);
                 else return {};
             } catch (err) {
                 LogService.error("NebProxy", err);
@@ -101,11 +112,12 @@ export class NebProxy {
         }
 
         if (integration.type === "rss") await this.updateRssConfiguration(inRoomId, newConfig);
+        else if (integration.type === "travisci") await this.updateTravisCiConfiguration(inRoomId, newConfig);
         else throw new Error("Cannot update go-neb: unrecognized type");
     }
 
-    private parseUpstreamRssConfiguration(integrations: any[]): any {
-        if (!integrations) return {};
+    private parseUpstreamRssConfiguration(integrations: any[]): RssBotConfiguration {
+        if (!integrations) return {feeds: {}};
 
         const result: RssBotConfiguration = {feeds: {}};
         for (const integration of integrations) {
@@ -120,6 +132,33 @@ export class NebProxy {
         return result;
     }
 
+    private parseUpstreamTravisCiConfiguration(integrations: any[]): InternalTravisCiConfig {
+        if (!integrations) return {rooms: {}, webhookUrl: null};
+
+        const result: InternalTravisCiConfig = {rooms: {}, webhookUrl: "https://example.org/nowhere"};
+        for (const integration of integrations) {
+            if (!integration.user_id || !integration.config || !integration.config.rooms) continue;
+
+            const userId = integration.user_id;
+            if (userId === this.requestingUserId && integration.config.webhook_url && !result.webhookUrl)
+                result.webhookUrl = integration.config.webhook_url;
+
+            const roomIds = Object.keys(integration.config.rooms);
+            for (const roomId of roomIds) {
+                if (!result.rooms[roomId]) result.rooms[roomId] = {};
+
+                const repoKeys = Object.keys(integration.config.rooms[roomId].repos || {});
+                for (const repoKey of repoKeys) {
+                    result.rooms[roomId][repoKey] = {
+                        template: integration.config.rooms[roomId].repos[repoKey].template,
+                    };
+                }
+            }
+        }
+
+        return result;
+    }
+
     private async updateRssConfiguration(roomId: string, newOpts: RssBotConfiguration): Promise<any> {
         const feedUrls = Object.keys(newOpts.feeds).filter(f => newOpts.feeds[f].addedByUserId === this.requestingUserId);
         const newConfig = {feeds: {}};
@@ -175,6 +214,44 @@ export class NebProxy {
         }
     }
 
+    private async updateTravisCiConfiguration(roomId: string, newOpts: TravisCiConfiguration): Promise<any> {
+        const repoKeys = Object.keys(newOpts.repos).filter(f => newOpts.repos[f].addedByUserId === this.requestingUserId);
+        let newConfig = {rooms: {}};
+
+        if (!this.neb.upstreamId) {
+            if (repoKeys.length === 0) {
+                const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
+                const appserviceClient = new MatrixAppserviceClient(await AppserviceStore.getAppservice(this.neb.appserviceId));
+                await appserviceClient.leaveRoom(notifUser.appserviceUserId, roomId);
+            }
+
+            const client = new NebClient(this.neb);
+            const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
+            newConfig = await client.getServiceConfig(notifUser.serviceId); // So we don't accidentally clear other rooms
+        }
+
+        // Reset the current room's configuration so we don't keep artifacts.
+        newConfig.rooms[roomId] = {repos: {}};
+        const roomReposConf = newConfig.rooms[roomId].repos;
+
+        for (const repoKey of repoKeys) {
+            roomReposConf[repoKey] = {
+                template: newOpts.repos[repoKey].template,
+            };
+        }
+
+        if (this.neb.upstreamId) {
+            await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/travis-ci/configureService", {
+                room_id: roomId,
+                rooms: newConfig.rooms,
+            });
+        } else {
+            const client = new NebClient(this.neb);
+            const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
+            await client.setServiceConfig(notifUser.serviceId, notifUser.appserviceUserId, "travis-ci", newConfig);
+        }
+    }
+
     public async removeBotFromRoom(integration: NebIntegration, roomId: string): Promise<any> {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
 
@@ -213,6 +290,7 @@ export class NebProxy {
                     reject(err);
                 } else if (res.statusCode !== 200) {
                     LogService.error("NebProxy", "Got status code " + res.statusCode + " when calling " + url);
+                    LogService.error("NebProxy", res.body);
                     reject(new Error("Request failed"));
                 } else {
                     if (typeof(res.body) === "string") res.body = JSON.parse(res.body);

From 6f238fc13ff4ac3a344312fe12b819230ddaa549 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 29 Mar 2018 20:56:08 -0600
Subject: [PATCH 098/111] Appease the linter

by actually making the code better
---
 src/neb/NebProxy.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index 8ef4f18..4d6e93b 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -219,15 +219,14 @@ export class NebProxy {
         let newConfig = {rooms: {}};
 
         if (!this.neb.upstreamId) {
+            const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
+            const client = new NebClient(this.neb);
+            newConfig = await client.getServiceConfig(notifUser.serviceId); // So we don't accidentally clear other rooms
+
             if (repoKeys.length === 0) {
-                const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
                 const appserviceClient = new MatrixAppserviceClient(await AppserviceStore.getAppservice(this.neb.appserviceId));
                 await appserviceClient.leaveRoom(notifUser.appserviceUserId, roomId);
             }
-
-            const client = new NebClient(this.neb);
-            const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
-            newConfig = await client.getServiceConfig(notifUser.serviceId); // So we don't accidentally clear other rooms
         }
 
         // Reset the current room's configuration so we don't keep artifacts.

From 4365cb0753233d7a7d2bfc773c143feaf34b295c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 30 Mar 2018 14:59:25 -0600
Subject: [PATCH 099/111] Support Travis CI completely

Webhooks are generated eagerly but have lazily set targets so that we can give the user a webhook URL to set in their config. go-neb (upstream & standalone) doesn't give a webhook URL until after the repositories are configured.

Fixes #16
---
 src/api/dimension/DimensionWebhookService.ts  | 35 ++++++++++
 src/db/DimensionStore.ts                      |  2 +
 .../migrations/20180330111645-AddWebhooks.ts  | 22 +++++++
 src/db/models/Webhook.ts                      | 25 +++++++
 src/integrations/ComplexBot.ts                |  2 +-
 src/neb/NebProxy.ts                           | 65 ++++++++++++++++---
 src/temp_todo.txt                             |  2 -
 .../travisci.complex-bot.component.html       | 33 +++++++++-
 .../travisci.complex-bot.component.ts         | 27 +++++++-
 9 files changed, 199 insertions(+), 14 deletions(-)
 create mode 100644 src/api/dimension/DimensionWebhookService.ts
 create mode 100644 src/db/migrations/20180330111645-AddWebhooks.ts
 create mode 100644 src/db/models/Webhook.ts

diff --git a/src/api/dimension/DimensionWebhookService.ts b/src/api/dimension/DimensionWebhookService.ts
new file mode 100644
index 0000000..06a2028
--- /dev/null
+++ b/src/api/dimension/DimensionWebhookService.ts
@@ -0,0 +1,35 @@
+import { FormParam, HeaderParam, Path, PathParam, POST } from "typescript-rest";
+import Webhook from "../../db/models/Webhook";
+import { ApiError } from "../ApiError";
+import * as request from "request";
+import { LogService } from "matrix-js-snippets";
+
+@Path("/api/v1/dimension/webhooks")
+export class DimensionWebhookService {
+
+    @POST
+    @Path("/travisci/:webhookId")
+    public async postTravisCiWebhook(@PathParam("webhookId") webhookId: string, @FormParam("payload") payload: string, @HeaderParam("Signature") signature: string): Promise<any> {
+        const webhook = await Webhook.findByPrimary(webhookId).catch(() => null);
+        if (!webhook) throw new ApiError(404, "Webhook not found");
+        if (!webhook.targetUrl) throw new ApiError(400, "Webhook not configured");
+
+        return new Promise((resolve, _reject) => {
+            request({
+                method: "POST",
+                url: webhook.targetUrl,
+                form: {payload: payload},
+                headers: {
+                    "Signature": signature,
+                },
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("DimensionWebhooksService", "Error invoking travis-ci webhook");
+                    LogService.error("DimensionWebhooksService", res.body);
+
+                    throw new ApiError(500, "Internal Server Error");
+                } else resolve();
+            });
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index bb958c4..a8bf4d6 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -14,6 +14,7 @@ import NebIntegration from "./models/NebIntegration";
 import NebBotUser from "./models/NebBotUser";
 import NebNotificationUser from "./models/NebNotificationUser";
 import NebIntegrationConfig from "./models/NebIntegrationConfig";
+import Webhook from "./models/Webhook";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -39,6 +40,7 @@ class _DimensionStore {
             NebBotUser,
             NebNotificationUser,
             NebIntegrationConfig,
+            Webhook,
         ]);
     }
 
diff --git a/src/db/migrations/20180330111645-AddWebhooks.ts b/src/db/migrations/20180330111645-AddWebhooks.ts
new file mode 100644
index 0000000..d057373
--- /dev/null
+++ b/src/db/migrations/20180330111645-AddWebhooks.ts
@@ -0,0 +1,22 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_webhooks", {
+                "hookId": {type: DataType.STRING, primaryKey: true, allowNull: false},
+                "ownerUserId": {
+                    type: DataType.STRING, allowNull: false,
+                    references: {model: "dimension_users", key: "userId"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "purposeId": {type: DataType.STRING, allowNull: false},
+                "targetUrl": {type: DataType.STRING, allowNull: true},
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.dropTable("dimension_webhooks"));
+    }
+}
\ No newline at end of file
diff --git a/src/db/models/Webhook.ts b/src/db/models/Webhook.ts
new file mode 100644
index 0000000..cbfcd16
--- /dev/null
+++ b/src/db/models/Webhook.ts
@@ -0,0 +1,25 @@
+import { Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import User from "./User";
+
+@Table({
+    tableName: "dimension_webhooks",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class Webhook extends Model<Webhook> {
+    // This is really just a holding class to keep foreign keys alive
+
+    @PrimaryKey
+    @Column
+    hookId: string;
+
+    @Column
+    @ForeignKey(() => User)
+    ownerUserId: string;
+
+    @Column
+    purposeId: string;
+
+    @Column
+    targetUrl: string;
+}
\ No newline at end of file
diff --git a/src/integrations/ComplexBot.ts b/src/integrations/ComplexBot.ts
index 51c0096..27d1792 100644
--- a/src/integrations/ComplexBot.ts
+++ b/src/integrations/ComplexBot.ts
@@ -21,7 +21,7 @@ export interface RssBotConfiguration {
 }
 
 export interface TravisCiConfiguration {
-    webhookUrl: string;
+    webhookId: string;
     repos: {
         [repoKey: string]: {
             addedByUserId: string;
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index 4d6e93b..9a8f8b7 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -11,6 +11,8 @@ import { AppserviceStore } from "../db/AppserviceStore";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
 import NebIntegrationConfig from "../db/models/NebIntegrationConfig";
 import { RssBotConfiguration, TravisCiConfiguration } from "../integrations/ComplexBot";
+import Webhook from "../db/models/Webhook";
+import * as randomString from "random-string";
 
 interface InternalTravisCiConfig {
     webhookUrl: string;
@@ -65,18 +67,17 @@ export class NebProxy {
     public async getServiceConfiguration(integration: NebIntegration, inRoomId: string): Promise<any> {
         if (integration.nebId !== this.neb.id) throw new Error("Integration is not for this NEB proxy");
 
+        let result = null;
         if (this.neb.upstreamId) {
             try {
                 const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/" + NebClient.getNebType(integration.type), {
                     room_id: inRoomId,
                 });
 
-                if (integration.type === "rss") return this.parseUpstreamRssConfiguration(response.integrations);
-                else if (integration.type === "travisci") return this.parseUpstreamTravisCiConfiguration(response.integrations);
-                else return {};
+                if (integration.type === "rss") result = await this.parseUpstreamRssConfiguration(response.integrations);
+                else if (integration.type === "travisci") result = await this.parseUpstreamTravisCiConfiguration(response.integrations);
             } catch (err) {
                 LogService.error("NebProxy", err);
-                return {};
             }
         } else {
             const serviceConfig = await NebIntegrationConfig.findOne({
@@ -85,8 +86,17 @@ export class NebProxy {
                     roomId: inRoomId,
                 },
             });
-            return serviceConfig ? JSON.parse(serviceConfig.jsonContent) : {};
+            result = serviceConfig ? JSON.parse(serviceConfig.jsonContent) : {};
         }
+
+        if (!result) result = {};
+        if (integration.type === "travisci") {
+            // Replace the webhook ID with the requesting user's webhook ID (generating it if needed)
+            result["webhookId"] = await this.getWebhookId(integration.type);
+            delete result["webhook_url"];
+        }
+
+        return result;
     }
 
     public async setServiceConfiguration(integration: NebIntegration, inRoomId: string, newConfig: any): Promise<any> {
@@ -135,7 +145,7 @@ export class NebProxy {
     private parseUpstreamTravisCiConfiguration(integrations: any[]): InternalTravisCiConfig {
         if (!integrations) return {rooms: {}, webhookUrl: null};
 
-        const result: InternalTravisCiConfig = {rooms: {}, webhookUrl: "https://example.org/nowhere"};
+        const result: InternalTravisCiConfig = {rooms: {}, webhookUrl: null};
         for (const integration of integrations) {
             if (!integration.user_id || !integration.config || !integration.config.rooms) continue;
 
@@ -240,14 +250,24 @@ export class NebProxy {
         }
 
         if (this.neb.upstreamId) {
-            await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/travis-ci/configureService", {
+            await this.doUpstreamRequest("/integrations/travis-ci/configureService", {
                 room_id: roomId,
                 rooms: newConfig.rooms,
             });
+
+            // Annoyingly, we don't get any kind of feedback for the webhook - we have to re-request it
+            const response = await this.doUpstreamRequest<ModularIntegrationInfoResponse>("/integrations/travis-ci", {
+                room_id: roomId,
+            });
+            const parsed = this.parseUpstreamTravisCiConfiguration(response.integrations);
+            if (parsed && parsed.webhookUrl)
+                await this.setWebhookTarget("travisci", parsed.webhookUrl);
         } else {
             const client = new NebClient(this.neb);
             const notifUser = await NebStore.getOrCreateNotificationUser(this.neb.id, "travisci", this.requestingUserId);
-            await client.setServiceConfig(notifUser.serviceId, notifUser.appserviceUserId, "travis-ci", newConfig);
+            const result = await client.setServiceConfig(notifUser.serviceId, notifUser.appserviceUserId, "travis-ci", newConfig);
+            if (result['NewConfig'] && result['NewConfig']['webhook_url'])
+                await this.setWebhookTarget("travisci", result['NewConfig']['webhook_url']);
         }
     }
 
@@ -263,6 +283,35 @@ export class NebProxy {
         }
     }
 
+    private async getWebhookId(serviceId: string): Promise<string> {
+        // We add a bit of uniqueness to the service ID to avoid conflicts
+        serviceId = serviceId + "_" + this.neb.id;
+
+        let webhook = await Webhook.findOne({
+            where: {
+                purposeId: serviceId,
+                ownerUserId: this.requestingUserId
+            }
+        }).catch(() => null);
+        if (!webhook) {
+            webhook = await Webhook.create({
+                hookId: randomString({length: 160}),
+                ownerUserId: this.requestingUserId,
+                purposeId: serviceId,
+                targetUrl: null, // Will be populated later
+            });
+        }
+
+        return webhook.hookId;
+    }
+
+    private async setWebhookTarget(serviceId: string, targetUrl: string): Promise<any> {
+        const webhookId = await this.getWebhookId(serviceId);
+        const webhook = await Webhook.findByPrimary(webhookId);
+        webhook.targetUrl = targetUrl;
+        return webhook.save();
+    }
+
     private async doUpstreamRequest<T>(endpoint: string, body?: any): Promise<T> {
         const upstream = await Upstream.findByPrimary(this.neb.upstreamId);
         const token = await UserScalarToken.findOne({
diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index c69e768..42714b4 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -1,6 +1,4 @@
 Release checklist:
-* RSS bot
-* Travis CI
 * IRC Bridge
 * Update documentation
 * Configuration migration (if possible)
diff --git a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html
index 5901432..9b75dc5 100644
--- a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html
+++ b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.html
@@ -1,5 +1,36 @@
 <my-complex-bot-config [botComponent]="this">
     <ng-template #botParamsTemplate>
+        <my-ibox [isCollapsible]="true">
+            <h5 class="my-ibox-title">
+                .travis.yml configuration and template information
+            </h5>
+            <div class="my-ibox-content">
+                <p>The following section needs to be added to your <code>.travis.yml</code> file in your repositories:</p>
+                <pre>{{ travisYaml }}</pre>
+
+                <p>
+                    The following variables can be used in your template. This template is used to post a message to the
+                    room when your webhook is activated.
+                </p>
+                <ul>
+                    <li><code>{{ '%{repository_slug}' }}</code> - The repository identifier (eg: "matrix-org/synapse")</li>
+                    <li><code>{{ '%{repository_name}' }}</code> - The repository name (eg: "synapse")</li>
+                    <li><code>{{ '%{build_number}' }}</code> - The build number</li>
+                    <li><code>{{ '%{build_id}' }}</code> - The build ID</li>
+                    <li><code>{{ '%{branch}' }}</code> - The branch name</li>
+                    <li><code>{{ '%{commit}' }}</code> - A short version of the commit SHA</li>
+                    <li><code>{{ '%{commit_subject}' }}</code> - The first line of the commit message</li>
+                    <li><code>{{ '%{commit_message}' }}</code> - The full commit message</li>
+                    <li><code>{{ '%{author}' }}</code> - The author of the commit</li>
+                    <li><code>{{ '%{result}' }}</code> - The result of the build</li>
+                    <li><code>{{ '%{message}' }}</code> - The message from Travis CI about the build</li>
+                    <li><code>{{ '%{duration}' }}</code> - The total duration of all builds in the matrix</li>
+                    <li><code>{{ '%{elapsed_timed}' }}</code> - The time it took to run the build</li>
+                    <li><code>{{ '%{compare_url}' }}</code> - A URL to see the changes which triggered the build</li>
+                    <li><code>{{ '%{build_url}' }}</code> - A URL to see the build information</li>
+                </ul>
+            </div>
+        </my-ibox>
         <my-ibox>
             <h5 class="my-ibox-title">
                 Repositories
@@ -19,7 +50,7 @@
                         <tr *ngFor="let repo of getRepos()">
                             <td>{{ repo.repoKey }}</td>
                             <td>
-                                <textarea title="Repository Template" class="repo-template form-control" rows="3" (change)="repo.template = $event.target.value">{{ repo.template }}</textarea>
+                                <textarea title="Repository Template" class="repo-template form-control" rows="3" (change)="repo.template = $event.target.value" [disabled]="isUpdating || !repo.isSelf">{{ repo.template }}</textarea>
                             </td>
                             <td>{{ repo.addedByUserId }}</td>
                             <td class="actions-col">
diff --git a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts
index 42fe035..e655a12 100644
--- a/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts
+++ b/web/app/configs/complex-bot/travisci/travisci.complex-bot.component.ts
@@ -3,7 +3,7 @@ import { Component } from "@angular/core";
 import { SessionStorage } from "../../../shared/SessionStorage";
 
 interface TravisCiConfig {
-    webhookUrl: string; // TODO: Display webhook URL somewhere
+    webhookId: string;
     repos: {
         [repoKey: string]: { // "turt2live/matrix-dimension"
             addedByUserId: string;
@@ -31,13 +31,36 @@ export class TravisCiComplexBotConfigComponent extends ComplexBotComponent<Travi
         super("travisci");
     }
 
+    public get webhookUrl(): string {
+        if (!this.newConfig) return "not specified";
+
+        return window.location.origin + "/api/v1/dimension/webhooks/travisci/" + this.newConfig.webhookId;
+    }
+
+    public get travisYaml(): string {
+        return "" +
+            "notifications:\n" +
+            "  webhooks:\n" +
+            "    urls:\n" +
+            "      - " + this.webhookUrl + "\n" +
+            "    on_success: change  # always | never | change\n" +
+            "    on_failure: always\n" +
+            "    on_start: never\n";
+    }
+
     public addRepo(): void {
         if (!this.newRepoKey.trim()) {
             this.toaster.pop('warning', 'Please enter a repository');
             return;
         }
 
-        this.newConfig.repos[this.newRepoKey] = {addedByUserId: SessionStorage.userId, template: "TODO: Default template"};
+        this.newConfig.repos[this.newRepoKey] = {
+            addedByUserId: SessionStorage.userId,
+            template: "" +
+            "%{repository_slug}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}\n" +
+            "    Change view : %{compare_url}\n" +
+            "    Build details : %{build_url}\n"
+        };
         this.newRepoKey = "";
     }
 

From 39a71429f30eac508f68c5450d71f448f6c2f828 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 30 Mar 2018 15:17:39 -0600
Subject: [PATCH 100/111] Add documentation for the backend APIs

---
 src/api/ApiError.ts                           | 26 +++++++++++++++++--
 src/api/Webserver.ts                          |  8 +++++-
 src/api/admin/AdminAppserviceService.ts       |  3 +++
 src/api/admin/AdminIntegrationsService.ts     |  4 +++
 src/api/admin/AdminNebService.ts              |  3 +++
 src/api/admin/AdminService.ts                 | 15 +++++++++++
 src/api/admin/AdminUpstreamService.ts         |  4 +++
 src/api/dimension/DimensionHealthService.ts   |  3 +++
 .../dimension/DimensionIntegrationsService.ts | 19 ++++++++++++++
 src/api/dimension/DimensionWebhookService.ts  |  3 +++
 src/api/matrix/MatrixAppServiceApiService.ts  |  3 +++
 src/api/scalar/ScalarService.ts               | 11 ++++++++
 src/api/scalar/ScalarWidgetService.ts         |  3 +++
 13 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/src/api/ApiError.ts b/src/api/ApiError.ts
index 1df7964..46db457 100644
--- a/src/api/ApiError.ts
+++ b/src/api/ApiError.ts
@@ -1,10 +1,32 @@
+/**
+ * Thrown when there is a problem with a given API call. This is special-cased in the responder
+ * to create a JSON error response with the status code given.
+ */
 export class ApiError {
 
+    /**
+     * The HTTP status code to return
+     */
     public statusCode: number;
-    public jsonResponse: any;
+
+    /**
+     * An object to be returned as JSON to the caller
+     */
+    public jsonResponse: object;
+
+    /**
+     * The internal error code to describe what went wrong
+     */
     public errorCode: string;
 
-    constructor(statusCode: number, json: any, errCode = "D_UNKNOWN") {
+    /**
+     * Creates a new API error
+     * @param {number} statusCode The HTTP status code to return
+     * @param {string|object} json An object to be returned as JSON or a message to be returned (which is
+     * then converted to JSON as {message: "your_message"})
+     * @param {string} errCode The internal error code to describe what went wrong
+     */
+    constructor(statusCode: number, json: string | object, errCode = "D_UNKNOWN") {
         // Because typescript is just plain dumb
         // https://stackoverflow.com/questions/31626231/custom-error-class-in-typescript
         Error.apply(this, ["ApiError"]);
diff --git a/src/api/Webserver.ts b/src/api/Webserver.ts
index 61729fd..2394706 100644
--- a/src/api/Webserver.ts
+++ b/src/api/Webserver.ts
@@ -8,6 +8,9 @@ import * as _ from "lodash";
 import config from "../config";
 import { ApiError } from "./ApiError";
 
+/**
+ * Web server for Dimension. Handles the API routes for the admin, scalar, dimension, and matrix APIs.
+ */
 export default class Webserver {
 
     private app: express.Application;
@@ -69,7 +72,10 @@ export default class Webserver {
         });
     }
 
-    start() {
+    /**
+     * Starts the webserver, bootstrapping the various API handlers
+     */
+    public start() {
         this.app.listen(config.web.port, config.web.address);
         LogService.info("Webserver", "API and UI listening on " + config.web.address + ":" + config.web.port);
     }
diff --git a/src/api/admin/AdminAppserviceService.ts b/src/api/admin/AdminAppserviceService.ts
index 16aac81..ad4ca05 100644
--- a/src/api/admin/AdminAppserviceService.ts
+++ b/src/api/admin/AdminAppserviceService.ts
@@ -17,6 +17,9 @@ interface AppserviceCreateRequest {
     userPrefix: string;
 }
 
+/**
+ * Administrative API for managing the appservices that Dimension operates.
+ */
 @Path("/api/v1/dimension/admin/appservices")
 export class AdminAppserviceService {
 
diff --git a/src/api/admin/AdminIntegrationsService.ts b/src/api/admin/AdminIntegrationsService.ts
index 47beddd..402172e 100644
--- a/src/api/admin/AdminIntegrationsService.ts
+++ b/src/api/admin/AdminIntegrationsService.ts
@@ -14,6 +14,10 @@ interface SetOptionsRequest {
     options: any;
 }
 
+/**
+ * Administrative API for managing the integrations for Dimension. This is to enable/disable integrations
+ * and set basic options. See the NEB APIs for configuring go-neb instances.
+ */
 @Path("/api/v1/dimension/admin/integrations")
 export class AdminIntegrationsService {
 
diff --git a/src/api/admin/AdminNebService.ts b/src/api/admin/AdminNebService.ts
index 06d1911..81e8bb5 100644
--- a/src/api/admin/AdminNebService.ts
+++ b/src/api/admin/AdminNebService.ts
@@ -20,6 +20,9 @@ interface SetEnabledRequest {
 }
 
 
+/**
+ * Administrative API for configuring go-neb instances.
+ */
 @Path("/api/v1/dimension/admin/neb")
 export class AdminNebService {
 
diff --git a/src/api/admin/AdminService.ts b/src/api/admin/AdminService.ts
index 1652358..6564273 100644
--- a/src/api/admin/AdminService.ts
+++ b/src/api/admin/AdminService.ts
@@ -21,13 +21,28 @@ interface DimensionConfigResponse {
     };
 }
 
+/**
+ * Administrative API for general information about Dimension
+ */
 @Path("/api/v1/dimension/admin")
 export class AdminService {
 
+    /**
+     * Determines if a given user is an administrator
+     * @param {string} userId The user ID to validate
+     * @returns {boolean} True if the user is an administrator
+     */
     public static isAdmin(userId: string) {
         return config.admins.indexOf(userId) >= 0;
     }
 
+    /**
+     * Validates the given scalar token to ensure the owner is an administrator. If the
+     * given scalar token does not belong to an administrator, an ApiError is raised.
+     * @param {string} scalarToken The scalar token to validate
+     * @returns {Promise<string>} Resolves to the owner's user ID if they are an administrator
+     * @throws {ApiError} Thrown with a status code of 401 if the owner is not an administrator
+     */
     public static async validateAndGetAdminTokenOwner(scalarToken: string): Promise<string> {
         const userId = await ScalarService.getTokenOwner(scalarToken, true);
         if (!AdminService.isAdmin(userId))
diff --git a/src/api/admin/AdminUpstreamService.ts b/src/api/admin/AdminUpstreamService.ts
index ea9ca6e..36ab43d 100644
--- a/src/api/admin/AdminUpstreamService.ts
+++ b/src/api/admin/AdminUpstreamService.ts
@@ -18,6 +18,10 @@ interface NewUpstreamRequest {
     apiUrl: string;
 }
 
+/**
+ * Administrative API for managing the instances upstream of this instance. Particularly
+ * useful for configuring the Modular upstream.
+ */
 @Path("/api/v1/dimension/admin/upstreams")
 export class AdminUpstreamService {
 
diff --git a/src/api/dimension/DimensionHealthService.ts b/src/api/dimension/DimensionHealthService.ts
index 154600c..00cf8c7 100644
--- a/src/api/dimension/DimensionHealthService.ts
+++ b/src/api/dimension/DimensionHealthService.ts
@@ -1,5 +1,8 @@
 import { GET, Path } from "typescript-rest";
 
+/**
+ * API for the health of Dimension
+ */
 @Path("/api/v1/dimension/health")
 export class DimensionHealthService {
 
diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 0589360..92bb6d2 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -15,9 +15,17 @@ export interface IntegrationsResponse {
     complexBots: ComplexBot[],
 }
 
+/**
+ * API for managing integrations, primarily for a given room
+ */
 @Path("/api/v1/dimension/integrations")
 export class DimensionIntegrationsService {
 
+    /**
+     * Gets a list of widgets
+     * @param {boolean} enabledOnly True to only return the enabled widgets
+     * @returns {Promise<Widget[]>} Resolves to the widget list
+     */
     public static async getWidgets(enabledOnly: boolean): Promise<Widget[]> {
         const cached = Cache.for(CACHE_INTEGRATIONS).get("widgets");
         if (cached) return cached;
@@ -27,6 +35,11 @@ export class DimensionIntegrationsService {
         return widgets;
     }
 
+    /**
+     * Gets a list of simple bots
+     * @param {string} userId The requesting user ID
+     * @returns {Promise<SimpleBot[]>} Resolves to the simple bot list
+     */
     public static async getSimpleBots(userId: string): Promise<SimpleBot[]> {
         const cached = Cache.for(CACHE_INTEGRATIONS).get("simple_bots");
         if (cached) return cached;
@@ -36,6 +49,12 @@ export class DimensionIntegrationsService {
         return bots;
     }
 
+    /**
+     * Gets a list of complex bots
+     * @param {string} userId The requesting user ID
+     * @param {string} roomId The room ID to get the complex bots for
+     * @returns {Promise<ComplexBot[]>} Resolves to the complex bot list
+     */
     public static async getComplexBots(userId: string, roomId: string): Promise<ComplexBot[]> {
         const cached = Cache.for(CACHE_INTEGRATIONS).get("complex_bots_" + roomId);
         if (cached) return cached;
diff --git a/src/api/dimension/DimensionWebhookService.ts b/src/api/dimension/DimensionWebhookService.ts
index 06a2028..cfc8171 100644
--- a/src/api/dimension/DimensionWebhookService.ts
+++ b/src/api/dimension/DimensionWebhookService.ts
@@ -4,6 +4,9 @@ import { ApiError } from "../ApiError";
 import * as request from "request";
 import { LogService } from "matrix-js-snippets";
 
+/**
+ * API for proxying webhooks to other services.
+ */
 @Path("/api/v1/dimension/webhooks")
 export class DimensionWebhookService {
 
diff --git a/src/api/matrix/MatrixAppServiceApiService.ts b/src/api/matrix/MatrixAppServiceApiService.ts
index 417b121..b232fae 100644
--- a/src/api/matrix/MatrixAppServiceApiService.ts
+++ b/src/api/matrix/MatrixAppServiceApiService.ts
@@ -8,6 +8,9 @@ interface AppServiceTransaction {
     events: SimplifiedMatrixEvent[];
 }
 
+/**
+ * API for handling appservice traffic from a homeserver
+ */
 // Note: There's no actual defined prefix for this API. The following was chosen to be
 // somewhat consistent with the other matrix APIs. In reality, the homeserver will just
 // hit the URL given in the registration - be sure to define it to match this prefix.
diff --git a/src/api/scalar/ScalarService.ts b/src/api/scalar/ScalarService.ts
index 1bc429b..ff6be08 100644
--- a/src/api/scalar/ScalarService.ts
+++ b/src/api/scalar/ScalarService.ts
@@ -19,9 +19,20 @@ interface RegisterRequest {
     expires_in: number;
 }
 
+/**
+ * API for the minimum Scalar API we need to implement to be compatible with clients. Used for registration
+ * and general account management.
+ */
 @Path("/api/v1/scalar")
 export class ScalarService {
 
+    /**
+     * Gets the owner of a given scalar token, throwing an ApiError if the token is invalid.
+     * @param {string} scalarToken The scalar token to validate
+     * @param {boolean} ignoreUpstreams True to consider the token valid if it is missing links to other upstreams
+     * @returns {Promise<string>} Resolves to the owner's user ID if the token is valid.
+     * @throws {ApiError} Thrown with a status code of 401 if the token is invalid.
+     */
     public static async getTokenOwner(scalarToken: string, ignoreUpstreams?: boolean): Promise<string> {
         const cachedUserId = Cache.for(CACHE_SCALAR_ACCOUNTS).get(scalarToken);
         if (cachedUserId) return cachedUserId;
diff --git a/src/api/scalar/ScalarWidgetService.ts b/src/api/scalar/ScalarWidgetService.ts
index ef3c6d3..7de17e9 100644
--- a/src/api/scalar/ScalarWidgetService.ts
+++ b/src/api/scalar/ScalarWidgetService.ts
@@ -18,6 +18,9 @@ interface UrlPreviewResponse {
     };
 }
 
+/**
+ * API for the minimum Scalar API for widget functionality in clients.
+ */
 @Path("/api/v1/scalar/widgets")
 export class ScalarWidgetService {
 

From ff088e3e490443848f5d98fdf5cabb8ca4a455dd Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 30 Mar 2018 16:34:39 -0600
Subject: [PATCH 101/111] Add a whole lot more logging to the backend

---
 src/MemoryCache.ts                          |  2 ++
 src/api/Webserver.ts                        |  2 +-
 src/api/admin/AdminAppserviceService.ts     |  3 ++-
 src/api/admin/AdminIntegrationsService.ts   |  7 +++++--
 src/api/admin/AdminNebService.ts            | 18 ++++++++++++++----
 src/api/admin/AdminUpstreamService.ts       |  4 +++-
 src/api/dimension/DimensionHealthService.ts |  2 ++
 src/api/scalar/ScalarService.ts             |  1 +
 src/db/AppserviceStore.ts                   | 14 +++++++++-----
 src/matrix/helpers.ts                       |  2 ++
 src/neb/NebClient.ts                        |  1 +
 src/neb/NebProxy.ts                         |  2 +-
 src/scalar/ScalarClient.ts                  |  1 +
 src/version.ts                              | 14 +++++++++++---
 14 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/MemoryCache.ts b/src/MemoryCache.ts
index 6453a26..a0b81f7 100644
--- a/src/MemoryCache.ts
+++ b/src/MemoryCache.ts
@@ -1,4 +1,5 @@
 import * as memoryCache from "memory-cache";
+import { LogService } from "matrix-js-snippets";
 
 export class MemoryCache {
 
@@ -30,6 +31,7 @@ class _CacheManager {
     public for(namespace: string): MemoryCache {
         let cache = this.caches[namespace];
         if (!cache) {
+            LogService.info("MemoryCache", "Creating a new cache for namespace: " + namespace);
             cache = this.caches[namespace] = new MemoryCache();
         }
 
diff --git a/src/api/Webserver.ts b/src/api/Webserver.ts
index 2394706..669b12b 100644
--- a/src/api/Webserver.ts
+++ b/src/api/Webserver.ts
@@ -62,7 +62,7 @@ export default class Webserver {
                 parsedUrl.query["scalar_token"] = "redacted";
                 parsedUrl.search = undefined; // to force URL.format to use `query`
             }
-            LogService.verbose("Webserver", "Incoming request: " + req.method + " " + URL.format(parsedUrl));
+            LogService.info("Webserver", "Incoming request: " + req.method + " " + URL.format(parsedUrl));
             next();
         });
         this.app.use((_req, res, next) => {
diff --git a/src/api/admin/AdminAppserviceService.ts b/src/api/admin/AdminAppserviceService.ts
index ad4ca05..d3a2dcc 100644
--- a/src/api/admin/AdminAppserviceService.ts
+++ b/src/api/admin/AdminAppserviceService.ts
@@ -47,7 +47,7 @@ export class AdminAppserviceService {
     @POST
     @Path("new")
     public async createAppservice(@QueryParam("scalar_token") scalarToken: string, request: AppserviceCreateRequest): Promise<AppserviceResponse> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         // Trim off the @ sign if it's on the prefix
         if (request.userPrefix[0] === "@") {
@@ -60,6 +60,7 @@ export class AdminAppserviceService {
         }
 
         const appservice = await AppserviceStore.create(AppserviceStore.getSafeUserId(request.userPrefix));
+        LogService.info("AdminAppserviceService", userId + " created an application service");
         return this.mapAppservice(appservice);
     }
 
diff --git a/src/api/admin/AdminIntegrationsService.ts b/src/api/admin/AdminIntegrationsService.ts
index 402172e..9c9174d 100644
--- a/src/api/admin/AdminIntegrationsService.ts
+++ b/src/api/admin/AdminIntegrationsService.ts
@@ -5,6 +5,7 @@ import { DimensionIntegrationsService } from "../dimension/DimensionIntegrations
 import { WidgetStore } from "../../db/WidgetStore";
 import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
+import { LogService } from "matrix-js-snippets";
 
 interface SetEnabledRequest {
     enabled: boolean;
@@ -24,11 +25,12 @@ export class AdminIntegrationsService {
     @POST
     @Path(":category/:type/options")
     public async setOptions(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetOptionsRequest): Promise<any> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         if (category === "widget") await WidgetStore.setOptions(type, body.options);
         else throw new ApiError(400, "Unrecognized category");
 
+        LogService.info("AdminIntegrationsService", userId + " updated the integration options for " + category + "/" + type);
         Cache.for(CACHE_INTEGRATIONS).clear();
         return {}; // 200 OK
     }
@@ -37,11 +39,12 @@ export class AdminIntegrationsService {
     @POST
     @Path(":category/:type/enabled")
     public async setEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string, @PathParam("type") type: string, body: SetEnabledRequest): Promise<any> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         if (category === "widget") await WidgetStore.setEnabled(type, body.enabled);
         else throw new ApiError(400, "Unrecognized category");
 
+        LogService.info("AdminIntegrationsService", userId + " set " + category + "/" + type + " to " + (body.enabled ? "enabled" : "disabled"));
         Cache.for(CACHE_INTEGRATIONS).clear();
         return {}; // 200 OK
     }
diff --git a/src/api/admin/AdminNebService.ts b/src/api/admin/AdminNebService.ts
index 81e8bb5..55c795a 100644
--- a/src/api/admin/AdminNebService.ts
+++ b/src/api/admin/AdminNebService.ts
@@ -51,8 +51,11 @@ export class AdminNebService {
     @POST
     @Path(":id/integration/:type/enabled")
     public async setIntegrationEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, request: SetEnabledRequest): Promise<any> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
         await NebStore.setIntegrationEnabled(nebId, integrationType, request.enabled);
+        LogService.info("AdminNebService", userId + " set the " + integrationType + " on NEB " + nebId + " to " + (request.enabled ? "enabled" : "disabled"));
+
         Cache.for(CACHE_NEB).clear();
         Cache.for(CACHE_INTEGRATIONS).clear();
         return {}; // 200 OK
@@ -61,8 +64,11 @@ export class AdminNebService {
     @POST
     @Path(":id/integration/:type/config")
     public async setIntegrationConfig(@QueryParam("scalar_token") scalarToken: string, @PathParam("id") nebId: number, @PathParam("type") integrationType: string, newConfig: any): Promise<any> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
         await NebStore.setIntegrationConfig(nebId, integrationType, newConfig);
+        LogService.info("AdminNebService", userId + " updated the configuration for " + integrationType + " on NEB " + nebId);
+
         Cache.for(CACHE_NEB).clear();
         Cache.for(CACHE_INTEGRATIONS).clear();
         return {}; // 200 OK
@@ -78,10 +84,12 @@ export class AdminNebService {
     @POST
     @Path("new/upstream")
     public async newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<NebConfig> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         try {
             const neb = await NebStore.createForUpstream(request.upstreamId);
+            LogService.info("AdminNebService", userId + " created a new NEB instance from upstream " + request.upstreamId);
+
             Cache.for(CACHE_NEB).clear();
             Cache.for(CACHE_INTEGRATIONS).clear();
             return neb;
@@ -94,10 +102,12 @@ export class AdminNebService {
     @POST
     @Path("new/appservice")
     public async newConfigForAppservice(@QueryParam("scalar_token") scalarToken: string, request: CreateWithAppservice): Promise<NebConfig> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         try {
             const neb = await NebStore.createForAppservice(request.appserviceId, request.adminUrl);
+            LogService.info("AdminNebService", userId + " created a new NEB instance from appservice " + request.appserviceId);
+
             Cache.for(CACHE_NEB).clear();
             Cache.for(CACHE_INTEGRATIONS).clear();
             return neb;
diff --git a/src/api/admin/AdminUpstreamService.ts b/src/api/admin/AdminUpstreamService.ts
index 36ab43d..5c9d994 100644
--- a/src/api/admin/AdminUpstreamService.ts
+++ b/src/api/admin/AdminUpstreamService.ts
@@ -2,6 +2,7 @@ import { GET, Path, POST, QueryParam } from "typescript-rest";
 import { AdminService } from "./AdminService";
 import { Cache, CACHE_UPSTREAM } from "../../MemoryCache";
 import Upstream from "../../db/models/Upstream";
+import { LogService } from "matrix-js-snippets";
 
 interface UpstreamRepsonse {
     id: number;
@@ -42,7 +43,7 @@ export class AdminUpstreamService {
     @POST
     @Path("new")
     public async createUpstream(@QueryParam("scalar_token") scalarToken: string, request: NewUpstreamRequest): Promise<UpstreamRepsonse> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         const upstream = await Upstream.create({
             name: request.name,
@@ -51,6 +52,7 @@ export class AdminUpstreamService {
             apiUrl: request.apiUrl,
         });
 
+        LogService.info("AdminUpstreamService", userId + " created a new upstream");
         Cache.for(CACHE_UPSTREAM).clear();
         return this.mapUpstream(upstream);
     }
diff --git a/src/api/dimension/DimensionHealthService.ts b/src/api/dimension/DimensionHealthService.ts
index 00cf8c7..7cda207 100644
--- a/src/api/dimension/DimensionHealthService.ts
+++ b/src/api/dimension/DimensionHealthService.ts
@@ -1,4 +1,5 @@
 import { GET, Path } from "typescript-rest";
+import { LogService } from "matrix-js-snippets";
 
 /**
  * API for the health of Dimension
@@ -9,6 +10,7 @@ export class DimensionHealthService {
     @GET
     @Path("heartbeat")
     public async heartbeat(): Promise<any> {
+        LogService.info("DimensionHealthService", "Heartbeat called");
         return {}; // 200 OK
     }
 }
\ No newline at end of file
diff --git a/src/api/scalar/ScalarService.ts b/src/api/scalar/ScalarService.ts
index ff6be08..2bfc524 100644
--- a/src/api/scalar/ScalarService.ts
+++ b/src/api/scalar/ScalarService.ts
@@ -84,6 +84,7 @@ export class ScalarService {
             isDimensionToken: true,
         });
 
+        LogService.info("ScalarService", mxUserId + " has registered for a scalar token successfully");
         return {scalar_token: dimensionScalarToken.scalarToken};
     }
 
diff --git a/src/db/AppserviceStore.ts b/src/db/AppserviceStore.ts
index c4fe326..2a16d60 100644
--- a/src/db/AppserviceStore.ts
+++ b/src/db/AppserviceStore.ts
@@ -2,6 +2,7 @@ import AppService from "./models/AppService";
 import AppServiceUser from "./models/AppServiceUser";
 import * as randomString from "random-string";
 import { MatrixAppserviceClient } from "../matrix/MatrixAppserviceClient";
+import { LogService } from "matrix-js-snippets";
 
 export class AppserviceStore {
 
@@ -37,22 +38,25 @@ export class AppserviceStore {
     public static getSafeUserId(userIdOrPrefix: string): string {
         // Force user IDs to be lowercase and strip out characters that aren't permitted
         // https://matrix.org/docs/spec/appendices.html#user-identifiers
+        if (userIdOrPrefix.startsWith('@')) {
+            // we only change out the parts we care about. The rest will be crushed down.
+            userIdOrPrefix = userIdOrPrefix.replace(/@/g, '=40');
+            userIdOrPrefix = userIdOrPrefix.replace(/:/g, '=3A');
+        }
         return userIdOrPrefix.toLowerCase().replace(/[^a-z0-9._\-=]/g, '.');
     }
 
-    public static async getUsers(appserviceId: string): Promise<AppServiceUser[]> {
-        return AppServiceUser.findAll({where: {appserviceId: appserviceId}});
-    }
-
     public static async registerUser(appserviceId: string, userId: string): Promise<AppServiceUser> {
         const appservice = await AppService.findOne({where: {id: appserviceId}});
         if (!appservice) throw new Error("Appservice not found");
 
+        LogService.info("AppserviceStore", "Registering to own " + userId + " in appservice " + appserviceId);
         const client = new MatrixAppserviceClient(appservice);
         const localpart = AppserviceStore.getSafeUserId(userId.substring(1).split(":")[0]);
         const response = await client.registerUser(localpart);
+        LogService.info("AppserviceStore", "Successfully registered " + userId);
 
-        return AppServiceUser.create({
+        return await AppServiceUser.create({
             id: userId,
             appserviceId: appserviceId,
             accessToken: response.access_token,
diff --git a/src/matrix/helpers.ts b/src/matrix/helpers.ts
index 8a5fe4c..38c9663 100644
--- a/src/matrix/helpers.ts
+++ b/src/matrix/helpers.ts
@@ -48,6 +48,7 @@ export async function getFederationUrl(serverName: string): Promise<string> {
 
 export async function doFederatedApiCall(method: string, serverName: string, endpoint: string, query?: object, body?: object): Promise<any> {
     const federationUrl = await  getFederationUrl(serverName);
+    LogService.info("matrix", "Doing federated API call: " + federationUrl + endpoint);
     return new Promise((resolve, reject) => {
         request({
             method: method,
@@ -74,6 +75,7 @@ export async function doFederatedApiCall(method: string, serverName: string, end
 export async function doClientApiCall(method: string, endpoint: string, query?: object, body?: object): Promise<any> {
     let url = config.homeserver.clientServerUrl;
     if (url.endsWith("/")) url = url.substring(0, url.length - 1);
+    LogService.info("matrix", "Doing client API call: " + url + endpoint);
 
     return new Promise((resolve, reject) => {
         request({
diff --git a/src/neb/NebClient.ts b/src/neb/NebClient.ts
index af8ae51..3621141 100644
--- a/src/neb/NebClient.ts
+++ b/src/neb/NebClient.ts
@@ -60,6 +60,7 @@ export class NebClient {
     private doRequest<T>(endpoint: string, body: any): Promise<T> {
         const adminUrl = (this.neb.adminUrl.endsWith("/") ? this.neb.adminUrl.substring(0, this.neb.adminUrl.length - 1) : this.neb.adminUrl);
         if (!endpoint.startsWith("/")) endpoint = "/" + endpoint;
+        LogService.info("NebClient", "Doing NEB call: " + adminUrl + endpoint);
 
         return new Promise((resolve, reject) => {
             request({
diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index 9a8f8b7..02ead02 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -27,7 +27,6 @@ interface InternalTravisCiConfig {
 
 export class NebProxy {
     constructor(private neb: NebConfig, private requestingUserId: string) {
-
     }
 
     public async getBotUserId(integration: NebIntegration): Promise<string> {
@@ -324,6 +323,7 @@ export class NebProxy {
 
         const apiUrl = upstream.apiUrl.endsWith("/") ? upstream.apiUrl.substring(0, upstream.apiUrl.length - 1) : upstream.apiUrl;
         const url = apiUrl + (endpoint.startsWith("/") ? endpoint : "/" + endpoint);
+        LogService.info("NebProxy", "Doing upstream NEB request: " + url);
 
         return new Promise<T>((resolve, reject) => {
             request({
diff --git a/src/scalar/ScalarClient.ts b/src/scalar/ScalarClient.ts
index 4cc86b6..c042a8c 100644
--- a/src/scalar/ScalarClient.ts
+++ b/src/scalar/ScalarClient.ts
@@ -9,6 +9,7 @@ export class ScalarClient {
     }
 
     public register(openId: OpenId): Promise<ScalarRegisterResponse> {
+        LogService.info("ScalarClient", "Doing upstream scalar request: " + this.upstream.scalarUrl + "/register");
         return new Promise((resolve, reject) => {
             request({
                 method: "POST",
diff --git a/src/version.ts b/src/version.ts
index ec868fb..3a9a0d7 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1,12 +1,20 @@
-import { LogService } from "matrix-js-snippets";
 import * as git from "git-rev-sync";
 
 let version = "Unknown";
+let gitHash = null;
 
 try {
     version = "v" + require("../../package.json").version;
 } catch (error) {
-    LogService.error("version", error);
+    // The log service isn't set up by the time we require this file
+    console.error("version", error);
 }
 
-export const CURRENT_VERSION = version + "-" + git.short();
+try {
+    gitHash = git.short();
+} catch (error) {
+    // The log service isn't set up by the time we require this file
+    console.error("version", error);
+}
+
+export const CURRENT_VERSION = version + (gitHash ? "-" + gitHash : "");

From bd03db7674597b4f8a82202709c434fcb303a5fe Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 30 Mar 2018 16:51:10 -0600
Subject: [PATCH 102/111] Parse upstream travis-ci configurations correctly

---
 src/neb/NebProxy.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/neb/NebProxy.ts b/src/neb/NebProxy.ts
index 02ead02..7f87e8e 100644
--- a/src/neb/NebProxy.ts
+++ b/src/neb/NebProxy.ts
@@ -20,6 +20,7 @@ interface InternalTravisCiConfig {
         [roomId: string]: {
             [repoKey: string]: {
                 template: string;
+                addedByUserId: string;
             };
         };
     };
@@ -90,9 +91,14 @@ export class NebProxy {
 
         if (!result) result = {};
         if (integration.type === "travisci") {
-            // Replace the webhook ID with the requesting user's webhook ID (generating it if needed)
-            result["webhookId"] = await this.getWebhookId(integration.type);
-            delete result["webhook_url"];
+            let repos = result.rooms ? result.rooms[inRoomId] : {};
+            if (!repos) repos = {};
+
+            // Replace the entire result to better represent how this should be sent
+            result = <TravisCiConfiguration>{
+                webhookId: await this.getWebhookId("travisci"),
+                repos: repos,
+            };
         }
 
         return result;
@@ -160,6 +166,7 @@ export class NebProxy {
                 for (const repoKey of repoKeys) {
                     result.rooms[roomId][repoKey] = {
                         template: integration.config.rooms[roomId].repos[repoKey].template,
+                        addedByUserId: userId,
                     };
                 }
             }

From 76931819af32a41f3b4e36d3547d4a9a0abbe49a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 30 Mar 2018 19:22:15 -0600
Subject: [PATCH 103/111] Add the shell for configuring IRC bridges

---
 src/api/admin/AdminIntegrationsService.ts     |  7 +-
 .../dimension/DimensionIntegrationsService.ts | 25 +++++++
 src/bridges/IrcBridge.ts                      | 19 +++++
 src/db/BridgeStore.ts                         | 66 ++++++++++++++++++
 src/db/DimensionStore.ts                      |  2 +
 .../migrations/20180330172445-AddBridges.ts   | 30 ++++++++
 src/db/models/BridgeRecord.ts                 | 32 +++++++++
 src/integrations/Bridge.ts                    | 32 +++++++++
 src/temp_todo.txt                             |  1 -
 web/app/admin/admin.component.html            |  1 +
 web/app/admin/bridges/bridges.component.html  | 37 ++++++++++
 web/app/admin/bridges/bridges.component.scss  |  8 +++
 web/app/admin/bridges/bridges.component.ts    | 28 ++++++++
 web/app/admin/bridges/irc/irc.component.html  | 49 +++++++++++++
 web/app/admin/bridges/irc/irc.component.scss  |  0
 web/app/admin/bridges/irc/irc.component.ts    | 31 +++++++++
 web/app/admin/widgets/widgets.component.ts    |  7 +-
 web/app/app.module.ts                         |  6 ++
 web/app/app.routing.ts                        | 26 +++++++
 web/app/configs/bridge/bridge.component.ts    | 69 +++++++++++++++++++
 .../config-screen.bridge.component.html       |  6 ++
 .../config-screen.bridge.component.scss       |  0
 .../config-screen.bridge.component.ts         | 16 +++++
 web/app/riot/riot-home/home.component.ts      |  2 +
 web/app/shared/models/dimension-responses.ts  |  3 +-
 web/app/shared/models/integration.ts          |  7 +-
 .../admin/admin-integrations-api.service.ts   |  8 ++-
 27 files changed, 509 insertions(+), 9 deletions(-)
 create mode 100644 src/bridges/IrcBridge.ts
 create mode 100644 src/db/BridgeStore.ts
 create mode 100644 src/db/migrations/20180330172445-AddBridges.ts
 create mode 100644 src/db/models/BridgeRecord.ts
 create mode 100644 src/integrations/Bridge.ts
 create mode 100644 web/app/admin/bridges/bridges.component.html
 create mode 100644 web/app/admin/bridges/bridges.component.scss
 create mode 100644 web/app/admin/bridges/bridges.component.ts
 create mode 100644 web/app/admin/bridges/irc/irc.component.html
 create mode 100644 web/app/admin/bridges/irc/irc.component.scss
 create mode 100644 web/app/admin/bridges/irc/irc.component.ts
 create mode 100644 web/app/configs/bridge/bridge.component.ts
 create mode 100644 web/app/configs/bridge/config-screen/config-screen.bridge.component.html
 create mode 100644 web/app/configs/bridge/config-screen/config-screen.bridge.component.scss
 create mode 100644 web/app/configs/bridge/config-screen/config-screen.bridge.component.ts

diff --git a/src/api/admin/AdminIntegrationsService.ts b/src/api/admin/AdminIntegrationsService.ts
index 9c9174d..e516ff0 100644
--- a/src/api/admin/AdminIntegrationsService.ts
+++ b/src/api/admin/AdminIntegrationsService.ts
@@ -6,6 +6,7 @@ import { WidgetStore } from "../../db/WidgetStore";
 import { Cache, CACHE_INTEGRATIONS } from "../../MemoryCache";
 import { Integration } from "../../integrations/Integration";
 import { LogService } from "matrix-js-snippets";
+import { BridgeStore } from "../../db/BridgeStore";
 
 interface SetEnabledRequest {
     enabled: boolean;
@@ -42,6 +43,7 @@ export class AdminIntegrationsService {
         const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         if (category === "widget") await WidgetStore.setEnabled(type, body.enabled);
+        else if (category === "bridge") await BridgeStore.setEnabled(type, body.enabled);
         else throw new ApiError(400, "Unrecognized category");
 
         LogService.info("AdminIntegrationsService", userId + " set " + category + "/" + type + " to " + (body.enabled ? "enabled" : "disabled"));
@@ -51,10 +53,11 @@ export class AdminIntegrationsService {
 
     @GET
     @Path(":category/all")
-    public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string, @QueryParam("category") category: string): Promise<Integration[]> {
-        await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+    public async getAllIntegrations(@QueryParam("scalar_token") scalarToken: string, @PathParam("category") category: string): Promise<Integration[]> {
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
 
         if (category === "widget") return await DimensionIntegrationsService.getWidgets(false);
+        else if (category === "bridge") return await DimensionIntegrationsService.getBridges(false, userId);
         else throw new ApiError(400, "Unrecongized category");
     }
 }
\ No newline at end of file
diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index 92bb6d2..f651062 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -8,11 +8,14 @@ import { WidgetStore } from "../../db/WidgetStore";
 import { SimpleBot } from "../../integrations/SimpleBot";
 import { NebStore } from "../../db/NebStore";
 import { ComplexBot } from "../../integrations/ComplexBot";
+import { Bridge } from "../../integrations/Bridge";
+import { BridgeStore } from "../../db/BridgeStore";
 
 export interface IntegrationsResponse {
     widgets: Widget[],
     bots: SimpleBot[],
     complexBots: ComplexBot[],
+    bridges: Bridge[],
 }
 
 /**
@@ -35,6 +38,24 @@ export class DimensionIntegrationsService {
         return widgets;
     }
 
+    /**
+     * Gets a list of bridges
+     * @param {boolean} enabledOnly True to only return the enabled bridges
+     * @param {string} forUserId The requesting user ID
+     * @param {string} inRoomId If specified, the room ID to list the bridges in
+     * @returns {Promise<Bridge[]>} Resolves to the bridge list
+     */
+    public static async getBridges(enabledOnly: boolean, forUserId: string, inRoomId?: string): Promise<Bridge[]> {
+        const cacheKey = inRoomId ? "bridges_" + inRoomId : "bridges";
+
+        const cached = Cache.for(CACHE_INTEGRATIONS).get(cacheKey);
+        if (cached) return cached;
+
+        const bridges = await BridgeStore.listAll(forUserId, enabledOnly ? true : null, inRoomId);
+        Cache.for(CACHE_INTEGRATIONS).put(cacheKey, bridges);
+        return bridges;
+    }
+
     /**
      * Gets a list of simple bots
      * @param {string} userId The requesting user ID
@@ -72,6 +93,7 @@ export class DimensionIntegrationsService {
             widgets: await DimensionIntegrationsService.getWidgets(true),
             bots: await DimensionIntegrationsService.getSimpleBots(userId),
             complexBots: await DimensionIntegrationsService.getComplexBots(userId, roomId),
+            bridges: await DimensionIntegrationsService.getBridges(true, userId, roomId),
         };
     }
 
@@ -83,6 +105,7 @@ export class DimensionIntegrationsService {
         if (category === "widget") return roomConfig.widgets.find(i => i.type === integrationType);
         else if (category === "bot") return roomConfig.bots.find(i => i.type === integrationType);
         else if (category === "complex-bot") return roomConfig.complexBots.find(i => i.type === integrationType);
+        else if (category === "bridge") return roomConfig.bridges.find(i => i.type === integrationType);
         else throw new ApiError(400, "Unrecognized category");
     }
 
@@ -92,6 +115,7 @@ export class DimensionIntegrationsService {
         const userId = await ScalarService.getTokenOwner(scalarToken);
 
         if (category === "complex-bot") await NebStore.setComplexBotConfig(userId, integrationType, roomId, newConfig);
+        else if (category === "bridge") await BridgeStore.setBridgeRoomConfig(userId, integrationType, roomId, newConfig);
         else throw new ApiError(400, "Unrecognized category");
 
         Cache.for(CACHE_INTEGRATIONS).clear(); // TODO: Improve which cache we invalidate
@@ -106,6 +130,7 @@ export class DimensionIntegrationsService {
         if (category === "widget") throw new ApiError(400, "Widgets should be removed client-side");
         else if (category === "bot") await NebStore.removeSimpleBot(integrationType, roomId, userId);
         else if (category === "complex-bot") throw new ApiError(400, "Complex bots should be removed automatically");
+        else if (category === "bridge") throw new ApiError(400, "Bridges should be removed automatically");
         else throw new ApiError(400, "Unrecognized category");
 
         Cache.for(CACHE_INTEGRATIONS).clear(); // TODO: Improve which cache we invalidate
diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts
new file mode 100644
index 0000000..fa69a2d
--- /dev/null
+++ b/src/bridges/IrcBridge.ts
@@ -0,0 +1,19 @@
+import BridgeRecord from "../db/models/BridgeRecord";
+import { IrcBridgeConfiguration } from "../integrations/Bridge";
+
+export class IrcBridge {
+    constructor(private bridgeRecord: BridgeRecord) {
+    }
+
+    public async hasNetworks(): Promise<boolean> {
+        return !!this.bridgeRecord;
+    }
+
+    public async getRoomConfiguration(requestingUserId: string, inRoomId: string): Promise<IrcBridgeConfiguration> {
+        return <any>{requestingUserId, inRoomId};
+    }
+
+    public async setRoomConfiguration(requestingUserId: string, inRoomId: string, newConfig: IrcBridgeConfiguration): Promise<any> {
+        return <any>{requestingUserId, inRoomId, newConfig};
+    }
+}
\ No newline at end of file
diff --git a/src/db/BridgeStore.ts b/src/db/BridgeStore.ts
new file mode 100644
index 0000000..ed3dff3
--- /dev/null
+++ b/src/db/BridgeStore.ts
@@ -0,0 +1,66 @@
+import { Bridge } from "../integrations/Bridge";
+import BridgeRecord from "./models/BridgeRecord";
+import { IrcBridge } from "../bridges/IrcBridge";
+
+export class BridgeStore {
+
+    public static async listAll(requestingUserId: string, isEnabled?: boolean, inRoomId?: string): Promise<Bridge[]> {
+        let conditions = {};
+        if (isEnabled === true || isEnabled === false) conditions = {where: {isEnabled: isEnabled}};
+
+        const allRecords = await BridgeRecord.findAll(conditions);
+        const enabledBridges: Bridge[] = [];
+
+        for (const bridgeRecord of allRecords) {
+            if (isEnabled === true || isEnabled === false) {
+                const isLogicallyEnabled = await BridgeStore.isLogicallyEnabled(bridgeRecord);
+                if (isLogicallyEnabled !== isEnabled) continue;
+            }
+
+            const bridgeConfig = await BridgeStore.getConfiguration(bridgeRecord, requestingUserId, inRoomId);
+            enabledBridges.push(new Bridge(bridgeRecord, bridgeConfig));
+        }
+
+        return enabledBridges;
+    }
+
+    public static async setEnabled(type: string, isEnabled: boolean): Promise<any> {
+        const bridge = await BridgeRecord.findOne({where: {type: type}});
+        if (!bridge) throw new Error("Bridge not found");
+
+        bridge.isEnabled = isEnabled;
+        return bridge.save();
+    }
+
+    public static async setBridgeRoomConfig(requestingUserId: string, integrationType: string, inRoomId: string, newConfig: any): Promise<any> {
+        console.log(requestingUserId);
+        console.log(inRoomId);
+        console.log(newConfig);
+        const record = await BridgeRecord.findOne({where: {type: integrationType}});
+        if (!record) throw new Error("Bridge not found");
+
+        if (integrationType === "irc") {
+            const irc = new IrcBridge(record);
+            return irc.setRoomConfiguration(requestingUserId, inRoomId, newConfig);
+        } else throw new Error("Unsupported bridge");
+    }
+
+    private static async isLogicallyEnabled(record: BridgeRecord): Promise<boolean> {
+        if (record.type === "irc") {
+            const irc = new IrcBridge(record);
+            return irc.hasNetworks();
+        } else return true;
+    }
+
+    private static async getConfiguration(record: BridgeRecord, requestingUserId: string, inRoomId?: string): Promise<any> {
+        if (record.type === "irc") {
+            if (!inRoomId) return {}; // The bridge's admin config is handled by other APIs
+            const irc = new IrcBridge(record);
+            return irc.getRoomConfiguration(requestingUserId, inRoomId);
+        } else return {};
+    }
+
+    private constructor() {
+    }
+
+}
\ No newline at end of file
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index a8bf4d6..b6c7eae 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -15,6 +15,7 @@ import NebBotUser from "./models/NebBotUser";
 import NebNotificationUser from "./models/NebNotificationUser";
 import NebIntegrationConfig from "./models/NebIntegrationConfig";
 import Webhook from "./models/Webhook";
+import BridgeRecord from "./models/BridgeRecord";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -41,6 +42,7 @@ class _DimensionStore {
             NebNotificationUser,
             NebIntegrationConfig,
             Webhook,
+            BridgeRecord,
         ]);
     }
 
diff --git a/src/db/migrations/20180330172445-AddBridges.ts b/src/db/migrations/20180330172445-AddBridges.ts
new file mode 100644
index 0000000..eb3ff97
--- /dev/null
+++ b/src/db/migrations/20180330172445-AddBridges.ts
@@ -0,0 +1,30 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_bridges", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "type": {type: DataType.STRING, allowNull: false},
+                "name": {type: DataType.STRING, allowNull: false},
+                "avatarUrl": {type: DataType.STRING, allowNull: false},
+                "description": {type: DataType.STRING, allowNull: false},
+                "isEnabled": {type: DataType.BOOLEAN, allowNull: false},
+                "isPublic": {type: DataType.BOOLEAN, allowNull: false},
+            }))
+            .then(() => queryInterface.bulkInsert("dimension_bridges", [
+                {
+                    type: "irc",
+                    name: "IRC Bridge",
+                    avatarUrl: "/img/avatars/irc.png",
+                    isEnabled: true,
+                    isPublic: true,
+                    description: "Bridges IRC channels to rooms, supporting multiple networks",
+                },
+            ]));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return queryInterface.dropTable("dimension_bridges");
+    }
+}
\ No newline at end of file
diff --git a/src/db/models/BridgeRecord.ts b/src/db/models/BridgeRecord.ts
new file mode 100644
index 0000000..facc328
--- /dev/null
+++ b/src/db/models/BridgeRecord.ts
@@ -0,0 +1,32 @@
+import { AutoIncrement, Column, Model, PrimaryKey, Table } from "sequelize-typescript";
+import { IntegrationRecord } from "./IntegrationRecord";
+
+@Table({
+    tableName: "dimension_bridges",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class BridgeRecord extends Model<BridgeRecord> implements IntegrationRecord {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @Column
+    type: string;
+
+    @Column
+    name: string;
+
+    @Column
+    avatarUrl: string;
+
+    @Column
+    description: string;
+
+    @Column
+    isEnabled: boolean;
+
+    @Column
+    isPublic: boolean;
+}
\ No newline at end of file
diff --git a/src/integrations/Bridge.ts b/src/integrations/Bridge.ts
new file mode 100644
index 0000000..87aeb22
--- /dev/null
+++ b/src/integrations/Bridge.ts
@@ -0,0 +1,32 @@
+import { Integration } from "./Integration";
+import BridgeRecord from "../db/models/BridgeRecord";
+
+export class Bridge extends Integration {
+    constructor(bridge: BridgeRecord, public config: any) {
+        super(bridge);
+        this.category = "bridge";
+        this.requirements = [{
+            condition: "publicRoom",
+            expectedValue: true,
+            argument: null, // not used
+        }];
+
+        // We'll just say we aren't
+        this.isEncryptionSupported = false;
+    }
+}
+
+export interface IrcBridgeConfiguration {
+    availableNetworks: {
+        [networkId: string]: {
+            name: string;
+            bridgeUserId: string;
+        };
+    };
+    links: {
+        [networkId: string]: {
+            channelName: string;
+            addedByUserId: string;
+        }[];
+    };
+}
\ No newline at end of file
diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index 42714b4..66e12e0 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -2,7 +2,6 @@ Release checklist:
 * IRC Bridge
 * Update documentation
 * Configuration migration (if possible)
-* Lots of logging
 * Final testing (widgets, bots, etc)
 
 After release:
diff --git a/web/app/admin/admin.component.html b/web/app/admin/admin.component.html
index 000c411..ca82593 100644
--- a/web/app/admin/admin.component.html
+++ b/web/app/admin/admin.component.html
@@ -2,6 +2,7 @@
     <li (click)="goto('')" [ngClass]="[isActive('', true) ? 'active' : '']">Dashboard</li>
     <li (click)="goto('widgets')" [ngClass]="[isActive('widgets') ? 'active' : '']">Widgets</li>
     <li (click)="goto('neb')" [ngClass]="[isActive('neb') ? 'active' : '']">go-neb</li>
+    <li (click)="goto('bridges')" [ngClass]="[isActive('bridges') ? 'active' : '']">Bridges</li>
 </ul>
 <span class="version">{{ version }}</span>
 
diff --git a/web/app/admin/bridges/bridges.component.html b/web/app/admin/bridges/bridges.component.html
new file mode 100644
index 0000000..af111eb
--- /dev/null
+++ b/web/app/admin/bridges/bridges.component.html
@@ -0,0 +1,37 @@
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox title="Bridges">
+        <div class="my-ibox-content">
+            <p>
+                Bridges provide a way for rooms to interact with and/or bring in events from a third party network. For
+                example, an IRC bridge can allow IRC and matrix users to communicate with each other.
+            </p>
+
+            <table class="table table-striped table-condensed table-bordered">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Description</th>
+                    <th class="text-center" style="width: 120px;">Actions</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngIf="!bridges || bridges.length === 0">
+                    <td colspan="2"><i>No bridges.</i></td>
+                </tr>
+                <tr *ngFor="let bridge of bridges trackById">
+                    <td>{{ bridge.displayName }}</td>
+                    <td>{{ bridge.description }}</td>
+                    <td class="text-center">
+                        <span class="editButton" [routerLink]="[bridge.type]" title="edit">
+                            <i class="fa fa-pencil-alt"></i>
+                        </span>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/bridges/bridges.component.scss b/web/app/admin/bridges/bridges.component.scss
new file mode 100644
index 0000000..847d207
--- /dev/null
+++ b/web/app/admin/bridges/bridges.component.scss
@@ -0,0 +1,8 @@
+tr td:last-child {
+  vertical-align: middle;
+}
+
+.appsvcConfigButton,
+.editButton {
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/web/app/admin/bridges/bridges.component.ts b/web/app/admin/bridges/bridges.component.ts
new file mode 100644
index 0000000..216eebc
--- /dev/null
+++ b/web/app/admin/bridges/bridges.component.ts
@@ -0,0 +1,28 @@
+import { Component, OnInit } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { FE_Bridge } from "../../shared/models/integration";
+import { AdminIntegrationsApiService } from "../../shared/services/admin/admin-integrations-api.service";
+
+@Component({
+    templateUrl: "./bridges.component.html",
+    styleUrls: ["./bridges.component.scss"],
+})
+export class AdminBridgesComponent implements OnInit {
+
+    public isLoading = true;
+    public bridges: FE_Bridge<any>[];
+
+    constructor(private adminIntegrations: AdminIntegrationsApiService,
+                private toaster: ToasterService) {
+    }
+
+    public ngOnInit() {
+        this.adminIntegrations.getAllBridges().then(bridges => {
+            this.bridges = bridges.filter(b => b.isEnabled);
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Failed to load bridges");
+        });
+    }
+}
diff --git a/web/app/admin/bridges/irc/irc.component.html b/web/app/admin/bridges/irc/irc.component.html
new file mode 100644
index 0000000..a4b61ab
--- /dev/null
+++ b/web/app/admin/bridges/irc/irc.component.html
@@ -0,0 +1,49 @@
+<div *ngIf="isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!isLoading">
+    <my-ibox title="IRC Bridge Configurations">
+        <div class="my-ibox-content">
+            <p>
+                <a href="https://github.com/matrix-org/matrix-appservice-irc" target="_blank">matrix-appservice-irc</a>
+                is an IRC bridge that supports multiple IRC networks. Dimension is capable of using multiple IRC
+                bridges to better distribute the load across multiple networks in large deployments.
+            </p>
+
+            <table class="table table-striped table-condensed table-bordered">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Enabled Networks</th>
+                    <th class="text-center" style="width: 120px;">Actions</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngIf="!configurations || configurations.length === 0">
+                    <td colspan="2"><i>No bridge configurations.</i></td>
+                </tr>
+                <tr *ngFor="let bridge of configurations trackById">
+                    <td>
+                        {{ bridge.upstreamId ? "matrix.org's bridge" : "Self-hosted bridge" }}
+                        <span class="text-muted" style="display: inline-block;" *ngIf="!bridge.upstreamId">({{ bridge.adminUrl }})</span>
+                    </td>
+                    <td>
+                        {{ getEnabledNetworksString(bridge) }}
+                    </td>
+                    <td class="text-center">
+                        <button type="button" class="editButton" (click)="editNetworks(bridge)">
+                            <i class="fa fa-pencil-alt"></i>
+                        </button>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+            <button type="button" class="btn btn-success btn-sm" (click)="addModularHostedBridge()" *ngIf="!hasModularBridge">
+                <i class="fa fa-plus"></i> Add matrix.org's bridge
+            </button>
+            <button type="button" class="btn btn-success btn-sm" (click)="addSelfHostedBridge()">
+                <i class="fa fa-plus"></i> Add self-hosted bridge
+            </button>
+        </div>
+    </my-ibox>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/bridges/irc/irc.component.scss b/web/app/admin/bridges/irc/irc.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/bridges/irc/irc.component.ts b/web/app/admin/bridges/irc/irc.component.ts
new file mode 100644
index 0000000..a2df478
--- /dev/null
+++ b/web/app/admin/bridges/irc/irc.component.ts
@@ -0,0 +1,31 @@
+import { Component } from "@angular/core";
+
+@Component({
+    templateUrl: "./irc.component.html",
+    styleUrls: ["./irc.component.scss"],
+})
+export class AdminIrcBridgeComponent {
+
+    public isLoading = true;
+    public hasModularBridge = false;
+    public configurations: any[] = [];
+
+    constructor() {
+    }
+
+    public getEnabledNetworksString(bridge: any): string {
+        return "TODO: " + bridge;
+    }
+
+    public addModularHostedBridge() {
+
+    }
+
+    public addSelfHostedBridge() {
+
+    }
+
+    public editNetworks(bridge: any) {
+        console.log(bridge);
+    }
+}
diff --git a/web/app/admin/widgets/widgets.component.ts b/web/app/admin/widgets/widgets.component.ts
index 3a98c00..5debd8e 100644
--- a/web/app/admin/widgets/widgets.component.ts
+++ b/web/app/admin/widgets/widgets.component.ts
@@ -22,9 +22,12 @@ export class AdminWidgetsComponent {
     public widgets: FE_Widget[];
 
     constructor(private adminIntegrationsApi: AdminIntegrationsApiService, private toaster: ToasterService, private modal: Modal) {
-        this.adminIntegrationsApi.getAllWidgets().then(integrations => {
+        this.adminIntegrationsApi.getAllWidgets().then(widgets => {
             this.isLoading = false;
-            this.widgets = integrations.widgets;
+            this.widgets = widgets;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Failed to load widgets");
         });
     }
 
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 128633e..4772a88 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -62,6 +62,9 @@ import { ConfigSimpleBotComponent } from "./configs/simple-bot/simple-bot.compon
 import { ConfigScreenComplexBotComponent } from "./configs/complex-bot/config-screen/config-screen.complex-bot.component";
 import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.complex-bot.component";
 import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisci/travisci.complex-bot.component";
+import { ConfigScreenBridgeComponent } from "./configs/bridge/config-screen/config-screen.bridge.component";
+import { AdminBridgesComponent } from "./admin/bridges/bridges.component";
+import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
 
 @NgModule({
     imports: [
@@ -118,6 +121,9 @@ import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisc
         ConfigScreenComplexBotComponent,
         RssComplexBotConfigComponent,
         TravisCiComplexBotConfigComponent,
+        ConfigScreenBridgeComponent,
+        AdminBridgesComponent,
+        AdminIrcBridgeComponent,
 
         // Vendor
     ],
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index a47411d..f7fca46 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -21,6 +21,8 @@ import { AdminEditNebComponent } from "./admin/neb/edit/edit.component";
 import { AdminAddSelfhostedNebComponent } from "./admin/neb/add-selfhosted/add-selfhosted.component";
 import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.complex-bot.component";
 import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisci/travisci.complex-bot.component";
+import { AdminBridgesComponent } from "./admin/bridges/bridges.component";
+import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -68,6 +70,21 @@ const routes: Routes = [
                             },
                         ]
                     },
+                    {
+                        path: "bridges",
+                        data: {breadcrumb: "Bridges", name: "Bridges"},
+                        children: [
+                            {
+                                path: "",
+                                component: AdminBridgesComponent,
+                            },
+                            {
+                                path: "irc",
+                                component: AdminIrcBridgeComponent,
+                                data: {breadcrumb: "IRC Bridge", name: "IRC Bridge"},
+                            },
+                        ],
+                    },
                 ],
             },
             {
@@ -125,6 +142,15 @@ const routes: Routes = [
                     },
                 ],
             },
+            // {
+            //     path: "bridge",
+            //     children: [
+            //         {
+            //             path: "irc",
+            //
+            //         }
+            //     ]
+            // }
         ],
     },
     {
diff --git a/web/app/configs/bridge/bridge.component.ts b/web/app/configs/bridge/bridge.component.ts
new file mode 100644
index 0000000..b5c100c
--- /dev/null
+++ b/web/app/configs/bridge/bridge.component.ts
@@ -0,0 +1,69 @@
+import { OnDestroy, OnInit } from "@angular/core";
+import { FE_Bridge } from "../../shared/models/integration";
+import { ActivatedRoute } from "@angular/router";
+import { Subscription } from "rxjs/Subscription";
+import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
+import { ToasterService } from "angular2-toaster";
+import { ServiceLocator } from "../../shared/registry/locator.service";
+import { ScalarClientApiService } from "../../shared/services/scalar/scalar-client-api.service";
+
+export class BridgeComponent<T> implements OnInit, OnDestroy {
+
+    public isLoading = true;
+    public isUpdating = false;
+    public bridge: FE_Bridge<T>;
+    public newConfig: T;
+    public roomId: string;
+
+    private routeQuerySubscription: Subscription;
+
+    protected toaster = ServiceLocator.injector.get(ToasterService);
+    protected integrationsApi = ServiceLocator.injector.get(IntegrationsApiService);
+    protected route = ServiceLocator.injector.get(ActivatedRoute);
+    protected scalarClientApi = ServiceLocator.injector.get(ScalarClientApiService);
+
+    constructor(private integrationType: string) {
+        this.isLoading = true;
+        this.isUpdating = false;
+    }
+
+    public ngOnInit(): void {
+        this.routeQuerySubscription = this.route.queryParams.subscribe(params => {
+            this.roomId = params['roomId'];
+            this.loadBridge();
+        });
+    }
+
+    public ngOnDestroy(): void {
+        if (this.routeQuerySubscription) this.routeQuerySubscription.unsubscribe();
+    }
+
+    private loadBridge() {
+        this.isLoading = true;
+        this.isUpdating = false;
+
+        this.newConfig = <T>{};
+
+        this.integrationsApi.getIntegrationInRoom("bridge", this.integrationType, this.roomId).then(i => {
+            this.bridge = <FE_Bridge<T>>i;
+            this.newConfig = JSON.parse(JSON.stringify(this.bridge.config));
+            this.isLoading = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Failed to load configuration");
+        });
+    }
+
+    public save(): void {
+        this.isUpdating = true;
+        this.integrationsApi.setIntegrationConfiguration("bridge", this.integrationType, this.roomId, this.newConfig).then(() => {
+            this.toaster.pop("success", "Configuration updated");
+            this.bridge.config = this.newConfig;
+            this.isUpdating = false;
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Error updating configuration");
+            this.isUpdating = false;
+        });
+    }
+}
\ No newline at end of file
diff --git a/web/app/configs/bridge/config-screen/config-screen.bridge.component.html b/web/app/configs/bridge/config-screen/config-screen.bridge.component.html
new file mode 100644
index 0000000..89aeb0e
--- /dev/null
+++ b/web/app/configs/bridge/config-screen/config-screen.bridge.component.html
@@ -0,0 +1,6 @@
+<div *ngIf="bridgeComponent.isLoading">
+    <my-spinner></my-spinner>
+</div>
+<div *ngIf="!bridgeComponent.isLoading">
+    <ng-container *ngTemplateOutlet="bridgeParamsTemplate"></ng-container>
+</div>
\ No newline at end of file
diff --git a/web/app/configs/bridge/config-screen/config-screen.bridge.component.scss b/web/app/configs/bridge/config-screen/config-screen.bridge.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/configs/bridge/config-screen/config-screen.bridge.component.ts b/web/app/configs/bridge/config-screen/config-screen.bridge.component.ts
new file mode 100644
index 0000000..01944b5
--- /dev/null
+++ b/web/app/configs/bridge/config-screen/config-screen.bridge.component.ts
@@ -0,0 +1,16 @@
+import { Component, ContentChild, Input, TemplateRef } from "@angular/core";
+import { BridgeComponent } from "../bridge.component";
+
+@Component({
+    selector: "my-bridge-config",
+    templateUrl: "config-screen.bridge.component.html",
+    styleUrls: ["config-screen.bridge.component.scss"],
+})
+export class ConfigScreenBridgeComponent {
+
+    @Input() bridgeComponent: BridgeComponent<any>;
+    @ContentChild(TemplateRef) bridgeParamsTemplate: TemplateRef<any>;
+
+    constructor() {
+    }
+}
\ No newline at end of file
diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 50e9b8c..3cdf886 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -259,6 +259,8 @@ export class RiotHomeComponent {
                     console.error(err);
                     if (requirement.expectedValue) return Promise.reject("Expected to be able to send specific event types");
                 });
+            case "userInRoom":
+                // TODO: Implement
             default:
                 return Promise.reject("Requirement '" + requirement.condition + "' not found");
         }
diff --git a/web/app/shared/models/dimension-responses.ts b/web/app/shared/models/dimension-responses.ts
index 23c5f1a..a8472f7 100644
--- a/web/app/shared/models/dimension-responses.ts
+++ b/web/app/shared/models/dimension-responses.ts
@@ -1,5 +1,6 @@
-import { FE_Widget } from "./integration";
+import { FE_Bridge, FE_Widget } from "./integration";
 
 export interface FE_IntegrationsResponse {
     widgets: FE_Widget[];
+    bridges: FE_Bridge<any>[];
 }
\ No newline at end of file
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index 0576099..6b064bb 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -26,6 +26,11 @@ export interface FE_ComplexBot<T> extends FE_Integration {
     config: T;
 }
 
+export interface FE_Bridge<T> extends FE_Integration {
+    bridgeUserId: string;
+    config: T;
+}
+
 export interface FE_Widget extends FE_Integration {
     options: any;
 }
@@ -44,7 +49,7 @@ export interface FE_JitsiWidget extends FE_Widget {
 }
 
 export interface FE_IntegrationRequirement {
-    condition: "publicRoom" | "canSendEventTypes";
+    condition: "publicRoom" | "canSendEventTypes" | "userInRoom";
     argument: any;
     expectedValue: any;
 }
\ No newline at end of file
diff --git a/web/app/shared/services/admin/admin-integrations-api.service.ts b/web/app/shared/services/admin/admin-integrations-api.service.ts
index 633a368..2a6ce67 100644
--- a/web/app/shared/services/admin/admin-integrations-api.service.ts
+++ b/web/app/shared/services/admin/admin-integrations-api.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
 import { AuthedApi } from "../authed-api";
-import { FE_IntegrationsResponse } from "../../models/dimension-responses";
+import { FE_Bridge, FE_Widget } from "../../models/integration";
 
 @Injectable()
 export class AdminIntegrationsApiService extends AuthedApi {
@@ -9,10 +9,14 @@ export class AdminIntegrationsApiService extends AuthedApi {
         super(http);
     }
 
-    public getAllWidgets(): Promise<FE_IntegrationsResponse> {
+    public getAllWidgets(): Promise<FE_Widget[]> {
         return this.authedGet("/api/v1/dimension/admin/integrations/widget/all").map(r => r.json()).toPromise();
     }
 
+    public getAllBridges(): Promise<FE_Bridge<any>[]> {
+        return this.authedGet("/api/v1/dimension/admin/integrations/bridge/all").map(r => r.json()).toPromise();
+    }
+
     public toggleIntegration(category: string, type: string, enabled: boolean): Promise<any> {
         return this.authedPost("/api/v1/dimension/admin/integrations/" + category + "/" + type + "/enabled", {enabled: enabled}).map(r => r.json()).toPromise();
     }

From 61ca805b193f662f3fbe4f186491c6ae533afe5b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 30 Mar 2018 23:12:31 -0600
Subject: [PATCH 104/111] Initial admin APIs for managing IRC bridges

Missing functionality:
* Toggle networks
* Add self-hosted
---
 src/MemoryCache.ts                            |   3 +-
 src/api/admin/AdminIrcService.ts              | 102 +++++++++
 src/bridges/IrcBridge.ts                      | 197 +++++++++++++++++-
 src/bridges/models/provision_responses.ts     |  10 +
 src/db/BridgeStore.ts                         |  13 +-
 src/db/DimensionStore.ts                      |   4 +
 .../migrations/20180330211845-AddIrcBridge.ts |  36 ++++
 src/db/models/IrcBridgeNetwork.ts             |  34 +++
 src/db/models/IrcBridgeRecord.ts              |  26 +++
 src/integrations/Bridge.ts                    |   8 +-
 src/models/ModularResponses.ts                |   9 +
 web/app/admin/bridges/irc/irc.component.html  |   4 +-
 web/app/admin/bridges/irc/irc.component.scss  |   3 +
 web/app/admin/bridges/irc/irc.component.ts    |  78 ++++++-
 web/app/admin/neb/neb.component.ts            |   2 +-
 web/app/app.module.ts                         |   2 +
 web/app/shared/models/irc.ts                  |  16 ++
 .../services/admin/admin-irc-api.service.ts   |  28 +++
 18 files changed, 546 insertions(+), 29 deletions(-)
 create mode 100644 src/api/admin/AdminIrcService.ts
 create mode 100644 src/bridges/models/provision_responses.ts
 create mode 100644 src/db/migrations/20180330211845-AddIrcBridge.ts
 create mode 100644 src/db/models/IrcBridgeNetwork.ts
 create mode 100644 src/db/models/IrcBridgeRecord.ts
 create mode 100644 web/app/shared/models/irc.ts
 create mode 100644 web/app/shared/services/admin/admin-irc-api.service.ts

diff --git a/src/MemoryCache.ts b/src/MemoryCache.ts
index a0b81f7..e66881a 100644
--- a/src/MemoryCache.ts
+++ b/src/MemoryCache.ts
@@ -46,4 +46,5 @@ export const CACHE_NEB = "neb";
 export const CACHE_UPSTREAM = "upstream";
 export const CACHE_SCALAR_ACCOUNTS = "scalar-accounts";
 export const CACHE_WIDGET_TITLES = "widget-titles";
-export const CACHE_FEDERATION = "federation";
\ No newline at end of file
+export const CACHE_FEDERATION = "federation";
+export const CACHE_IRC_BRIDGE = "irc-bridge";
\ No newline at end of file
diff --git a/src/api/admin/AdminIrcService.ts b/src/api/admin/AdminIrcService.ts
new file mode 100644
index 0000000..2e17cca
--- /dev/null
+++ b/src/api/admin/AdminIrcService.ts
@@ -0,0 +1,102 @@
+import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
+import { AdminService } from "./AdminService";
+import { Cache, CACHE_INTEGRATIONS, CACHE_IRC_BRIDGE } from "../../MemoryCache";
+import { LogService } from "matrix-js-snippets";
+import { ApiError } from "../ApiError";
+import IrcBridgeRecord from "../../db/models/IrcBridgeRecord";
+import { AvailableNetworks, IrcBridge } from "../../bridges/IrcBridge";
+import Upstream from "../../db/models/Upstream";
+
+interface CreateWithUpstream {
+    upstreamId: number;
+}
+
+interface CreateSelfhosted {
+    provisionUrl: string;
+}
+
+interface BridgeResponse {
+    id: number;
+    upstreamId?: number;
+    provisionUrl?: string;
+    isEnabled: boolean;
+    availableNetworks: AvailableNetworks;
+}
+
+/**
+ * Administrative API for configuring IRC bridge instances.
+ */
+@Path("/api/v1/dimension/admin/irc")
+export class AdminIrcService {
+
+    @GET
+    @Path("all")
+    public async getBridges(@QueryParam("scalar_token") scalarToken: string): Promise<BridgeResponse[]> {
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const bridges = await IrcBridgeRecord.findAll();
+        const client = new IrcBridge(userId);
+        return Promise.all(bridges.map(async b => {
+            return {
+                id: b.id,
+                upstreamId: b.upstreamId,
+                provisionUrl: b.provisionUrl,
+                isEnabled: b.isEnabled,
+                availableNetworks: await client.getNetworks(b),
+            };
+        }));
+    }
+
+    @GET
+    @Path(":bridgeId")
+    public async getBridge(@QueryParam("scalar_token") scalarToken: string, @PathParam("bridgeId") bridgeId: number): Promise<BridgeResponse> {
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const ircBridge = await IrcBridgeRecord.findByPrimary(bridgeId);
+        if (!ircBridge) throw new ApiError(404, "IRC Bridge not found");
+
+        const client = new IrcBridge(userId);
+        return {
+            id: ircBridge.id,
+            upstreamId: ircBridge.upstreamId,
+            provisionUrl: ircBridge.provisionUrl,
+            isEnabled: ircBridge.isEnabled,
+            availableNetworks: await client.getNetworks(ircBridge),
+        };
+    }
+
+    @POST
+    @Path("new/upstream")
+    public async newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<BridgeResponse> {
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const upstream = await Upstream.findByPrimary(request.upstreamId);
+        if (!upstream) throw new ApiError(400, "Upstream not found");
+
+        const bridge = await IrcBridgeRecord.create({
+            upstreamId: request.upstreamId,
+            isEnabled: true,
+        });
+        LogService.info("AdminIrcService", userId + " created a new IRC Bridge from upstream " + request.upstreamId);
+
+        Cache.for(CACHE_IRC_BRIDGE).clear();
+        Cache.for(CACHE_INTEGRATIONS).clear();
+        return this.getBridge(scalarToken, bridge.id);
+    }
+
+    @POST
+    @Path("new/selfhosted")
+    public async newSelfhosted(@QueryParam("scalar_token") scalarToken: string, request: CreateSelfhosted): Promise<BridgeResponse> {
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const bridge = await IrcBridgeRecord.create({
+            provisionUrl: request.provisionUrl,
+            isEnabled: true,
+        });
+        LogService.info("AdminIrcService", userId + " created a new IRC Bridge with provisioning URL " + request.provisionUrl);
+
+        Cache.for(CACHE_IRC_BRIDGE).clear();
+        Cache.for(CACHE_INTEGRATIONS).clear();
+        return this.getBridge(scalarToken, bridge.id);
+    }
+}
\ No newline at end of file
diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts
index fa69a2d..700c839 100644
--- a/src/bridges/IrcBridge.ts
+++ b/src/bridges/IrcBridge.ts
@@ -1,12 +1,64 @@
-import BridgeRecord from "../db/models/BridgeRecord";
 import { IrcBridgeConfiguration } from "../integrations/Bridge";
+import { Cache, CACHE_IRC_BRIDGE } from "../MemoryCache";
+import IrcBridgeRecord from "../db/models/IrcBridgeRecord";
+import Upstream from "../db/models/Upstream";
+import UserScalarToken from "../db/models/UserScalarToken";
+import { LogService } from "matrix-js-snippets";
+import * as request from "request";
+import { QueryNetworksResponse } from "./models/provision_responses";
+import { ModularIrcQueryNetworksResponse } from "../models/ModularResponses";
+import IrcBridgeNetwork from "../db/models/IrcBridgeNetwork";
+
+interface CachedNetwork {
+    ircBridgeId: number;
+    bridgeNetworkId: string;
+    bridgeUserId: string;
+    displayName: string;
+    domain: string;
+    isEnabled: boolean;
+}
+
+export interface AvailableNetworks {
+    [networkId: string]: {
+        name: string;
+        domain: string;
+        bridgeUserId: string;
+        isEnabled: boolean;
+    };
+}
 
 export class IrcBridge {
-    constructor(private bridgeRecord: BridgeRecord) {
+    private static getNetworkId(network: CachedNetwork): string {
+        return network.ircBridgeId + "-" + network.bridgeNetworkId;
+    }
+
+    public static parseNetworkId(networkId: string): { bridgeId: string, bridgeNetworkId: string } {
+        const parts = networkId.split("-");
+        const bridgeId = parts.splice(1, 1)[0];
+        const bridgeNetworkId = parts.join("-");
+        return {bridgeId, bridgeNetworkId};
+    }
+
+    constructor(private requestingUserId: string) {
     }
 
     public async hasNetworks(): Promise<boolean> {
-        return !!this.bridgeRecord;
+        const allNetworks = (await this.getAllNetworks()).filter(n => n.isEnabled);
+        return allNetworks.length > 0;
+    }
+
+    public async getNetworks(bridge?: IrcBridgeRecord): Promise<AvailableNetworks> {
+        let networks = await this.getAllNetworks();
+        if (bridge) networks = networks.filter(n => n.ircBridgeId === bridge.id);
+
+        const available: AvailableNetworks = {};
+        networks.forEach(n => available[IrcBridge.getNetworkId(n)] = {
+            name: n.displayName,
+            domain: n.domain,
+            bridgeUserId: n.bridgeUserId,
+            isEnabled: n.isEnabled,
+        });
+        return available;
     }
 
     public async getRoomConfiguration(requestingUserId: string, inRoomId: string): Promise<IrcBridgeConfiguration> {
@@ -16,4 +68,143 @@ export class IrcBridge {
     public async setRoomConfiguration(requestingUserId: string, inRoomId: string, newConfig: IrcBridgeConfiguration): Promise<any> {
         return <any>{requestingUserId, inRoomId, newConfig};
     }
+
+    private async getAllNetworks(): Promise<CachedNetwork[]> {
+        const cached = Cache.for(CACHE_IRC_BRIDGE).get("networks");
+        if (cached) return cached;
+
+        const bridges = await IrcBridgeRecord.findAll();
+        if (!bridges) return [];
+
+        const networks: CachedNetwork[] = [];
+        for (const bridge of bridges) {
+            const bridgeNetworks = await this.fetchNetworks(bridge);
+            bridgeNetworks.forEach(n => networks.push(n));
+        }
+
+        Cache.for(CACHE_IRC_BRIDGE).put("networks", networks, 60 * 60 * 1000); // 1 hour
+        return networks;
+    }
+
+    private async fetchNetworks(bridge: IrcBridgeRecord): Promise<CachedNetwork[]> {
+        let responses: QueryNetworksResponse[] = [];
+        if (bridge.upstreamId) {
+            const result = await this.doUpstreamRequest<ModularIrcQueryNetworksResponse>(bridge, "GET", "/bridges/irc/_matrix/provision/querynetworks");
+            if (result && result.replies) responses = result.replies.map(r => r.response);
+        } else {
+            const result = await this.doProvisionRequest<QueryNetworksResponse>(bridge, "GET", "/_matrix/provision/querynetworks");
+            if (result) responses = [result];
+        }
+
+        const networks: CachedNetwork[] = [];
+        for (const response of responses) {
+            if (!response || !response.servers) continue;
+
+            for (const server of response.servers) {
+                if (!server) continue;
+
+                let existingNetwork = await IrcBridgeNetwork.findOne({
+                    where: {
+                        bridgeId: bridge.id,
+                        bridgeNetworkId: server.network_id,
+                    },
+                });
+                if (!existingNetwork) {
+                    LogService.info("IrcBridge", "Discovered new network for bridge " + bridge.id + ": " + server.network_id);
+                    existingNetwork = await IrcBridgeNetwork.create({
+                        bridgeId: bridge.id,
+                        isEnabled: false,
+                        bridgeNetworkId: server.network_id,
+                        bridgeUserId: server.bot_user_id,
+                        displayName: server.desc,
+                        domain: server.fields.domain,
+                    });
+                } else {
+                    existingNetwork.displayName = server.desc;
+                    existingNetwork.bridgeUserId = server.bot_user_id;
+                    existingNetwork.domain = server.fields.domain;
+                    await existingNetwork.save();
+                }
+
+                networks.push({
+                    ircBridgeId: bridge.id,
+                    bridgeNetworkId: existingNetwork.bridgeNetworkId,
+                    bridgeUserId: existingNetwork.bridgeUserId,
+                    displayName: existingNetwork.displayName,
+                    domain: existingNetwork.domain,
+                    isEnabled: existingNetwork.isEnabled,
+                });
+            }
+        }
+
+        return networks;
+    }
+
+    private async doUpstreamRequest<T>(bridge: IrcBridgeRecord, method: string, endpoint: string, qs?: any, body?: any): Promise<T> {
+        const upstream = await Upstream.findByPrimary(bridge.upstreamId);
+        const token = await UserScalarToken.findOne({
+            where: {
+                upstreamId: upstream.id,
+                isDimensionToken: false,
+                userId: this.requestingUserId,
+            },
+        });
+
+        if (!qs) qs = {};
+        qs["scalar_token"] = token.scalarToken;
+
+        const apiUrl = upstream.apiUrl.endsWith("/") ? upstream.apiUrl.substring(0, upstream.apiUrl.length - 1) : upstream.apiUrl;
+        const url = apiUrl + (endpoint.startsWith("/") ? endpoint : "/" + endpoint);
+        LogService.info("IrcBridge", "Doing upstream IRC Bridge request: " + url);
+
+        return new Promise<T>((resolve, reject) => {
+            request({
+                method: method,
+                url: url,
+                qs: qs,
+                json: body,
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("IrcBridge", "Error calling" + url);
+                    LogService.error("IrcBridge", err);
+                    reject(err);
+                } else if (res.statusCode !== 200) {
+                    LogService.error("IrcBridge", "Got status code " + res.statusCode + " when calling " + url);
+                    LogService.error("IrcBridge", res.body);
+                    reject(new Error("Request failed"));
+                } else {
+                    if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
+                    resolve(res.body);
+                }
+            });
+        });
+    }
+
+    private async doProvisionRequest<T>(bridge: IrcBridgeRecord, method: string, endpoint: string, qs?: any, body?: any): Promise<T> {
+        const provisionUrl = bridge.provisionUrl;
+        const apiUrl = provisionUrl.endsWith("/") ? provisionUrl.substring(0, provisionUrl.length - 1) : provisionUrl;
+        const url = apiUrl + (endpoint.startsWith("/") ? endpoint : "/" + endpoint);
+        LogService.info("IrcBridge", "Doing provision IRC Bridge request: " + url);
+
+        return new Promise<T>((resolve, reject) => {
+            request({
+                method: method,
+                url: url,
+                qs: qs,
+                json: body,
+            }, (err, res, _body) => {
+                if (err) {
+                    LogService.error("IrcBridge", "Error calling" + url);
+                    LogService.error("IrcBridge", err);
+                    reject(err);
+                    LogService.error("IrcBridge", "Got status code " + res.statusCode + " when calling " + url);
+                    LogService.error("IrcBridge", res.body);
+                    reject(new Error("Request failed"));
+                } else {
+                    if (typeof(res.body) === "string") res.body = JSON.parse(res.body);
+                    resolve(res.body);
+                }
+            });
+        });
+    }
 }
\ No newline at end of file
diff --git a/src/bridges/models/provision_responses.ts b/src/bridges/models/provision_responses.ts
new file mode 100644
index 0000000..0c92c9a
--- /dev/null
+++ b/src/bridges/models/provision_responses.ts
@@ -0,0 +1,10 @@
+export interface QueryNetworksResponse {
+    servers: {
+        network_id: string;
+        bot_user_id: string;
+        desc: string;
+        fields: {
+            domain: string;
+        };
+    }[];
+}
\ No newline at end of file
diff --git a/src/db/BridgeStore.ts b/src/db/BridgeStore.ts
index ed3dff3..99faa01 100644
--- a/src/db/BridgeStore.ts
+++ b/src/db/BridgeStore.ts
@@ -13,7 +13,7 @@ export class BridgeStore {
 
         for (const bridgeRecord of allRecords) {
             if (isEnabled === true || isEnabled === false) {
-                const isLogicallyEnabled = await BridgeStore.isLogicallyEnabled(bridgeRecord);
+                const isLogicallyEnabled = await BridgeStore.isLogicallyEnabled(bridgeRecord, requestingUserId);
                 if (isLogicallyEnabled !== isEnabled) continue;
             }
 
@@ -33,21 +33,18 @@ export class BridgeStore {
     }
 
     public static async setBridgeRoomConfig(requestingUserId: string, integrationType: string, inRoomId: string, newConfig: any): Promise<any> {
-        console.log(requestingUserId);
-        console.log(inRoomId);
-        console.log(newConfig);
         const record = await BridgeRecord.findOne({where: {type: integrationType}});
         if (!record) throw new Error("Bridge not found");
 
         if (integrationType === "irc") {
-            const irc = new IrcBridge(record);
+            const irc = new IrcBridge(requestingUserId);
             return irc.setRoomConfiguration(requestingUserId, inRoomId, newConfig);
         } else throw new Error("Unsupported bridge");
     }
 
-    private static async isLogicallyEnabled(record: BridgeRecord): Promise<boolean> {
+    private static async isLogicallyEnabled(record: BridgeRecord, requestingUserId: string): Promise<boolean> {
         if (record.type === "irc") {
-            const irc = new IrcBridge(record);
+            const irc = new IrcBridge(requestingUserId);
             return irc.hasNetworks();
         } else return true;
     }
@@ -55,7 +52,7 @@ export class BridgeStore {
     private static async getConfiguration(record: BridgeRecord, requestingUserId: string, inRoomId?: string): Promise<any> {
         if (record.type === "irc") {
             if (!inRoomId) return {}; // The bridge's admin config is handled by other APIs
-            const irc = new IrcBridge(record);
+            const irc = new IrcBridge(requestingUserId);
             return irc.getRoomConfiguration(requestingUserId, inRoomId);
         } else return {};
     }
diff --git a/src/db/DimensionStore.ts b/src/db/DimensionStore.ts
index b6c7eae..bab7d0e 100644
--- a/src/db/DimensionStore.ts
+++ b/src/db/DimensionStore.ts
@@ -16,6 +16,8 @@ import NebNotificationUser from "./models/NebNotificationUser";
 import NebIntegrationConfig from "./models/NebIntegrationConfig";
 import Webhook from "./models/Webhook";
 import BridgeRecord from "./models/BridgeRecord";
+import IrcBridgeRecord from "./models/IrcBridgeRecord";
+import IrcBridgeNetwork from "./models/IrcBridgeNetwork";
 
 class _DimensionStore {
     private sequelize: Sequelize;
@@ -43,6 +45,8 @@ class _DimensionStore {
             NebIntegrationConfig,
             Webhook,
             BridgeRecord,
+            IrcBridgeRecord,
+            IrcBridgeNetwork,
         ]);
     }
 
diff --git a/src/db/migrations/20180330211845-AddIrcBridge.ts b/src/db/migrations/20180330211845-AddIrcBridge.ts
new file mode 100644
index 0000000..3e53d82
--- /dev/null
+++ b/src/db/migrations/20180330211845-AddIrcBridge.ts
@@ -0,0 +1,36 @@
+import { QueryInterface } from "sequelize";
+import { DataType } from "sequelize-typescript";
+
+export default {
+    up: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.createTable("dimension_irc_bridges", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "upstreamId": {
+                    type: DataType.INTEGER, allowNull: true,
+                    references: {model: "dimension_upstreams", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "provisionUrl": {type: DataType.STRING, allowNull: true},
+                "isEnabled": {type: DataType.BOOLEAN, allowNull: false},
+            }))
+            .then(() => queryInterface.createTable("dimension_irc_bridge_networks", {
+                "id": {type: DataType.INTEGER, primaryKey: true, autoIncrement: true, allowNull: false},
+                "bridgeId": {
+                    type: DataType.INTEGER, allowNull: false,
+                    references: {model: "dimension_irc_bridges", key: "id"},
+                    onUpdate: "cascade", onDelete: "cascade",
+                },
+                "bridgeNetworkId": {type: DataType.STRING, allowNull: false},
+                "bridgeUserId": {type: DataType.STRING, allowNull: false},
+                "displayName": {type: DataType.STRING, allowNull: false},
+                "domain": {type: DataType.STRING, allowNull: false},
+                "isEnabled": {type: DataType.BOOLEAN, allowNull: false},
+            }));
+    },
+    down: (queryInterface: QueryInterface) => {
+        return Promise.resolve()
+            .then(() => queryInterface.dropTable("dimension_irc_bridges"))
+            .then(() => queryInterface.dropTable("dimension_irc_bridge_networks"));
+    }
+}
\ No newline at end of file
diff --git a/src/db/models/IrcBridgeNetwork.ts b/src/db/models/IrcBridgeNetwork.ts
new file mode 100644
index 0000000..98c272a
--- /dev/null
+++ b/src/db/models/IrcBridgeNetwork.ts
@@ -0,0 +1,34 @@
+import { AllowNull, AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import IrcBridgeRecord from "./IrcBridgeRecord";
+
+@Table({
+    tableName: "dimension_irc_bridge_networks",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class IrcBridgeNetwork extends Model<IrcBridgeNetwork> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @AllowNull
+    @Column
+    @ForeignKey(() => IrcBridgeRecord)
+    bridgeId: number;
+
+    @Column
+    isEnabled: boolean;
+
+    @Column
+    bridgeNetworkId: string; // the real ID as given by /querynetworks
+
+    @Column
+    bridgeUserId: string;
+
+    @Column
+    displayName: string;
+
+    @Column
+    domain: string;
+}
\ No newline at end of file
diff --git a/src/db/models/IrcBridgeRecord.ts b/src/db/models/IrcBridgeRecord.ts
new file mode 100644
index 0000000..167bbba
--- /dev/null
+++ b/src/db/models/IrcBridgeRecord.ts
@@ -0,0 +1,26 @@
+import { AllowNull, AutoIncrement, Column, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import Upstream from "./Upstream";
+
+@Table({
+    tableName: "dimension_irc_bridges",
+    underscoredAll: false,
+    timestamps: false,
+})
+export default class IrcBridgeRecord extends Model<IrcBridgeRecord> {
+    @PrimaryKey
+    @AutoIncrement
+    @Column
+    id: number;
+
+    @AllowNull
+    @Column
+    @ForeignKey(() => Upstream)
+    upstreamId?: number;
+
+    @AllowNull
+    @Column
+    provisionUrl?: string;
+
+    @Column
+    isEnabled: boolean;
+}
\ No newline at end of file
diff --git a/src/integrations/Bridge.ts b/src/integrations/Bridge.ts
index 87aeb22..f80dcd3 100644
--- a/src/integrations/Bridge.ts
+++ b/src/integrations/Bridge.ts
@@ -1,5 +1,6 @@
 import { Integration } from "./Integration";
 import BridgeRecord from "../db/models/BridgeRecord";
+import { AvailableNetworks } from "../bridges/IrcBridge";
 
 export class Bridge extends Integration {
     constructor(bridge: BridgeRecord, public config: any) {
@@ -17,12 +18,7 @@ export class Bridge extends Integration {
 }
 
 export interface IrcBridgeConfiguration {
-    availableNetworks: {
-        [networkId: string]: {
-            name: string;
-            bridgeUserId: string;
-        };
-    };
+    availableNetworks: AvailableNetworks;
     links: {
         [networkId: string]: {
             channelName: string;
diff --git a/src/models/ModularResponses.ts b/src/models/ModularResponses.ts
index 8d18f22..31d4e77 100644
--- a/src/models/ModularResponses.ts
+++ b/src/models/ModularResponses.ts
@@ -1,4 +1,13 @@
+import { QueryNetworksResponse } from "../bridges/models/provision_responses";
+
 export interface ModularIntegrationInfoResponse {
     bot_user_id: string;
     integrations?: any[];
+}
+
+export interface ModularIrcQueryNetworksResponse {
+    replies: {
+        rid: string;
+        response: QueryNetworksResponse;
+    }[];
 }
\ No newline at end of file
diff --git a/web/app/admin/bridges/irc/irc.component.html b/web/app/admin/bridges/irc/irc.component.html
index a4b61ab..d542354 100644
--- a/web/app/admin/bridges/irc/irc.component.html
+++ b/web/app/admin/bridges/irc/irc.component.html
@@ -31,9 +31,9 @@
                         {{ getEnabledNetworksString(bridge) }}
                     </td>
                     <td class="text-center">
-                        <button type="button" class="editButton" (click)="editNetworks(bridge)">
+                        <span class="editButton" (click)="editNetworks(bridge)">
                             <i class="fa fa-pencil-alt"></i>
-                        </button>
+                        </span>
                     </td>
                 </tr>
                 </tbody>
diff --git a/web/app/admin/bridges/irc/irc.component.scss b/web/app/admin/bridges/irc/irc.component.scss
index e69de29..788d7ed 100644
--- a/web/app/admin/bridges/irc/irc.component.scss
+++ b/web/app/admin/bridges/irc/irc.component.scss
@@ -0,0 +1,3 @@
+.editButton {
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/web/app/admin/bridges/irc/irc.component.ts b/web/app/admin/bridges/irc/irc.component.ts
index a2df478..ab86c37 100644
--- a/web/app/admin/bridges/irc/irc.component.ts
+++ b/web/app/admin/bridges/irc/irc.component.ts
@@ -1,31 +1,93 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { AdminIrcApiService } from "../../../shared/services/admin/admin-irc-api.service";
+import { FE_Upstream } from "../../../shared/models/admin-responses";
+import { AdminUpstreamApiService } from "../../../shared/services/admin/admin-upstream-api.service";
+import { FE_IrcBridge } from "../../../shared/models/irc";
 
 @Component({
     templateUrl: "./irc.component.html",
     styleUrls: ["./irc.component.scss"],
 })
-export class AdminIrcBridgeComponent {
+export class AdminIrcBridgeComponent implements OnInit {
 
     public isLoading = true;
+    public isUpdating = false;
     public hasModularBridge = false;
-    public configurations: any[] = [];
+    public configurations: FE_IrcBridge[] = [];
 
-    constructor() {
+    private upstreams: FE_Upstream[];
+
+    constructor(private upstreamApi: AdminUpstreamApiService,
+                private ircApi: AdminIrcApiService,
+                private toaster: ToasterService) {
     }
 
-    public getEnabledNetworksString(bridge: any): string {
-        return "TODO: " + bridge;
+    public ngOnInit() {
+        this.reload().then(() => this.isLoading = false);
+    }
+
+    private async reload(): Promise<any> {
+        try {
+            this.upstreams = await this.upstreamApi.getUpstreams();
+            this.configurations = await this.ircApi.getBridges();
+
+            this.hasModularBridge = false;
+            for (const bridge of this.configurations) {
+                if (bridge.upstreamId) {
+                    this.hasModularBridge = true;
+                    break;
+                }
+            }
+        } catch (err) {
+            console.error(err);
+            this.toaster.pop("error", "Error loading bridges");
+        }
+    }
+
+    public getEnabledNetworksString(bridge: FE_IrcBridge): string {
+        const networkIds = Object.keys(bridge.availableNetworks);
+        const result = networkIds.filter(i => bridge.availableNetworks[i].isEnabled)
+            .map(i => bridge.availableNetworks[i].name)
+            .join(", ");
+        if (!result) return "None";
+        return result;
     }
 
     public addModularHostedBridge() {
+        this.isUpdating = true;
 
+        const createBridge = (upstream: FE_Upstream) => {
+            return this.ircApi.newFromUpstream(upstream).then(bridge => {
+                this.configurations.push(bridge);
+                this.toaster.pop("success", "matrix.org's IRC bridge added", "Click the pencil icon to enable networks.");
+                this.isUpdating = false;
+                this.hasModularBridge = true;
+            }).catch(err => {
+                console.error(err);
+                this.isUpdating = false;
+                this.toaster.pop("error", "Error adding matrix.org's IRC Bridge");
+            });
+        };
+        const vectorUpstreams = this.upstreams.filter(u => u.type === "vector");
+        if (vectorUpstreams.length === 0) {
+            console.log("Creating default scalar upstream");
+            const scalarUrl = "https://scalar.vector.im/api";
+            this.upstreamApi.newUpstream("modular", "vector", scalarUrl, scalarUrl).then(upstream => {
+                this.upstreams.push(upstream);
+                createBridge(upstream);
+            }).catch(err => {
+                console.error(err);
+                this.toaster.pop("error", "Error creating matrix.org's IRC Bridge");
+            });
+        } else createBridge(vectorUpstreams[0]);
     }
 
     public addSelfHostedBridge() {
-
+        console.log("TODO: Dialog");
     }
 
-    public editNetworks(bridge: any) {
+    public editNetworks(bridge: FE_IrcBridge) {
         console.log(bridge);
     }
 }
diff --git a/web/app/admin/neb/neb.component.ts b/web/app/admin/neb/neb.component.ts
index a75f625..d2fa73d 100644
--- a/web/app/admin/neb/neb.component.ts
+++ b/web/app/admin/neb/neb.component.ts
@@ -95,7 +95,7 @@ export class AdminNebComponent {
     public addModularHostedNeb() {
         this.isAddingModularNeb = true;
         const createNeb = (upstream: FE_Upstream) => {
-            this.nebApi.newUpstreamConfiguration(upstream).then(neb => {
+            return this.nebApi.newUpstreamConfiguration(upstream).then(neb => {
                 this.configurations.push(neb);
                 this.toaster.pop("success", "matrix.org's go-neb added", "Click the pencil icon to enable the bots.");
                 this.isAddingModularNeb = false;
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 4772a88..73ded73 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -65,6 +65,7 @@ import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisc
 import { ConfigScreenBridgeComponent } from "./configs/bridge/config-screen/config-screen.bridge.component";
 import { AdminBridgesComponent } from "./admin/bridges/bridges.component";
 import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
+import { AdminIrcApiService } from "./shared/services/admin/admin-irc-api.service";
 
 @NgModule({
     imports: [
@@ -138,6 +139,7 @@ import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
         AdminAppserviceApiService,
         AdminNebApiService,
         AdminUpstreamApiService,
+        AdminIrcApiService,
         {provide: Window, useValue: window},
 
         // Vendor
diff --git a/web/app/shared/models/irc.ts b/web/app/shared/models/irc.ts
new file mode 100644
index 0000000..40839ac
--- /dev/null
+++ b/web/app/shared/models/irc.ts
@@ -0,0 +1,16 @@
+export interface FE_IrcBridge {
+    id: number;
+    upstreamId?: number;
+    provisionUrl?: string;
+    isEnabled: boolean;
+    availableNetworks: FE_IrcBridgeAvailableNetworks;
+}
+
+export interface FE_IrcBridgeAvailableNetworks {
+    [networkId: string]: {
+        name: string;
+        domain: string;
+        bridgeUserId: string;
+        isEnabled: boolean;
+    };
+}
\ No newline at end of file
diff --git a/web/app/shared/services/admin/admin-irc-api.service.ts b/web/app/shared/services/admin/admin-irc-api.service.ts
new file mode 100644
index 0000000..cf7df20
--- /dev/null
+++ b/web/app/shared/services/admin/admin-irc-api.service.ts
@@ -0,0 +1,28 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../authed-api";
+import { FE_Upstream } from "../../models/admin-responses";
+import { FE_IrcBridge } from "../../models/irc";
+
+@Injectable()
+export class AdminIrcApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getBridges(): Promise<FE_IrcBridge[]> {
+        return this.authedGet("/api/v1/dimension/admin/irc/all").map(r => r.json()).toPromise();
+    }
+
+    public getBridge(bridgeId: number): Promise<FE_IrcBridge> {
+        return this.authedGet("/api/v1/dimension/admin/irc/" + bridgeId).map(r => r.json()).toPromise();
+    }
+
+    public newFromUpstream(upstream: FE_Upstream): Promise<FE_IrcBridge> {
+        return this.authedPost("/api/v1/dimension/admin/irc/new/upstream", {upstreamId: upstream.id}).map(r => r.json()).toPromise();
+    }
+
+    public newSelfhosted(provisionUrl: string): Promise<FE_IrcBridge> {
+        return this.authedPost("/api/v1/dimension/admin/irc/new/selfhosted", {provisionUrl: provisionUrl}).map(r => r.json()).toPromise();
+    }
+}

From aa8ec0ed5857194e7be57b3fd00dee5f8650bba7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 11:26:00 -0600
Subject: [PATCH 105/111] API and UI for toggling IRC networks

---
 src/api/admin/AdminIrcService.ts              | 30 +++++++++
 src/bridges/IrcBridge.ts                      |  2 +-
 web/app/admin/bridges/irc/irc.component.ts    | 12 +++-
 .../irc/networks/networks.component.html      | 29 +++++++++
 .../irc/networks/networks.component.scss      |  5 ++
 .../irc/networks/networks.component.ts        | 63 +++++++++++++++++++
 web/app/app.module.ts                         |  3 +
 .../services/admin/admin-irc-api.service.ts   |  6 ++
 8 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 web/app/admin/bridges/irc/networks/networks.component.html
 create mode 100644 web/app/admin/bridges/irc/networks/networks.component.scss
 create mode 100644 web/app/admin/bridges/irc/networks/networks.component.ts

diff --git a/src/api/admin/AdminIrcService.ts b/src/api/admin/AdminIrcService.ts
index 2e17cca..f5c2310 100644
--- a/src/api/admin/AdminIrcService.ts
+++ b/src/api/admin/AdminIrcService.ts
@@ -6,6 +6,7 @@ import { ApiError } from "../ApiError";
 import IrcBridgeRecord from "../../db/models/IrcBridgeRecord";
 import { AvailableNetworks, IrcBridge } from "../../bridges/IrcBridge";
 import Upstream from "../../db/models/Upstream";
+import IrcBridgeNetwork from "../../db/models/IrcBridgeNetwork";
 
 interface CreateWithUpstream {
     upstreamId: number;
@@ -23,6 +24,10 @@ interface BridgeResponse {
     availableNetworks: AvailableNetworks;
 }
 
+interface SetEnabledRequest {
+    isEnabled: boolean;
+}
+
 /**
  * Administrative API for configuring IRC bridge instances.
  */
@@ -65,6 +70,31 @@ export class AdminIrcService {
         };
     }
 
+    @POST
+    @Path(":bridgeId/network/:networkId/enabled")
+    public async setNetworkEnabled(@QueryParam("scalar_token") scalarToken: string, @PathParam("bridgeId") bridgeId: number, @PathParam("networkId") networkId: string, request: SetEnabledRequest): Promise<any> {
+        const userId = await AdminService.validateAndGetAdminTokenOwner(scalarToken);
+
+        const ircBridge = await IrcBridgeRecord.findByPrimary(bridgeId);
+        if (!ircBridge) throw new ApiError(404, "IRC Bridge not found");
+
+        const localNetworkId = IrcBridge.parseNetworkId(networkId).bridgeNetworkId;
+        const network = await IrcBridgeNetwork.findOne({
+            where: {
+                bridgeId: ircBridge.id,
+                bridgeNetworkId: localNetworkId,
+            },
+        });
+        if (!network) throw new ApiError(404, "Network not found");
+
+        network.isEnabled = request.isEnabled;
+        await network.save();
+
+        LogService.info("AdminIrcService", userId + " toggled the network '" + localNetworkId + "' on bridge " + ircBridge.id);
+        Cache.for(CACHE_IRC_BRIDGE).clear();
+        return {}; // 200 OK
+    }
+
     @POST
     @Path("new/upstream")
     public async newConfigForUpstream(@QueryParam("scalar_token") scalarToken: string, request: CreateWithUpstream): Promise<BridgeResponse> {
diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts
index 700c839..ec943cf 100644
--- a/src/bridges/IrcBridge.ts
+++ b/src/bridges/IrcBridge.ts
@@ -34,7 +34,7 @@ export class IrcBridge {
 
     public static parseNetworkId(networkId: string): { bridgeId: string, bridgeNetworkId: string } {
         const parts = networkId.split("-");
-        const bridgeId = parts.splice(1, 1)[0];
+        const bridgeId = parts.splice(0, 1)[0];
         const bridgeNetworkId = parts.join("-");
         return {bridgeId, bridgeNetworkId};
     }
diff --git a/web/app/admin/bridges/irc/irc.component.ts b/web/app/admin/bridges/irc/irc.component.ts
index ab86c37..f29403b 100644
--- a/web/app/admin/bridges/irc/irc.component.ts
+++ b/web/app/admin/bridges/irc/irc.component.ts
@@ -4,6 +4,8 @@ import { AdminIrcApiService } from "../../../shared/services/admin/admin-irc-api
 import { FE_Upstream } from "../../../shared/models/admin-responses";
 import { AdminUpstreamApiService } from "../../../shared/services/admin/admin-upstream-api.service";
 import { FE_IrcBridge } from "../../../shared/models/irc";
+import { Modal, overlayConfigFactory } from "ngx-modialog";
+import { AdminIrcBridgeNetworksComponent, IrcNetworksDialogContext } from "./networks/networks.component";
 
 @Component({
     templateUrl: "./irc.component.html",
@@ -20,7 +22,8 @@ export class AdminIrcBridgeComponent implements OnInit {
 
     constructor(private upstreamApi: AdminUpstreamApiService,
                 private ircApi: AdminIrcApiService,
-                private toaster: ToasterService) {
+                private toaster: ToasterService,
+                private modal: Modal) {
     }
 
     public ngOnInit() {
@@ -88,6 +91,11 @@ export class AdminIrcBridgeComponent implements OnInit {
     }
 
     public editNetworks(bridge: FE_IrcBridge) {
-        console.log(bridge);
+        this.modal.open(AdminIrcBridgeNetworksComponent, overlayConfigFactory({
+            bridge: bridge,
+
+            isBlocking: true,
+            size: 'lg',
+        }, IrcNetworksDialogContext));
     }
 }
diff --git a/web/app/admin/bridges/irc/networks/networks.component.html b/web/app/admin/bridges/irc/networks/networks.component.html
new file mode 100644
index 0000000..b93d7e0
--- /dev/null
+++ b/web/app/admin/bridges/irc/networks/networks.component.html
@@ -0,0 +1,29 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>{{ bridge.upstreamId ? "matrix.org's" : "Self-hosted" }} IRC Bridge Networks</h4>
+    </div>
+    <div class="dialog-content">
+        <table class="table table-striped table-condensed table-bordered">
+            <thead>
+            <tr>
+                <th>Network</th>
+                <th>Enabled</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr *ngFor="let network of networks trackById">
+                <td>{{ network.name }}</td>
+                <td>
+                    <ui-switch [checked]="network.isEnabled" size="small" [disabled]="isUpdating"
+                               (change)="toggleNetwork(network)"></ui-switch>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="dialog-footer">
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-primary btn-sm">
+            <i class="far fa-times-circle"></i> Close
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/bridges/irc/networks/networks.component.scss b/web/app/admin/bridges/irc/networks/networks.component.scss
new file mode 100644
index 0000000..344be0c
--- /dev/null
+++ b/web/app/admin/bridges/irc/networks/networks.component.scss
@@ -0,0 +1,5 @@
+table tr th:last-child,
+table tr td:last-child {
+  text-align: center;
+  width: 100px;
+}
\ No newline at end of file
diff --git a/web/app/admin/bridges/irc/networks/networks.component.ts b/web/app/admin/bridges/irc/networks/networks.component.ts
new file mode 100644
index 0000000..d65b821
--- /dev/null
+++ b/web/app/admin/bridges/irc/networks/networks.component.ts
@@ -0,0 +1,63 @@
+import { Component } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+import { FE_IrcBridge } from "../../../../shared/models/irc";
+import { AdminIrcApiService } from "../../../../shared/services/admin/admin-irc-api.service";
+
+export class IrcNetworksDialogContext extends BSModalContext {
+    public bridge: FE_IrcBridge;
+}
+
+interface LocalNetwork {
+    id: string;
+    name: string;
+    domain: string;
+    bridgeUserId: string;
+    isEnabled: boolean;
+}
+
+@Component({
+    templateUrl: "./networks.component.html",
+    styleUrls: ["./networks.component.scss"],
+})
+export class AdminIrcBridgeNetworksComponent implements ModalComponent<IrcNetworksDialogContext> {
+
+    public isUpdating = false;
+    public bridge: FE_IrcBridge;
+    public networks: LocalNetwork[];
+
+    constructor(public dialog: DialogRef<IrcNetworksDialogContext>,
+                private ircApi: AdminIrcApiService,
+                private toaster: ToasterService) {
+        this.bridge = dialog.context.bridge;
+
+        const networkIds = Object.keys(this.bridge.availableNetworks);
+        this.networks = networkIds.map(i => {
+            return {
+                id: i,
+                name: this.bridge.availableNetworks[i].name,
+                domain: this.bridge.availableNetworks[i].domain,
+                bridgeUserId: this.bridge.availableNetworks[i].bridgeUserId,
+                isEnabled: this.bridge.availableNetworks[i].isEnabled,
+            };
+        });
+    }
+
+    public toggleNetwork(network: LocalNetwork) {
+        network.isEnabled = !network.isEnabled;
+        this.bridge.availableNetworks[network.id].isEnabled = network.isEnabled;
+
+        this.isUpdating = true;
+        this.ircApi.setNetworkEnabled(this.bridge.id, network.id, network.isEnabled).then(() => {
+            this.isUpdating = false;
+            this.toaster.pop("success", "Network " + (network.isEnabled ? "enabled" : "disabled"));
+        }).catch(err => {
+            console.error(err);
+            this.isUpdating = false;
+            network.isEnabled = !network.isEnabled;
+            this.bridge.availableNetworks[network.id].isEnabled = network.isEnabled;
+            this.toaster.pop("error", "Failed to update network");
+        });
+    }
+}
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 73ded73..5574b08 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -66,6 +66,7 @@ import { ConfigScreenBridgeComponent } from "./configs/bridge/config-screen/conf
 import { AdminBridgesComponent } from "./admin/bridges/bridges.component";
 import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
 import { AdminIrcApiService } from "./shared/services/admin/admin-irc-api.service";
+import { AdminIrcBridgeNetworksComponent } from "./admin/bridges/irc/networks/networks.component";
 
 @NgModule({
     imports: [
@@ -125,6 +126,7 @@ import { AdminIrcApiService } from "./shared/services/admin/admin-irc-api.servic
         ConfigScreenBridgeComponent,
         AdminBridgesComponent,
         AdminIrcBridgeComponent,
+        AdminIrcBridgeNetworksComponent,
 
         // Vendor
     ],
@@ -154,6 +156,7 @@ import { AdminIrcApiService } from "./shared/services/admin/admin-irc-api.servic
         AdminNebGoogleConfigComponent,
         AdminNebImgurConfigComponent,
         ConfigSimpleBotComponent,
+        AdminIrcBridgeNetworksComponent,
     ]
 })
 export class AppModule {
diff --git a/web/app/shared/services/admin/admin-irc-api.service.ts b/web/app/shared/services/admin/admin-irc-api.service.ts
index cf7df20..ed47554 100644
--- a/web/app/shared/services/admin/admin-irc-api.service.ts
+++ b/web/app/shared/services/admin/admin-irc-api.service.ts
@@ -25,4 +25,10 @@ export class AdminIrcApiService extends AuthedApi {
     public newSelfhosted(provisionUrl: string): Promise<FE_IrcBridge> {
         return this.authedPost("/api/v1/dimension/admin/irc/new/selfhosted", {provisionUrl: provisionUrl}).map(r => r.json()).toPromise();
     }
+
+    public setNetworkEnabled(bridgeId: number, networkId: string, isEnabled: boolean): Promise<any> {
+        return this.authedPost("/api/v1/dimension/admin/irc/" + bridgeId + "/network/" + networkId + "/enabled", {
+            isEnabled: isEnabled,
+        }).map(r => r.json()).toPromise();
+    }
 }

From 1e437a2f8b48da9c184b4d126368674ef1bda6ad Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 11:45:19 -0600
Subject: [PATCH 106/111] Add ability to add self-hosted IRC bridges

---
 .../add-selfhosted.component.html             | 24 +++++++++++++
 .../add-selfhosted.component.scss             |  0
 .../add-selfhosted.component.ts               | 35 +++++++++++++++++++
 web/app/admin/bridges/irc/irc.component.html  |  2 +-
 web/app/admin/bridges/irc/irc.component.ts    | 14 +++++++-
 web/app/app.module.ts                         |  3 ++
 6 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.html
 create mode 100644 web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.scss
 create mode 100644 web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.ts

diff --git a/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.html b/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.html
new file mode 100644
index 0000000..b9d0d3c
--- /dev/null
+++ b/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.html
@@ -0,0 +1,24 @@
+<div class="dialog">
+    <div class="dialog-header">
+        <h4>Add a new self-hosted IRC Bridge</h4>
+    </div>
+    <div class="dialog-content">
+        <p>Self-hosted IRC bridges must have <code>provisioning</code> enabled in the configuration.</p>
+
+        <label class="label-block">
+            Provisioning URL
+            <span class="text-muted ">The provisioning URL for the bridge. This is usually the same as the URL given in the registration. This API is not authenticated and should be treated with caution.</span>
+            <input type="text" class="form-control"
+                   placeholder="http://localhost:9999"
+                   [(ngModel)]="provisionUrl" [disabled]="isSaving"/>
+        </label>
+    </div>
+    <div class="dialog-footer">
+        <button type="button" (click)="add()" title="close" class="btn btn-primary btn-sm">
+            <i class="far fa-save"></i> Save
+        </button>
+        <button type="button" (click)="dialog.close()" title="close" class="btn btn-secondary btn-sm">
+            <i class="far fa-times-circle"></i> Cancel
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.scss b/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.ts b/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.ts
new file mode 100644
index 0000000..c26e7af
--- /dev/null
+++ b/web/app/admin/bridges/irc/add-selfhosted/add-selfhosted.component.ts
@@ -0,0 +1,35 @@
+import { Component } from "@angular/core";
+import { ToasterService } from "angular2-toaster";
+import { DialogRef, ModalComponent } from "ngx-modialog";
+import { BSModalContext } from "ngx-modialog/plugins/bootstrap";
+import { AdminIrcApiService } from "../../../../shared/services/admin/admin-irc-api.service";
+
+export class AddSelfhostedIrcBridgeDialogContext extends BSModalContext {
+}
+
+@Component({
+    templateUrl: "./add-selfhosted.component.html",
+    styleUrls: ["./add-selfhosted.component.scss"],
+})
+export class AdminIrcBridgeAddSelfhostedComponent implements ModalComponent<AddSelfhostedIrcBridgeDialogContext> {
+
+    public isSaving = false;
+    public provisionUrl: string;
+
+    constructor(public dialog: DialogRef<AddSelfhostedIrcBridgeDialogContext>,
+                private ircApi: AdminIrcApiService,
+                private toaster: ToasterService) {
+    }
+
+    public add() {
+        this.isSaving = true;
+        this.ircApi.newSelfhosted(this.provisionUrl).then(() => {
+            this.toaster.pop("success", "IRC Bridge added");
+            this.dialog.close();
+        }).catch(err => {
+            console.error(err);
+            this.isSaving = false;
+            this.toaster.pop("error", "Failed to create IRC bridge");
+        });
+    }
+}
diff --git a/web/app/admin/bridges/irc/irc.component.html b/web/app/admin/bridges/irc/irc.component.html
index d542354..5a324f7 100644
--- a/web/app/admin/bridges/irc/irc.component.html
+++ b/web/app/admin/bridges/irc/irc.component.html
@@ -25,7 +25,7 @@
                 <tr *ngFor="let bridge of configurations trackById">
                     <td>
                         {{ bridge.upstreamId ? "matrix.org's bridge" : "Self-hosted bridge" }}
-                        <span class="text-muted" style="display: inline-block;" *ngIf="!bridge.upstreamId">({{ bridge.adminUrl }})</span>
+                        <span class="text-muted" style="display: inline-block;" *ngIf="!bridge.upstreamId">({{ bridge.provisionUrl }})</span>
                     </td>
                     <td>
                         {{ getEnabledNetworksString(bridge) }}
diff --git a/web/app/admin/bridges/irc/irc.component.ts b/web/app/admin/bridges/irc/irc.component.ts
index f29403b..ab46c26 100644
--- a/web/app/admin/bridges/irc/irc.component.ts
+++ b/web/app/admin/bridges/irc/irc.component.ts
@@ -6,6 +6,10 @@ import { AdminUpstreamApiService } from "../../../shared/services/admin/admin-up
 import { FE_IrcBridge } from "../../../shared/models/irc";
 import { Modal, overlayConfigFactory } from "ngx-modialog";
 import { AdminIrcBridgeNetworksComponent, IrcNetworksDialogContext } from "./networks/networks.component";
+import {
+    AddSelfhostedIrcBridgeDialogContext,
+    AdminIrcBridgeAddSelfhostedComponent
+} from "./add-selfhosted/add-selfhosted.component";
 
 @Component({
     templateUrl: "./irc.component.html",
@@ -87,7 +91,15 @@ export class AdminIrcBridgeComponent implements OnInit {
     }
 
     public addSelfHostedBridge() {
-        console.log("TODO: Dialog");
+        this.modal.open(AdminIrcBridgeAddSelfhostedComponent, overlayConfigFactory({
+            isBlocking: true,
+            size: 'lg',
+        }, AddSelfhostedIrcBridgeDialogContext)).result.then(() => {
+            this.reload().catch(err => {
+                console.error(err);
+                this.toaster.pop("error", "Failed to get an update IRC bridge list");
+            });
+        });
     }
 
     public editNetworks(bridge: FE_IrcBridge) {
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 5574b08..059d8c5 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -67,6 +67,7 @@ import { AdminBridgesComponent } from "./admin/bridges/bridges.component";
 import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
 import { AdminIrcApiService } from "./shared/services/admin/admin-irc-api.service";
 import { AdminIrcBridgeNetworksComponent } from "./admin/bridges/irc/networks/networks.component";
+import { AdminIrcBridgeAddSelfhostedComponent } from "./admin/bridges/irc/add-selfhosted/add-selfhosted.component";
 
 @NgModule({
     imports: [
@@ -127,6 +128,7 @@ import { AdminIrcBridgeNetworksComponent } from "./admin/bridges/irc/networks/ne
         AdminBridgesComponent,
         AdminIrcBridgeComponent,
         AdminIrcBridgeNetworksComponent,
+        AdminIrcBridgeAddSelfhostedComponent,
 
         // Vendor
     ],
@@ -157,6 +159,7 @@ import { AdminIrcBridgeNetworksComponent } from "./admin/bridges/irc/networks/ne
         AdminNebImgurConfigComponent,
         ConfigSimpleBotComponent,
         AdminIrcBridgeNetworksComponent,
+        AdminIrcBridgeAddSelfhostedComponent,
     ]
 })
 export class AppModule {

From f33f7e5716c0aaad843a9039c6faa3fcce6ac78f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 14:37:36 -0600
Subject: [PATCH 107/111] Self-service requests to bridge IRC channels

---
 .../dimension/DimensionIntegrationsService.ts |   9 +-
 src/api/dimension/DimensionIrcService.ts      |  49 +++++++
 src/bridges/IrcBridge.ts                      | 114 +++++++++++++--
 .../models/{provision_responses.ts => irc.ts} |  10 ++
 src/db/BridgeStore.ts                         |   7 +-
 src/integrations/Bridge.ts                    |  11 +-
 src/models/ModularResponses.ts                |   6 +-
 web/app/app.module.ts                         |   4 +
 web/app/app.routing.ts                        |  20 +--
 .../bridge/irc/irc.bridge.component.html      |  89 ++++++++++++
 .../bridge/irc/irc.bridge.component.scss      |   4 +
 .../bridge/irc/irc.bridge.component.ts        | 133 ++++++++++++++++++
 web/app/shared/models/integration.ts          |   1 -
 .../shared/models/server-client-responses.ts  |   6 +
 .../services/integrations/irc-api.service.ts  |  18 +++
 .../scalar/scalar-client-api.service.ts       |  12 +-
 16 files changed, 450 insertions(+), 43 deletions(-)
 create mode 100644 src/api/dimension/DimensionIrcService.ts
 rename src/bridges/models/{provision_responses.ts => irc.ts} (50%)
 create mode 100644 web/app/configs/bridge/irc/irc.bridge.component.html
 create mode 100644 web/app/configs/bridge/irc/irc.bridge.component.scss
 create mode 100644 web/app/configs/bridge/irc/irc.bridge.component.ts
 create mode 100644 web/app/shared/services/integrations/irc-api.service.ts

diff --git a/src/api/dimension/DimensionIntegrationsService.ts b/src/api/dimension/DimensionIntegrationsService.ts
index f651062..5eae02b 100644
--- a/src/api/dimension/DimensionIntegrationsService.ts
+++ b/src/api/dimension/DimensionIntegrationsService.ts
@@ -46,14 +46,7 @@ export class DimensionIntegrationsService {
      * @returns {Promise<Bridge[]>} Resolves to the bridge list
      */
     public static async getBridges(enabledOnly: boolean, forUserId: string, inRoomId?: string): Promise<Bridge[]> {
-        const cacheKey = inRoomId ? "bridges_" + inRoomId : "bridges";
-
-        const cached = Cache.for(CACHE_INTEGRATIONS).get(cacheKey);
-        if (cached) return cached;
-
-        const bridges = await BridgeStore.listAll(forUserId, enabledOnly ? true : null, inRoomId);
-        Cache.for(CACHE_INTEGRATIONS).put(cacheKey, bridges);
-        return bridges;
+        return BridgeStore.listAll(forUserId, enabledOnly ? true : null, inRoomId);
     }
 
     /**
diff --git a/src/api/dimension/DimensionIrcService.ts b/src/api/dimension/DimensionIrcService.ts
new file mode 100644
index 0000000..1cd13df
--- /dev/null
+++ b/src/api/dimension/DimensionIrcService.ts
@@ -0,0 +1,49 @@
+import { GET, Path, PathParam, POST, QueryParam } from "typescript-rest";
+import { LogService } from "matrix-js-snippets";
+import { ScalarService } from "../scalar/ScalarService";
+import { IrcBridge } from "../../bridges/IrcBridge";
+import IrcBridgeRecord from "../../db/models/IrcBridgeRecord";
+import { ApiError } from "../ApiError";
+
+interface RequestLinkRequest {
+    op: string;
+}
+
+/**
+ * API for interacting with the IRC bridge
+ */
+@Path("/api/v1/dimension/irc")
+export class DimensionIrcService {
+
+    @GET
+    @Path(":networkId/channel/:channel/ops")
+    public async getOps(@QueryParam("scalar_token") scalarToken: string, @PathParam("networkId") networkId: string, @PathParam("channel") channelNoHash: string): Promise<string[]> {
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+
+        const parsed = IrcBridge.parseNetworkId(networkId);
+        const bridge = await IrcBridgeRecord.findByPrimary(parsed.bridgeId);
+        if (!bridge) throw new ApiError(404, "Bridge not found");
+
+        const client = new IrcBridge(userId);
+        const operators = await client.getOperators(bridge, parsed.bridgeNetworkId, "#" + channelNoHash);
+
+        LogService.info("DimensionIrcService", userId + " listed the operators for #" + channelNoHash + " on " + networkId);
+        return operators;
+    }
+
+    @POST
+    @Path(":networkId/channel/:channel/link/:roomId")
+    public async requestLink(@QueryParam("scalar_token") scalarToken: string, @PathParam("networkId") networkId: string, @PathParam("channel") channelNoHash: string, @PathParam("roomId") roomId: string, request: RequestLinkRequest): Promise<any> {
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+
+        const parsed = IrcBridge.parseNetworkId(networkId);
+        const bridge = await IrcBridgeRecord.findByPrimary(parsed.bridgeId);
+        if (!bridge) throw new ApiError(404, "Bridge not found");
+
+        const client = new IrcBridge(userId);
+        await client.requestLink(bridge, parsed.bridgeNetworkId, "#" + channelNoHash, request.op, roomId);
+
+        LogService.info("DimensionIrcService", userId + " requested #" + channelNoHash + " on " + networkId + " to be linked to " + roomId);
+        return {}; // 200 OK
+    }
+}
\ No newline at end of file
diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts
index ec943cf..922f5c9 100644
--- a/src/bridges/IrcBridge.ts
+++ b/src/bridges/IrcBridge.ts
@@ -5,9 +5,9 @@ import Upstream from "../db/models/Upstream";
 import UserScalarToken from "../db/models/UserScalarToken";
 import { LogService } from "matrix-js-snippets";
 import * as request from "request";
-import { QueryNetworksResponse } from "./models/provision_responses";
-import { ModularIrcQueryNetworksResponse } from "../models/ModularResponses";
+import { ListLinksResponseItem, ListOpsResponse, QueryNetworksResponse } from "./models/irc";
 import IrcBridgeNetwork from "../db/models/IrcBridgeNetwork";
+import { ModularIrcResponse } from "../models/ModularResponses";
 
 interface CachedNetwork {
     ircBridgeId: number;
@@ -27,6 +27,12 @@ export interface AvailableNetworks {
     };
 }
 
+export interface LinkedChannels {
+    [networkId: string]: {
+        channelName: string;
+    }[];
+}
+
 export class IrcBridge {
     private static getNetworkId(network: CachedNetwork): string {
         return network.ircBridgeId + "-" + network.bridgeNetworkId;
@@ -47,9 +53,10 @@ export class IrcBridge {
         return allNetworks.length > 0;
     }
 
-    public async getNetworks(bridge?: IrcBridgeRecord): Promise<AvailableNetworks> {
+    public async getNetworks(bridge?: IrcBridgeRecord, enabledOnly?: boolean): Promise<AvailableNetworks> {
         let networks = await this.getAllNetworks();
         if (bridge) networks = networks.filter(n => n.ircBridgeId === bridge.id);
+        if (enabledOnly) networks = networks.filter(n => n.isEnabled);
 
         const available: AvailableNetworks = {};
         networks.forEach(n => available[IrcBridge.getNetworkId(n)] = {
@@ -61,12 +68,63 @@ export class IrcBridge {
         return available;
     }
 
-    public async getRoomConfiguration(requestingUserId: string, inRoomId: string): Promise<IrcBridgeConfiguration> {
-        return <any>{requestingUserId, inRoomId};
+    public async getRoomConfiguration(inRoomId: string): Promise<IrcBridgeConfiguration> {
+        const availableNetworks = await this.getNetworks(null, true);
+        const bridges = await IrcBridgeRecord.findAll({where: {isEnabled: true}});
+        const linkedChannels: LinkedChannels = {};
+
+        for (const bridge of bridges) {
+            const links = await this.fetchLinks(bridge, inRoomId);
+            for (const key of Object.keys(links)) {
+                linkedChannels[key] = links[key];
+            }
+        }
+
+        return {availableNetworks: availableNetworks, links: linkedChannels};
     }
 
-    public async setRoomConfiguration(requestingUserId: string, inRoomId: string, newConfig: IrcBridgeConfiguration): Promise<any> {
-        return <any>{requestingUserId, inRoomId, newConfig};
+    public async getOperators(bridge: IrcBridgeRecord, networkId: string, channel: string): Promise<string[]> {
+        const network = (await this.getAllNetworks()).find(n => n.isEnabled && n.ircBridgeId === bridge.id && n.bridgeNetworkId === networkId);
+        if (!network) throw new Error("Network not found");
+
+        const requestBody = {remote_room_server: network.domain, remote_room_channel: channel};
+
+        let responses: ListOpsResponse[] = [];
+        if (bridge.upstreamId) {
+            const result = await this.doUpstreamRequest<ModularIrcResponse<ListOpsResponse>>(bridge, "POST", "/bridges/irc/_matrix/provision/querylink", null, requestBody);
+            if (result && result.replies) responses = result.replies.map(r => r.response);
+        } else {
+            const result = await this.doProvisionRequest<ListOpsResponse>(bridge, "POST", "/_matrix/provision/querylink", null, requestBody);
+            if (result) responses = [result];
+        }
+
+        const ops: string[] = [];
+        for (const response of responses) {
+            if (!response || !response.operators) continue;
+            response.operators.forEach(i => ops.push(i));
+        }
+
+        return ops;
+    }
+
+    public async requestLink(bridge: IrcBridgeRecord, networkId: string, channel: string, op: string, inRoomId: string): Promise<any> {
+        const network = (await this.getAllNetworks()).find(n => n.isEnabled && n.ircBridgeId === bridge.id && n.bridgeNetworkId === networkId);
+        if (!network) throw new Error("Network not found");
+
+        const requestBody = {
+            remote_room_server: network.domain,
+            remote_room_channel: channel,
+            matrix_room_id: inRoomId,
+            op_nick: op,
+            user_id: this.requestingUserId,
+        };
+
+        if (bridge.upstreamId) {
+            delete requestBody["user_id"];
+            await this.doUpstreamRequest(bridge, "POST", "/bridges/irc/_matrix/provision/link", null, requestBody);
+        } else {
+            await this.doProvisionRequest(bridge, "POST", "/_matrix/provision/link", null, requestBody);
+        }
     }
 
     private async getAllNetworks(): Promise<CachedNetwork[]> {
@@ -86,10 +144,50 @@ export class IrcBridge {
         return networks;
     }
 
+    private async fetchLinks(bridge: IrcBridgeRecord, inRoomId: string): Promise<LinkedChannels> {
+        const availableNetworks = await this.getNetworks(bridge, true);
+        const networksByDomain: { [domain: string]: { id: string, name: string, bridgeUserId: string } } = {};
+        for (const key of Object.keys(availableNetworks)) {
+            const network = availableNetworks[key];
+            networksByDomain[network.domain] = {
+                id: key,
+                name: network.name,
+                bridgeUserId: network.bridgeUserId,
+            };
+        }
+
+        let responses: ListLinksResponseItem[] = [];
+        if (bridge.upstreamId) {
+            const result = await this.doUpstreamRequest<ModularIrcResponse<ListLinksResponseItem[]>>(bridge, "GET", "/bridges/irc/_matrix/provision/listlinks/" + inRoomId);
+            if (result && result.replies) {
+                const replies = result.replies.map(r => r.response);
+                for (const reply of replies) reply.forEach(r => responses.push(r));
+            }
+        } else {
+            const result = await this.doProvisionRequest<ListLinksResponseItem[]>(bridge, "GET", "/_matrix/provision/listlinks/" + inRoomId);
+            if (result) responses = result;
+        }
+
+        const linked: LinkedChannels = {};
+        for (const response of responses) {
+            if (!response || !response.remote_room_server) continue;
+
+            const network = networksByDomain[response.remote_room_server];
+            if (!network) continue;
+
+            if (!linked[network.id]) linked[network.id] = [];
+            linked[network.id].push({
+                channelName: response.remote_room_channel,
+            });
+        }
+
+        return linked;
+    }
+
     private async fetchNetworks(bridge: IrcBridgeRecord): Promise<CachedNetwork[]> {
         let responses: QueryNetworksResponse[] = [];
         if (bridge.upstreamId) {
-            const result = await this.doUpstreamRequest<ModularIrcQueryNetworksResponse>(bridge, "GET", "/bridges/irc/_matrix/provision/querynetworks");
+            const result = await this.doUpstreamRequest<ModularIrcResponse<QueryNetworksResponse>>(bridge, "GET", "/bridges/irc/_matrix/provision/querynetworks");
             if (result && result.replies) responses = result.replies.map(r => r.response);
         } else {
             const result = await this.doProvisionRequest<QueryNetworksResponse>(bridge, "GET", "/_matrix/provision/querynetworks");
diff --git a/src/bridges/models/provision_responses.ts b/src/bridges/models/irc.ts
similarity index 50%
rename from src/bridges/models/provision_responses.ts
rename to src/bridges/models/irc.ts
index 0c92c9a..b8dde4b 100644
--- a/src/bridges/models/provision_responses.ts
+++ b/src/bridges/models/irc.ts
@@ -7,4 +7,14 @@ export interface QueryNetworksResponse {
             domain: string;
         };
     }[];
+}
+
+export interface ListLinksResponseItem {
+    matrix_room_id: string;
+    remote_room_channel: string;
+    remote_room_server: string;
+}
+
+export interface ListOpsResponse {
+    operators: string[];
 }
\ No newline at end of file
diff --git a/src/db/BridgeStore.ts b/src/db/BridgeStore.ts
index 99faa01..5c502b9 100644
--- a/src/db/BridgeStore.ts
+++ b/src/db/BridgeStore.ts
@@ -32,13 +32,12 @@ export class BridgeStore {
         return bridge.save();
     }
 
-    public static async setBridgeRoomConfig(requestingUserId: string, integrationType: string, inRoomId: string, newConfig: any): Promise<any> {
+    public static async setBridgeRoomConfig(_requestingUserId: string, integrationType: string, _inRoomId: string, _newConfig: any): Promise<any> {
         const record = await BridgeRecord.findOne({where: {type: integrationType}});
         if (!record) throw new Error("Bridge not found");
 
         if (integrationType === "irc") {
-            const irc = new IrcBridge(requestingUserId);
-            return irc.setRoomConfiguration(requestingUserId, inRoomId, newConfig);
+            throw new Error("IRC Bridges should be modified with the dedicated API");
         } else throw new Error("Unsupported bridge");
     }
 
@@ -53,7 +52,7 @@ export class BridgeStore {
         if (record.type === "irc") {
             if (!inRoomId) return {}; // The bridge's admin config is handled by other APIs
             const irc = new IrcBridge(requestingUserId);
-            return irc.getRoomConfiguration(requestingUserId, inRoomId);
+            return irc.getRoomConfiguration(inRoomId);
         } else return {};
     }
 
diff --git a/src/integrations/Bridge.ts b/src/integrations/Bridge.ts
index f80dcd3..fef2643 100644
--- a/src/integrations/Bridge.ts
+++ b/src/integrations/Bridge.ts
@@ -1,6 +1,6 @@
 import { Integration } from "./Integration";
 import BridgeRecord from "../db/models/BridgeRecord";
-import { AvailableNetworks } from "../bridges/IrcBridge";
+import { AvailableNetworks, LinkedChannels } from "../bridges/IrcBridge";
 
 export class Bridge extends Integration {
     constructor(bridge: BridgeRecord, public config: any) {
@@ -12,17 +12,12 @@ export class Bridge extends Integration {
             argument: null, // not used
         }];
 
-        // We'll just say we aren't
+        // We'll just say we don't support encryption
         this.isEncryptionSupported = false;
     }
 }
 
 export interface IrcBridgeConfiguration {
     availableNetworks: AvailableNetworks;
-    links: {
-        [networkId: string]: {
-            channelName: string;
-            addedByUserId: string;
-        }[];
-    };
+    links: LinkedChannels;
 }
\ No newline at end of file
diff --git a/src/models/ModularResponses.ts b/src/models/ModularResponses.ts
index 31d4e77..f9bac1b 100644
--- a/src/models/ModularResponses.ts
+++ b/src/models/ModularResponses.ts
@@ -1,13 +1,11 @@
-import { QueryNetworksResponse } from "../bridges/models/provision_responses";
-
 export interface ModularIntegrationInfoResponse {
     bot_user_id: string;
     integrations?: any[];
 }
 
-export interface ModularIrcQueryNetworksResponse {
+export interface ModularIrcResponse<T> {
     replies: {
         rid: string;
-        response: QueryNetworksResponse;
+        response: T;
     }[];
 }
\ No newline at end of file
diff --git a/web/app/app.module.ts b/web/app/app.module.ts
index 059d8c5..c27dc03 100644
--- a/web/app/app.module.ts
+++ b/web/app/app.module.ts
@@ -68,6 +68,8 @@ import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
 import { AdminIrcApiService } from "./shared/services/admin/admin-irc-api.service";
 import { AdminIrcBridgeNetworksComponent } from "./admin/bridges/irc/networks/networks.component";
 import { AdminIrcBridgeAddSelfhostedComponent } from "./admin/bridges/irc/add-selfhosted/add-selfhosted.component";
+import { IrcBridgeConfigComponent } from "./configs/bridge/irc/irc.bridge.component";
+import { IrcApiService } from "./shared/services/integrations/irc-api.service";
 
 @NgModule({
     imports: [
@@ -129,6 +131,7 @@ import { AdminIrcBridgeAddSelfhostedComponent } from "./admin/bridges/irc/add-se
         AdminIrcBridgeComponent,
         AdminIrcBridgeNetworksComponent,
         AdminIrcBridgeAddSelfhostedComponent,
+        IrcBridgeConfigComponent,
 
         // Vendor
     ],
@@ -144,6 +147,7 @@ import { AdminIrcBridgeAddSelfhostedComponent } from "./admin/bridges/irc/add-se
         AdminNebApiService,
         AdminUpstreamApiService,
         AdminIrcApiService,
+        IrcApiService,
         {provide: Window, useValue: window},
 
         // Vendor
diff --git a/web/app/app.routing.ts b/web/app/app.routing.ts
index f7fca46..8fc8699 100644
--- a/web/app/app.routing.ts
+++ b/web/app/app.routing.ts
@@ -23,6 +23,7 @@ import { RssComplexBotConfigComponent } from "./configs/complex-bot/rss/rss.comp
 import { TravisCiComplexBotConfigComponent } from "./configs/complex-bot/travisci/travisci.complex-bot.component";
 import { AdminBridgesComponent } from "./admin/bridges/bridges.component";
 import { AdminIrcBridgeComponent } from "./admin/bridges/irc/irc.component";
+import { IrcBridgeConfigComponent } from "./configs/bridge/irc/irc.bridge.component";
 
 const routes: Routes = [
     {path: "", component: HomeComponent},
@@ -142,15 +143,16 @@ const routes: Routes = [
                     },
                 ],
             },
-            // {
-            //     path: "bridge",
-            //     children: [
-            //         {
-            //             path: "irc",
-            //
-            //         }
-            //     ]
-            // }
+            {
+                path: "bridge",
+                children: [
+                    {
+                        path: "irc",
+                        component: IrcBridgeConfigComponent,
+                        data: {breadcrumb: "IRC Bridge Configuration", name: "IRC Bridge Configuration"},
+                    },
+                ],
+            },
         ],
     },
     {
diff --git a/web/app/configs/bridge/irc/irc.bridge.component.html b/web/app/configs/bridge/irc/irc.bridge.component.html
new file mode 100644
index 0000000..9063f54
--- /dev/null
+++ b/web/app/configs/bridge/irc/irc.bridge.component.html
@@ -0,0 +1,89 @@
+<my-bridge-config [bridgeComponent]="this">
+    <ng-template #bridgeParamsTemplate>
+        <my-ibox [isCollapsible]="true">
+            <h5 class="my-ibox-title">
+                Add an IRC channel
+            </h5>
+            <div class="my-ibox-content">
+                <div class="alert alert-info">
+                    Bridging a channel requires authorization from a channel operator. When entering a channel below, a
+                    bot will
+                    join the channel to ensure it exists and has operators available.
+                </div>
+
+                <div *ngIf="channelStep === 1">
+                    <label class="label-block">
+                        Network
+                        <select class="form-control form-control-sm" [(ngModel)]="networkId" [disabled]="loadingOps">
+                            <option *ngFor="let network of getNetworks()" [ngValue]="network.id">
+                                {{ network.name }}
+                            </option>
+                        </select>
+                    </label>
+                    <label class="label-block">
+                        Channel Name
+                    </label>
+                    <div class="input-group input-group-sm">
+                        <div class="input-group-addon">#</div>
+                        <input title="channel" type="text" class="form-control form-control-sm" [(ngModel)]="channel" [disabled]="loadingOps">
+                    </div>
+                    <div style="margin-top: 25px">
+                        <button type="button" class="btn btn-sm btn-primary" [disabled]="loadingOps" (click)="loadOps()">
+                            Next
+                        </button>
+                    </div>
+                </div>
+
+                <div *ngIf="channelStep === 2">
+                    <label class="label-block">
+                        Operator
+                        <span class="text-muted ">The person selected here will be asked to approve or deny the bridge request.</span>
+                        <select class="form-control form-control-sm" [(ngModel)]="op" [disabled]="requestingBridge">
+                            <option *ngFor="let op of ops" [ngValue]="op">{{ op }}</option>
+                        </select>
+                    </label>
+                    <div style="margin-top: 25px">
+                        <button type="button" class="btn btn-sm btn-primary" [disabled]="requestingBridge" (click)="requestBridge()">
+                            Request Bridge
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </my-ibox>
+        <my-ibox [isCollapsible]="true">
+            <h5 class="my-ibox-title">
+                IRC Networks
+            </h5>
+            <div class="my-ibox-content">
+                <table class="table table-striped table-condensed table-bordered">
+                    <thead>
+                    <tr>
+                        <th>Channel</th>
+                        <th>Network</th>
+                        <th class="actions-col">Actions</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr *ngIf="getChannels().length === 0">
+                        <td colspan="3">No bridged channels</td>
+                    </tr>
+                    <tr *ngFor="let channel of getChannels()">
+                        <td>
+                            {{ channel.name }}
+                            <span *ngIf="channel.pending" class="text-muted">(pending)</span>
+                        </td>
+                        <td>{{ channel.networkName }}</td>
+                        <td class="actions-col">
+                            <button type="button" class="btn btn-sm btn-outline-danger"
+                                    [disabled]="isUpdating || channel.pending"
+                                    (click)="removeChannel(channel)">
+                                <i class="far fa-trash-alt"></i> Remove
+                            </button>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </my-ibox>
+    </ng-template>
+</my-bridge-config>
\ No newline at end of file
diff --git a/web/app/configs/bridge/irc/irc.bridge.component.scss b/web/app/configs/bridge/irc/irc.bridge.component.scss
new file mode 100644
index 0000000..7c9eeab
--- /dev/null
+++ b/web/app/configs/bridge/irc/irc.bridge.component.scss
@@ -0,0 +1,4 @@
+.actions-col {
+  width: 120px;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/web/app/configs/bridge/irc/irc.bridge.component.ts b/web/app/configs/bridge/irc/irc.bridge.component.ts
new file mode 100644
index 0000000..fb31acb
--- /dev/null
+++ b/web/app/configs/bridge/irc/irc.bridge.component.ts
@@ -0,0 +1,133 @@
+import { Component } from "@angular/core";
+import { BridgeComponent } from "../bridge.component";
+import { FE_IrcBridgeAvailableNetworks } from "../../../shared/models/irc";
+import { IrcApiService } from "../../../shared/services/integrations/irc-api.service";
+
+interface IrcConfig {
+    availableNetworks: FE_IrcBridgeAvailableNetworks;
+    links: {
+        [networkId: string]: {
+            channelName: string;
+        }[];
+    };
+}
+
+interface LocalChannel {
+    name: string;
+    networkId: string;
+    networkName: string;
+    pending: boolean;
+}
+
+@Component({
+    templateUrl: "irc.bridge.component.html",
+    styleUrls: ["irc.bridge.component.scss"],
+})
+export class IrcBridgeConfigComponent extends BridgeComponent<IrcConfig> {
+
+    public loadingOps = false;
+    public requestingBridge = false;
+    public channelStep = 1;
+    public networkId: string;
+    public channel = "";
+    public ops: string[];
+    public op: string;
+    public pending: LocalChannel[] = [];
+
+    constructor(private irc: IrcApiService) {
+        super("irc");
+    }
+
+    private resetForm() {
+        this.networkId = this.getNetworks()[0].id;
+        this.channel = "";
+        this.ops = [];
+        this.channelStep = 1;
+    }
+
+    public getNetworks(): { id: string, name: string }[] {
+        const ids = Object.keys(this.bridge.config.availableNetworks);
+        if (!this.networkId) setTimeout(() => this.networkId = ids[0], 0);
+        return ids.map(i => {
+            return {id: i, name: this.bridge.config.availableNetworks[i].name};
+        });
+    }
+
+    public loadOps() {
+        if (!this.channel.trim()) {
+            this.toaster.pop("warning", "Please enter a channel name");
+            return;
+        }
+
+        this.loadingOps = true;
+        this.irc.getOperators(this.networkId, this.channel).then(ops => {
+            this.ops = ops;
+            this.op = ops[0];
+            this.loadingOps = false;
+            this.channelStep = 2;
+        }).catch(err => {
+            console.error(err);
+            this.loadingOps = false;
+            this.toaster.pop("error", "Error loading channel operators");
+        });
+    }
+
+    public async requestBridge() {
+        this.requestingBridge = true;
+        const bridgeUserId = this.bridge.config.availableNetworks[this.networkId].bridgeUserId;
+
+        const memberEvent = await this.scalarClientApi.getMembershipState(this.roomId, bridgeUserId);
+        const isJoined = memberEvent && memberEvent.response && ["join", "invite"].indexOf(memberEvent.response.membership) !== -1;
+
+        if (!isJoined) await this.scalarClientApi.inviteUser(this.roomId, bridgeUserId);
+
+        try {
+            await this.scalarClientApi.setUserPowerLevel(this.roomId, bridgeUserId, 100);
+        } catch (err) {
+            console.error(err);
+            this.requestingBridge = false;
+            this.toaster.pop("error", "Failed to make the bridge an administrator", "Please ensure you are an 'Admin' for the room");
+            return;
+        }
+
+        this.irc.requestLink(this.roomId, this.networkId, this.channel, this.op).then(() => {
+            this.requestingBridge = false;
+            this.pending.push({
+                name: this.channel,
+                networkId: this.networkId,
+                networkName: this.bridge.config.availableNetworks[this.networkId].name,
+                pending: true,
+            });
+            this.resetForm();
+            this.toaster.pop("success", "Link requested!", "The operator selected will have to approve the bridge for it to work");
+        }).catch(err => {
+            console.error(err);
+            this.requestingBridge = false;
+            this.toaster.pop("error", "Failed to request a link");
+        });
+    }
+
+    public getChannels(): LocalChannel[] {
+        const channels: LocalChannel[] = [];
+        this.pending.forEach(p => channels.push(p));
+
+        for (const networkId of Object.keys(this.bridge.config.links)) {
+            const network = this.bridge.config.availableNetworks[networkId];
+
+            for (const channel of this.bridge.config.links[networkId]) {
+                channels.push({
+                    networkId: networkId,
+                    networkName: network.name,
+                    name: channel.channelName,
+                    pending: false,
+                });
+            }
+        }
+
+        return channels;
+    }
+
+    public removeChannel(channel: any) {
+        console.log(channel);
+    }
+}
\ No newline at end of file
diff --git a/web/app/shared/models/integration.ts b/web/app/shared/models/integration.ts
index 6b064bb..ea72042 100644
--- a/web/app/shared/models/integration.ts
+++ b/web/app/shared/models/integration.ts
@@ -27,7 +27,6 @@ export interface FE_ComplexBot<T> extends FE_Integration {
 }
 
 export interface FE_Bridge<T> extends FE_Integration {
-    bridgeUserId: string;
     config: T;
 }
 
diff --git a/web/app/shared/models/server-client-responses.ts b/web/app/shared/models/server-client-responses.ts
index 3cc3987..1b5a84f 100644
--- a/web/app/shared/models/server-client-responses.ts
+++ b/web/app/shared/models/server-client-responses.ts
@@ -55,4 +55,10 @@ export interface CanSendEventResponse extends ScalarRoomResponse {
 
 export interface RoomEncryptionStatusResponse extends ScalarRoomResponse {
     response: boolean;
+}
+
+export interface SetPowerLevelResponse extends ScalarRoomResponse {
+    response: {
+        success: boolean;
+    };
 }
\ No newline at end of file
diff --git a/web/app/shared/services/integrations/irc-api.service.ts b/web/app/shared/services/integrations/irc-api.service.ts
new file mode 100644
index 0000000..7932098
--- /dev/null
+++ b/web/app/shared/services/integrations/irc-api.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from "@angular/core";
+import { Http } from "@angular/http";
+import { AuthedApi } from "../authed-api";
+
+@Injectable()
+export class IrcApiService extends AuthedApi {
+    constructor(http: Http) {
+        super(http);
+    }
+
+    public getOperators(networkId: string, channelNoHash: string): Promise<string[]> {
+        return this.authedGet("/api/v1/dimension/irc/" + networkId + "/channel/" + channelNoHash + "/ops").map(r => r.json()).toPromise();
+    }
+
+    public requestLink(roomId: string, networkId: string, channelNoHash: string, op: string): Promise<any> {
+        return this.authedPost("/api/v1/dimension/irc/" + networkId + "/channel/" + channelNoHash + "/link/" + roomId, {op: op}).map(r => r.json()).toPromise();
+    }
+}
diff --git a/web/app/shared/services/scalar/scalar-client-api.service.ts b/web/app/shared/services/scalar/scalar-client-api.service.ts
index ad111ce..f943cac 100644
--- a/web/app/shared/services/scalar/scalar-client-api.service.ts
+++ b/web/app/shared/services/scalar/scalar-client-api.service.ts
@@ -3,8 +3,10 @@ import * as randomString from "random-string";
 import {
     CanSendEventResponse,
     JoinRuleStateResponse,
-    MembershipStateResponse, RoomEncryptionStatusResponse,
+    MembershipStateResponse,
+    RoomEncryptionStatusResponse,
     ScalarSuccessResponse,
+    SetPowerLevelResponse,
     WidgetsResponse
 } from "../../models/server-client-responses";
 import { EditableWidget } from "../../models/widget";
@@ -87,6 +89,14 @@ export class ScalarClientApiService {
         });
     }
 
+    public setUserPowerLevel(roomId: string, userId: string, powerLevel: number): Promise<SetPowerLevelResponse> {
+        return this.callAction("set_bot_power", {
+            room_id: roomId,
+            user_id: userId,
+            level: powerLevel,
+        });
+    }
+
     private callAction(action, payload): Promise<any> {
         let requestKey = randomString({length: 20});
         return new Promise((resolve, reject) => {

From 9a8041ea3812094b49a03adf7dec826c18864bc2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 15:48:20 -0600
Subject: [PATCH 108/111] Self-service removal of channel links

---
 src/api/dimension/DimensionIrcService.ts      | 16 ++++++++++++++++
 src/bridges/IrcBridge.ts                      | 19 +++++++++++++++++++
 src/temp_todo.txt                             |  1 -
 .../bridge/irc/irc.bridge.component.ts        | 13 +++++++++++--
 .../services/integrations/irc-api.service.ts  |  4 ++++
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/api/dimension/DimensionIrcService.ts b/src/api/dimension/DimensionIrcService.ts
index 1cd13df..827d94b 100644
--- a/src/api/dimension/DimensionIrcService.ts
+++ b/src/api/dimension/DimensionIrcService.ts
@@ -46,4 +46,20 @@ export class DimensionIrcService {
         LogService.info("DimensionIrcService", userId + " requested #" + channelNoHash + " on " + networkId + " to be linked to " + roomId);
         return {}; // 200 OK
     }
+
+    @POST
+    @Path(":networkId/channel/:channel/unlink/:roomId")
+    public async unlink(@QueryParam("scalar_token") scalarToken: string, @PathParam("networkId") networkId: string, @PathParam("channel") channelNoHash: string, @PathParam("roomId") roomId: string): Promise<any> {
+        const userId = await ScalarService.getTokenOwner(scalarToken);
+
+        const parsed = IrcBridge.parseNetworkId(networkId);
+        const bridge = await IrcBridgeRecord.findByPrimary(parsed.bridgeId);
+        if (!bridge) throw new ApiError(404, "Bridge not found");
+
+        const client = new IrcBridge(userId);
+        await client.removeLink(bridge, parsed.bridgeNetworkId, "#" + channelNoHash, roomId);
+
+        LogService.info("DimensionIrcService", userId + " unlinked #" + channelNoHash + " on " + networkId + " from " + roomId);
+        return {}; // 200 OK
+    }
 }
\ No newline at end of file
diff --git a/src/bridges/IrcBridge.ts b/src/bridges/IrcBridge.ts
index 922f5c9..1b45d44 100644
--- a/src/bridges/IrcBridge.ts
+++ b/src/bridges/IrcBridge.ts
@@ -127,6 +127,25 @@ export class IrcBridge {
         }
     }
 
+    public async removeLink(bridge: IrcBridgeRecord, networkId: string, channel: string, inRoomId: string): Promise<any> {
+        const network = (await this.getAllNetworks()).find(n => n.isEnabled && n.ircBridgeId === bridge.id && n.bridgeNetworkId === networkId);
+        if (!network) throw new Error("Network not found");
+
+        const requestBody = {
+            remote_room_server: network.domain,
+            remote_room_channel: channel,
+            matrix_room_id: inRoomId,
+            user_id: this.requestingUserId,
+        };
+
+        if (bridge.upstreamId) {
+            delete requestBody["user_id"];
+            await this.doUpstreamRequest(bridge, "POST", "/bridges/irc/_matrix/provision/unlink", null, requestBody);
+        } else {
+            await this.doProvisionRequest(bridge, "POST", "/_matrix/provision/unlink", null, requestBody);
+        }
+    }
+
     private async getAllNetworks(): Promise<CachedNetwork[]> {
         const cached = Cache.for(CACHE_IRC_BRIDGE).get("networks");
         if (cached) return cached;
diff --git a/src/temp_todo.txt b/src/temp_todo.txt
index 66e12e0..87362b4 100644
--- a/src/temp_todo.txt
+++ b/src/temp_todo.txt
@@ -1,5 +1,4 @@
 Release checklist:
-* IRC Bridge
 * Update documentation
 * Configuration migration (if possible)
 * Final testing (widgets, bots, etc)
diff --git a/web/app/configs/bridge/irc/irc.bridge.component.ts b/web/app/configs/bridge/irc/irc.bridge.component.ts
index fb31acb..a02f9cb 100644
--- a/web/app/configs/bridge/irc/irc.bridge.component.ts
+++ b/web/app/configs/bridge/irc/irc.bridge.component.ts
@@ -127,7 +127,16 @@ export class IrcBridgeConfigComponent extends BridgeComponent<IrcConfig> {
         return channels;
     }
 
-    public removeChannel(channel: any) {
-        console.log(channel);
+    public removeChannel(channel: LocalChannel) {
+        this.isUpdating = true;
+        this.irc.removeLink(this.roomId, channel.networkId, channel.name.substring(1)).then(() => {
+            this.isUpdating = false;
+            const idx = this.bridge.config.links[channel.networkId].findIndex(c => c.channelName === channel.name);
+            if (idx !== -1) this.bridge.config.links[channel.networkId].splice(idx, 1);
+            this.toaster.pop("success", "Link removed");
+        }).catch(err => {
+            console.error(err);
+            this.toaster.pop("error", "Failed to remove link");
+        });
     }
 }
\ No newline at end of file
diff --git a/web/app/shared/services/integrations/irc-api.service.ts b/web/app/shared/services/integrations/irc-api.service.ts
index 7932098..d9004e3 100644
--- a/web/app/shared/services/integrations/irc-api.service.ts
+++ b/web/app/shared/services/integrations/irc-api.service.ts
@@ -15,4 +15,8 @@ export class IrcApiService extends AuthedApi {
     public requestLink(roomId: string, networkId: string, channelNoHash: string, op: string): Promise<any> {
         return this.authedPost("/api/v1/dimension/irc/" + networkId + "/channel/" + channelNoHash + "/link/" + roomId, {op: op}).map(r => r.json()).toPromise();
     }
+
+    public removeLink(roomId: string, networkId: string, channelNoHash: string): Promise<any> {
+        return this.authedPost("/api/v1/dimension/irc/" + networkId + "/channel/" + channelNoHash + "/unlink/" + roomId).map(r => r.json()).toPromise();
+    }
 }

From a73fb53dcbb6eb2a3ebd0e19df116e9c7695e2ef Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 16:07:19 -0600
Subject: [PATCH 109/111] Update documentation and remove extra files

---
 DEVELOPMENT.md                                |  42 +++--
 config/integrations/circleci.yaml             |   8 -
 config/integrations/custom_widget.yaml        |   7 -
 config/integrations/etherpad_widget.yaml      |  11 --
 config/integrations/giphy.yaml                |  19 --
 config/integrations/github.yaml.disabled      |   8 -
 config/integrations/google.yaml               |  19 --
 .../integrations/googlecalendar_widget.yaml   |   7 -
 config/integrations/googledocs_widget.yaml    |   7 -
 config/integrations/guggy.yaml                |  19 --
 config/integrations/imgur.yaml                |  19 --
 config/integrations/irc_bridge.yaml           |  10 -
 config/integrations/jitsi_widget.yaml         |  15 --
 config/integrations/rssbot.yaml               |   8 -
 .../samples/dimension_demo_bot.yaml           |  10 -
 config/integrations/samples/pollbot.yaml      |  10 -
 config/integrations/travisci.yaml             |   8 -
 config/integrations/twitch_widget.yaml        |   7 -
 config/integrations/wikipedia.yaml            |  19 --
 config/integrations/youtube_widget.yaml       |   7 -
 docs/dimension_api.md                         | 174 ------------------
 docs/integrations/irc_bridge.md               |  47 -----
 docs/{ => reference}/riot_widget_api.md       |   0
 docs/{ => reference}/scalar_auth.md           |   0
 docs/{ => reference}/scalar_bot_options.md    |   0
 docs/{ => reference}/scalar_client_api.md     |   0
 docs/{ => reference}/scalar_server_api.md     |   0
 jenkins.sh                                    |   7 -
 src/temp_todo.txt                             |  10 -
 29 files changed, 22 insertions(+), 476 deletions(-)
 delete mode 100644 config/integrations/circleci.yaml
 delete mode 100644 config/integrations/custom_widget.yaml
 delete mode 100644 config/integrations/etherpad_widget.yaml
 delete mode 100644 config/integrations/giphy.yaml
 delete mode 100644 config/integrations/github.yaml.disabled
 delete mode 100644 config/integrations/google.yaml
 delete mode 100644 config/integrations/googlecalendar_widget.yaml
 delete mode 100644 config/integrations/googledocs_widget.yaml
 delete mode 100644 config/integrations/guggy.yaml
 delete mode 100644 config/integrations/imgur.yaml
 delete mode 100644 config/integrations/irc_bridge.yaml
 delete mode 100644 config/integrations/jitsi_widget.yaml
 delete mode 100644 config/integrations/rssbot.yaml
 delete mode 100644 config/integrations/samples/dimension_demo_bot.yaml
 delete mode 100644 config/integrations/samples/pollbot.yaml
 delete mode 100644 config/integrations/travisci.yaml
 delete mode 100644 config/integrations/twitch_widget.yaml
 delete mode 100644 config/integrations/wikipedia.yaml
 delete mode 100644 config/integrations/youtube_widget.yaml
 delete mode 100644 docs/dimension_api.md
 delete mode 100644 docs/integrations/irc_bridge.md
 rename docs/{ => reference}/riot_widget_api.md (100%)
 rename docs/{ => reference}/scalar_auth.md (100%)
 rename docs/{ => reference}/scalar_bot_options.md (100%)
 rename docs/{ => reference}/scalar_client_api.md (100%)
 rename docs/{ => reference}/scalar_server_api.md (100%)
 delete mode 100644 jenkins.sh
 delete mode 100644 src/temp_todo.txt

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 1cefaa8..36789b7 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -22,30 +22,32 @@ npm run start:web
 npm run build:app && node build/app/index.js
 ```
 
-## General architecture
+## Backend Architecture
 
-Integrations are defined in the database for administrators to enable, disable, and configure as they please. They are added using migrations (or in some cases, manually by the administrators) and should always be added as "disabled" by default.
+Integrations are defined into one of four categories:
+* Simple bots - Bots that can be invited to the room and left alone (Imgur, Giphy, etc)
+* Complex bots - Bots that require some sort of per-room configuration (RSS, Github, etc)
+* Bridges - Application services that bridge the room in some way to an external network (IRC, Webhooks, etc)
+* Widgets - Added functionality through iframes for rooms/users
 
-The frontend has two sections: the admin and non-admin sections. The admin section is used by authorized users to configure the various integrations, or parts of integrations. The non-admin section is used by everyone else to add the integrations to their rooms.
+The backend further breaks these categories out to redirect traffic to the correct place. For instance, the admin backend 
+breaks out go-neb specifically as it's configuration is fairly involved.
 
-The frontend automatically routes edit pages in both the admin and non-admin sections to the appropriate routes. It does this by using a combination of the `category` and `type` of the integrations. For example, a `widget` with the type `jitsi` will be redirected to the `/riot-app/widget/jitsi` route for editing. Both the admin and non-admin routes need to be declared in the `app.routing.ts` class. After that, it is best to copy/paste a similar widget component and edit it to your needs.
+The backend has 3 major layers:
+* The webserver (where all the requests come from)
+* The data stores (where requests normally get routed to)
+* The proxy (where we flip between using upstream configurations and self-hosted)
 
-The backend is slightly more complicated, where particular integrations may have their own API defined depending on the complexity involved. For example, all bridges have their own admin and non-admin API to configure the various parts. The required changes to the backend are described in the later sections of this document.
+Many of the API routes are generic, however many of the integrations require additional structure that the routes cannot 
+provide. For example, the IRC bridge is complicated in that it needs a dedicated API in order to be configured, however
+the bots can work well within their constraints.
 
-## Adding new widgets
+## Frontend Architecture
 
-TODO
+The frontend app is split into two major parts: The Riot frontend and the admin section. The components are nested under
+their respective categories and route. For example, the edit page for the Jitsi widget is under the Widgets directory.
 
-## Adding new go-neb services
-
-TODO
-
-## Adding new bridges
-
-TODO
-
-## Adding new bots
-
-TODO
-
-*note to self: are simple bots even a thing anymore?*
+The frontend is otherwise a fairly basic Angular 5 application: there's components, services, etc. The services should be
+kept small and generic where possible (almost always matching the Service classes in the backend). Components are more of
+a judgement call and should be split out where it makes sense. For example, it doesn't make sense to create a component
+for every instance where an `ngFor` is used because the number of components would be astronomical.
diff --git a/config/integrations/circleci.yaml b/config/integrations/circleci.yaml
deleted file mode 100644
index f0941c5..0000000
--- a/config/integrations/circleci.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-type: "complex-bot"
-integrationType: "circleci"
-enabled: false # disabled because the API is considered unstable/inoperable. Use at your own risk!
-name: "CircleCI"
-about: "Sends CircleCI build results into the room"
-avatar: "img/avatars/circleci.png"
-upstream:
-  type: "vector"
diff --git a/config/integrations/custom_widget.yaml b/config/integrations/custom_widget.yaml
deleted file mode 100644
index d41ce3d..0000000
--- a/config/integrations/custom_widget.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# All this configuration does is make "Custom Widget" available in the UI
-type: "widget"
-integrationType: "customwidget"
-enabled: true
-name: "Custom Widgets"
-about: "A webpage embedded in the room."
-avatar: "img/avatars/customwidget.png"
diff --git a/config/integrations/etherpad_widget.yaml b/config/integrations/etherpad_widget.yaml
deleted file mode 100644
index 065fc64..0000000
--- a/config/integrations/etherpad_widget.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# All this configuration does is make "Etherpad Widget" available in the UI
-type: "widget"
-integrationType: "etherpad"
-enabled: true
-name: "Etherpad"
-about: "Collaborate on documents with members of your room."
-avatar: "img/avatars/etherpad.png"
-
-# This is the URL people will be provided when adding a new Etherpad widget. The supported variables
-# are $roomId and $padName. Both will end up being URL encoded.
-defaultUrl: "https://demo.riot.im/etherpad/p/$roomId_$padName"
\ No newline at end of file
diff --git a/config/integrations/giphy.yaml b/config/integrations/giphy.yaml
deleted file mode 100644
index a408508..0000000
--- a/config/integrations/giphy.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-type: "bot"
-integrationType: "giphy"
-enabled: true
-userId: "@neb_giphy:matrix.org"
-name: "Giphy"
-about: "Use `!giphy query` to find an animated GIF on demand"
-avatar: "img/avatars/giphy.png"
-
-# This integration can be hosted in one of two ways: self-hosted or using vector.im's version.
-# By default, vector.im's version is used, but you can host your own by uncommenting the `hosted`
-# section below. Be sure to comment out or remove the `upstream` section below if you're self-hosting.
-# Self-hosted bots are expected to auto-respond to invites.
-
-upstream:
-  type: "vector"
-  id: "giphy"
-#hosted:
-#  homeserverUrl: "https://t2bot.io"
-#  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/github.yaml.disabled b/config/integrations/github.yaml.disabled
deleted file mode 100644
index 4ef0184..0000000
--- a/config/integrations/github.yaml.disabled
+++ /dev/null
@@ -1,8 +0,0 @@
-type: "complex-bot"
-integrationType: "github"
-enabled: true
-name: "Github"
-about: "Track changes to your projects and create new issues using `!github create`"
-avatar: "img/avatars/github.png"
-upstream:
-  type: "vector"
diff --git a/config/integrations/google.yaml b/config/integrations/google.yaml
deleted file mode 100644
index 97d4e5c..0000000
--- a/config/integrations/google.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-type: "bot"
-integrationType: "google"
-enabled: true
-userId: "@_neb_google:matrix.org"
-name: "Google"
-about: "Use `!google image query` to find an image from Google"
-avatar: "img/avatars/google.png"
-
-# This integration can be hosted in one of two ways: self-hosted or using vector.im's version.
-# By default, vector.im's version is used, but you can host your own by uncommenting the `hosted`
-# section below. Be sure to comment out or remove the `upstream` section below if you're self-hosting.
-# Self-hosted bots are expected to auto-respond to invites.
-
-upstream:
-  type: "vector"
-  id: "google"
-#hosted:
-#  homeserverUrl: "https://t2bot.io"
-#  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/googlecalendar_widget.yaml b/config/integrations/googlecalendar_widget.yaml
deleted file mode 100644
index 4b12fd3..0000000
--- a/config/integrations/googlecalendar_widget.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# All this configuration does is make "Google Calendar Widget" available in the UI
-type: "widget"
-integrationType: "googlecalendar"
-enabled: true
-name: "Google Calendar"
-about: "Share upcoming events in your room with a Google Calendar"
-avatar: "img/avatars/googlecalendar.png"
\ No newline at end of file
diff --git a/config/integrations/googledocs_widget.yaml b/config/integrations/googledocs_widget.yaml
deleted file mode 100644
index 170f15f..0000000
--- a/config/integrations/googledocs_widget.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# All this configuration does is make "Google Docs Widget" available in the UI
-type: "widget"
-integrationType: "googledocs"
-enabled: true
-name: "Google Docs"
-about: "Collaborate on and share documents using Google Docs"
-avatar: "img/avatars/googledocs.png"
\ No newline at end of file
diff --git a/config/integrations/guggy.yaml b/config/integrations/guggy.yaml
deleted file mode 100644
index b759fbc..0000000
--- a/config/integrations/guggy.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-type: "bot"
-integrationType: "guggy"
-enabled: true
-userId: "@_neb_guggy:matrix.org"
-name: "Guggy"
-about: "Use `!guggy sentence` to create an animated GIF from a sentence"
-avatar: "img/avatars/guggy.png"
-
-# This integration can be hosted in one of two ways: self-hosted or using vector.im's version.
-# By default, vector.im's version is used, but you can host your own by uncommenting the `hosted`
-# section below. Be sure to comment out or remove the `upstream` section below if you're self-hosting.
-# Self-hosted bots are expected to auto-respond to invites.
-
-upstream:
-  type: "vector"
-  id: "guggy"
-#hosted:
-#  homeserverUrl: "https://t2bot.io"
-#  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/imgur.yaml b/config/integrations/imgur.yaml
deleted file mode 100644
index 0e9669d..0000000
--- a/config/integrations/imgur.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-type: "bot"
-integrationType: "imgur"
-enabled: true
-userId: "@_neb_imgur:matrix.org"
-name: "Imgur"
-about: "Use `!imgur query` to find an image from Imgur"
-avatar: "img/avatars/imgur.png"
-
-# This integration can be hosted in one of two ways: self-hosted or using vector.im's version.
-# By default, vector.im's version is used, but you can host your own by uncommenting the `hosted`
-# section below. Be sure to comment out or remove the `upstream` section below if you're self-hosting.
-# Self-hosted bots are expected to auto-respond to invites.
-
-upstream:
-  type: "vector"
-  id: "imgur"
-#hosted:
-#  homeserverUrl: "https://t2bot.io"
-#  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/irc_bridge.yaml b/config/integrations/irc_bridge.yaml
deleted file mode 100644
index 0aca31a..0000000
--- a/config/integrations/irc_bridge.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-type: "bridge"
-integrationType: "irc"
-enabled: true
-name: "IRC"
-about: "Bridges IRC channels to the room"
-avatar: "img/avatars/irc.png"
-requirements:
-  joinRule: 'public'
-upstream:
-  type: "vector"
diff --git a/config/integrations/jitsi_widget.yaml b/config/integrations/jitsi_widget.yaml
deleted file mode 100644
index 568c2b7..0000000
--- a/config/integrations/jitsi_widget.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# All this configuration does is make "Jitsi Widget" available in the UI
-type: "widget"
-integrationType: "jitsi"
-enabled: true
-name: "Jitsi"
-about: "Add video conferencing to your room with Jitsi"
-avatar: "img/avatars/jitsi.png"
-
-# This is the domain that will be used to construct the Jitsi widget. It must be just the domain.
-# The default is meet.jit.si  The Riot.IM instance is at jitsi.riot.im
-jitsiDomain: "jitsi.riot.im"
-
-# This is the path to the external API script. Usually the domain can be replaced with your custom
-# domain above without any other modifications.
-scriptUrl: "https://jitsi.riot.im/libs/external_api.min.js"
\ No newline at end of file
diff --git a/config/integrations/rssbot.yaml b/config/integrations/rssbot.yaml
deleted file mode 100644
index db559b5..0000000
--- a/config/integrations/rssbot.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-type: "complex-bot"
-integrationType: "rss"
-enabled: true
-name: "RSS Bot"
-about: "Tracks any Atom/RSS feed and sends new items into this room"
-avatar: "img/avatars/rssbot.png"
-upstream:
-  type: "vector"
diff --git a/config/integrations/samples/dimension_demo_bot.yaml b/config/integrations/samples/dimension_demo_bot.yaml
deleted file mode 100644
index 25d7e01..0000000
--- a/config/integrations/samples/dimension_demo_bot.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-type: "bot"
-integrationType: "demo"
-enabled: false
-userId: "@dimension:t2bot.io"
-name: "Demo Bot"
-about: "A bot that has no functionality. This is just a demonstration on the config."
-avatar: "img/avatars/demobot.png"
-hosted:
-  homeserverUrl: "https://t2bot.io"
-  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/samples/pollbot.yaml b/config/integrations/samples/pollbot.yaml
deleted file mode 100644
index 25a042f..0000000
--- a/config/integrations/samples/pollbot.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-type: "bot"
-integrationType: "pollbot"
-enabled: false
-userId: "@pollbot:t2bot.io"
-name: "Poll Bot"
-about: "A bot to poll users in a room. Use `!pollhelp` for more information"
-avatar: "img/avatars/pollbot.png"
-hosted:
-  homeserverUrl: "https://t2bot.io"
-  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/travisci.yaml b/config/integrations/travisci.yaml
deleted file mode 100644
index 54e872a..0000000
--- a/config/integrations/travisci.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-type: "complex-bot"
-integrationType: "travisci"
-enabled: true
-name: "Travis CI"
-about: "Sends Travis CI build results into the room"
-avatar: "img/avatars/travisci.png"
-upstream:
-  type: "vector"
diff --git a/config/integrations/twitch_widget.yaml b/config/integrations/twitch_widget.yaml
deleted file mode 100644
index 46ce899..0000000
--- a/config/integrations/twitch_widget.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# All this configuration does is make "Twitch Widget" available in the UI
-type: "widget"
-integrationType: "twitch"
-enabled: true
-name: "Twitch Livestream"
-about: "Embed a Twitch Livestream"
-avatar: "img/avatars/twitch.png"
diff --git a/config/integrations/wikipedia.yaml b/config/integrations/wikipedia.yaml
deleted file mode 100644
index 078f283..0000000
--- a/config/integrations/wikipedia.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-type: "bot"
-integrationType: "wikipedia"
-enabled: true
-userId: "@_neb_wikipedia:matrix.org"
-name: "Wikipedia"
-about: "Use `!wikipedia query` to find something from Wikipedia"
-avatar: "img/avatars/wikipedia.png"
-
-# This integration can be hosted in one of two ways: self-hosted or using vector.im's version.
-# By default, vector.im's version is used, but you can host your own by uncommenting the `hosted`
-# section below. Be sure to comment out or remove the `upstream` section below if you're self-hosting.
-# Self-hosted bots are expected to auto-respond to invites.
-
-upstream:
-  type: "vector"
-  id: "wikipedia"
-#hosted:
-#  homeserverUrl: "https://t2bot.io"
-#  accessToken: "your_matrix_access_token_here"
diff --git a/config/integrations/youtube_widget.yaml b/config/integrations/youtube_widget.yaml
deleted file mode 100644
index 36ed516..0000000
--- a/config/integrations/youtube_widget.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# All this configuration does is make "Youtube Widget" available in the UI
-type: "widget"
-integrationType: "youtube"
-enabled: true
-name: "YouTube Video"
-about: "Embed a YouTube, Vimeo, or DailyMotion video"
-avatar: "img/avatars/youtube.png"
diff --git a/docs/dimension_api.md b/docs/dimension_api.md
deleted file mode 100644
index aaaa525..0000000
--- a/docs/dimension_api.md
+++ /dev/null
@@ -1,174 +0,0 @@
-# Dimension API
-
-Dimension has its own API that allows for management of integrations in Riot/Matrix.
-
-## Types of integrations
-
-### Simple Bots
-
-* Can only be in a room or not
-* No state information held
-
-### Complex Bots
-
-* Simple Bots that hold state information
-
-### Bridges
-
-* Manage their own state through dedicated API endpoints
-
-## Endpoints
-
-### `GET /api/v1/dimension/integrations/{roomId}?scalar_token=your_token_here`
-
-**Parameters**
-* `{roomId}` - The room ID to get integrations for
-* `scalar_token` - The scalar (dimension) token to authenticate with
-
-**Example Response**
-```
-TODO
-```
-
-### `DELETE /api/v1/dimension/integrations/{roomId}/{type}/{integrationType}?scalar_token=your_token_here`
-
-**Parameters**
-* `{roomId}` - The room ID to remove the integration from
-* `{type}` - The integration type (eg: `bot`, `complex-bot`, `bridge`, etc)
-* `{integrationType}` - The integration subtype (eg: `irc`, `rssbot`, `giphy`, etc)
-* `scalar_token` - The scalar (dimension) token to authenticate with
-
-**Example Response**
-```
-TODO
-```
-
-### `PUT /api/v1/dimension/integrations/{roomId}/{type}/{integrationType}/state`
-
-**Parameters**
-* `{roomId}` - The room ID to update the integration state in
-* `{type}` - The integration type (eg: `bot`, `complex-bot`, `bridge`, etc)
-* `{integrationType}` - The integration subtype (eg: `irc`, `rssbot`, `giphy`, etc)
-
-**Example Body**
-```
-{
-    "scalar_token": "your_token_here",
-    "state": {
-        // integration specific state goes here
-    }
-}
-```
-
-### `GET /api/v1/dimension/integrations/{roomId}/{type}/{integrationType}/state?scalar_token=your_token_here`
-
-**Parameters**
-* `{roomId}` - The room ID to get the integration state in
-* `{type}` - The integration type (eg: `bot`, `complex-bot`, `bridge`, etc)
-* `{integrationType}` - The integration subtype (eg: `irc`, `rssbot`, `giphy`, etc)
-* `scalar_token` - The scalar (dimension) token to authenticate with
-
-**Response**
-
-An object representing the integration-specific state. See the documentation for the desired integration for more information.
-
-### `GET /api/v1/dimension/{type}/{integrationType}/oauth/url?redirect=your_url_here&scalar_token=your_token_here`
-
-**Parameters**
-* `{type}` - The integration type (eg: `bot`, `complex-bot`, `bridge`, etc)
-* `{integrationType}` - The integration subtype (eg: `irc`, `rssbot`, `giphy`, etc)
-* `redirect` - The URL to redirect to when complete
-* `scalar_token` - The scalar (dimension) token to authenticate with
-
-**Example Response**
-```
-{
-  "url": "https://github.com/somewhere?with=params"
-}
-```
-
-### `DELETE /api/v1/dimension/{type}/{integrationType}/oauth?scalar_token=your_token_here`
-
-**Parameters**
-* `{type}` - The integration type (eg: `bot`, `complex-bot`, `bridge`, etc)
-* `{integrationType}` - The integration subtype (eg: `irc`, `rssbot`, `giphy`, etc)
-* `scalar_token` - The scalar (dimension) token to authenticate with
-
-**Example Response**
-```
-{}
-```
-
-## Integration State Information
-
-### Simple Bots
-
-Do not hold state.
-
-### Complex Bots
-
-#### RSS Bot
-```
-{
-    // Mutable using state API
-    "feeds": [
-        "https://some.domain.com/feed.rss",
-        "https://some.domain.com/another_feed.rss"
-    ],
-    
-    // Read only. Controlled by other users.
-    "immutableFeeds": [
-        "https://some.domain.com/third_feed.rss",
-        "https://some.domain.com/fourth_feed.rss"
-    ]
-}
-```
-
-#### Github
-```
-{
-  // Mutable using state API
-  "repositories": {
-    "turt2live/matrix-dimension": ["push", "pull_request", "issues", "issue_comment", "pull_request_review_comment", "labels", "milestones", "assignments"],
-    "turt2live/matrix-voyager-bot": []
-  },
-
-  // Read only.
-  "authenticated": true
-}
-```
-
-*Unauthenticated response*
-```
-{
-  // Read only.
-  "repositories": {},
-
-  // Read only.
-  "authenticated": false
-}
-```
-
-### Bridges
-
-#### IRC
-```
-{
-    // Read only
-    "availableNetworks": [
-        {"name": "Freenode", "id": "freenode"},
-        {"name": "EsperNet", "id": "espernet"},
-        {"name": "OFTC", "id": "oftc"}
-    ],
-    
-    // Read only. Use IRC API to mutate
-    "channels": {
-        "freenode": [
-            "#dimensiontesting",
-            "#dimensiontest"
-        ],
-        "espernet": [],
-        "oftc": []
-    }
-}
-```
\ No newline at end of file
diff --git a/docs/integrations/irc_bridge.md b/docs/integrations/irc_bridge.md
deleted file mode 100644
index 9ea9a0e..0000000
--- a/docs/integrations/irc_bridge.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Dimension IRC Bridge API
-
-As with most bridges, the IRC bridge uses a dedicated set of API endpoints to manage the state of the bridge. The IRC bridge still uses the state API provided by Dimension to report basic state information, but does not allow edits through the regular API. Instead, it is expected that the IRC API be used to mutate the state.
-
-## Getting available networks/bridged channels
-
-Make a call to the Dimension state API: `GET /api/v1/dimension/integrations/{roomId}/bridge/irc/state?scalar_token=...`.
-
-*Example state*
-```
-{
-    "availableNetworks": [
-        {"name": "Freenode", "id": "freenode"},
-        {"name": "Espernet", "id": "espernet"},
-        {"name": "OFTC", "id": "oftc"}
-    ],
-    "channels": {
-        "freenode": [
-            "#dimensiontesting",
-            "#dimensiontest"
-        ],
-        "espernet": [],
-        "oftc": []
-    }
-}
-```
-
-## Getting the OPs in a channel
-
-IRC API Endpoint: `GET /api/v1/irc/{roomId}/ops/{network}/{channel}?scalar_token=...`. The channel should not include the prefix (`#test` becomes `test`).
-
-*Example response*
-```
-["turt2live", "johndoe"]
-```
-
-## Linking a new channel
-
-IRC API Endpoint: `PUT /api/v1/irc/{roomId}/channels/{network}/{channel}?op=turt2live&scalar_token=...`. The channel should not include the prefix (`#test` becomes `test`).
-
-A 200 OK is returned if the request to add the channel was sent. The channel will not appear in the state information until the op has approved the bridge.
-
-## Unlinking a channel
-
-IRC API Endpoint: `DELETE /api/v1/irc/{roomId}/channels/{network}/{channel}?scalar_token=...`. The channel should not include the prefix (`#test` becomes `test`).
-
-A 200 OK is returned if the delete was successful.
\ No newline at end of file
diff --git a/docs/riot_widget_api.md b/docs/reference/riot_widget_api.md
similarity index 100%
rename from docs/riot_widget_api.md
rename to docs/reference/riot_widget_api.md
diff --git a/docs/scalar_auth.md b/docs/reference/scalar_auth.md
similarity index 100%
rename from docs/scalar_auth.md
rename to docs/reference/scalar_auth.md
diff --git a/docs/scalar_bot_options.md b/docs/reference/scalar_bot_options.md
similarity index 100%
rename from docs/scalar_bot_options.md
rename to docs/reference/scalar_bot_options.md
diff --git a/docs/scalar_client_api.md b/docs/reference/scalar_client_api.md
similarity index 100%
rename from docs/scalar_client_api.md
rename to docs/reference/scalar_client_api.md
diff --git a/docs/scalar_server_api.md b/docs/reference/scalar_server_api.md
similarity index 100%
rename from docs/scalar_server_api.md
rename to docs/reference/scalar_server_api.md
diff --git a/jenkins.sh b/jenkins.sh
deleted file mode 100644
index c566eaa..0000000
--- a/jenkins.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-npm --version
-node --version
-npm install
-npm run build
-rm -f web.zip
-zip -r web.zip web-dist/*
diff --git a/src/temp_todo.txt b/src/temp_todo.txt
deleted file mode 100644
index 87362b4..0000000
--- a/src/temp_todo.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Release checklist:
-* Update documentation
-* Configuration migration (if possible)
-* Final testing (widgets, bots, etc)
-
-After release:
-* Manage custom bots
-* Github
-* Circle CI
-* Avatars/display names for managed go-neb bots
\ No newline at end of file

From a6dae219a54001a137dcbf164bcb689af25ab299 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 16:38:38 -0600
Subject: [PATCH 110/111] Add the missing "embed-ability" api for widgets

---
 src/api/dimension/DimensionWidgetService.ts   | 75 +++++++++++++++++++
 .../integrations/integrations-api.service.ts  | 11 +--
 2 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 src/api/dimension/DimensionWidgetService.ts

diff --git a/src/api/dimension/DimensionWidgetService.ts b/src/api/dimension/DimensionWidgetService.ts
new file mode 100644
index 0000000..2876dd2
--- /dev/null
+++ b/src/api/dimension/DimensionWidgetService.ts
@@ -0,0 +1,75 @@
+import { GET, Path, QueryParam } from "typescript-rest";
+import { LogService } from "matrix-js-snippets";
+import * as url from "url";
+import { ApiError } from "../ApiError";
+import * as dns from "dns-then";
+import config from "../../config";
+import { Netmask } from "netmask";
+import * as request from "request";
+
+interface EmbedCapabilityResponse {
+    canEmbed: boolean;
+}
+
+/**
+ * API for widgets
+ */
+@Path("/api/v1/dimension/widgets")
+export class DimensionWidgetService {
+
+    @GET
+    @Path("embeddable")
+    public async isEmbeddable(@QueryParam("url") checkUrl: string): Promise<EmbedCapabilityResponse> {
+        LogService.info("DimensionWidgetService", "Checking to see if a url is embeddable: " + checkUrl);
+
+        const parsed = url.parse(checkUrl);
+
+        // Only allow http and https
+        if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+            throw new ApiError(400, "Invalid scheme: " + parsed.protocol);
+        }
+
+        // Get the IP address we're trying to connect to so we can ensure it's not blacklisted
+        const hostname = parsed.hostname.split(":")[0];
+        let addresses = [];
+        try {
+            addresses = await dns.resolve(hostname);
+        } catch (err) {
+            LogService.error("DimensionWidgetService", err);
+        }
+        if (!addresses || addresses.length === 0) throw new ApiError(400, "Cannot resolve host " + hostname);
+
+        // Check the blacklist
+        for (const ipOrCidr of config.widgetBlacklist) {
+            const block = new Netmask(ipOrCidr);
+            for (const address of addresses) {
+                if (block.contains(address)) {
+                    throw new ApiError(400, "Address blacklisted");
+                }
+            }
+        }
+
+        // Now we need to verify we can actually make the request
+        await new Promise((resolve, _reject) => {
+            request(checkUrl, (err, response) => {
+                if (err) {
+                    LogService.error("DimensionWidgetService", err);
+                    throw new ApiError(400, "Failed to contact host");
+                }
+
+                if (response.statusCode >= 200 && response.statusCode < 300) {
+                    // 200 OK
+                    const xFrameOptions = (response.headers["x-frame-options"] || '').toLowerCase();
+
+                    if (xFrameOptions === "sameorigin" || xFrameOptions === "deny") {
+                        throw new ApiError(400, "X-Frame-Options prevents embedding");
+                    }
+
+                    resolve();
+                } else throw new ApiError(400, "Non-success status code returned");
+            });
+        });
+
+        return {canEmbed: true};
+    }
+}
\ No newline at end of file
diff --git a/web/app/shared/services/integrations/integrations-api.service.ts b/web/app/shared/services/integrations/integrations-api.service.ts
index ecde3f4..4030802 100644
--- a/web/app/shared/services/integrations/integrations-api.service.ts
+++ b/web/app/shared/services/integrations/integrations-api.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from "@angular/core";
 import { Http } from "@angular/http";
 import { AuthedApi } from "../authed-api";
 import { FE_IntegrationsResponse } from "../../models/dimension-responses";
-import { FE_Integration, FE_Widget } from "../../models/integration";
+import { FE_Integration } from "../../models/integration";
 
 @Injectable()
 export class IntegrationsApiService extends AuthedApi {
@@ -26,15 +26,6 @@ export class IntegrationsApiService extends AuthedApi {
         return this.authedPost("/api/v1/dimension/integrations/room/" + roomId + "/integrations/" + category + "/" + type + "/config", newConfig).map(r => r.json()).toPromise();
     }
 
-    public getWidget(type: string): Promise<FE_Widget> {
-        return this.getIntegration("widget", type).then(i => <FE_Widget>i);
-    }
-
-    public isEmbeddable(url: string): Promise<any> { // 200 = success, anything else = error
-        return this.http.get("/api/v1/dimension/widgets/embeddable", {params: {url: url}})
-            .map(r => r.json()).toPromise();
-    }
-
     public removeIntegration(category: string, type: string, roomId: string): Promise<any> {
         return this.authedDelete("/api/v1/dimension/integrations/room/" + roomId + "/integrations/" + category + "/" + type).map(r => r.json()).toPromise();
     }

From ca8c6b1d95f7e90dc842ba3e4ace543142f40143 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 31 Mar 2018 16:47:30 -0600
Subject: [PATCH 111/111] Prevent unauthorized people from editing integrations

---
 web/app/riot/riot-home/home.component.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/web/app/riot/riot-home/home.component.ts b/web/app/riot/riot-home/home.component.ts
index 3cdf886..a6c5637 100644
--- a/web/app/riot/riot-home/home.component.ts
+++ b/web/app/riot/riot-home/home.component.ts
@@ -10,6 +10,7 @@ import { AdminApiService } from "../../shared/services/admin/admin-api.service";
 import { IntegrationsApiService } from "../../shared/services/integrations/integrations-api.service";
 import { Modal, overlayConfigFactory } from "ngx-modialog";
 import { ConfigSimpleBotComponent, SimpleBotConfigDialogContext } from "../../configs/simple-bot/simple-bot.component";
+import { ToasterService } from "angular2-toaster";
 
 const CATEGORY_MAP = {
     "Widgets": ["widget"],
@@ -41,7 +42,8 @@ export class RiotHomeComponent {
                 private integrationsApi: IntegrationsApiService,
                 private adminApi: AdminApiService,
                 private router: Router,
-                private modal: Modal) {
+                private modal: Modal,
+                private toaster: ToasterService) {
         let params: any = this.activatedRoute.snapshot.queryParams;
 
         this.requestedScreen = params.screen;
@@ -124,6 +126,13 @@ export class RiotHomeComponent {
     }
 
     public modifyIntegration(integration: FE_Integration) {
+        if (!integration._isSupported) {
+            console.log(this.userId + " tried to modify " + integration.displayName + " with error: " + integration._notSupportedReason);
+            const reason = integration.category === "widget" ? "You do not appear to have permission to modify widgets in this room" : integration._notSupportedReason;
+            this.toaster.pop("error", reason);
+            return;
+        }
+
         SessionStorage.editIntegration = integration;
         SessionStorage.editsRequested++;
         console.log(this.userId + " is trying to modify " + integration.displayName);
@@ -260,7 +269,7 @@ export class RiotHomeComponent {
                     if (requirement.expectedValue) return Promise.reject("Expected to be able to send specific event types");
                 });
             case "userInRoom":
-                // TODO: Implement
+            // TODO: Implement
             default:
                 return Promise.reject("Requirement '" + requirement.condition + "' not found");
         }