Skip to content

Commit fb25e14

Browse files
peterpeter
peter
authored and
peter
committed
v1.2.0
1 parent 66abbb8 commit fb25e14

File tree

8 files changed

+154
-794
lines changed

8 files changed

+154
-794
lines changed

‎app/public/css/pages.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,4 +773,15 @@ h1>.badge, h2>.badge, h3>.badge, h4>.badge,h5>.badge,h6>.badge {
773773

774774
.StripeElement--webkit-autofill {
775775
background-color: #fefde5 !important;
776+
}
777+
.usDollar {
778+
font-weight: lighter;
779+
font-style: italic;
780+
padding-left: 0.5em;
781+
font-size: smaller;
782+
}
783+
.amount {
784+
font-size: large;
785+
font-weight: bold;
786+
color: darkslategray;
776787
}

‎app/public/scripts/home.js‎

Lines changed: 36 additions & 34 deletions
Large diffs are not rendered by default.

‎app/public/scripts/home.ts‎

Lines changed: 41 additions & 39 deletions
Large diffs are not rendered by default.

‎app/views/home/index.pug‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ block jumbotron1
296296
p( data-bind = " text: infoDefine[ languageIndex() ].Home_keyPairInfo_view.creatDate + keyPair().createDate" )
297297
p( data-bind = " text: infoDefine[ languageIndex() ].Home_keyPairInfo_view.keyLength + keyPair().keyLength" )
298298
p( data-bind = " text: infoDefine[ languageIndex() ].Home_keyPairInfo_view.keyID + keyPair().publicKeyID" )
299-
.ui.button.positive( data-bind = "visible: QTTransferData(),click: showUserDetail,text: infoDefine[ languageIndex() ].account.upgradeTitle")
299+
.ui.button.positive( data-bind = "visible: QTTransferData(),click: showUserDetail,text: infoDefine[ languageIndex() ].account.accountOptionButton")
300300
.ui.bottom.right.attached.label.background-clolr-white( data-bind = " click: () => { keyPair_delete_btn_view ( true ); showPasswordErrorMessage ( false ); showSystemError ( false )}, visible: ! keyPair_delete_btn_view()")
301301
a
302302
i.trash.outline.icon.large( style = " color: red;")
@@ -363,7 +363,7 @@ block jumbotron1
363363
form.ui.form
364364
.fields
365365
.field( style = "width: 17em;")
366-
input.promoCodeInput( data-bind="value: promoInput, attr: { placeholder: infoDefine[ languageIndex() ].account.promoCode}")
366+
input.promoCodeInput( data-bind="value: promoInput" placeholder ="XXXX-XXXX-XXXX-XXXX" type="text")
367367
.field
368368
.ui.buttons
369369
.ui.button( data-bind="text: infoDefine[ languageIndex() ].home_index_view.cancel, click: ()=> {return promoButton(false)}")
@@ -373,9 +373,9 @@ block jumbotron1
373373
.row( data-bind = "visible: cancelPlanButton()" style="padding: 0px;padding-top: 0.5em;")
374374
i.link.remove.circle.big.icon( data-bind="click: () => { cancelPlanButton (false); return false;}, clickBubble: false" style="position: absolute;margin-left: 23.7em;z-index: 999;color: gray;")
375375
.ui.olive.message.transition( data-bind="css: { hidden: !cancelPlanButton ()}")
376-
p( data-bind = "text: infoDefine[ languageIndex() ].account.cancelPlanMessage, visible: !showCancelSuccess()")
377-
p( data-bind = "text: QTTransferData() ? infoDefine[ languageIndex() ].account.cancelPlanMessage1 ( QTTransferData().productionPackage, QTTransferData().isAnnual, QTTransferData().expire ): null, visible: !showCancelSuccess()")
378-
p( data-bind="visible: showCancelSuccess(), text:infoDefine[ languageIndex() ].account.CancelSuccess( cancel_PlanExpire(), QTTransferData() ? QTTransferData().isAnnual: false, cancel_Amount())")
376+
p( data-bind = "html: infoDefine[ languageIndex() ].account.cancelPlanMessage, visible: !showCancelSuccess()")
377+
p( data-bind = "html: QTTransferData() ? infoDefine[ languageIndex() ].account.cancelPlanMessage1 ( QTTransferData().productionPackage, QTTransferData().isAnnual, QTTransferData().expire ): '', visible: !showCancelSuccess()" style="color: darkblue;")
378+
p( data-bind="visible: showCancelSuccess(), text: QTTransferData() ? infoDefine[ languageIndex() ].account.CancelSuccess( QTTransferData().expire, QTTransferData().isAnnual, cancel_Amount()) : null")
379379
p( data-bind="visible: showCancelSuccess(), text:infoDefine[ languageIndex() ].account.qtgateTeam")
380380
button.ui.button.negative( data-bind = "visible: !showCancelSuccess(), text: infoDefine[ languageIndex() ].account.cancelPlanButton, click: doCancelPlan, css: { loading: doingPayment() } ")
381381
.ui.raised.green.segment( data-bind = "visible: showSuccessPayment()")
@@ -448,7 +448,7 @@ block jumbotron1
448448
span( data-bind = "visible: showStripeError()")
449449
i.icon.warning.sign.red
450450
.hidden.content
451-
img( src="/images/Stripe.svg" style="margin-top: -0.6em;width: 60%;")
451+
img( src="/images/Stripe.svg" style="margin-top: -0.8em;width: 60%;")
452452
//-.ui.animated.fade.basic.button( data-bind = " click: openStripeAlipay, css: { disabled: showStripeError() }")
453453
.visible.content
454454
img( src="/images/alipay.svg" style="height: 14px;")
@@ -479,62 +479,61 @@ block jumbotron1
479479
480480
script( data-bind = "attr: { 'data-amount': cardPayAmount()}" src = "https://checkout.stripe.com/checkout.js" class= "stripe-button" data-key = "pk_test_pSOYZa8ABXjatNN5jHb2UTdN" data-name = "QTGate Systems Inc" data-description = "Widget" data-locale = "auto" data-zip-code="true")
481481
.ui.blue.segment.form( data-bind = "visible: UserPermentShapeDetail() && cardpay()")
482-
.ui.dividing.header
483-
.ui.grid
484-
.row( style="padding-bottom: 0px;")
485-
.eight.wide.column
486-
span( data-bind = "text: infoDefine[ $root.languageIndex() ].account.payAmountTitile")
487-
span( style="padding-left: 1em;padding-right: 0.2em;font-style: italic;font-weight: lighter;font-size: medium;") us$
488-
span( data-bind = "text: totalAmount()" style="color: darkolivegreen;font-size: larger;")
482+
.ui.grid
483+
.row( style="padding-bottom: 0px;")
484+
.eight.wide.column
485+
span( data-bind = "text: infoDefine[ $root.languageIndex() ].account.payAmountTitile")
486+
span( style="padding-left: 1em;padding-right: 0.2em;font-style: italic;font-weight: lighter;font-size: medium;") us$
487+
span( data-bind = "text: totalAmount()" style="color: darkolivegreen;font-size: larger;")
489488

490-
.right.aligned.eight.wide.column( data-bind="style:{'padding-bottom': showCurrentPlanBalance() ? '0px;' : ''}" style="color: gray;")
491-
span.ui.mini.images
492-
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='visa', showCardImage: cardType()==='visa' }" src="/images/visa.svg")
493-
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='mastercard', showCardImage: cardType()==='mastercard' }" src="/images/mastercard.svg")
494-
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='amex', showCardImage: cardType()==='amex' }" src="/images/amex.svg")
495-
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='discover', showCardImage: cardType()==='discover' }" src="/images/discover.svg")
496-
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='jcb', showCardImage: cardType()==='jcb' }" src="/images/jcb.svg")
497-
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='diners', showCardImage: cardType()==='diners' }" src="/images/diners.svg")
498-
.sixteen.wide.column(data-bind = "visible: showCurrentPlanBalance()" style="font-size: small;padding-top: 0px;color: gray;font-weight: lighter;")
499-
span( data-bind= " text: infoDefine[ $root.languageIndex() ].account.planPrice")
500-
span( style="font-size: smaller;") us$
501-
span( data-bind=" text: selectPlanPrice()")
502-
span( style = "padding: 0.5em;") -
503-
spann( data-bind= " text: infoDefine[ $root.languageIndex() ].account.oldPlanBalance")
504-
span( style="font-size: smaller;") us$
505-
span( data-bind=" text: showCurrentPlanBalance()")
506-
span( style = "padding: 0.5em;") =
507-
span( data-bind= " text: infoDefine[ $root.languageIndex() ].account.needPay" )
508-
span( style="font-size: smaller;") us$
509-
span( data-bind = "text: selectPlanPrice() - showCurrentPlanBalance()")
510-
.row( data-bind = "visible: !doingPayment()" style = "padding-top: 0px;")
511-
.column
512-
p( data-bind = "text: infoDefine[ languageIndex() ].account.QTGatePayRisk" style="font-size: smaller;color: red;font-weight: lighter;")
513-
.field( data-bind = "visible: cardErrorMessage() > -1 && !doingPayment()")
514-
.ui.warning.message
515-
p( data-bind = "text: cardErrorMessage() > -1 ? infoDefine[ languageIndex() ].account.cardPaymentErrorMessage[cardErrorMessage()] : null")
516-
.fields( data-bind = "visible: !doingPayment()")
489+
.right.aligned.eight.wide.column( data-bind="style:{'padding-bottom': showCurrentPlanBalance() ? '0px;' : ''}" style="color: gray;")
490+
span.ui.mini.images
491+
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='visa', showCardImage: cardType()==='visa' }" src="/images/visa.svg")
492+
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='mastercard', showCardImage: cardType()==='mastercard' }" src="/images/mastercard.svg")
493+
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='amex', showCardImage: cardType()==='amex' }" src="/images/amex.svg")
494+
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='discover', showCardImage: cardType()==='discover' }" src="/images/discover.svg")
495+
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='jcb', showCardImage: cardType()==='jcb' }" src="/images/jcb.svg")
496+
img.ui.image( data-bind="css:{ hideCardImage: cardType()!=='diners', showCardImage: cardType()==='diners' }" src="/images/diners.svg")
497+
.sixteen.wide.column(data-bind = "visible: showCurrentPlanBalance()" style="font-size: small;padding-top: 0px;color: gray;font-weight: lighter;")
498+
span( data-bind= " text: infoDefine[ $root.languageIndex() ].account.planPrice")
499+
span( style="font-size: smaller;") us$
500+
span( data-bind=" text: selectPlanPrice()")
501+
span( style = "padding: 0.5em;") -
502+
spann( data-bind= " text: infoDefine[ $root.languageIndex() ].account.oldPlanBalance")
503+
span( style="font-size: smaller;") us$
504+
span( data-bind=" text: showCurrentPlanBalance()")
505+
span( style = "padding: 0.5em;") =
506+
span( data-bind= " text: infoDefine[ $root.languageIndex() ].account.needPay" )
507+
span( style="font-size: smaller;") us$
508+
span( data-bind = "text: selectPlanPrice() - showCurrentPlanBalance()")
509+
.row( data-bind = "visible: !doingPayment()" style = "padding-top: 0px;")
510+
.column
511+
p( data-bind = "text: infoDefine[ languageIndex() ].account.QTGatePayRisk" style="font-size: smaller;color: red;font-weight: lighter;")
512+
.field( data-bind = "visible: cardErrorMessage() > -1 && !doingPayment()")
513+
.ui.warning.message
514+
p( data-bind = "text: cardErrorMessage() > -1 ? infoDefine[ languageIndex() ].account.cardPaymentErrorMessage[cardErrorMessage()] : null")
515+
.fields( data-bind = "visible: !doingPayment()")
517516

