Merge branch 'zgocsp' into dev

This commit is contained in:
Rene Vergara 2023-10-20 09:08:32 -05:00
commit b7d44e354d
Signed by: pitmutt
GPG key ID: 65122AD495A7F5B2
5 changed files with 14 additions and 5 deletions

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "zgo", "name": "zgo",
"version": "2.1.0", "version": "2.3.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "zgo", "name": "zgo",
"version": "2.1.0", "version": "2.3.1",
"dependencies": { "dependencies": {
"@angular/animations": "^16.0.0", "@angular/animations": "^16.0.0",
"@angular/cdk": "^16.0.0", "@angular/cdk": "^16.0.0",

View file

@ -47,7 +47,7 @@
</div> </div>
<p class="rv_price" <p class="rv_price"
*ngIf="owner.zats"> *ngIf="owner.zats">
&#x24e9;{{(item.cost/zecPrice)*100000000 | number: '1.0-0'}} &#x24e9; {{ ((item.cost/zecPrice)*100000000).toString().substring( 0, ((item.cost/zecPrice)*100000000 ).toString().indexOf('.')) }} [{{item.cost | number: '1.02' | currency: getCurrency() }}]
</p> </p>
</td> </td>
</tr> </tr>

View file

@ -66,6 +66,7 @@ export class ItemListComponent implements OnInit{
itemlistNotifClose : '', itemlistNotifClose : '',
itemlistNotifSuccess : '' itemlistNotifSuccess : ''
} }
// //
// ------------------------------------------------------------ // ------------------------------------------------------------
constructor( constructor(

View file

@ -137,7 +137,7 @@ export class ViewerComponent implements OnInit {
this.user = user; this.user = user;
//console.log('Viewer loginCheck', this.user); //console.log('Viewer loginCheck', this.user);
if (!this.owner.paid || !this.user.validated) { if (!this.owner.paid || !this.user.validated) {
//console.log('Log in expired!'); // console.log('Log in expired!');
this.router.navigate(['/login']); this.router.navigate(['/login']);
} }
}); });

View file

@ -1,6 +1,14 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Security-Policy"
content=
"connect-src 'self' https://test.zgo.cash https://zgo.cash ;
default-src 'self';
style-src 'self' https://fonts.googleapis.com 'unsafe-inline' ;
img-src 'self' https://fonts.googleapis.com http://www.w3.org data: ;
font-src 'self' http://www.w3.org https://fonts.gstatic.com https://fonts.gstatic.com ; ">
<meta charset="utf-8"> <meta charset="utf-8">
<title>ZGo - The Zcash Register</title> <title>ZGo - The Zcash Register</title>
<base href="/"> <base href="/">
@ -14,4 +22,4 @@
<body> <body>
<app-root></app-root> <app-root></app-root>
</body> </body>
</html> </html>