-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #123 from oliverheywood451/admin-products
Admin login + product list
- Loading branch information
Showing
107 changed files
with
3,019 additions
and
488 deletions.
There are no files selected for viewing
60 changes: 31 additions & 29 deletions
60
src/UI/Buyer/src/app/auth/containers/forgot-password/forgot-password.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,32 @@ | ||
| <div class="text-center mt-3"> | ||
| <h1 class="display-4">{{appConfig.appname}}</h1> | ||
| </div> | ||
| <div class="mx-auto " | ||
| style="max-width:350px;"> | ||
| <h3 class="text-center text-muted mb-3">Forgot Password</h3> | ||
| <form (ngSubmit)="onSubmit()" | ||
| [formGroup]="resetEmailForm" | ||
| name="ResetEmail" | ||
| autocomplete="off" | ||
| novalidate> | ||
| <div class="form-group"> | ||
| <label for="email" | ||
| class="sr-only">Email</label> | ||
| <input formControlName="email" | ||
| id="email" | ||
| type="text" | ||
| class="form-control" | ||
| placeholder="Email" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <button id="submitBtn" | ||
| type="submit" | ||
| class="btn btn-primary btn-block">Send Email</button> | ||
| </form> | ||
| <button type="button" | ||
| class="btn btn-link btn-block" | ||
| routerLink="/login">Return to Login</button> | ||
| <div class="logged-out-page"> | ||
| <div class="text-center mt-3"> | ||
| <h1 class="display-4">{{appConfig.appname}}</h1> | ||
| </div> | ||
| <div class="mx-auto " | ||
| style="max-width:350px;"> | ||
| <h3 class="text-center text-muted mb-3">Forgot Password</h3> | ||
| <form (ngSubmit)="onSubmit()" | ||
| [formGroup]="resetEmailForm" | ||
| name="ResetEmail" | ||
| autocomplete="off" | ||
| novalidate> | ||
| <div class="form-group"> | ||
| <label for="email" | ||
| class="sr-only">Email</label> | ||
| <input formControlName="email" | ||
| id="email" | ||
| type="text" | ||
| class="form-control" | ||
| placeholder="Email" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <button id="submitBtn" | ||
| type="submit" | ||
| class="btn btn-primary btn-block">Send Email</button> | ||
| </form> | ||
| <button type="button" | ||
| class="btn btn-link btn-block" | ||
| routerLink="/login">Return to Login</button> | ||
| </div> | ||
| </div> |
92 changes: 45 additions & 47 deletions
92
src/UI/Buyer/src/app/auth/containers/login/login.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,49 @@ | ||
| <section class="login"> | ||
| <div class="text-center"> | ||
| <p *ngIf="showRegisterLink()">Don't have an account? <button type="button" | ||
| class="btn btn-link" | ||
| routerLink="/register">Sign Up</button></p> | ||
| <h1 class="display-4">{{appConfig.appname}}</h1> | ||
| </div> | ||
| <div class="mx-auto mt-4" | ||
| style="max-width:350px;"> | ||
| <h3 class="text-center headline-text">Account Login</h3> | ||
| <form (ngSubmit)="onSubmit()" | ||
| [formGroup]="form" | ||
| name="LoginForm" | ||
| autocomplete="off" | ||
| novalidate> | ||
| <div class="form-group"> | ||
| <label for="username">Username</label> | ||
| <input formControlName="username" | ||
| id="username" | ||
| type="text" | ||
| class="form-control" | ||
| placeholder="Username" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="password">Password</label> | ||
| <input formControlName="password" | ||
| type="password" | ||
| class="form-control" | ||
| placeholder="Password" | ||
| id="password" /> | ||
| </div> | ||
| <div class="form-group text-center"> | ||
| <div class="checkbox"> | ||
| <label for="rememberMeId"> | ||
| <div class="text-center"> | ||
| <p *ngIf="showRegisterLink()">Don't have an account? <button type="button" | ||
| class="btn btn-link" | ||
| routerLink="/register">Sign Up</button></p> | ||
| <h1 class="display-4">{{appConfig.appname}}</h1> | ||
| </div> | ||
| <div class="mx-auto mt-4" | ||
| style="max-width:350px;"> | ||
| <h3 class="text-center headline-text">Account Login</h3> | ||
| <form (ngSubmit)="onSubmit()" | ||
| [formGroup]="form" | ||
| name="LoginForm" | ||
| autocomplete="off" | ||
| novalidate> | ||
| <div class="form-group"> | ||
| <label for="username">Username</label> | ||
| <input formControlName="username" | ||
| id="username" | ||
| type="text" | ||
| class="form-control" | ||
| placeholder="Username" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="password">Password</label> | ||
| <input formControlName="password" | ||
| type="password" | ||
| class="form-control" | ||
| placeholder="Password" | ||
| id="password" /> | ||
| </div> | ||
| <div class="form-group text-center"> | ||
| <div class="checkbox"> | ||
| <label for="rememberMeId"> | ||
| <input formControlName="rememberMe" type="checkbox" id="rememberMeId"> | ||
| Remember Me | ||
| </label> | ||
| </div> | ||
| </div> | ||
| <button id="submitBtn" | ||
| type="submit" | ||
| [disabled]="!form.valid" | ||
| class="btn btn-primary btn-lg btn-block">Submit</button> | ||
| </form> | ||
| <button type="button" | ||
| class="btn btn-link btn-block text-center" | ||
| routerLink="/forgot-password">Forgot Password</button> | ||
| </div> | ||
| </section> | ||
| </div> | ||
| <button id="submitBtn" | ||
| type="submit" | ||
| [disabled]="!form.valid" | ||
| class="btn btn-primary btn-lg btn-block">Submit</button> | ||
| </form> | ||
| <button type="button" | ||
| class="btn btn-link btn-block text-center" | ||
| routerLink="/forgot-password">Forgot Password</button> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 41 additions & 39 deletions
80
src/UI/Buyer/src/app/auth/containers/reset-password/reset-password.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,42 @@ | ||
| <div class="text-center mt-3"> | ||
| <h1 class="display-4">{{appConfig.appname}}</h1> | ||
| </div> | ||
| <div class="mx-auto " | ||
| style="max-width:350px;"> | ||
| <h3 class="text-center text-muted mb-3">New Password</h3> | ||
| <form (ngSubmit)="onSubmit()" | ||
| [formGroup]="resetPasswordForm" | ||
| name="NewPassword" | ||
| autocomplete="off" | ||
| novalidate> | ||
| <div class="form-group"> | ||
| <label for="psswrd" | ||
| class="sr-only">Password</label> | ||
| <input formControlName="password" | ||
| id="psswrd" | ||
| type="password" | ||
| class="form-control" | ||
| placeholder="Password" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="confirm" | ||
| class="sr-only">Confirm Password</label> | ||
| <input formControlName="passwordConfirm" | ||
| id="confirm" | ||
| type="password" | ||
| class="form-control" | ||
| placeholder="Confirm Password" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <span *ngIf="passwordMismatchError()" | ||
| class="error-message">Passwords must match</span> | ||
| <button id="submitBtn" | ||
| type="submit" | ||
| class="btn btn-primary btn-block">Set New Password</button> | ||
| </form> | ||
| <div class="logged-out-page"> | ||
| <div class="text-center mt-3"> | ||
| <h1 class="display-4">{{appConfig.appname}}</h1> | ||
| </div> | ||
| <div class="mx-auto " | ||
| style="max-width:350px;"> | ||
| <h3 class="text-center text-muted mb-3">New Password</h3> | ||
| <form (ngSubmit)="onSubmit()" | ||
| [formGroup]="resetPasswordForm" | ||
| name="NewPassword" | ||
| autocomplete="off" | ||
| novalidate> | ||
| <div class="form-group"> | ||
| <label for="psswrd" | ||
| class="sr-only">Password</label> | ||
| <input formControlName="password" | ||
| id="psswrd" | ||
| type="password" | ||
| class="form-control" | ||
| placeholder="Password" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="confirm" | ||
| class="sr-only">Confirm Password</label> | ||
| <input formControlName="passwordConfirm" | ||
| id="confirm" | ||
| type="password" | ||
| class="form-control" | ||
| placeholder="Confirm Password" | ||
| autocapitalize="off" | ||
| autofocus /> | ||
| </div> | ||
| <span *ngIf="passwordMismatchError()" | ||
| class="error-message">Passwords must match</span> | ||
| <button id="submitBtn" | ||
| type="submit" | ||
| class="btn btn-primary btn-block">Set New Password</button> | ||
| </form> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../src/app/order/containers/order-approval-details/order-approval-details.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/UI/Buyer/src/app/order/containers/order-reorder/order-reorder.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.