Skip to content

Commit

Permalink
Merge pull request #468 from hiwuyi/feature/backupAPI
Browse files Browse the repository at this point in the history
Add backup API
  • Loading branch information
PlutoNbai authored Jun 1, 2023
2 parents f1fac5f + b8817ea commit 6a58013
Show file tree
Hide file tree
Showing 20 changed files with 227 additions and 142 deletions.
2 changes: 1 addition & 1 deletion commit_timestamp.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Commit timestamp: 2023-05-10 09:08:16
Commit timestamp: 2023-05-30 16:51:24
9 changes: 7 additions & 2 deletions web/config/calibration.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module.exports = {
NODE_ENV: '"production"',
BASE_API: '"https://calibration-api.filswan.com/"',
BASE_URL: '"https://calibration-mcs.filswan.com/"',
BASE_URL: '"https://calibration-mcs.filswan.com"',
BASE_PAYMENT_GATEWAY_API: '"https://calibration-mcs-api.filswan.com/"',
BASE_PAYMENT_GATEWAY_BSC_API: '"https://calibration-mcs-bsc.filswan.com/"',
BASE_PAYMENT_GATEWAY_POLYGON_API: '"https://api.multichain.storage/"',
Expand All @@ -13,5 +13,10 @@ module.exports = {
BASE_POLYGON_ADDRESS: '"https://polygonscan.com/"',
BASE_ECO_API: '"https://calibration-eco-api.filswan.com/"',
BASE_METASPACE: '"https://calibration-mybucket-api.filswan.com/"',
BASE_ENV: 'false'
BASE_ENV: 'false',
MEDIUM_LINK: '"https://filswan.medium.com/"',
DISCORD_LINK: '"https://discord.com/invite/KKGhy8ZqzK"',
TWITTER_LINK: '"https://twitter.com/0xfilswan"',
GITHUB_LINK: '"https://github.com/filswan"',
TELEGRAM_LINK: '"https://t.me/filswan"'
}
6 changes: 3 additions & 3 deletions web/config/dev.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const merge = require('webpack-merge')
const prodEnv = require('./calibration.env')

module.exports = merge(prodEnv, {
NODE_ENV: '"development"',
BASE_METASPACE: '"https://test-meta-xieyi.nbai.io/"',
BASE_PAYMENT_GATEWAY_API: '"https://test-mcs-xieyi.nbai.io/"'
NODE_ENV: '"development"'
// BASE_METASPACE: '"https://test-meta-xieyi.nbai.io/"',
// BASE_PAYMENT_GATEWAY_API: '"https://test-mcs-xieyi.nbai.io/"'
})
11 changes: 8 additions & 3 deletions web/config/prod.env.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'
module.exports = {  
module.exports = {
NODE_ENV: '"production"',
BASE_API: '"https://api.filswan.com/"',
BASE_URL: '"https://www.multichain.storage/"',
BASE_URL: '"https://www.multichain.storage"',
BASE_PAYMENT_GATEWAY_API: '"https://api.multichain.storage/"',
BASE_PAYMENT_GATEWAY_BSC_API: '"https://calibration-mcs-bsc.filswan.com/"',
BASE_PAYMENT_GATEWAY_POLYGON_API: '"https://api.multichain.storage/"',
Expand All @@ -13,5 +13,10 @@ module.exports = {  
BASE_POLYGON_ADDRESS: '"https://polygonscan.com/"',
BASE_ECO_API: '"https://ecosystem-api.multichain.storage/"',
BASE_METASPACE: '"https://meta-api.multichain.storage/"',
BASE_ENV: 'true'
BASE_ENV: 'true',
MEDIUM_LINK: '"https://filswan.medium.com/"',
DISCORD_LINK: '"https://discord.com/invite/KKGhy8ZqzK"',
TWITTER_LINK: '"https://twitter.com/0xfilswan"',
GITHUB_LINK: '"https://github.com/filswan"',
TELEGRAM_LINK: '"https://t.me/filswan"'
}
11 changes: 8 additions & 3 deletions web/config/semi_prod.env.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'
module.exports = {  
module.exports = {
NODE_ENV: '"production"',
BASE_API: '"https://api.filswan.com/"',
BASE_URL: '"https://www.multichain.storage/"',
BASE_URL: '"https://www.multichain.storage"',
BASE_PAYMENT_GATEWAY_API: '"https://mcs-api.filswan.com/"',
BASE_PAYMENT_GATEWAY_BSC_API: '"https://calibration-mcs-bsc.filswan.com/"',
BASE_PAYMENT_GATEWAY_POLYGON_API: '"https://api.multichain.storage/"',
Expand All @@ -13,5 +13,10 @@ module.exports = {  
BASE_POLYGON_ADDRESS: '"https://polygonscan.com/"',
BASE_ECO_API: '"https://ecosystem-api.multichain.storage/"',
BASE_METASPACE: '"https://meta-api.multichain.storage/"',
BASE_ENV: 'true'
BASE_ENV: 'true',
MEDIUM_LINK: '"https://filswan.medium.com/"',
DISCORD_LINK: '"https://discord.com/invite/KKGhy8ZqzK"',
TWITTER_LINK: '"https://twitter.com/0xfilswan"',
GITHUB_LINK: '"https://github.com/filswan"',
TELEGRAM_LINK: '"https://t.me/filswan"'
}
9 changes: 7 additions & 2 deletions web/config/test.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module.exports = {
NODE_ENV: '"test"',
BASE_API: '"http://192.168.88.216:5002/"',
BASE_URL: '"http://192.168.88.216:8080/mcs/"',
BASE_URL: '"http://192.168.88.216:8080/mcs"',
BASE_PAYMENT_GATEWAY_API: '"http://192.168.88.41:8889/"',
BASE_PAYMENT_GATEWAY_BSC_API: '"http://192.168.88.41:8892/"',
BASE_PAYMENT_GATEWAY_POLYGON_API: '"https://api.multichain.storage/"',
Expand All @@ -13,5 +13,10 @@ module.exports = {
BASE_POLYGON_ADDRESS: '"https://polygonscan.com/"',
BASE_ECO_API: '"http://192.168.88.216:5005/"',
BASE_METASPACE: '"http://192.168.88.41:5212/"',
BASE_ENV: 'false'
BASE_ENV: 'false',
MEDIUM_LINK: '"https://filswan.medium.com/"',
DISCORD_LINK: '"https://discord.com/invite/KKGhy8ZqzK"',
TWITTER_LINK: '"https://twitter.com/0xfilswan"',
GITHUB_LINK: '"https://github.com/filswan"',
TELEGRAM_LINK: '"https://t.me/filswan"'
}
9 changes: 7 additions & 2 deletions web/config/test_prod.env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module.exports = {
NODE_ENV: '"test"',
BASE_API: '"http://192.168.88.216:5002/"',
BASE_URL: '"http://192.168.88.216:8080/mcs/"',
BASE_URL: '"http://192.168.88.216:8080/mcs"',
BASE_PAYMENT_GATEWAY_API: '"http://192.168.88.41:8889/"',
BASE_PAYMENT_GATEWAY_BSC_API: '"http://192.168.88.41:8892/"',
BASE_PAYMENT_GATEWAY_POLYGON_API: '"https://api.multichain.storage/"',
Expand All @@ -13,5 +13,10 @@ module.exports = {
BASE_POLYGON_ADDRESS: '"https://polygonscan.com/"',
BASE_ECO_API: '"http://192.168.88.216:5005/"',
BASE_METASPACE: '"http://192.168.88.41:5212/"',
BASE_ENV: 'true'
BASE_ENV: 'true',
MEDIUM_LINK: '"https://filswan.medium.com/"',
DISCORD_LINK: '"https://discord.com/invite/KKGhy8ZqzK"',
TWITTER_LINK: '"https://twitter.com/0xfilswan"',
GITHUB_LINK: '"https://github.com/filswan"',
TELEGRAM_LINK: '"https://t.me/filswan"'
}
49 changes: 26 additions & 23 deletions web/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<!DOCTYPE html>
<html>
<head prefix="og: http://ogp.me/ns#">
<meta name="referrer" content="no-referrer" charset="utf-8">
<title>Multi-Chain storage</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<meta name="format-detection" content="telephone=no" />
<meta name="renderer" content="webkit|ie-comp|ie-stand">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta content="telephone=no" name="format-detection">
<meta content="email=no" name="format-detection" />

<head prefix="og: http://ogp.me/ns#">
<meta name="referrer" content="no-referrer" charset="utf-8">
<title>Multi-Chain storage</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<meta name="format-detection" content="telephone=no" />
<meta name="renderer" content="webkit|ie-comp|ie-stand">
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta content="telephone=no" name="format-detection">
<meta content="email=no" name="format-detection" />

<meta name="keywords" content="MCS,Swan,Dashboard,Browse Tasks,Tools,Statistics" />
<meta name="description" content="Multi-Chain storage (MCS) is a smart-contract-based cross-chain storage gateway that is integrated with oracle technology. It accelerates the mass adoption of decentralized storage by bridging multiple blockchain networks."
Expand Down Expand Up @@ -36,15 +37,15 @@
</script>

<%if (process.env.NODE_ENV === 'production'){ %>
<link rel="stylesheet" href="<% process.env.BASE_URL %>static/css/element-ui.css">
<script src="<% process.env.BASE_URL %>static/js/echarts.min.js"></script>
<script src="<% process.env.BASE_URL %>static/js/qs.min.js"></script>
<script src="<% process.env.BASE_URL %>static/js/axios.min.js"></script>
<script src="<% process.env.BASE_URL %>static/js/moment.min.js"></script>
<script src="<% process.env.BASE_URL %>static/js/vue.min.js"></script>
<script src="<% process.env.BASE_URL %>static/js/vue-router.min.js"></script>
<script src="<% process.env.BASE_URL %>static/js/vuex.js"></script>
<!-- <script src="<% process.env.BASE_URL %>static/js/element-ui.min.js"></script> -->
<link rel="stylesheet" href="<% process.env.BASE_URL %>/static/css/element-ui.css">
<script src="<% process.env.BASE_URL %>/static/js/echarts.min.js"></script>
<script src="<% process.env.BASE_URL %>/static/js/qs.min.js"></script>
<script src="<% process.env.BASE_URL %>/static/js/axios.min.js"></script>
<script src="<% process.env.BASE_URL %>/static/js/moment.min.js"></script>
<script src="<% process.env.BASE_URL %>/static/js/vue.min.js"></script>
<script src="<% process.env.BASE_URL %>/static/js/vue-router.min.js"></script>
<script src="<% process.env.BASE_URL %>/static/js/vuex.js"></script>
<!-- <script src="<% process.env.BASE_URL %>/static/js/element-ui.min.js"></script> -->
<%} else {%>
<link rel="stylesheet" href="/static/css/element-ui.css">
<script src="/static/js/echarts.min.js"></script>
Expand All @@ -63,9 +64,11 @@
<!-- built files will be auto injected -->
</body>

</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</head>

<body>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>

</html>
2 changes: 1 addition & 1 deletion web/src/components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ export default {
})
},
commonParam () {
let commonApi = `${that.baseAPIURL}api/v1/config/params?limit=20&wallet_address=${that.metaAddress}`
let commonApi = `${that.baseAPIURL}api/v1/common/system/params?limit=20&wallet_address=${that.metaAddress}`
axios.get(commonApi, {
headers: {
Expand Down
37 changes: 20 additions & 17 deletions web/src/components/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
<el-button round>{{$t('comment.Tell_Comment')}}</el-button>
</div>
<div class="need" v-if="languageMcs === 'en'">Need help? Join our
<a href="https://discord.com/invite/KKGhy8ZqzK" target="_blank">Discord</a>
<a :href="discord_link" target="_blank">Discord</a>
or send an
<a href="mailto:[email protected]">Email</a> to us.
</div>
<div class="need" v-else>需要帮助吗?加入我们的
<a href="https://discord.com/invite/KKGhy8ZqzK" target="_blank">Discord</a>
<a :href="discord_link" target="_blank">Discord</a>
或发送
<a href="mailto:[email protected]">电子邮件</a> 给我们。
</div>
Expand All @@ -56,11 +56,11 @@
<span v-else class="tip">目前使用量:{{free_usage | byteStorage}}GB(Onchain Storage免费储存空间配额:{{free_quota_per_month | byteStorage}}GB)</span>
</div> -->
<div class="fes-icon-logo">
<a href="https://filswan.medium.com/" target="_blank"><img :src="share_medium" alt=""></a>
<a href="https://discord.com/invite/KKGhy8ZqzK" target="_blank"><img :src="share_discord" alt=""></a>
<a href="https://twitter.com/0xfilswan" target="_blank"><img :src="share_twitter" alt=""></a>
<a href="https://github.com/filswan" target="_blank"><img :src="share_github" alt=""></a>
<a href="https://t.me/filswan" target="_blank"><img :src="share_telegram" alt=""></a>
<a :href="medium_link" target="_blank"><img :src="share_medium" alt=""></a>
<a :href="discord_link" target="_blank"><img :src="share_discord" alt=""></a>
<a :href="twitter_link" target="_blank"><img :src="share_twitter" alt=""></a>
<a :href="github_link" target="_blank"><img :src="share_github" alt=""></a>
<a :href="telegram_link" target="_blank"><img :src="share_telegram" alt=""></a>
</div>
<!-- market data white badge -->
<div class="fes-market">
Expand All @@ -86,20 +86,20 @@ export default {
lanShow: false,
bodyWidth: document.body.clientWidth < 999,
items: [
{
icon: 'el-icon-s-deal',
index: '1',
title: this.$t('route.Deal'),
name: 'my_files',
type: ''
},
{
icon: 'el-icon-s-metaSpace',
index: '20',
title: this.$t('route.metaSpace'),
name: 'Space',
type: ''
},
{
icon: 'el-icon-s-deal',
index: '1',
title: this.$t('route.Deal'),
name: 'my_files',
type: ''
},
{
icon: 'el-icon-s-billing',
index: '5',
Expand All @@ -120,6 +120,11 @@ export default {
share_github: require('@/assets/images/landing/github-fill.png'),
share_telegram: require('@/assets/images/landing/telegram.png'),
share_discord: require('@/assets/images/landing/discord.png'),
medium_link: process.env.MEDIUM_LINK,
discord_link: process.env.DISCORD_LINK,
twitter_link: process.env.TWITTER_LINK,
github_link: process.env.GITHUB_LINK,
telegram_link: process.env.TELEGRAM_LINK,
rateValue: null,
colors: { 5: '#e92721' },
iconClasses: ['icon-rate-face']
Expand Down Expand Up @@ -160,9 +165,7 @@ export default {
}
},
created () {
if (process.env.COMMITHASH) {
this.git_version = process.env.COMMITHASH.slice(0, 8)
}
if (process.env.COMMITHASH) this.git_version = process.env.COMMITHASH.slice(0, 8)
this.getListBuckets()
},
methods: {
Expand Down
15 changes: 10 additions & 5 deletions web/src/components/footHome.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<li @click="goLink('https://discord.gg/pGDTxtgB')">{{$t('footer.Get_Help')}}</li>
</ul>
<div class="fes-icon-logo">
<a href="https://filswan.medium.com/" target="_blank"><img :src="share_medium" alt=""></a>
<a href="https://discord.com/invite/KKGhy8ZqzK" target="_blank"><img :src="share_discord" alt=""></a>
<a href="https://twitter.com/0xfilswan" target="_blank"><img :src="share_twitter" alt=""></a>
<a href="https://github.com/filswan" target="_blank"><img :src="share_github" alt=""></a>
<a href="https://t.me/filswan" target="_blank"><img :src="share_telegram" alt=""></a>
<a :href="medium_link" target="_blank"><img :src="share_medium" alt=""></a>
<a :href="discord_link" target="_blank"><img :src="share_discord" alt=""></a>
<a :href="twitter_link" target="_blank"><img :src="share_twitter" alt=""></a>
<a :href="github_link" target="_blank"><img :src="share_github" alt=""></a>
<a :href="telegram_link" target="_blank"><img :src="share_telegram" alt=""></a>
</div>
<p class="copy">© {{fullYear}}{{$t('footer.copy')}}</p>
</div>
Expand All @@ -33,6 +33,11 @@ export default {
share_github: require('@/assets/images/landing/github-fill.png'),
share_telegram: require('@/assets/images/landing/telegram.png'),
share_discord: require('@/assets/images/landing/discord.png'),
medium_link: process.env.MEDIUM_LINK,
discord_link: process.env.DISCORD_LINK,
twitter_link: process.env.TWITTER_LINK,
github_link: process.env.GITHUB_LINK,
telegram_link: process.env.TELEGRAM_LINK,
ComingSoon: false,
typeName: 'comingSoon',
fullYear: new Date().getFullYear()
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/mintTip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export default {
const transaction = await CollectionFactory.methods
.mint(collectAddress, that.metaAddress, that.ruleForm.amount || 1, nftUrl)
.send(payObject)
.on('transactionHash', function (hash) {
.on('transactionHash', async function (hash) {
that.nftHash = hash
that.isloadText = that.$t('uploadFile.payment_tip_deal02')
console.log('transactionHash console:', that.nftHash)
Expand Down
Loading

0 comments on commit 6a58013

Please sign in to comment.