Merge branch 'dev' into zgointl

CHANGELOG.md

@@ -71,6 +71,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Memo for checkout orders
 
+## Added
+
+- Add `crmToken` field to `owner.model.ts`
+- Add `externalInvoice` field and `shortCode` field to `order.model.ts`
+
 ## [1.2.1] - 2022-08-01
 
 ### Changed

package.json

@@ -10,55 +10,52 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-material-components/datetime-picker": "^8.0.0",
-    "@angular/animations": "^14.2.5",
-    "@angular/cdk": "^14.2.4",
-    "@angular/common": "^14.2.5",
-    "@angular/compiler": "^14.2.5",
-    "@angular/core": "^14.2.5",
-    "@angular/forms": "^14.2.5",
-    "@angular/material": "^14.2.4",
-    "@angular/platform-browser": "^14.2.5",
-    "@angular/platform-browser-dynamic": "^14.2.5",
-    "@angular/router": "^14.2.5",
-    "@fortawesome/angular-fontawesome": "^0.10.2",
-    "@fortawesome/fontawesome-free": "^6.1.1",
-    "@fortawesome/fontawesome-svg-core": "^6.1.0",
-    "@fortawesome/free-brands-svg-icons": "^6.1.0",
-    "@fortawesome/free-regular-svg-icons": "^6.1.0",
-    "@fortawesome/free-solid-svg-icons": "^6.1.0",
-    "@supercharge/request-ip": "^1.1.2",
+    "@angular-material-components/datetime-picker": "^9.0.0",
+    "@angular/animations": "^15.1.2",
+    "@angular/cdk": "^15.1.2",
+    "@angular/common": "^15.1.2",
+    "@angular/compiler": "^15.1.2",
+    "@angular/core": "^15.1.2",
+    "@angular/forms": "^15.1.2",
+    "@angular/material": "^15.1.2",
+    "@angular/platform-browser": "^15.1.2",
+    "@angular/platform-browser-dynamic": "^15.1.2",
+    "@angular/router": "^15.1.2",
+    "@fortawesome/angular-fontawesome": "^0.12.1",
+    "@fortawesome/fontawesome-free": "^6.2.1",
+    "@fortawesome/fontawesome-svg-core": "^6.2.1",
+    "@fortawesome/free-brands-svg-icons": "^6.2.1",
+    "@fortawesome/free-regular-svg-icons": "^6.2.1",
+    "@fortawesome/free-solid-svg-icons": "^6.2.1",
+    "@supercharge/request-ip": "^1.2.0",
     "angular-local-storage": "^0.7.1",
     "angular-material-datepicker": "^1.0.2",
-    "async": "^3.2.2",
+    "async": "^3.2.4",
     "coingecko-api": "^1.0.10",
-    "easyqrcodejs": "^4.4.6",
+    "easyqrcodejs": "^4.4.13",
     "material-design-icons": "^3.0.1",
-    "mongoose": "^6.0.13",
-    "rxjs": "~6.6.0",
+    "rxjs": "~7.8.0",
     "sha.js": "^2.4.11",
-    "stdrpc": "^1.3.0",
-    "tslib": "^2.3.0",
+    "tslib": "^2.5.0",
     "urlsafe-base64": "^1.0.0",
-    "uuid": "^8.3.2",
-    "xero-node": "^4.23.0",
-    "zone.js": "~0.11.4"
+    "uuid": "^9.0.0",
+    "zone.js": "~0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.2.5",
-    "@angular/cli": "^14.2.5",
-    "@angular/compiler-cli": "^14.2.5",
-    "@types/jasmine": "~3.8.0",
-    "@types/node": "^12.20.33",
+    "@angular-devkit/build-angular": "^15.1.3",
+    "@angular/cli": "^15.1.3",
+    "@angular/compiler-cli": "^15.1.2",
+    "@types/jasmine": "~4.3.1",
+    "@types/node": "^18.11.18",
     "@types/request": "^2.48.8",
     "@types/urlsafe-base64": "^1.0.28",
-    "@types/uuid": "^8.3.1",
-    "jasmine-core": "~3.8.0",
-    "karma": "~6.3.0",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.0.3",
-    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "~1.7.0",
-    "typescript": "~4.7.4"
+    "@types/uuid": "^9.0.0",
+    "jasmine-core": "~4.5.0",
+    "karma": "~6.4.1",
+    "karma-chrome-launcher": "~3.1.1",
+    "karma-coverage": "~2.2.0",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "~2.0.0",
+    "typescript": "~4.9.4"
   }
 }

src/app/header/header.component.html

@@ -9,6 +9,6 @@
 		<p class="mini text">{{heightUpdate | async}}</p>
 	</span>
 	<span>
-		<button mat-raised-button (click)="logout()"><mat-icon class="logbutton">logout</mat-icon></button>
+		<button mat-icon-button (click)="logout()"><mat-icon>logout</mat-icon></button>
 	</span>
 </mat-toolbar>

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

@@ -1,16 +1,19 @@
 <div *ngIf="items.length > 0">
-	<div class="availableItems" >
+	<mat-toolbar color="accent">
+		<span align="center" class="text">
 			Available Items:
-		<button mat-raised-button 
-				class="buttons-class"
+		</span>
+		<span class="spacer"></span>
+		<span align="center">
+		<button mat-icon-button 
+				color="primary"
 				(click)="openDialog()">
-			<mat-icon class="icon">
+			<mat-icon aria-button-label="Add Item">
 				add
 			</mat-icon>
-			Add item
 		</button>
-
-	</div>
+		</span>
+	</mat-toolbar>
 	<div style="display: block;
 				overflow-y: auto;
 				height: 500px;">
@@ -54,18 +57,18 @@
 						<tr>
 							<td>
 								<button mat-icon-button class="icons" (click)="edit(item._id!)">
-									<mat-icon inline=true>edit</mat-icon>
+									<mat-icon>edit</mat-icon>
 								</button>
 								<button mat-icon-button class="icons" (click)="delete(item._id!)">
-									<mat-icon inline=true>delete</mat-icon>
+									<mat-icon>delete</mat-icon>
 								</button>
 							</td>
 							<td align="right">
-								<button mat-raised-button 
+								<button mat-icon-button 
 										color="primary" 
 										class="buttons-class-cart" 
 										(click)="addToOrder(item._id!)">
-									<mat-icon [inline]="true">
+									<mat-icon>
 										shopping_cart
 									</mat-icon>
 								</button>

src/app/login/login.component.css

@@ -5,10 +5,13 @@ mat-card.coolcard{
 	background-color: #FF5722;
 	color: #FFFFFF;
 	margin: 5px;
+	width: 90%;
+	justify-content: center;
 }
 mat-card.centercard{
 	max-width: 450px;
 	border: 1px solid #CCCCCC;
+	justify-content: center;
 }
 .icon{
 	font-family: 'Material Icons';

src/app/login/login.component.html

@@ -1,7 +1,9 @@
 <div align="center" class="text">
 	<mat-card class="coolcard">
-		<img src="/assets/logo-new-white_01.png" height="120px" />
+		<mat-card-content>
+			<img mat-card-image src="/assets/logo-new-white_01.png" height="120px" />
 			<p class="text">{{ vE.loginLastBlock }}<span class="numbers">{{ heightUpdate | async }}</span></p>
+		</mat-card-content>
 	</mat-card>
 </div>
 <div align="center">
@@ -9,15 +11,11 @@
 		<h3>The Zcash Register</h3>
 			<mat-vertical-stepper #stepper linear>
 				<mat-step label= "{{ vE.loginConnectToZGo }}" editable="false">
-					<mat-card>
 					<div align="center" id="info">
-							<mat-card-actions>
 						<button mat-raised-button color="primary" (click)="login(stepper)">
 							<mat-icon class="icon">login</mat-icon><span class="bigbutton">{{ vE.loginLinkWallet }}</span>
 						</button>
-							</mat-card-actions>
 					</div>
-					</mat-card>
 				</mat-step>
 				<mat-step label="{{ vE.loginConfirmLogin }}" editable="false">
 					<p>{{barMessage}}</p>

src/app/viewer/viewer.component.html

@@ -14,11 +14,11 @@
 		        [routerLink]="['/orders']">
 		   View Orders
 		</button>
-		<button mat-raised-button color="primary"
-		        class="text" (click)="openSettings()">
+		<button mat-icon-button color="primary"
+		        (click)="openSettings()">
 			 <mat-icon class="icon">manage_accounts</mat-icon>
 		</button>
-		<a mat-raised-button color="primary" 
+		<a mat-icon-button color="primary" 
 		   href="https://zgo.cash/" 
 		   target="_blank" 
 		   rel="noopener noreferrer">

src/custom-theme.scss

@@ -1,11 +1,31 @@
-@import "@angular/material/_theming";
+//@import "@angular/material/_theming";
+@use '@angular/material' as mat;
 
-@include mat-core();
+@include mat.core();
 
-$custom-theme-primary: mat-palette($mat-deep-orange);
-$custom-theme-accent: mat-palette($mat-light-blue, A200, A100, A400);
-$custom-theme-warn: mat-palette($mat-red);
+$custom-theme-primary: mat.define-palette(mat.$deep-orange-palette, 500);
+$custom-theme-accent: mat.define-palette(mat.$light-blue-palette, 100, 50, 200);
+$custom-theme-warn: mat.define-palette(mat.$red-palette);
 
-$custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn);
+//$custom-theme: mat.define-light-theme($custom-theme-primary, $custom-theme-accent);
 
-@include angular-material-theme($custom-theme);
+$my-theme: mat.define-light-theme(
+	(color: (
+		primary: $custom-theme-primary,
+		accent: $custom-theme-accent,
+		warn: $custom-theme-warn
+	),
+	typography: mat.define-typography-config(),
+	density: 0
+	)
+);
+
+//@include angular-material-theme($custom-theme);
+//@include mat.core-theme($my-theme);
+
+//@include mat.button-theme($my-theme);
+//@include mat.toolbar-theme($my-theme);
+//@include mat.card-theme($my-theme);
+//@include mat.dialog-theme($my-theme);
+
+@include mat.all-component-themes($my-theme);