Merge branch 'zgo-test' of https://gitlab.com/pitmutt/zgo into zgo-test

src/app/items/item-list/item-list.component.css

@@ -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;
+}

src/app/items/item-list/item-list.component.html

@@ -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%" >

src/app/items/item-list/item-list.component.ts

@@ -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(){

src/app/order/order.component.css

@@ -51,7 +51,7 @@ img.icon{
 }
 
 .buttons-class {
-  background-color: #ff4700;
+  background-color: #ff4722;
   color: white;
   font-weight: 700;
   height: 25px !important;

src/app/order/order.component.html

@@ -123,7 +123,3 @@
 -->
 </div>
 </mat-card>
-<div class="availableItems" >
-     Available Items:
-</div>
-

src/app/settings/settings.component.css

@@ -1,18 +1,18 @@
-@import url('https://fonts.googleapis.com/css?family=Roboto&display=swap');
+* {
+	font-family: Spartan;
+}
 
 .settings-title {
-	font-family: Roboto Mono;
+	font-family: Spartan;
-	background: #ff4700;
+	background: #ff4722;
 	color: white;
 	font-size: 30px;
-	font-weight: 700;
 	text-align: center;
-	margin-bottom: 15px;
+	padding: 5px;
-	height: 40px;
-	justify-content: center;
 }
 
 .settings_field {
 	width:  100%;
+	font-family: Spartan;
 }
 

src/app/viewer/viewer.component.css

@@ -17,6 +17,8 @@
     align-items: center;
     margin-top: 12px;
     margin-bottom: 12px;
+    font-weight: 500;
+    color: white;
 }
 
 .small{

src/app/viewer/viewer.component.html

@@ -10,22 +10,15 @@
 		</div>
 	</div>
 	<div class="main-buttons">
-		<button mat-raised-button 
+		<button mat-raised-button color="primary"
-		        style="background: #ff4700;
-		               font-weight: 700;
-		        	   color: white;" 
 		        [routerLink]="['/orders']">
 		   View Orders
 		</button>
-		<button mat-raised-button 
+		<button mat-raised-button color="primary"
-		        style="background: #ff4700;
-		        	   color: white;" 
 		        class="text" (click)="openSettings()">
 			 <mat-icon class="icon">manage_accounts</mat-icon>
 		</button>
-		<a mat-raised-button 
+		<a mat-raised-button color="primary" 
-	       style="background: #ff4700;
-	              color: white;" 
 		   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>