From 84bcc64e30912cd545c2adfdeba644878c3406a2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 11 Dec 2017 15:39:15 -0700
Subject: [PATCH] Use avatars from the integration configurations

---
 web/app/configs/rss/rss-config.component.html                   | 2 +-
 web/app/configs/travisci/travisci-config.component.html         | 2 +-
 .../widget/custom_widget/custom_widget-config.component.html    | 2 +-
 .../widget/custom_widget/custom_widget-config.component.ts      | 1 +
 web/app/configs/widget/etherpad/etherpad-config.component.html  | 2 +-
 web/app/configs/widget/etherpad/etherpad-config.component.ts    | 1 +
 web/app/configs/widget/jitsi/jitsi-config.component.html        | 2 +-
 web/app/configs/widget/jitsi/jitsi-config.component.ts          | 1 +
 web/app/configs/widget/twitch/twitch-config.component.html      | 2 +-
 web/app/configs/widget/twitch/twitch-config.component.ts        | 1 +
 web/app/configs/widget/widget.component.ts                      | 2 ++
 web/app/configs/widget/youtube/youtube-config.component.html    | 2 +-
 web/app/configs/widget/youtube/youtube-config.component.ts      | 1 +
 13 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/web/app/configs/rss/rss-config.component.html b/web/app/configs/rss/rss-config.component.html
index 8a13e3b..028bbac 100644
--- a/web/app/configs/rss/rss-config.component.html
+++ b/web/app/configs/rss/rss-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/rssbot.png">
+        <img [src]="integration.avatar">
         <h4>Configure RSS/Atom Feeds</h4>
     </div>
     <div class="config-content">
diff --git a/web/app/configs/travisci/travisci-config.component.html b/web/app/configs/travisci/travisci-config.component.html
index e3f1ebc..15dbe7a 100644
--- a/web/app/configs/travisci/travisci-config.component.html
+++ b/web/app/configs/travisci/travisci-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/travisci.png">
+        <img [src]="integration.avatar">
         <h4>Configure Travis CI hooks</h4>
     </div>
     <div class="config-content">
diff --git a/web/app/configs/widget/custom_widget/custom_widget-config.component.html b/web/app/configs/widget/custom_widget/custom_widget-config.component.html
index ab7cb23..527df32 100644
--- a/web/app/configs/widget/custom_widget/custom_widget-config.component.html
+++ b/web/app/configs/widget/custom_widget/custom_widget-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/customwidget.png">
+        <img [src]="integration.avatar">
         <h4>Configure custom widgets</h4>
     </div>
     <div class="config-content" *ngIf="isLoading">
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 78e0ca6..20e6efe 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
@@ -24,6 +24,7 @@ export class CustomWidgetConfigComponent extends WidgetComponent implements Moda
             window,
             WIDGET_DIM_CUSTOM,
             WIDGET_SCALAR_CUSTOM,
+            dialog.context.integration,
             dialog.context.integrationId,
             "Custom Widget",
             "generic" // wrapper
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.html b/web/app/configs/widget/etherpad/etherpad-config.component.html
index d57a899..94d526f 100644
--- a/web/app/configs/widget/etherpad/etherpad-config.component.html
+++ b/web/app/configs/widget/etherpad/etherpad-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/etherpad.png">
+        <img [src]="integration.avatar">
         <h4>Configure Etherpad widgets</h4>
     </div>
     <div class="config-content" *ngIf="isLoading">
diff --git a/web/app/configs/widget/etherpad/etherpad-config.component.ts b/web/app/configs/widget/etherpad/etherpad-config.component.ts
index 4072a18..f5139d2 100644
--- a/web/app/configs/widget/etherpad/etherpad-config.component.ts
+++ b/web/app/configs/widget/etherpad/etherpad-config.component.ts
@@ -27,6 +27,7 @@ export class EtherpadWidgetConfigComponent extends WidgetComponent implements Mo
             window,
             WIDGET_DIM_ETHERPAD,
             WIDGET_SCALAR_ETHERPAD,
+            dialog.context.integration,
             dialog.context.integrationId,
             "Etherpad Widget",
             "generic", // wrapper
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.html b/web/app/configs/widget/jitsi/jitsi-config.component.html
index 8040769..3344bf2 100644
--- a/web/app/configs/widget/jitsi/jitsi-config.component.html
+++ b/web/app/configs/widget/jitsi/jitsi-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/jitsi.png">
+        <img [src]="integration.avatar">
         <h4>Configure Jitsi Conferences</h4>
     </div>
     <div class="config-content" *ngIf="isLoading">
