diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b0f97f4..2203d4f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -14,6 +14,7 @@ import { AppRoutingModule } from 'src/routes'; import { NotFoundComponent } from './not-found/not-found.component'; import { CartComponent } from './cart/cart.component'; import { PushNotificationsModule } from 'ng-push-ivy'; +import { ClipboardModule } from 'ngx-clipboard'; const config: SocketIoConfig = { url: 'http://localhost:2009', options: {} }; @@ -33,7 +34,8 @@ const config: SocketIoConfig = { url: 'http://localhost:2009', options: {} }; HttpClientModule, AppRoutingModule, SocketIoModule.forRoot(config), - PushNotificationsModule + PushNotificationsModule, + ClipboardModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/backend.service.ts b/src/app/backend.service.ts index da6d496..94096e6 100644 --- a/src/app/backend.service.ts +++ b/src/app/backend.service.ts @@ -52,13 +52,12 @@ export interface IInvoice { cart?: ICart[]; totalPrice?: number; currency: string; - dueBy: Date; + dueBy: string; status?: PaymentStatus; email?: string; successUrl: string; cancelUrl: string; - createdAt?: number; - + createdAt: string; } @Injectable({ @@ -74,9 +73,10 @@ export class BackendService { paymentMethods: [], receiveAddress: '', currency: 'USD', - dueBy: new Date(), + dueBy: '', successUrl: '', - cancelUrl: '' + cancelUrl: '', + createdAt: '' }; invoiceUpdate: BehaviorSubject; diff --git a/src/app/payment/payment.component.css b/src/app/payment/payment.component.css index 4312632..2e46582 100644 --- a/src/app/payment/payment.component.css +++ b/src/app/payment/payment.component.css @@ -107,7 +107,7 @@ .clipboard-amount { grid-row: 3; } -/*.clipboard:hover { +.clipboard-click { animation: clipboard-clicked .5s linear; } @@ -124,7 +124,7 @@ 100% { transform: scale(1); } -}*/ +} #target, #amount, #status { grid-column: 2; @@ -209,4 +209,26 @@ #list li h4 { grid-row: 2; grid-column: 2; +} + +.progress { + position: absolute; + bottom: -11px; + left: 0; + width: 100%; + line-height: 1.5; + text-align: center; +} + +.progress div { + vertical-align: middle; + align-items: center; +} + +.progress div span { + padding-bottom: .5rem; +} + +.progress div * { + padding: .2rem; } \ No newline at end of file diff --git a/src/app/payment/payment.component.html b/src/app/payment/payment.component.html index 713dee4..23e67bd 100644 --- a/src/app/payment/payment.component.html +++ b/src/app/payment/payment.component.html @@ -19,7 +19,7 @@ -
@@ -38,13 +38,23 @@
- + Send to

{{ getReceiveAddress() }}

- + Amount

{{ this.backend.getAmount() }} {{ this.backend.invoice.paymentMethod }} | {{ this.backend.invoice.totalPrice!.toFixed(2) }} {{ this.backend.currencyPrefix() }}

@@ -59,6 +69,15 @@ Confirmations: {{ this.backend.confirmations }}
+
+
+ + {{ formatedTime }} +
+ + + +