From a1e00429661760b663c5babc9189034b2cc603ed Mon Sep 17 00:00:00 2001
From: Jamie Rees <tidusjar@gmail.com>
Date: Thu, 4 Apr 2019 22:51:53 +0100
Subject: [PATCH] Fixed a issue with the proxy and also fixed build

---
 .../Engine/V2/MovieSearchEngineV2.cs          |  5 +++-
 .../Search/V2/MovieCollectionsViewModel.cs    |  4 ++-
 .../movie-advanced-options.component.html     |  2 +-
 .../src/app/my-nav/my-nav.component.html      |  2 +-
 .../src/app/my-nav/my-nav.component.ts        |  2 +-
 src/Ombi/ClientApp/src/index.html             | 25 +++++++++++++++++--
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
index 673958218..c6bb022e0 100644
--- a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
@@ -51,7 +51,9 @@ namespace Ombi.Core.Engine.V2
             langCode = await DefaultLanguageCode(langCode);
             var collections = await MovieApi.GetCollection(langCode, collectionId);
 
-            return await ProcessCollection(collections);
+            var c = await ProcessCollection(collections);
+            c.Collection = c.Collection.OrderBy(x => x.ReleaseDate).ToList();
+            return c;
         }
 
         public async Task<int> GetTvDbId(int theMovieDbId)
@@ -208,6 +210,7 @@ namespace Ombi.Core.Engine.V2
                 mapped.EmbyUrl = movie.EmbyUrl;
                 mapped.Subscribed = movie.Subscribed;
                 mapped.ShowSubscribe = movie.ShowSubscribe;
+                mapped.ReleaseDate = movie.ReleaseDate;
             }
             return viewMovie;
         }
diff --git a/src/Ombi.Core/Models/Search/V2/MovieCollectionsViewModel.cs b/src/Ombi.Core/Models/Search/V2/MovieCollectionsViewModel.cs
index 9490ff23f..ace5ce76c 100644
--- a/src/Ombi.Core/Models/Search/V2/MovieCollectionsViewModel.cs
+++ b/src/Ombi.Core/Models/Search/V2/MovieCollectionsViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Ombi.Store.Entities;
 
 namespace Ombi.Core.Models.Search.V2
@@ -16,6 +17,7 @@ namespace Ombi.Core.Models.Search.V2
         public string Overview { get; set; }
         public string PosterPath { get; set; }
         public string Title { get; set; }
+        public DateTime ReleaseDate { get; set; }
 
 
         public override RequestType Type => RequestType.Movie;
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
index 8c438cce5..76cc80869 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-advanced-options/movie-advanced-options.component.html
@@ -17,5 +17,5 @@
       </mat-form-field>
   </div>
   <div mat-dialog-actions>
-    <button mat-button [mat-dialog-close]="selectedRadarrProfile" cdkFocusInitial>Ok</button>
+    <button mat-button [mat-dialog-close]="options" cdkFocusInitial>Ok</button>
   </div>
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
index 8de40bfcc..52eb57759 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
@@ -7,7 +7,7 @@
       <a *ngIf="nav.requiresAdmin && isAdmin || !nav.requiresAdmin" mat-list-item [routerLink]="nav.link" 
       [routerLinkActive]="getTheme()" >
         <mat-icon aria-label="Side nav toggle icon">{{nav.icon}}</mat-icon>
-        {{nav.name | translate}}
+        &nbsp;{{nav.name | translate}}
       </a>    </span>
 
       <a class="bottom-nav-link" mat-list-item  [routerLinkActive]="theme === 'dark' ? 'active-list-item-dark' : 'active-list-item'" aria-label="Toggle sidenav" (click)="logOut();">
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
index 5ddfe3bef..7d46774a2 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
@@ -38,7 +38,7 @@ export class MyNavComponent implements OnInit {
     { name: "NavigationBar.Discover", icon: "find_replace", link: "/discover", requiresAdmin: false },
     { name: "NavigationBar.Requests", icon: "list", link: "/requests-list", requiresAdmin: false },   
     { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true },
-    { name: "NavigationBar.Calendar", icon: "calendar", link: "/calendar", requiresAdmin: false },
+    { name: "NavigationBar.Calendar", icon: "calendar_today", link: "/calendar", requiresAdmin: false },
     { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true },
   ]
 
diff --git a/src/Ombi/ClientApp/src/index.html b/src/Ombi/ClientApp/src/index.html
index da162d0d7..8cca37e00 100644
--- a/src/Ombi/ClientApp/src/index.html
+++ b/src/Ombi/ClientApp/src/index.html
@@ -4,10 +4,31 @@
 <head>
   <script>
     // manually sets the <base> tag's href attribute so the app can be located in places other than root
-    debugger;
+ 
     var split = location.pathname.split('/');
     var base = "";
+    var invalidProxies = ['DISCOVER',
+    'REQUESTS-LIST',
+    'DETAILS',
+    'SETTINGS',
+    'ISSUES',
+    'USERMANAGEMENT',
+    'RECENTLYADDED',
+    'DETAILS',
+    'VOTE',
+    'LOGIN',
+    'LANDINGPAGE',
+    'TOKEN',
+    'RESET',
+    'CUSTOM',
+    'AUTH',
+    'WIZARD',
+    "CALENDAR"    
+]
     for (var i = 0; i < split.length - 1; i++) {
+      if( invalidProxies.indexOf(split[i].toUpperCase()) !== -1) {
+        break;
+      }
         base += split[i];
         if(base.length > 1) {
           break;
@@ -17,7 +38,7 @@
         }
     }
     if(base === "") {
-      base = "./";
+      base = "/";
     }
     window['_app_base'] = base;
     document.write("<base href='" + base + "' />");