-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make primary-button act as submit button
- Loading branch information
Showing
10 changed files
with
66 additions
and
55 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
src/app/components/admin-link-button/admin-link-button.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,4 +1,4 @@ | ||
| <div class="cursor-pointer bg-warning px-5 py-2 rounded text-center drop-shadow-lg w-64"> | ||
| <button class="cursor-pointer bg-warning px-5 py-2 rounded text-center drop-shadow-lg w-64"> | ||
| <fa-icon [icon]="faWrench" class="pr-1.5"></fa-icon> | ||
| Manage in Admin Panel | ||
| </div> | ||
| </button> |
6 changes: 3 additions & 3 deletions
6
src/app/components/carousel-cycle-button/carousel-cycle-button.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,3 +1,3 @@ | ||
| <fa-icon [icon]="getIconForSide()" class="text-secondary text-3xl cursor-pointer drop-shadow-lg"> | ||
|
|
||
| </fa-icon> | ||
| <button> | ||
| <fa-icon [icon]="getIconForSide()" class="text-secondary text-3xl cursor-pointer drop-shadow-lg"></fa-icon> | ||
| </button> |
4 changes: 2 additions & 2 deletions
4
src/app/components/dangerous-button/dangerous-button.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,4 +1,4 @@ | ||
| <div class="cursor-pointer bg-dangerous hover:bg-red-700 px-5 py-2 rounded text-center drop-shadow-lg"> | ||
| <button class="cursor-pointer bg-dangerous hover:bg-red-700 px-5 py-2 rounded text-center drop-shadow-lg w-full"> | ||
| <fa-icon *ngIf="_icon" [icon]="_icon" class="pr-1.5"></fa-icon> | ||
| {{_text}} | ||
| </div> | ||
| </button> |
4 changes: 2 additions & 2 deletions
4
src/app/components/primary-button/primary-button.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,4 +1,4 @@ | ||
| <div class="cursor-pointer bg-primary px-5 py-2 rounded text-center drop-shadow-lg"> | ||
| <button class="cursor-pointer bg-primary px-5 py-2 rounded text-center drop-shadow-lg w-full" type="submit"> | ||
| <fa-icon *ngIf="_icon" [icon]="_icon" class="pr-1.5"></fa-icon> | ||
| {{_text}} | ||
| </div> | ||
| </button> |
4 changes: 2 additions & 2 deletions
4
src/app/components/secondary-button/secondary-button.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,4 +1,4 @@ | ||
| <div class="cursor-pointer bg-secondary transition-colors hover:bg-secondary-hover px-5 py-2 rounded text-center drop-shadow-lg"> | ||
| <button class="cursor-pointer bg-secondary transition-colors hover:bg-secondary-hover px-5 py-2 rounded text-center drop-shadow-lg w-full"> | ||
| <fa-icon *ngIf="_icon" [icon]="_icon" class="pr-1.5"></fa-icon> | ||
| {{_text}} | ||
| </div> | ||
| </button> |
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
18 changes: 10 additions & 8 deletions
18
src/app/pages/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,10 +1,12 @@ | ||
| <form-holder> | ||
| <page-header class="text-3xl">Forgor Password</page-header> <!-- I'm sorry. --> | ||
| <form> | ||
| <form-holder> | ||
| <page-header class="text-3xl">Forgor Password</page-header> <!-- I'm sorry. --> | ||
|
|
||
| <form-input [icon]="faEnvelope" name="Email Address" type="email" [(value)]="email"></form-input> | ||
| <form-input [icon]="faEnvelope" name="Email Address" type="email" [(value)]="email"></form-input> | ||
|
|
||
| <div class="flex flex-row my-1 justify-between space-x-4"> | ||
| <primary-button [icon]="faSkull" class="w-full" text="Send" (click)="send()"></primary-button> | ||
| <dangerous-button [icon]="faCancel" class="min-w-fit" text="Cancel" onclick="window.history.back()"></dangerous-button> | ||
| </div> | ||
| </form-holder> | ||
| <div class="flex flex-row my-1 justify-between space-x-4"> | ||
| <primary-button [icon]="faSkull" class="w-full" text="Send" (click)="send()"></primary-button> | ||
| <dangerous-button [icon]="faCancel" class="min-w-fit" text="Cancel" onclick="window.history.back()"></dangerous-button> | ||
| </div> | ||
| </form-holder> | ||
| </form> |
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,13 +1,15 @@ | ||
| <form-holder> | ||
| <page-header class="text-3xl">Sign into Refresh</page-header> | ||
| <form> | ||
| <form-holder> | ||
| <page-header class="text-3xl">Sign into Refresh</page-header> | ||
|
|
||
| <form-input [icon]="faEnvelope" name="Email Address" type="email" [(value)]="email"></form-input> | ||
| <form-input [icon]="faKey" name="Password" type="password" [(value)]="password"></form-input> | ||
| <form-input [icon]="faEnvelope" name="Email Address" type="email" [(value)]="email"></form-input> | ||
| <form-input [icon]="faKey" name="Password" type="password" [(value)]="password"></form-input> | ||
|
|
||
| <primary-button [icon]="faSignIn" class="min-w-fit" text="Sign in" (click)="login()"></primary-button> | ||
| <secondary-button [icon]="faKey" class="w-full" text="Forgot password?" routerLink="/forgotPassword"></secondary-button> | ||
| <primary-button [icon]="faSignIn" class="min-w-fit" text="Sign in" (click)="login()"></primary-button> | ||
| <secondary-button [icon]="faKey" class="w-full" text="Forgot password?" routerLink="/forgotPassword"></secondary-button> | ||
|
|
||
| <divider></divider> | ||
| <p>Haven't signed up yet?</p> | ||
| <secondary-button [icon]="faUserPlus" text="Create an account" routerLink="/register"></secondary-button> | ||
| </form-holder> | ||
| <divider></divider> | ||
| <p>Haven't signed up yet?</p> | ||
| <secondary-button [icon]="faUserPlus" text="Create an account" routerLink="/register"></secondary-button> | ||
| </form-holder> | ||
| </form> |
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,20 +1,22 @@ | ||
| <form-holder> | ||
| <page-header class="text-3xl">Sign Up</page-header> | ||
| <form> | ||
| <form-holder> | ||
| <page-header class="text-3xl">Sign Up</page-header> | ||
|
|
||
| <p class="text-warning"> | ||
| <fa-icon [icon]="faTriangleExclamation" class="mr-1"></fa-icon> | ||
| Remember to make your username match your PSN/RPCN id! | ||
| </p> | ||
| <p class="text-warning"> | ||
| <fa-icon [icon]="faTriangleExclamation" class="mr-1"></fa-icon> | ||
| Remember to make your username match your PSN/RPCN id! | ||
| </p> | ||
|
|
||
| <form-input [icon]="faUser" name="Username" type="text" [(value)]="username"></form-input> | ||
| <form-input [icon]="faEnvelope" name="Email Address" type="text" [(value)]="email"></form-input> | ||
| <form-input [icon]="faKey" name="Password" type="password" [(value)]="password"></form-input> | ||
| <form-input [icon]="faKey" name="Confirm Password" type="password" [(value)]="confirmPassword"></form-input> | ||
| <form-input [icon]="faUser" name="Username" type="text" [(value)]="username"></form-input> | ||
| <form-input [icon]="faEnvelope" name="Email Address" type="text" [(value)]="email"></form-input> | ||
| <form-input [icon]="faKey" name="Password" type="password" [(value)]="password"></form-input> | ||
| <form-input [icon]="faKey" name="Confirm Password" type="password" [(value)]="confirmPassword"></form-input> | ||
|
|
||
| <primary-button class="min-w-full" [icon]="faUserPlus" text="Register" (click)="register()"></primary-button> | ||
| <primary-button class="min-w-full" [icon]="faUserPlus" text="Register" (click)="register()"></primary-button> | ||
|
|
||
| <divider class="w-full"></divider> | ||
| <divider class="w-full"></divider> | ||
|
|
||
| <p>Already have an account?</p> | ||
| <secondary-button [icon]="faSignIn" text="Log in" routerLink="/login"></secondary-button> | ||
| </form-holder> | ||
| <p>Already have an account?</p> | ||
| <secondary-button [icon]="faSignIn" text="Log in" routerLink="/login"></secondary-button> | ||
| </form-holder> | ||
| </form> |
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,11 +1,14 @@ | ||
| <form-holder> | ||
| <page-header class="text-3xl">Verify Email</page-header> | ||
| <form> | ||
| <form-holder> | ||
| <page-header class="text-3xl">Verify Email</page-header> | ||
|
|
||
| <form-input [icon]="faKey" name="Code" type="text" [(value)]="code"></form-input> | ||
| <form-input [icon]="faKey" name="Code" type="text" [(value)]="code"></form-input> | ||
|
|
||
| <primary-button [icon]="faCheckCircle" class="min-w-full" text="Verify" (click)="verify()"></primary-button> | ||
| <primary-button [icon]="faCheckCircle" class="min-w-full" text="Verify" (click)="verify()"></primary-button> | ||
|
|
||
| <divider class="w-full"></divider> | ||
| <p>Didn't get the email?</p> | ||
| <secondary-button [icon]="faMailReply" text="Resend Verification Code" (click)="resend()"></secondary-button> | ||
| </form-holder> | ||
| <divider class="w-full"></divider> | ||
| <p>Didn't get the email?</p> | ||
| <secondary-button [icon]="faMailReply" text="Resend Verification Code" (click)="resend()"></secondary-button> | ||
| </form-holder> | ||
|
|
||
| </form> |