open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Started reworking the settings

Browse Source
pull/3895/head
Jamie Rees 6 years ago
parent 619e22827f
commit 01eb74d90b
7 changed files with 132 additions and 198 deletions
Show Stats Download Patch File Download Diff File

2
src/Ombi.Store/Context/SettingsContext.cs
Unescape View File

@ -28,7 +28,7 @@ namespace Ombi.Store.Context
{ {
i.StoragePath = string.Empty; 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() public void Seed()

2
src/Ombi/ClientApp/src/app/settings/about/about.component.html
Unescape View File

@ -1,6 +1,6 @@
 
<settings-menu></settings-menu> <settings-menu></settings-menu>
<div *ngIf="about"> <div *ngIf="about" class="container">
<fieldset> <fieldset>
<legend>About</legend> <legend>About</legend>
<form> <form>

143
src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
Unescape View File

@ -1,101 +1,64 @@
<settings-menu></settings-menu> <settings-menu></settings-menu>
<wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Ombi-Settings'"></wiki> <wiki [url]="'https://github.com/tidusjar/Ombi/wiki/Ombi-Settings'"></wiki>
<fieldset *ngIf="form"> <fieldset *ngIf="form" class="container">
<legend>Ombi Configuration</legend> <legend>Ombi Configuration</legend>
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)"> <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<!--<div class="form-group"> <div class="col-12">
<label for="portNumber" class="control-label">Port</label>
<div>
<input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" formControlName="port" pTooltip="You will have to restart after changing the port.">
</div>
</div>-->
<!--<div *ngIf="form.invalid && form.dirty" class="alert alert-danger"> <mat-form-field>
<div>The External URL is incorrect</div> <input matInput placeholder="Base Url" formControlName="baseUrl">
</div> </mat-form-field>
<div class="form-group">
<label for="externalUrl" class="control-label">External Url</label>
<div>
<input type="text" class="form-control form-control-custom " id="externalUrl" name="externalUrl" placeholder="http://ombi.io/" formControlName="externalUrl" tooltipPosition="top" pTooltip="This will be the link that will be in any emails/notifications sent to the users.">
</div>
</div>-->
<div class="col-md-6">
<div class="form-group">
<label for="baseUrl" class="control-label">Base Url</label>
<div>
<input type="text" class="form-control form-control-custom" id="baseUrl" name="baseUrl"
formControlName="baseUrl">
</div>
</div>
<div class="form-group">
<label for="ApiKey" class="control-label">Api Key</label>
<div class="input-group">
<input type="text" class="form-control form-control-custom" id="ApiKey" name="ApiKey"
formControlName="apiKey" readonly="readonly" #apiKey>
<div class="input-group-addon">
<div (click)="refreshApiKey()" id="refreshKey" class="fa fa-refresh" title="Reset API Key"
pTooltip="This will invalidate the old API key"></div>
</div>
<div class="input-group-addon">
<div ngxClipboard [ngxClipboard]="apiKey" class="fa fa-clipboard" (cbOnSuccess)="successfullyCopied()"></div>
</div>
</div>
</div>
<br />
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="doNotSendNotificationsForAutoApprove" name="doNotSendNotificationsForAutoApprove"
formControlName="doNotSendNotificationsForAutoApprove">
<label for="doNotSendNotificationsForAutoApprove">Do not send Notifications if a User has the Auto
Approve permission</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="hideRequestsUsers" name="hideRequestsUsers" formControlName="hideRequestsUsers">
<label for="hideRequestsUsers">Hide requests from other users</label>
</div>
</div>
<div class="form-group">
<label for="ApiKey" class="control-label">Api Key</label>
<div class="input-group">
<input type="text" class="form-control form-control-custom" id="ApiKey" name="ApiKey" formControlName="apiKey"
readonly="readonly" #apiKey>
<div class="form-group"> <div class="input-group-addon">
<div class="checkbox"> <div (click)="refreshApiKey()" id="refreshKey" class="fa fa-refresh" title="Reset API Key" pTooltip="This will invalidate the old API key"></div>
<input type="checkbox" id="ignoreCertificateErrors" name="ignoreCertificateErrors" formControlName="ignoreCertificateErrors"> </div>
<label for="ignoreCertificateErrors" tooltipPosition="top" pTooltip="Enable if you are having connectivity problems over SSL">Ignore
any certificate errors</label>
</div>
</div>
<div class="form-group"> <div class="input-group-addon">
<div class="checkbox"> <div ngxClipboard [ngxClipboard]="apiKey" class="fa fa-clipboard" (cbOnSuccess)="successfullyCopied()"></div>
<input type="checkbox" id="CollectAnalyticData" name="CollectAnalyticData" formControlName="collectAnalyticData"> </div>
<label for="CollectAnalyticData" tooltipPosition="top" pTooltip="This will allow us to have a better understanding of the userbase so we know what we should be supporting">Allow </div>
us to collect anonymous analytical data e.g. browser used</label> </div>
</div> <br />
</div> <div>
<mat-checkbox formControlName="doNotSendNotificationsForAutoApprove">
<div class="form-group" *ngIf="langauges"> Do not send Notifications if a User has the Auto Approve permission</mat-checkbox>
<label for="select" class="control-label">Language</label> </div><div>
<div id="profiles"> <mat-checkbox formControlName="hideRequestsUsers">
<select formControlName="defaultLanguageCode" class="form-control form-control-custom" id="select"> Hide requests from other users
<option *ngFor="let lang of langauges" value="{{lang.code}}">{{lang.nativeName}}</option> </mat-checkbox>
</select> </div><div>
</div> <mat-checkbox formControlName="ignoreCertificateErrors" matTooltip="Enable if you are having connectivity problems over SSL">
</div> Ignore any certificate errors
</mat-checkbox>
<div class="form-group"> </div><div>
<div> <mat-checkbox formControlName="collectAnalyticData" matTooltip="This will allow us to have a better understanding of the userbase so we know what we should be supporting">
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> Allow us to collect anonymous analytical data e.g. browser used
</div> </mat-checkbox>
</div> </div><div>
<mat-form-field *ngIf="langauges">
<mat-select placeholder="Language" formControlName="defaultLanguageCode">
<mat-option>--</mat-option>
<mat-option *ngFor="let lang of langauges" [value]="lang.code">
{{lang.nativeName}}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="form-group">
<div>
<button mat-raised-button [disabled]="form.invalid" type="submit" id="save" color="accent">Submit</button>
</div> </div>
</form> </div>
</fieldset> </div>
</form>
</fieldset>

4
src/Ombi/ClientApp/src/app/settings/settings.module.ts
Unescape View File

@ -48,6 +48,8 @@ import { WikiComponent } from "./wiki.component";
import { SettingsMenuComponent } from "./settingsmenu.component"; import { SettingsMenuComponent } from "./settingsmenu.component";
import { AutoCompleteModule, CalendarModule, DialogModule, InputSwitchModule, InputTextModule, MenuModule, RadioButtonModule, TooltipModule } from "primeng/primeng"; 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 = [ const routes: Routes = [
{ path: "Ombi", component: OmbiComponent, canActivate: [AuthGuard] }, { path: "Ombi", component: OmbiComponent, canActivate: [AuthGuard] },
@ -99,6 +101,8 @@ const routes: Routes = [
PipeModule, PipeModule,
RadioButtonModule, RadioButtonModule,
DialogModule, DialogModule,
SharedModule,
MatMenuModule
], ],
declarations: [ declarations: [
SettingsMenuComponent, SettingsMenuComponent,

157
src/Ombi/ClientApp/src/app/settings/settingsmenu.component.html
Unescape View File

@ -1,97 +1,60 @@
<ul class="nav nav-tabs"> <button mat-button [routerLink]="['/Settings/Ombi']">Ombi</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Ombi']">Ombi</a></li> <button mat-button [matMenuTriggerFor]="configurationmenu"><i class="fa fa-cogs" aria-hidden="true"></i> Configuration</button>
<mat-menu #configurationmenu="matMenu">
<li class="dropdown" [routerLinkActive]="['active']"> <button mat-menu-item [routerLink]="['/Settings/Customization']">Customization</button>
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown"> <button mat-menu-item [routerLink]="['/Settings/LandingPage']">Landing Page</button>
<i class="fa fa-cogs" aria-hidden="true"></i> Configuration <span class="caret"></span> <button mat-menu-item [routerLink]="['/Settings/Issues']">Issues</button>
</a> <button mat-menu-item [routerLink]="['/Settings/Usermanagement']">User Management</button>
<ul class="dropdown-menu"> <button mat-menu-item [routerLink]="['/Settings/Authentication']">Authentication</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Customization']">Customization</a></li> <button mat-menu-item [routerLink]="['/Settings/Vote']">Vote</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/LandingPage']">Landing Page</a></li> </mat-menu>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Issues']">Issues</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/UserManagement']">User Importer</a></li> <button mat-button [matMenuTriggerFor]="mediaservermenu"><i class="fa fa-server" aria-hidden="true"></i> Media Server</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Authentication']">Authentication</a></li> <mat-menu #mediaservermenu="matMenu">
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Vote']">Vote</a></li> <button mat-menu-item [routerLink]="['/Settings/Plex']">Plex</button>
</ul> <button mat-menu-item [routerLink]="['/Settings/Emby']">Emby</button>
</li> </mat-menu>
<li class="dropdown" [routerLinkActive]="['active']"> <button mat-button [matMenuTriggerFor]="tvmenu"><i class="fa fa-television" aria-hidden="true"></i> TV</button>
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown"> <mat-menu #tvmenu="matMenu">
<i class="fa fa-server" aria-hidden="true"></i> Media Server <span class="caret"></span> <button mat-menu-item [routerLink]="['/Settings/Sonarr']">Sonarr</button>
</a> <button mat-menu-item [routerLink]="['/Settings/DogNzb']">DogNzb</button>
<ul class="dropdown-menu"> <button mat-menu-item [routerLink]="['/Settings/SickRage']">SickRage</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Plex']">Plex</a></li> </mat-menu>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Emby']">Emby</a></li>
</ul> <button mat-button [matMenuTriggerFor]="movieMenu"><i class="fa fa-film" aria-hidden="true"></i> Movies</button>
</li> <mat-menu #movieMenu="matMenu">
<button mat-menu-item [routerLink]="['/Settings/CouchPotato']">CouchPotato</button>
<li class="dropdown" [routerLinkActive]="['active']"> <button mat-menu-item [routerLink]="['/Settings/DogNzb']">DogNzb</button>
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown"> <button mat-menu-item [routerLink]="['/Settings/Radarr']">Radarr</button>
<i class="fa fa-television" aria-hidden="true"></i> TV <span class="caret"></span> </mat-menu>
</a>
<ul class="dropdown-menu"> <button mat-button [matMenuTriggerFor]="musicMenu"><i class="fa fa-music" aria-hidden="true"></i> Music</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Sonarr']">Sonarr</a></li> <mat-menu #musicMenu="matMenu">
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/DogNzb']">DogNzb</a></li> <button mat-menu-item [routerLink]="['/Settings/Lidarr']">Lidarr</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/SickRage']">SickRage</a></li> </mat-menu>
</ul>
</li> <button mat-button [matMenuTriggerFor]="notificationMenu"><i class="fa fa-bell-o" aria-hidden="true"></i> Notifications</button>
<mat-menu #notificationMenu="matMenu">
<li class="dropdown" [routerLinkActive]="['active']"> <button mat-menu-item [routerLink]="['/Settings/Mobile']">Mobile</button>
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown"> <button mat-menu-item [routerLink]="['/Settings/Email']">Email</button>
<i class="fa fa-film" aria-hidden="true"></i> Movies <span class="caret"></span> <button mat-menu-item [routerLink]="['/Settings/MassEmail']">MassEmail</button>
</a> <button mat-menu-item [routerLink]="['/Settings/Newsletter']">Newsletter</button>
<ul class="dropdown-menu"> <button mat-menu-item [routerLink]="['/Settings/Discord']">Discord</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/CouchPotato']">CouchPotato</a></li> <button mat-menu-item [routerLink]="['/Settings/Slack']">Slack</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/DogNzb']">DogNzb</a></li> <button mat-menu-item [routerLink]="['/Settings/Pushbullet']">Pushbullet</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Radarr']">Radarr</a></li> <button mat-menu-item [routerLink]="['/Settings/Pushover']">Pushover</button>
<!--<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Watcher']">Watcher</a></li>--> <button mat-menu-item [routerLink]="['/Settings/Mattermost']">Mattermost</button>
</ul> <button mat-menu-item [routerLink]="['/Settings/Telegram']">Telegram</button>
</li> </mat-menu>
<li class="dropdown" [routerLinkActive]="['active']"> <button mat-button [matMenuTriggerFor]="systemMenu"><i class="fa fa-tachometer" aria-hidden="true"></i> System</button>
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown"> <mat-menu #systemMenu="matMenu">
<i class="fa fa-music" aria-hidden="true"></i> Music <span class="caret"></span> <button mat-menu-item [routerLink]="['/Settings/About']">About</button>
</a> <button mat-menu-item [routerLink]="['/Settings/FailedRequests']">Failed Requests</button>
<ul class="dropdown-menu"> <button mat-menu-item [routerLink]="['/Settings/Update']">Update</button>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Lidarr']">Lidarr</a></li> <button mat-menu-item [routerLink]="['/Settings/Jobs']">Background Jobs</button>
</ul> </mat-menu>
</li>
<hr/>
<li class="dropdown" [routerLinkActive]="['active']">
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bell-o" aria-hidden="true"></i> Notifications <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Mobile']">Mobile</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Email']">Email</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/MassEmail']">Mass Email</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Newsletter']">Newsletter</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Discord']">Discord</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Slack']">Slack</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Pushbullet']">Pushbullet</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Pushover']">Pushover</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Mattermost']">Mattermost</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Telegram']">Telegram</a></li>
</ul>
</li>
<li class="dropdown" [routerLinkActive]="['active']">
<a href="ignore($event)" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-tachometer" aria-hidden="true"></i> System <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/About']">About</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/FailedRequests']">Failed Requests</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Update']">Update</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Jobs']">Jobs</a></li>
<!-- <li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/Logs']">Logs (Not available)</a></li>
<li [routerLinkActive]="['active']"><a [routerLink]="['/Settings/ScheduledJobs']">Scheduled Jobs (Not available)</a></li> -->
</ul>
</li>
</ul>
<hr/>

