Chore: Removed @angular/flex-layout and replaced it with tailwind.
Chore: Upgraded some packages
This commit is contained in:
1 parent
b9fbdd4b99
commit
4a85a9133e
104 files changed
+564
-975
No files matched your search
@@ -2,19 +2,19 @@
|
||||
<mat-tab label="Lock Dates">
|
||||
<mat-card>
|
||||
<mat-card-content>
|
||||
<form [formGroup]="lockInfoForm" fxLayout="column">
|
||||
<div
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
>
|
||||
<mat-checkbox formControlName="lockOlder" fxFlex="20">Lock Older</mat-checkbox>
|
||||
<mat-checkbox formControlName="olderRolling" *ngIf="lockOlder" fxFlex="20">
|
||||
<form [formGroup]="lockInfoForm" class="flex flex-col">
|
||||
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
|
||||
<mat-checkbox formControlName="lockOlder" class="flex-auto basis-1/5 mr-5"
|
||||
>Lock Older</mat-checkbox
|
||||
>
|
||||
<mat-checkbox
|
||||
formControlName="olderRolling"
|
||||
*ngIf="lockOlder"
|
||||
class="flex-auto basis-1/5 mr-5"
|
||||
>
|
||||
Is Rolling
|
||||
</mat-checkbox>
|
||||
<mat-form-field fxFlex="60" *ngIf="lockOlder && !olderRolling">
|
||||
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockOlder && !olderRolling">
|
||||
<input
|
||||
matInput
|
||||
[matDatepicker]="olderDate"
|
||||
@@ -25,22 +25,22 @@
|
||||
<mat-datepicker-toggle matSuffix [for]="olderDate"></mat-datepicker-toggle>
|
||||
<mat-datepicker #olderDate></mat-datepicker>
|
||||
</mat-form-field>
|
||||
<mat-form-field fxFlex="60" *ngIf="lockOlder && olderRolling">
|
||||
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockOlder && olderRolling">
|
||||
<input matInput placeholder="Days" formControlName="olderDays" autocomplete="off" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
>
|
||||
<mat-checkbox formControlName="lockNewer" fxFlex="20">Lock Newer</mat-checkbox>
|
||||
<mat-checkbox formControlName="newerRolling" *ngIf="lockNewer" fxFlex="20">
|
||||
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
|
||||
<mat-checkbox formControlName="lockNewer" class="flex-auto basis-1/5 mr-5"
|
||||
>Lock Newer</mat-checkbox
|
||||
>
|
||||
<mat-checkbox
|
||||
formControlName="newerRolling"
|
||||
*ngIf="lockNewer"
|
||||
class="flex-auto basis-1/5 mr-5"
|
||||
>
|
||||
Is Rolling
|
||||
</mat-checkbox>
|
||||
<mat-form-field fxFlex="60" *ngIf="lockNewer && !newerRolling">
|
||||
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockNewer && !newerRolling">
|
||||
<input
|
||||
matInput
|
||||
[matDatepicker]="newerDate"
|
||||
@@ -51,56 +51,38 @@
|
||||
<mat-datepicker-toggle matSuffix [for]="newerDate"></mat-datepicker-toggle>
|
||||
<mat-datepicker #newerDate></mat-datepicker>
|
||||
</mat-form-field>
|
||||
<mat-form-field fxFlex="60" *ngIf="lockNewer && newerRolling">
|
||||
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockNewer && newerRolling">
|
||||
<input matInput placehnewer="Days" formControlName="newerDays" autocomplete="off" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
>
|
||||
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
|
||||
<div formArrayName="accountTypes">
|
||||
<h3>Account Types</h3>
|
||||
<div
|
||||
fxLayout="row"
|
||||
*ngFor="let at of accountTypes; index as i"
|
||||
[formGroupName]="i"
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
class="flex flex-row justify-around content-start items-start"
|
||||
>
|
||||
<mat-checkbox formControlName="accountType" fxFlex>{{ at.name }}</mat-checkbox>
|
||||
<mat-checkbox formControlName="accountType" class="flex-auto">{{
|
||||
at.name
|
||||
}}</mat-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
<div formArrayName="voucherTypes">
|
||||
<h3>Voucher Types</h3>
|
||||
<div
|
||||
fxLayout="row"
|
||||
*ngFor="let vt of voucherTypes; index as j"
|
||||
[formGroupName]="j"
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
class="flex flex-row justify-around content-start items-start"
|
||||
>
|
||||
<mat-checkbox formControlName="voucherType" fxFlex>{{ vt.name }}</mat-checkbox>
|
||||
<mat-checkbox formControlName="voucherType" class="flex-auto">{{
|
||||
vt.name
|
||||
}}</mat-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
fxLayout="row"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
fxLayoutAlign="space-around start"
|
||||
>
|
||||
<mat-form-field fxFlex="30%">
|
||||
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
|
||||
<mat-form-field class="flex-auto basis-3/10 mr-5">
|
||||
<input
|
||||
matInput
|
||||
[matDatepicker]="validFrom"
|
||||
@@ -111,7 +93,7 @@
|
||||
<mat-datepicker-toggle matSuffix [for]="validFrom"></mat-datepicker-toggle>
|
||||
<mat-datepicker #validFrom></mat-datepicker>
|
||||
</mat-form-field>
|
||||
<mat-form-field fxFlex="30%">
|
||||
<mat-form-field class="flex-auto basis-3/10 mr-5">
|
||||
<input
|
||||
matInput
|
||||
[matDatepicker]="validTill"
|
||||
@@ -122,7 +104,7 @@
|
||||
<mat-datepicker-toggle matSuffix [for]="validTill"></mat-datepicker-toggle>
|
||||
<mat-datepicker #validTill></mat-datepicker>
|
||||
</mat-form-field>
|
||||
<mat-form-field fxFlex="20">
|
||||
<mat-form-field class="flex-auto basis-1/5 mr-5">
|
||||
<mat-label>Index</mat-label>
|
||||
<input
|
||||
type="text"
|
||||
@@ -132,7 +114,14 @@
|
||||
autocomplete="off"
|
||||
/>
|
||||
</mat-form-field>
|
||||
<button mat-raised-button color="primary" (click)="saveLock()">Add</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
(click)="saveLock()"
|
||||
class="flex-auto basis-1/5"
|
||||
>
|
||||
Add
|
||||
</button>
|
||||
</div>
|
||||
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
|
||||
<!-- Index Column -->
|
||||
@@ -203,15 +192,9 @@
|
||||
<mat-tab label="Rebase Data">
|
||||
<mat-card>
|
||||
<mat-card-content>
|
||||
<form [formGroup]="rebaseDataForm" fxLayout="column">
|
||||
<div
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
>
|
||||
<mat-form-field fxFlex="80">
|
||||
<form [formGroup]="rebaseDataForm" class="flex flex-col">
|
||||
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
|
||||
<mat-form-field class="flex-auto basis-4/5 mr-5">
|
||||
<input
|
||||
matInput
|
||||
[matDatepicker]="rebaseDataDate"
|
||||
@@ -224,7 +207,12 @@
|
||||
<mat-datepicker #rebaseDataDate></mat-datepicker>
|
||||
</mat-form-field>
|
||||
|
||||
<button mat-raised-button color="primary" (click)="confirmRebase()" fxFlex="20">
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
(click)="confirmRebase()"
|
||||
class="flex-auto basis-1/5"
|
||||
>
|
||||
Rebase
|
||||
</button>
|
||||
</div>
|
||||
@@ -248,7 +236,7 @@
|
||||
mat-raised-button
|
||||
[color]="maintenance.enabled ? 'warn' : 'primary'"
|
||||
(click)="toggleMaintenance()"
|
||||
fxFlex="100"
|
||||
class="flex-auto"
|
||||
>
|
||||
{{ maintenance.enabled ? 'Disable' : 'Enable' }}
|
||||
</button>
|
||||
|
||||
Reference in new issue
Block a user