From 01eb74d90b34168249ee94e490897fcb1e6ce7b1 Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Tue, 12 Mar 2019 13:49:28 +0000 Subject: [PATCH] Started reworking the settings --- src/Ombi.Store/Context/SettingsContext.cs | 2 +- .../app/settings/about/about.component.html | 2 +- .../src/app/settings/ombi/ombi.component.html | 143 ++++++---------- .../src/app/settings/settings.module.ts | 4 + .../app/settings/settingsmenu.component.html | 157 +++++++----------- .../src/app/settings/wiki.component.html | 18 +- .../ClientApp/src/app/shared/shared.module.ts | 4 +- 7 files changed, 132 insertions(+), 198 deletions(-) diff --git a/src/Ombi.Store/Context/SettingsContext.cs b/src/Ombi.Store/Context/SettingsContext.cs index 6c9fad335..926f8cdba 100644 --- a/src/Ombi.Store/Context/SettingsContext.cs +++ b/src/Ombi.Store/Context/SettingsContext.cs @@ -28,7 +28,7 @@ namespace Ombi.Store.Context { i.StoragePath = string.Empty; } - optionsBuilder.UseSqlite($"Data Source={Path.Combine(i.StoragePath, "OmbiSettings.db")}"); + optionsBuilder.UseSqlite($"Data Source={Path.Combine(i.StoragePath, "OmbiSettings" + ".db")}"); } public void Seed() diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.html b/src/Ombi/ClientApp/src/app/settings/about/about.component.html index fc1efde3f..195e59bcc 100644 --- a/src/Ombi/ClientApp/src/app/settings/about/about.component.html +++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.html @@ -1,6 +1,6 @@  -
+
About
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 478817d6b..c9750656c 100644 --- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html +++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html @@ -1,101 +1,64 @@  -
- Ombi Configuration - +
+ Ombi Configuration + - +
- -
- -
- -
- -
-
- -
- -
- - -
-
-
- -
-
-
-
-
-
+ + + -
-
- - -
-
-
-
- - -
-
+
+ +
+ -
-
- - -
-
+
+
+
-
-
- - -
-
- -
- -
- -
-
- -
-
- -
-
+
+
+
+
+
+
+
+ + Do not send Notifications if a User has the Auto Approve permission +
+ + Hide requests from other users + +
+ + Ignore any certificate errors + +
+ + Allow us to collect anonymous analytical data e.g. browser used + +
+ + + -- + + {{lang.nativeName}} + + + +
+
+
+
- -
\ No newline at end of file +
+
+ + diff --git a/src/Ombi/ClientApp/src/app/settings/settings.module.ts b/src/Ombi/ClientApp/src/app/settings/settings.module.ts index fb1a10abe..4408a14bd 100644 --- a/src/Ombi/ClientApp/src/app/settings/settings.module.ts +++ b/src/Ombi/ClientApp/src/app/settings/settings.module.ts @@ -48,6 +48,8 @@ import { WikiComponent } from "./wiki.component"; import { SettingsMenuComponent } from "./settingsmenu.component"; import { AutoCompleteModule, CalendarModule, DialogModule, InputSwitchModule, InputTextModule, MenuModule, RadioButtonModule, TooltipModule } from "primeng/primeng"; +import { MatMenuModule} from "@angular/material"; +import { SharedModule } from "../shared/shared.module"; const routes: Routes = [ { path: "Ombi", component: OmbiComponent, canActivate: [AuthGuard] }, @@ -99,6 +101,8 @@ const routes: Routes = [ PipeModule, RadioButtonModule, DialogModule, + SharedModule, + MatMenuModule ], declarations: [ SettingsMenuComponent, diff --git a/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html b/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html index 91405d1c5..a8e94b89a 100644 --- a/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html +++ b/src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html @@ -1,97 +1,60 @@ - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/settings/wiki.component.html b/src/Ombi/ClientApp/src/app/settings/wiki.component.html index d93fdb2b7..9f02b1354 100644 --- a/src/Ombi/ClientApp/src/app/settings/wiki.component.html +++ b/src/Ombi/ClientApp/src/app/settings/wiki.component.html @@ -1,15 +1,17 @@ 
- -
- - Wiki - +
+ + +
-
- +
+ +
-
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/shared/shared.module.ts b/src/Ombi/ClientApp/src/app/shared/shared.module.ts index e9ad2f4b1..ea6cbcace 100644 --- a/src/Ombi/ClientApp/src/app/shared/shared.module.ts +++ b/src/Ombi/ClientApp/src/app/shared/shared.module.ts @@ -10,7 +10,7 @@ import { IssuesReportComponent } from "./issues-report.component"; import { InputSwitchModule, SidebarModule } from "primeng/primeng"; import { - MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule} from '@angular/material'; + MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule, MatSelectModule} from '@angular/material'; import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule, MatCheckboxModule, MatExpansionModule, MatDialogModule, MatProgressSpinnerModule, MatChipsModule } from "@angular/material"; import { EpisodeRequestComponent } from "./episode-request/episode-request.component"; @@ -44,6 +44,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo MatExpansionModule, MatDialogModule, MatTooltipModule, + MatSelectModule, ], entryComponents: [ EpisodeRequestComponent @@ -67,6 +68,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo MatNativeDateModule, MatIconModule, MatSidenavModule, + MatSelectModule, MatListModule, MatToolbarModule, MatTooltipModule,