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] 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 {