518-
.five.wide.field( data-bind = "css: { error: cardNumberFolder_Error()} ")
519-
label( data-bind = "text: infoDefine[ $root.languageIndex() ].account.cardNumber")
520-
input.paymaneCardNumber( data-bind = "value: cardNumber" )
521-
.three.wide.field( data-bind = "css: { error: cardExpirationYearFolder_Error()} ")
522-
label( data-bind = "text: infoDefine[ $root.languageIndex() ].account.expirationYear")
523-
input.paymaneExpiration( data-bind = "value: cardExpirationYear" placeholder = "MM/YYYY" )
524-
.four.wide.field( data-bind = "css: { error: cvcNumber_Error()} ")
525-
label( data-bind = " text: infoDefine[ $root.languageIndex() ].account.cvcNumber")
526-
input.paymaneCVC( data-bind = "value: cardcvc" placeholder="CVC")
527-
.four.wide.field( data-bind = "css: { error: postcode_Error()} ")
528-
label( data-bind = " text: infoDefine[ $root.languageIndex() ].account.postcodeTitle")
529-
input.paymaneCVC( data-bind = "value: cardPostcode" )
530-
.fields( data-bind = "visible: !doingPayment()")
531-
.five.wide.field
532-
.ui.buttons
533-
button.ui.button( data-bind="text: infoDefine[ $root.languageIndex() ].account.calcelPayment, click: () => { cardpay ( false ); paymentSelect(true)}" )
534-
.or
535-
button.ui.button.positive( data-bind="text: infoDefine[ $root.languageIndex() ].account.doPayment, click: doPayment ")
536-
.eleven.wide.field
537-
span( data-bind="text: infoDefine[ $root.languageIndex() ].account.canadaCard" style="font-size: small;color:gray;")
517+
.five.wide.field( data-bind = "css: { error: cardNumberFolder_Error()} ")
518+
label( data-bind = "text: infoDefine[ $root.languageIndex() ].account.cardNumber")
519+
input.paymaneCardNumber( data-bind = "value: cardNumber" )
520+
.three.wide.field( data-bind = "css: { error: cardExpirationYearFolder_Error()} ")
521+
label( data-bind = "text: infoDefine[ $root.languageIndex() ].account.expirationYear")
522+
input.paymaneExpiration( data-bind = "value: cardExpirationYear" placeholder = "MM/YYYY" )
523+
.four.wide.field( data-bind = "css: { error: cvcNumber_Error()} ")
524+
label( data-bind = " text: infoDefine[ $root.languageIndex() ].account.cvcNumber")
525+
input.paymaneCVC( data-bind = "value: cardcvc" placeholder="CVC")
526+
.four.wide.field( data-bind = "css: { error: postcode_Error()} ")
527+
label( data-bind = " text: infoDefine[ $root.languageIndex() ].account.postcodeTitle")
528+
input.paymaneCVC( data-bind = "value: cardPostcode" )
529+
.fields( data-bind = "visible: !doingPayment()")
530+
.five.wide.field
531+
.ui.buttons
532+
button.ui.button( data-bind="text: infoDefine[ $root.languageIndex() ].account.calcelPayment, click: () => { cardpay ( false ); paymentSelect(true)}" )
533+
.or
534+
button.ui.button.positive( data-bind="text: infoDefine[ $root.languageIndex() ].account.doPayment, click: doPayment ")
535+
.eleven.wide.field
536+
span( data-bind="text: infoDefine[ $root.languageIndex() ].account.canadaCard" style="font-size: small;color:gray;")
538537
.ui.red.segment( data-bind = " visible: cardErrorMessage()")
539538
.ui.negative.message
540539
p( data-bind = "text: cardErrorMessage() ? infoDefine[ languageIndex() ].account.cardPaymentErrorMessage[ cardErrorMessage() ] : null")

‎index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818
Object.defineProperty(exports, "__esModule", { value: true });
19-
const DEBUG = false;
19+
const DEBUG = true;
2020
const Fs = require("fs");
2121
const Os = require("os");
2222
const path_1 = require("path");
@@ -418,7 +418,7 @@ const appReady = () => {
418418
protocol: 'file:',
419419
slashes: true
420420
}));
421-
}, 2000);
421+
}, 500);
422422
});
423423
}
424424
else {

‎index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
const DEBUG = false
18+
const DEBUG = true
1919

2020
import * as Fs from 'fs'
2121
import * as Os from 'os'
@@ -478,7 +478,7 @@ const appReady = () => {
478478
protocol: 'file:',
479479
slashes: true
480480
}))
481-
}, 2000 )
481+
}, 500 )
482482
})
483483
} else {
484484
saveLog ( `app.once ( 'ready') have localServer1 & createWindow()` )

0 commit comments

Comments
 (0)