18
src/Ombi/ClientApp/src/app/settings/wiki.component.html
Unescape View File

@ -1,15 +1,17 @@
<div class="col-md-12"> <div class="col-md-12">
<div *ngIf="!text" class="col-md-1 offset-md-11">
<div *ngIf="!text" class="col-md-1 col-md-push-11"> <a href="{{url}}" target="_blank">
<a href="{{url}}" target="_blank" class="btn btn-sm btn-info-outline"> <button mat-raised-button color="accent">
<span >Wiki</span> <span>Wiki</span>
</a> </button>
</a>
</div> </div>
<div *ngIf="text" class="col-md-1 col-md-push-9"> <div *ngIf="text" class="col-md-1 offset-md-9">
<a href="{{url}}" target="_blank" class="btn btn-sm btn-info-outline"> <a href="{{url}}" target="_blank">
<button mat-raised-button color="accent">
<span>{{text}}</span> <span>{{text}}</span>
</button>
</a> </a>
</div> </div>
</div> </div>

4
src/Ombi/ClientApp/src/app/shared/shared.module.ts
Unescape View File

@ -10,7 +10,7 @@ import { IssuesReportComponent } from "./issues-report.component";
import { InputSwitchModule, SidebarModule } from "primeng/primeng"; import { InputSwitchModule, SidebarModule } from "primeng/primeng";
import { 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, import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule, MatCheckboxModule, MatExpansionModule, MatDialogModule, MatProgressSpinnerModule,
MatChipsModule } from "@angular/material"; MatChipsModule } from "@angular/material";
import { EpisodeRequestComponent } from "./episode-request/episode-request.component"; import { EpisodeRequestComponent } from "./episode-request/episode-request.component";
@ -44,6 +44,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo
MatExpansionModule, MatExpansionModule,
MatDialogModule, MatDialogModule,
MatTooltipModule, MatTooltipModule,
MatSelectModule,
], ],
entryComponents: [ entryComponents: [
EpisodeRequestComponent EpisodeRequestComponent
@ -67,6 +68,7 @@ import { EpisodeRequestComponent } from "./episode-request/episode-request.compo
MatNativeDateModule, MatNativeDateModule,
MatIconModule, MatIconModule,
MatSidenavModule, MatSidenavModule,
MatSelectModule,
MatListModule, MatListModule,
MatToolbarModule, MatToolbarModule,
MatTooltipModule, MatTooltipModule,

Write Preview
Loading…
Cancel
Save