diff --git a/web/app/configs/widget/jitsi/jitsi-config.component.ts b/web/app/configs/widget/jitsi/jitsi-config.component.ts
index 82a2f0a..5b23659 100644
--- a/web/app/configs/widget/jitsi/jitsi-config.component.ts
+++ b/web/app/configs/widget/jitsi/jitsi-config.component.ts
@@ -35,6 +35,7 @@ export class JitsiWidgetConfigComponent extends WidgetComponent implements Modal
             window,
             WIDGET_DIM_JITSI,
             WIDGET_SCALAR_JITSI,
+            dialog.context.integration,
             dialog.context.integrationId,
             "Jitsi Video Conference",
             "" // we intentionally don't specify the wrapper so we can control the behaviour
diff --git a/web/app/configs/widget/twitch/twitch-config.component.html b/web/app/configs/widget/twitch/twitch-config.component.html
index 285fa9a..478d399 100644
--- a/web/app/configs/widget/twitch/twitch-config.component.html
+++ b/web/app/configs/widget/twitch/twitch-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/twitch.png">
+        <img [src]="integration.avatar">
         <h4>Configure Twitch Livestream widgets</h4>
     </div>
     <div class="config-content" *ngIf="isLoading">
diff --git a/web/app/configs/widget/twitch/twitch-config.component.ts b/web/app/configs/widget/twitch/twitch-config.component.ts
index 56b16e8..7e0aceb 100644
--- a/web/app/configs/widget/twitch/twitch-config.component.ts
+++ b/web/app/configs/widget/twitch/twitch-config.component.ts
@@ -24,6 +24,7 @@ export class TwitchWidgetConfigComponent extends WidgetComponent implements Moda
             window,
             WIDGET_DIM_TWITCH,
             WIDGET_SCALAR_TWITCH,
+            dialog.context.integration,
             dialog.context.integrationId,
             "Twitch Widget",
             "video", // wrapper
diff --git a/web/app/configs/widget/widget.component.ts b/web/app/configs/widget/widget.component.ts
index 9824045..39c3268 100644
--- a/web/app/configs/widget/widget.component.ts
+++ b/web/app/configs/widget/widget.component.ts
@@ -1,6 +1,7 @@
 import { ScalarService } from "../../shared/scalar.service";
 import { ScalarToWidgets, Widget } from "../../shared/models/widget";
 import { ToasterService } from "angular2-toaster";
+import { Integration } from "../../shared/models/integration";
 
 const SCALAR_WIDGET_LINKS = [
     "https://scalar-staging.riot.im/scalar/api/widgets/__TYPE__.html?url=",
@@ -27,6 +28,7 @@ export class WidgetComponent {
                 window: Window,
                 private primaryWidgetType: string,
                 alternateWidgetType: string,
+                public integration: Integration,
                 requestedEditId: string,
                 private defaultName: string,
                 wrapperId = "generic",
diff --git a/web/app/configs/widget/youtube/youtube-config.component.html b/web/app/configs/widget/youtube/youtube-config.component.html
index 06b8bb1..85514c4 100644
--- a/web/app/configs/widget/youtube/youtube-config.component.html
+++ b/web/app/configs/widget/youtube/youtube-config.component.html
@@ -1,7 +1,7 @@
 <div class="config-wrapper">
     <img src="/img/close.svg" (click)="dialog.close()" class="close-icon">
     <div class="config-header">
-        <img src="/img/avatars/youtube.png">
+        <img [src]="integration.avatar">
         <h4>Configure video widgets</h4>
     </div>
     <div class="config-content" *ngIf="isLoading">
diff --git a/web/app/configs/widget/youtube/youtube-config.component.ts b/web/app/configs/widget/youtube/youtube-config.component.ts
index d6652b5..6706cff 100644
--- a/web/app/configs/widget/youtube/youtube-config.component.ts
+++ b/web/app/configs/widget/youtube/youtube-config.component.ts
@@ -26,6 +26,7 @@ export class YoutubeWidgetConfigComponent extends WidgetComponent implements Mod
             window,
             WIDGET_DIM_YOUTUBE,
             WIDGET_SCALAR_YOUTUBE,
+            dialog.context.integration,
             dialog.context.integrationId,
             "Youtube Widget",
             "video", // wrapper