Skip to content

Commit

Permalink
upgrade v0.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomdurrent
tomdurrent committed Oct 26, 2019
1 parent 701d12a commit 3a60c29
Show file tree
Hide file tree
Showing 4 changed files with 159 additions and 102 deletions.
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func init() {
flag.StringVar(&w, "w", "", "set `web url`")
flag.BoolVar(&d, "d", false, "set `dev env`")
flag.StringVar(&c, "c", "", "set `component path`")
flag.StringVar(&l, "l", "zh", "set `location`")
flag.StringVar(&l, "l", "en", "set `location`")
flag.Usage = usage
}
func usage() {
Expand Down
32 changes: 32 additions & 0 deletions node-global.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"default": {
"id": "1",
"network": "main",
"name": "JAPAN",
"rpc": "http://52.199.145.159:8545",
"web": "http://pullup.sero.cash/v0.1.8/"
},
"host": [
{
"id": "1",
"network": "main",
"name": "华南(成都)",
"rpc": "http://140.143.83.98:8545",
"web": "http://pullup.sero.cash/v0.1.8/"
},
{
"id": "2",
"network": "main",
"name": "华南(广州)",
"rpc": "http://129.204.197.105:8545",
"web": "http://pullup.sero.cash/v0.1.8/"
},
{
"id": "3",
"network": "main",
"name": "JAPAN",
"rpc": "http://52.199.145.159:8545",
"web": "http://pullup.sero.cash/v0.1.8/"
}
]
}
7 changes: 6 additions & 1 deletion web/dapps.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h5 class="modal-title" id="showModalTitle">Add Dapp</h5>

<script src="assets/js/bignumber.js"></script>
<script src="assets/js/common.js"></script>
<script src="assets/js/dapps.js?v"></script>
<script src="assets/js/dapps.js?v0.1.8"></script>

<script>
$('.header').load('header.html');
Expand All @@ -101,6 +101,11 @@ <h5 class="modal-title" id="showModalTitle">Add Dapp</h5>

Common.init();

var refer = document.referrer;
if(){
Common.postPullupRpc()
}

