🔨 resolves #50

BryanWilhite · Mar 2, 2019 · fd4bad8 · fd4bad8
1 parent 9a4bd2b
commit fd4bad8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/Songhay.Dashboard/Client/src/app/app.module.ts b/Songhay.Dashboard/Client/src/app/app.module.ts
@@ -3,6 +3,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { HttpModule } from '@angular/http';
 import { BrowserModule } from '@angular/platform-browser';
 
+import { YouTubeModule } from '@songhay/player-video-you-tube';
+
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { ReactiveFormsModule } from '@angular/forms';
@@ -24,7 +26,6 @@ import { StudioToolsComponent } from './components/dashboard/studio-tools/studio
 import { StudioVersionsComponent } from './components/dashboard/studio-versions/studio-versions.component';
 import { AmazonProductImagesComponent } from './components/affiliates/amazon-product-images/amazon-product-images.component';
 import { TweetedLinksBuilderComponent } from './components/social/tweeted-links-builder/tweeted-links-builder.component';
-import { YouTubeLibModule } from './you-tube-lib.module';
 
 @NgModule({
     imports: [
@@ -36,7 +37,7 @@ import { YouTubeLibModule } from './you-tube-lib.module';
         MaterialModule,
         ReactiveFormsModule,
         RoutingModule,
-        YouTubeLibModule
+        YouTubeModule
     ],
     declarations: [
         AppComponent,

diff --git a/Songhay.Dashboard/Client/src/app/components/dashboard/dashboard.component.html b/Songhay.Dashboard/Client/src/app/components/dashboard/dashboard.component.html
@@ -26,5 +26,5 @@
 </div>
 <div class="dash b-roll yt">
     <mat-spinner *ngIf="youTubeDataService.isLoading" color="accent"></mat-spinner>
-    <rx-you-tube-thumbs *ngIf="youTubeDataService.isLoaded" [disableDefaultSort]="false" [thumbsAnimationDuration]="500" [thumbsHeaderLevel]="2" [thumbsTitle]="'songhay tube'" [titleRouterLink]="'/player/video/youtube/uploads/songhay/news'" [youTubeItems]="youTubeItems"></rx-you-tube-thumbs>
+    <rx-you-tube-thumbs *ngIf="youTubeDataService.isLoaded" [disableDefaultSort]="false" [thumbsAnimationDuration]="500" [thumbsHeaderLevel]="2" [thumbsTitle]="'songhay tube'" [titleRouterLink]="titleRouterLink" [youTubeItems]="youTubeItems"></rx-you-tube-thumbs>
 </div>
diff --git a/Songhay.Dashboard/Client/src/app/components/dashboard/dashboard.component.ts b/Songhay.Dashboard/Client/src/app/components/dashboard/dashboard.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
 import { DashboardDataService } from '../../services/dashboard-data.service';
-import { YouTubeItem, YouTubeDataService } from '@songhay/player-video-you-tube';
+import { YouTubeItem, YouTubeDataService, YouTubeRoutePaths } from '@songhay/player-video-you-tube';
 
 @Component({
     selector: 'app-dashboard',
@@ -10,12 +10,18 @@ import { YouTubeItem, YouTubeDataService } from '@songhay/player-video-you-tube'
 })
 export class DashboardComponent implements OnInit {
 
+    titleRouterLink: string = '/' +
+        YouTubeRoutePaths.root +
+        YouTubeRoutePaths.uploads
+            .replace(':suffix', 'songhay')
+            .replace(':id', 'news');
+
     youTubeItems: YouTubeItem[];
 
     constructor(
         public dashService: DashboardDataService,
         public youTubeDataService: YouTubeDataService
-    ) {}
+    ) { }
 
     ngOnInit(): void {
         this.dashService.loadAppData();

diff --git a/Songhay.Dashboard/Client/src/app/routing.module.ts b/Songhay.Dashboard/Client/src/app/routing.module.ts
@@ -6,18 +6,19 @@ import { StudioToolsComponent } from './components/dashboard/studio-tools/studio
 
 import { AmazonProductImagesComponent } from './components/affiliates/amazon-product-images/amazon-product-images.component';
 import { TweetedLinksBuilderComponent } from './components/social/tweeted-links-builder/tweeted-links-builder.component';
+import { YouTubeRoutePaths } from '@songhay/player-video-you-tube';
 
 const routes: Routes = [
     { path: '', redirectTo: 'dash', pathMatch: 'full' },
     { path: 'dash', component: DashboardComponent },
     { path: 'dash/tools', component: StudioToolsComponent },
     { path: 'affiliates/amazon/products/images', component: AmazonProductImagesComponent },
     { path: 'social/twitter/builder', component: TweetedLinksBuilderComponent },
-    { path: 'player/video/youtube', loadChildren: './you-tube-lib.module#YouTubeLibModule' }
+    { path: YouTubeRoutePaths.root + YouTubeRoutePaths.uploads, loadChildren: './you-tube-lib.module#YouTubeLibModule' }
 ];
 
 @NgModule({
     imports: [RouterModule.forRoot(routes)],
     exports: [RouterModule]
 })
-export class RoutingModule {}
+export class RoutingModule { }
diff --git a/Songhay.Dashboard/Client/src/app/you-tube-lib.module.ts b/Songhay.Dashboard/Client/src/app/you-tube-lib.module.ts
@@ -1,12 +1,11 @@
 import { NgModule } from '@angular/core';
 import {
-    YouTubeModule,
-    YouTubeRoutingModule
+    YouTubeModule
 } from '@songhay/player-video-you-tube';
 
 @NgModule({
     declarations: [],
-    imports: [YouTubeModule, YouTubeRoutingModule],
-    exports: [YouTubeModule, YouTubeRoutingModule]
+    imports: [YouTubeModule],
+    exports: [YouTubeModule]
 })
 export class YouTubeLibModule {}