From f7a5abe81f574f486dbe85610b5f3857c16e1c47 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 20 Jan 2021 20:38:42 +0000
Subject: [PATCH] Styling tweaks and changed the wiki links
 https://github.com/Ombi-app/Ombi.Docs/issues/32

---
 .../discover/components/card/discover-card.component.html | 3 +++
 .../discover/components/card/discover-card.component.scss | 5 +++--
 .../components/carousel-list/carousel-list.component.html | 2 +-
 .../components/carousel-list/carousel-list.component.scss | 7 +++++--
 .../components/movie/movie-details.component.html         | 4 ++--
 src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss   | 8 --------
 .../settings/authentication/authentication.component.html | 2 +-
 .../settings/customization/customization.component.html   | 2 +-
 .../src/app/settings/dognzb/dognzb.component.html         | 2 +-
 .../src/app/settings/issues/issues.component.html         | 2 +-
 .../ClientApp/src/app/settings/jobs/jobs.component.html   | 2 +-
 .../app/settings/landingpage/landingpage.component.html   | 2 +-
 .../src/app/settings/massemail/massemail.component.html   | 2 +-
 .../app/settings/notifications/newsletter.component.html  | 2 +-
 .../notifications/notificationtemplate.component.html     | 2 +-
 .../ClientApp/src/app/settings/ombi/ombi.component.html   | 2 +-
 .../src/app/settings/settingsmenu.component.html          | 4 ++--
 .../settings/usermanagement/usermanagement.component.html | 2 +-
 .../ClientApp/src/app/settings/vote/vote.component.html   | 2 +-
 src/Ombi/ClientApp/src/app/settings/wiki.component.html   | 4 ++--
 src/Ombi/ClientApp/src/app/settings/wiki.component.ts     | 3 ++-
 src/Ombi/ClientApp/src/styles/material-overrides.scss     | 7 ++++++-
 src/Ombi/Startup.cs                                       | 7 -------
 23 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html
index bd1a9cf90..023f80d6e 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html
+++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html
@@ -20,6 +20,9 @@
 <p-skeleton  *ngIf="!fullyLoaded" width="100%" height="315px"></p-skeleton>
 
 <div *ngIf="fullyLoaded" class="ombi-card dark-card c" [style.display]="hide ? 'none' : 'block'">
+    <div class="ribbon {{getStatusClass()}} ribbon-top-right"><span>
+        {{getAvailbilityStatus()}}
+    </span></div>
     <a>
         <img [routerLink]="generateDetailsLink()" id="cardImage" src="{{result.posterPath}}" class="image"
             alt="{{result.title}}">
diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss
index 03fc37187..485bfc543 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss
+++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss
@@ -147,8 +147,9 @@ small {
 
   /* top right*/
   .ribbon-top-right {
-    top: -10px;
-    right: -10px;
+    top: -5px;
+    right: -5px;
+    z-index: 999999;
   }
   .ribbon-top-right::before,
   .ribbon-top-right::after {
diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
index 224a43be2..de0498318 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
+++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.html
@@ -14,7 +14,7 @@
 <div *ngIf="loadingFlag">
     <p-carousel [numVisible]="10" [numScroll]="10" [page]="0" [value]="[0,1,2,3,4,5,6,7,8,9,10,11,12,13]" [responsiveOptions]="responsiveOptions">
         <ng-template let-result pTemplate="item">
-            <p-skeleton  *ngIf="!fullyLoaded" width="100%" height="315px"></p-skeleton>
+            <p-skeleton  *ngIf="!fullyLoaded" width="100%" height="315px" borderRadius="16px" style="padding: 5px;"></p-skeleton>
         </ng-template>
     </p-carousel>
 </div>
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
index 8e285ddb7..c3a0d32b4 100644
--- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
+++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
@@ -72,9 +72,8 @@
   .discover-filter-button{
     background:inherit;
     color:inherit;
-    padding:0 20px;
+    padding:0 0px;
     border-radius: 30px;
-    margin:5px;
   }
 
   .discover-filter-button.cdk-focused{
@@ -84,4 +83,8 @@
   .discover-filter-button .mat-button-toggle-button:focus{
     outline:none;
   }
+}
+
+.card-skeleton {
+   padding: 5px;
 }
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
index e3fd88067..d62cad6f0 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
@@ -28,8 +28,6 @@
                     <span *ngIf="!movie.available">
             <span *ngIf="movie.requested || movie.approved; then requestedBtn else notRequestedBtn"></span>
 
-            <button *ngIf="movie.belongsToCollection" [routerLink]="'/discover/collection/' + movie.belongsToCollection.id" mat-raised-button class="btn-spacing"><i class="fa fa-list"></i> {{'MediaDetails.ViewCollection' | translate}}</button>
-
                     <ng-template #requestedBtn>
                         <button mat-raised-button *ngIf="!hasRequest || hasRequest && movieRequest && !movieRequest.denied" class="btn-spacing" color="warn" [disabled]><i class="fa fa-check"></i>
                 {{ 'Common.Requested' | translate }}</button>
@@ -64,6 +62,8 @@
                     <button mat-raised-button class="btn-spacing" color="danger" (click)="issue()">
             <i class="fa fa-exclamation"></i> {{
                 'Requests.ReportIssue' | translate }}</button>
+                <button *ngIf="movie.belongsToCollection" [routerLink]="'/discover/collection/' + movie.belongsToCollection.id" mat-raised-button class="btn-spacing"><i class="fa fa-list"></i> {{'MediaDetails.ViewCollection' | translate}}</button>
+
                 </div>
 
                 <!-- Setting/Configuration admin area -->
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss
index 6d6559a44..1c487cc6e 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss
@@ -91,16 +91,9 @@
 }
 
 .profile-img img {
-    border-radius: 6px;
-    box-shadow: 4px 3px 6px 0 rgba(0,0,0,.2);
     width: 45px;
 }
 
-.outer-profile {
-    background-color: #303030;
-    box-shadow: inset 0 0 3px #000000;
-    padding: 1px;
-}
 
 .full {
     width: 100%;
@@ -116,7 +109,6 @@
 .sidenav-container .sidenav{
     background: $ombi-background-accent;
     color:#FFF;
-    width: 23rem;
     font-family: 'Montserrat', sans-serif;
 
     .application-name{
diff --git a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
index 1d6b6f5d3..5a51201cd 100644
--- a/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/authentication/authentication.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Authentication-Settings'"></wiki>
+<wiki [path]="'/settings/authentication/'"></wiki>
 <fieldset *ngIf="form">
     <legend>Authentication</legend>
     <div class="md-form-field" style="margin-top:1em;"></div>
diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
index 55f4a1b42..c98cf65fc 100644
--- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Customization-Settings'"></wiki>
+<wiki [path]="'/settings/customization/'"></wiki>
 <fieldset *ngIf="settings">
     <legend>Customization</legend>
 
diff --git a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html
index 6587c07d1..43de0ce74 100644
--- a/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/dognzb/dognzb.component.html
@@ -1,7 +1,7 @@
 <settings-menu>
 </settings-menu>
 <div>
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/DogNzb-Settings'"></wiki>
+<wiki [path]="'/settings/dognzb/'"></wiki>
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>DogNzb Settings</legend>
diff --git a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html
index 702ca6915..e42dd3182 100644
--- a/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/issues/issues.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Issue-Settings'"></wiki>
+<wiki [path]="'/settings/issues/'"></wiki>
 
 <fieldset>
     <legend>Issues</legend>
diff --git a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html
index 612f9eaf8..f51c5626e 100644
--- a/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/jobs/jobs.component.html
@@ -1,5 +1,5 @@
 <settings-menu></settings-menu>
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Job-Settings'"></wiki>
+<wiki [path]="'/settings/scheduled-tasks/'"></wiki>
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Job Settings</legend>
diff --git a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html
index 91b923833..fbec2a300 100644
--- a/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/landingpage/landingpage.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Landing-Page-Settings'"></wiki>
+<wiki [path]="'/settings/landing-page/'"></wiki>
 <fieldset *ngIf="settings" class="container">
         <legend>Landing Page Configuration</legend>
         <div class="md-form-field" style="margin-top:1em;"></div>
diff --git a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html
index a858b98d8..d6e68a05f 100644
--- a/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/massemail/massemail.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Mass-Email'"></wiki>
+<wiki [path]="'/settings/notifications/mass-email/'"></wiki>
 <fieldset>
     <legend>Mass Email</legend>
 
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html
index 80aeba34f..4da0689eb 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/newsletter.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Newsletter-Settings'"></wiki>
+<wiki [path]="'/settings/notifications/newsletter/'"></wiki>
 <div *ngIf="settings" class="small-middle-container">
     <fieldset>
         <legend>Newsletter</legend>
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.html
index 02551a345..50d4b5c32 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/notificationtemplate.component.html
@@ -1,4 +1,4 @@
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Notification-Template-Variables'" [text]="'Notification Variables'">
+<wiki [path]="'/settings/notifications/template-variables/'" [text]="'Notification Variables'">
 </wiki>
 <br><br>
 
diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
index 63d9ce2a1..26d7681a6 100644
--- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Ombi-Settings'"></wiki>
+<wiki [path]="'/settings/ombi-settings/'"></wiki>
 <fieldset *ngIf="form">
     <legend>Ombi Configuration</legend>
     <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
diff --git a/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html b/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html
index ce97ee200..e3d2d9257 100644
--- a/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html
@@ -7,7 +7,7 @@
     <button mat-menu-item [routerLink]="['/Settings/Issues']">Issues</button>
     <button mat-menu-item [routerLink]="['/Settings/UserManagement']">User Management</button>
     <button mat-menu-item [routerLink]="['/Settings/Authentication']">Authentication</button>
-    <button mat-menu-item [routerLink]="['/Settings/Vote']">Vote</button>
+    <!-- <button mat-menu-item [routerLink]="['/Settings/Vote']">Vote</button> -->
     <button mat-menu-item [routerLink]="['/Settings/TheMovieDb']">The Movie Database</button>
 </mat-menu>
 
@@ -59,7 +59,7 @@
 <mat-menu #systemMenu="matMenu">
     <button mat-menu-item [routerLink]="['/Settings/About']">About</button>
     <button mat-menu-item [routerLink]="['/Settings/FailedRequests']">Failed Requests</button>
-    <button mat-menu-item [routerLink]="['/Settings/Update']">Update</button>
+    <!-- <button mat-menu-item [routerLink]="['/Settings/Update']">Update</button> -->
     <button mat-menu-item [routerLink]="['/Settings/Jobs']">Scheduled Tasks</button>
     <button mat-menu-item [routerLink]="['/Settings/Logs']">Logs</button>
 </mat-menu>
diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
index ba5ae4842..20bd9a970 100644
--- a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/User-Importer-Settings'"></wiki>
+<wiki [path]="'/settings/import-users/'"></wiki>
 <fieldset *ngIf="settings">
     <legend>User Importer Settings</legend>
     <div class="md-form-field" style="margin-top:1em;"></div>
diff --git a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html
index a556fa048..c126bec0d 100644
--- a/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/vote/vote.component.html
@@ -1,6 +1,6 @@
 <settings-menu></settings-menu>
 <div class="small-middle-container">
-<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Vote-Settings'"></wiki>
+<wiki [path]="'/settings/voting/'"></wiki>
 
 <fieldset>
     <legend>Vote</legend>
diff --git a/src/Ombi/ClientApp/src/app/settings/wiki.component.html b/src/Ombi/ClientApp/src/app/settings/wiki.component.html
index 52cedf6ea..fe12a1a19 100644
--- a/src/Ombi/ClientApp/src/app/settings/wiki.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/wiki.component.html
@@ -1,6 +1,6 @@
 <div class="col" style="text-align: -webkit-right;">
     <div *ngIf="!text" class="col-md-4 ml-auto ">
-        <a href="{{url}}" target="_blank">
+        <a href="{{domain}}{{url}}" target="_blank">
         <button mat-raised-button color="accent">
             <span>Wiki</span>
         </button>
@@ -8,7 +8,7 @@
     </div>
 
     <div *ngIf="text" class="col-md-4 ml-auto ">
-            <a href="{{url}}" target="_blank">
+            <a href="{{domain}}{{url}}" target="_blank">
             <button mat-raised-button color="accent">
                 <span>{{text}}</span>
             </button>
diff --git a/src/Ombi/ClientApp/src/app/settings/wiki.component.ts b/src/Ombi/ClientApp/src/app/settings/wiki.component.ts
index d2187bb8a..f391713cd 100644
--- a/src/Ombi/ClientApp/src/app/settings/wiki.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/wiki.component.ts
@@ -5,6 +5,7 @@
     templateUrl: "./wiki.component.html",
 })
 export class WikiComponent {
-    @Input() public url: string;
+    @Input() public path: string;
     @Input() public text: string;
+    public domain: string = "http://docs.ombi.app/"
 }
diff --git a/src/Ombi/ClientApp/src/styles/material-overrides.scss b/src/Ombi/ClientApp/src/styles/material-overrides.scss
index 7596451e0..42d028c09 100644
--- a/src/Ombi/ClientApp/src/styles/material-overrides.scss
+++ b/src/Ombi/ClientApp/src/styles/material-overrides.scss
@@ -22,7 +22,12 @@ td.mat-cell {
 }
 
 // lighter bg
-.mat-expansion-panel, .mat-card, .mat-dialog-container, .mat-menu-content{
+.mat-expansion-panel,
+.mat-card,
+.mat-dialog-container,
+.mat-menu-content,
+.mat-table,
+.mat-paginator {
     background: $ombi-background-accent !important;
 }
 
diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs
index 2ed2b49e4..fecaaccb3 100644
--- a/src/Ombi/Startup.cs
+++ b/src/Ombi/Startup.cs
@@ -153,13 +153,6 @@ namespace Ombi
                 ombiService.SaveSettings(settings);
             }
 
-            if (!settings.Set)
-            {
-                settings.Set = true;
-                settings.CollectAnalyticData = true;
-                ombiService.SaveSettings(settings);
-            }
-
             // Check if it's in the startup args
             var appConfig = serviceProvider.GetService<IApplicationConfigRepository>();
             var baseUrl = appConfig.Get(ConfigurationTypes.BaseUrl);