$("#form1").submit(function (event) {
const f = $(this);
event.preventDefault()
Expand Down
220 changes: 120 additions & 100 deletions web/upgrade.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,149 +13,169 @@
</head>

<body id="page-top">
<div id="wrapper">
<div class="d-flex flex-column" id="content-wrapper">
<div id="content">
<div class="header">
<div id="wrapper">
<div class="d-flex flex-column" id="content-wrapper">
<div id="content">
<div class="header">
</div>
<div class="container-fluid" style="margin-top: 100px;">
<div class="d-sm-flex justify-content-between align-items-center mb-4">
<h3 class="text-dark mb-0">Account</h3><button class="btn btn-primary"><i class="fas fa-folder"></i> <span class="backup">Backup</span></button>
</div>
<div class="container-fluid" style="margin-top: 100px;">
<div class="d-sm-flex justify-content-between align-items-center mb-4">
<h3 class="text-dark mb-0">Account</h3><button class="btn btn-primary"><i class="fas fa-folder"></i> <span class="backup">Backup</span></button>
</div>
<div class="row">
<div class="col-md-5 col-xl-5 mb-4">
<div class="card shadow border-left-primary py-2">
<div class="card-body">
<div class="row align-items-center no-gutters">
<div class="col mr-2">
<div class="text-uppercase text-primary font-weight-bold text-xs mb-1 total"><span>Total</span></div>
<div class="text-dark font-weight-bold h5 mb-0 dashboard"><span>0</span> SERO</div>
</div>
<div class="col-auto"><i class="fas fa-dollar-sign fa-2x text-gray-300"></i></div>
<div class="row">
<div class="col-md-5 col-xl-5 mb-4">
<div class="card shadow border-left-primary py-2">
<div class="card-body">
<div class="row align-items-center no-gutters">
<div class="col mr-2">
<div class="text-uppercase text-primary font-weight-bold text-xs mb-1 total"><span>Total</span></div>
<div class="text-dark font-weight-bold h5 mb-0 dashboard"><span>0</span> SERO</div>
</div>
<div class="col-auto"><i class="fas fa-dollar-sign fa-2x text-gray-300"></i></div>
</div>
</div>
</div>
<div class="col-md-3 col-xl-3 mb-4">
<div class="card shadow border-left-warning py-2">
<div class="card-body">
<div class="row align-items-center no-gutters">
<div class="col mr-2">
<div class="text-uppercase text-warning font-weight-bold text-xs mb-1 blockHeight"><span>Block height</span></div>
<div class="text-dark font-weight-bold h5 mb-0 dashboard"><span></span></div>
</div>
<div class="col-auto"><i class="fas fa-cubes fa-2x text-gray-300"></i></div>
</div>
<div class="col-md-3 col-xl-3 mb-4">
<div class="card shadow border-left-warning py-2">
<div class="card-body">
<div class="row align-items-center no-gutters">
<div class="col mr-2">
<div class="text-uppercase text-warning font-weight-bold text-xs mb-1 blockHeight"><span>Block height</span></div>
<div class="text-dark font-weight-bold h5 mb-0 dashboard"><span></span></div>
</div>
<div class="col-auto"><i class="fas fa-cubes fa-2x text-gray-300"></i></div>
</div>
</div>
</div>
<div class="col-md-4 col-xl-4 mb-4">
<div class="card shadow border-left-info py-2">
<div class="card-body">
<div class="row align-items-center no-gutters">
<div class="col mr-2">
<div class="text-uppercase text-info font-weight-bold text-xs mb-1 network"><span>Network</span></div>
<div class="row no-gutters align-items-center">
<div class="col-auto">
<div class="text-dark font-weight-bold h5 mb-0 mr-3 dashboard select-net">
<a href="javascript:void(0);"><i class="fa fa-exchange-alt text-secondary"></i> <span>0.0.0.0</span></a></div>
</div>
</div>
<div class="col-md-4 col-xl-4 mb-4">
<div class="card shadow border-left-info py-2">
<div class="card-body">
<div class="row align-items-center no-gutters">
<div class="col mr-2">
<div class="text-uppercase text-info font-weight-bold text-xs mb-1 network"><span>Network</span></div>
<div class="row no-gutters align-items-center">
<div class="col-auto">
<div class="text-dark font-weight-bold h5 mb-0 mr-3 dashboard select-net">
<a href="javascript:void(0);"><i class="fa fa-exchange-alt text-secondary"></i> <span>0.0.0.0</span></a></div>
</div>
</div>
<div class="col-auto"><i class="fas fa-network-wired fa-2x text-gray-300"></i></div>
</div>
<div class="col-auto"><i class="fas fa-network-wired fa-2x text-gray-300"></i></div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="row pkrs">
</div>
<div class="row">
<div class="col-lg-12 mb-4">
<button class="btn btn-outline-primary btn-block addAcount" type="button" onclick="window.location.href='account-new.html'">Add Account</button>
</div>
</div>
<div class="row">
<div class="col">
<div class="row pkrs">
</div>
<div class="row">
<div class="col-lg-12 mb-4">
<button class="btn btn-outline-primary btn-block addAcount" type="button" onclick="window.location.href='account-new.html'">Add Account</button>
</div>
</div>
</div>
</div>

<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" >
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="toast" style="position: absolute;z-index: 99999; left: 50%;top: 5%;transform: translate(-50%, -50%);" id="toast2">
<div class="toast-body alert-danger">
</div>
</div>
<div class="modal-header">
<h5 class="modal-title" id="modalLongTitle">Upgrade prompt</h5>
</div>
<div class="modal-body ">
<ul class="list-group">
</ul>
<!-- Modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" >
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="toast" style="position: absolute;z-index: 99999; left: 50%;top: 5%;transform: translate(-50%, -50%);" id="toast2">
<div class="toast-body alert-danger">
</div>
</div>
<div class="modal-header">
<h5 class="modal-title" id="modalLongTitle">Upgrade!!!</h5>
</div>
<div class="modal-body ">
<ul class="list-group">
</ul>
</div>
</div>
</div>

</div>

</div>
<footer class="bg-white sticky-footer">
<div class="container my-auto">
<div class="text-center my-auto copyright"><span>Copyright © SERO <span class="version">v0.1.5</span></span></div>
</div>
</footer>
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a></div>
<script src="assets/plugin/jquery.min.js"></script>
<script src="assets/bootstrap/js/bootstrap.min.js"></script>
<script src="assets/js/theme.js"></script>
<script type="text/javascript" src="assets/plugin/jquery.i18n.properties.js"></script>
<script type="text/javascript" src="assets/plugin/jquery.cookie.js"></script>
</div>
<footer class="bg-white sticky-footer">
<div class="container my-auto">
<div class="text-center my-auto copyright"><span>Copyright © SERO</span></div>
</div>
</footer>
</div><a class="border rounded d-inline scroll-to-top" href="#page-top"><i class="fas fa-angle-up"></i></a></div>
<script src="assets/plugin/jquery.min.js"></script>
<script src="assets/bootstrap/js/bootstrap.min.js"></script>
<script src="assets/js/theme.js"></script>
<script type="text/javascript" src="assets/plugin/jquery.i18n.properties.js"></script>
<script type="text/javascript" src="assets/plugin/jquery.cookie.js"></script>

<script src="assets/plugin/bignumber.js"></script>
<script src="assets/js/common.js"></script>
<script src="assets/js/index.js"></script>
<script src="assets/plugin/bignumber.js"></script>
<script src="assets/js/common.js"></script>
<script src="assets/js/index.js"></script>

<script>
$(function () {
Common.app = Index;
Common.init();
})
<script>
$(function () {
Common.app = Index;
Common.init();
})

if (jQuery.i18n.normaliseLanguageCode({})) {
if (jQuery.i18n.normaliseLanguageCode({}) === 'zh_CN'){
$('.modal-body').empty().append(`
<li class="list-group-item">亲爱的朋友，0.1.4版本已升级账户系统，升级后，主收款码将会使用新的地址，原收款码地址可以继续收款。请下载安装包升级。</li>
if (jQuery.i18n.normaliseLanguageCode({})) {
if (jQuery.i18n.normaliseLanguageCode({}) === 'zh_CN'){
$('.modal-body').empty().append(`
<li class="list-group-item">SERO Pullup钱包已升级至0.1.8版本，支持了superzk2.0协议，之前的版本将停止使用。请点击下载钱包：</li>
<li class="list-group-item">
Mac系统: <a href="https://sero-media-1256272584.cos.ap-shanghai.myqcloud.com/pullup/v0.1.4/pullup-mac-0.1.4.tar.gz" target="_blank">pullup-mac-0.1.4.tar.gz</a>
Mac系统: <a href="https://sero-media-1256272584.cos.ap-shanghai.myqcloud.com/pullup/v0.1.8/pullup-mac-0.1.8-zh_CN.tar.gz" target="_blank">pullup-mac-0.1.8.tar.gz</a>
</li>
<li class="list-group-item">
Windows: <a href="https://sero-media-1256272584.cos.ap-shanghai.myqcloud.com/pullup/v0.1.4/pullup-windows-0.1.4.zip" target="_blank">pullup-windows-0.1.4.zip</a>
Windows: <a href="https://sero-media-1256272584.cos.ap-shanghai.myqcloud.com/pullup/v0.1.8/pullup-windows-0.1.8-zh_CN.zip" target="_blank">pullup-windows-0.1.8.zip</a>
</li>
`);
}else{
$('.modal-body').empty().append(`
<li class="list-group-item">Dear friend, version 0.1.4 has upgraded the account system. After the upgrade, the main receipt code will use the new address, the original receipt code address can continue to receive payment. Please download the installation package to upgrade.</li>
<li class="list-group-item">
For Mac: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.4/pullup-mac-0.1.4.tar.gz" target="_blank">pullup-mac-0.1.4.tar.gz</a></li>
<li class="list-group-item">
For Windows: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.4/pullup-windows-0.1.4.zip" target="_blank">pullup-mac-0.1.4.tar.gz</a>
更新内容:<br/>
1. 使用了superzk2.0协议<br/>
2. 修复了一些已知的问题<br/>
3. 优化了同步数据的速度<br/>
</li>
`);
}
}else{
$('.modal-body').empty().append(`
<li class="list-group-item">Dear friend, version 0.1.4 has been upgraded to the account system.After the upgrade, the main receipt code will use the new address, the original receipt code address can continue to receive payment. Please download the installation package to upgrade.</li>
<li class="list-group-item">The SERO Pullup wallet has been upgraded to version 0.1.8 and supports the superzk2.0 protocol. The previous version will be discontinued. Please click to download the wallet.</li>
<li class="list-group-item">
For Mac: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.8/pullup-mac-0.1.8.tar.gz">pullup-mac-0.1.8.tar.gz</a></li>
<li class="list-group-item">
For Mac: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.4/pullup-mac-0.1.4.tar.gz" target="_blank">pullup-mac-0.1.4.tar.gz</a></li>
For Windows: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.8/pullup-windows-0.1.8.zip" target="_blank">pullup-windows-0.1.8.tar.gz</a>
</li>
<li class="list-group-item">
For Windows: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.4/pullup-windows-0.1.4.zip" target="_blank">pullup--windows0.1.4.tar.gz</a>
Update content:<br/>
1. Using the superzk2.0 protocol<br/>
2. Fixed some known bugs<br/>
3. Optimized the speed of syncing data <br/>
</li>
`);
}
$('#myModal').modal({backdrop: 'static', keyboard: false});
</script>
}else{
$('.modal-body').empty().append(`
<li class="list-group-item">The SERO Pullup wallet has been upgraded to version 0.1.8 and supports the superzk2.0 protocol. The previous version will be discontinued. Please click to download the wallet.</li>
<li class="list-group-item">
For Mac: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.8/pullup-mac-0.1.8.tar.gz">pullup-mac-0.1.8.tar.gz</a></li>
<li class="list-group-item">
For Windows: <a href="https://github.com/sero-cash/pullup/releases/download/v0.1.8/pullup-windows-0.1.8.zip" target="_blank">pullup-windows-0.1.8.tar.gz</a>
</li>
<li class="list-group-item">
Update content:<br/>
1. Using the superzk2.0 protocol<br/>
2. Fixed some known bugs<br/>
3. Optimized the speed of syncing data <br/>
</li>
`);
}

$('#myModal').modal({backdrop: 'static', keyboard: false});
</script>

</body>

Expand Down

0 comments on commit 3a60c29

Please sign in to comment.