github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sorted out the login page to support oauth and single user password

Browse source
This commit is contained in:
tidusjar 2019-10-06 21:20:50 +01:00
commit afc803163e
4 changed files with 19 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/Ombi/ClientApp/src/app/login/login.component.html
View file

@ -3,10 +3,9 @@
<div class="small-middle-container"> <div class="small-middle-container">
<div *ngIf="form && customizationSettings && authenticationSettings"> <div *ngIf="form && customizationSettings && authenticationSettings">
<!--TODO TURN BACK ON-->
<mat-card class="mat-elevation-z8 top-margin"> <mat-card class="mat-elevation-z8 top-margin">
<img mat-card-image src="{{baseUrl}}/images/logo.png"> <img mat-card-image src="{{baseUrl}}/images/logo.png">
<mat-card-content> <mat-card-content *ngIf="!authenticationSettings.enableOAuth || loginWithOmbi">
<form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)"> <form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
@ -29,56 +28,16 @@
</a> </a>
</form> </form>
</mat-card-content> </mat-card-content>
<mat-card-content *ngIf="authenticationSettings.enableOAuth && !loginWithOmbi" class="login-buttons">
<div >
<button mat-raised-button color="primary" type="submit" (click)="loginWithOmbi = true">{{'Login.SignInWith' | translate:appNameTranslate}}</button>
<button mat-raised-button color="accent" type="button" (click)="oauth()">{{'Login.SignInWithPlex' | translate}}</button>
</div>
</mat-card-content>
</mat-card> </mat-card>
<!-- <div class="container" id="login">
<div class="card card-container">
<div *ngIf="!customizationSettings.logo">
<img id="profile-img" class="profile-img-card" src="{{baseUrl}}/images/logo.png" />
</div>
<div *ngIf="customizationSettings.logo">
<img id="profile-img" class="center" [src]="customizationSettings.logo" />
</div>
<p id="profile-name" class="profile-name-card"></p>
<div *ngIf="!authenticationSettings.enableOAuth || loginWithOmbi">
<form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<mat-form-field class="full-width">
<input type="text" matInput placeholder="{{'Login.UsernamePlaceholder' | translate}}" formControlName="username" />
<mat-error *ngIf="form.get('username').hasError('required')">
{{'Login.UsernamePlaceholder' | translate}} is <strong>required</strong></mat-error>
</mat-form-field>
<mat-form-field class="full-width">
<input type="password" matInput placeholder="{{'Login.PasswordPlaceholder' | translate}}" formControlName="password" />
</mat-form-field>
<mat-checkbox class="white-checkbox" formControlName="rememberMe">{{'Login.RememberMe' | translate}}</mat-checkbox>
<button mat-raised-button color="accent" type="submit">{{'Login.SignInButton' | translate}}</button>
<a [routerLink]="['/reset']" class="forgot-password col-md-12">
<b [translate]="'Login.ForgottenPassword'"></b>
</a>
</form>
</div>
<div *ngIf="authenticationSettings.enableOAuth && !loginWithOmbi">
<div class="form-signin">
<button mat-raised-button color="warn" type="button" (click)="loginWithOmbi = true">
Sign In With {{appName}}</button>
</div>
<div class="form-signin">
<button mat-raised-button color="warn" type="button" (click)="oauth()">
Sign In With Plex</button>
</div>
</div>
</div>
</div> -->
</div> </div>
</div> </div>

4
src/Ombi/ClientApp/src/app/login/login.component.scss
View file

@ -225,3 +225,7 @@ div.bg {
.top-margin { .top-margin {
margin-top:10%; margin-top:10%;
} }
.login-buttons {
text-align: center;
}

3
src/Ombi/ClientApp/src/app/login/login.component.ts
View file

@ -42,6 +42,9 @@ export class LoginComponent implements OnDestroy, OnInit {
} }
} }
public get appNameTranslate(): object {
return { appName: this.appName };
}
private timer: any; private timer: any;
private clientId: string; private clientId: string;

2
src/Ombi/wwwroot/translations/en.json
View file

@ -4,6 +4,8 @@
"UsernamePlaceholder": "Username", "UsernamePlaceholder": "Username",
"PasswordPlaceholder": "Password", "PasswordPlaceholder": "Password",
"RememberMe": "Remember Me", "RememberMe": "Remember Me",
"SignInWith": "Sign in with {{appName}}",
"SignInWithPlex": "Sign in with Plex",
"ForgottenPassword": "Forgot your password?", "ForgottenPassword": "Forgot your password?",
"Errors": { "Errors": {
"IncorrectCredentials": "Incorrect username or password" "IncorrectCredentials": "Incorrect username or password"