Merge branch 'zgo-test' of https://gitlab.com/pitmutt/zgo into zgo-test
This commit is contained in:
commit
3815f94204
8 changed files with 29 additions and 25 deletions
|
@ -36,7 +36,7 @@ p.price{
|
|||
}
|
||||
|
||||
.buttons-class-cart{
|
||||
background-color: #ff4700;
|
||||
background-color: #ff4722;
|
||||
color: white;
|
||||
font-size: 18px;
|
||||
font-weight: 700;
|
||||
|
@ -47,3 +47,12 @@ p.price{
|
|||
justify-content: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.availableItems{
|
||||
background: lightblue;
|
||||
font-family: Roboto Mono;
|
||||
font-size: 18px;
|
||||
font-weight: 700;
|
||||
text-align: left;
|
||||
margin: 5px;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
<div *ngIf="items.length > 0">
|
||||
<div class="availableItems" >
|
||||
Available Items:
|
||||
</div>
|
||||
<div class="card" *ngFor="let item of itemsUpdate | async">
|
||||
<mat-card>
|
||||
<table cellspacing="0" width="100%" >
|
||||
|
|
|
@ -23,7 +23,7 @@ import { ItemAddComponent } from '../item-add/item-add.component';
|
|||
|
||||
export class ItemListComponent implements OnInit{
|
||||
|
||||
@Input() zecPrice: number = 1;
|
||||
@Input() zecPrice: number;
|
||||
|
||||
public items: Item[] = [];
|
||||
|
||||
|
@ -75,6 +75,7 @@ export class ItemListComponent implements OnInit{
|
|||
this.items = items;
|
||||
});
|
||||
});
|
||||
this.zecPrice = 1;
|
||||
}
|
||||
|
||||
ngOnInit(){
|
||||
|
|
|
@ -51,7 +51,7 @@ img.icon{
|
|||
}
|
||||
|
||||
.buttons-class {
|
||||
background-color: #ff4700;
|
||||
background-color: #ff4722;
|
||||
color: white;
|
||||
font-weight: 700;
|
||||
height: 25px !important;
|
||||
|
|
|
@ -123,7 +123,3 @@
|
|||
-->
|
||||
</div>
|
||||
</mat-card>
|
||||
<div class="availableItems" >
|
||||
Available Items:
|
||||
</div>
|
||||
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
@import url('https://fonts.googleapis.com/css?family=Roboto&display=swap');
|
||||
* {
|
||||
font-family: Spartan;
|
||||
}
|
||||
|
||||
.settings-title {
|
||||
font-family: Roboto Mono;
|
||||
background: #ff4700;
|
||||
font-family: Spartan;
|
||||
background: #ff4722;
|
||||
color: white;
|
||||
font-size: 30px;
|
||||
font-weight: 700;
|
||||
text-align: center;
|
||||
margin-bottom: 15px;
|
||||
height: 40px;
|
||||
justify-content: center;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.settings_field {
|
||||
width: 100%;
|
||||
font-family: Spartan;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
align-items: center;
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
font-weight: 500;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.small{
|
||||
|
|
|
@ -10,22 +10,15 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="main-buttons">
|
||||
<button mat-raised-button
|
||||
style="background: #ff4700;
|
||||
font-weight: 700;
|
||||
color: white;"
|
||||
<button mat-raised-button color="primary"
|
||||
[routerLink]="['/orders']">
|
||||
View Orders
|
||||
</button>
|
||||
<button mat-raised-button
|
||||
style="background: #ff4700;
|
||||
color: white;"
|
||||
<button mat-raised-button color="primary"
|
||||
class="text" (click)="openSettings()">
|
||||
<mat-icon class="icon">manage_accounts</mat-icon>
|
||||
</button>
|
||||
<a mat-raised-button
|
||||
style="background: #ff4700;
|
||||
color: white;"
|
||||
<a mat-raised-button color="primary"
|
||||
href="https://zgo.cash/"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer">
|
||||
|
@ -41,7 +34,7 @@
|
|||
<table cellspacing="0" width="75%">
|
||||
<tr>
|
||||
<td>
|
||||
<app-item-list></app-item-list>
|
||||
<app-item-list [zecPrice]="price"></app-item-list>
|
||||
</td>
|
||||
<td>
|
||||
<app-order></app-order>
|
||||
|
|
Loading…
Reference in a new issue