From 0960000b96acc8aff8a1b054a4261775ab6d386f Mon Sep 17 00:00:00 2001 From: Zhiting Lin Date: Thu, 27 Aug 2020 14:21:24 +0800 Subject: [PATCH] update the bapp domain meta logic --- icons/logo.png | Bin 8247 -> 2750 bytes src/assets/bapp/bapp.json | 5 +---- src/popup.js | 5 ++++- src/prompt.js | 3 ++- src/utils/utils.js | 28 +++++++++++++++++++++++++--- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/icons/logo.png b/icons/logo.png index 65b66d86a9bfeb9b55d1b2ec901188583309aac2..4761ddb4cf3341cabb1b8c117e5f24ed2ef2eb1b 100644 GIT binary patch literal 2750 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 diff --git a/src/assets/bapp/bapp.json b/src/assets/bapp/bapp.json index 403ddf4..ff1558d 100644 --- a/src/assets/bapp/bapp.json +++ b/src/assets/bapp/bapp.json @@ -30,10 +30,7 @@ { "icon":"red-packet.jpg", "color":"linear-gradient(274.27deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0) 100%), #EB4232", - "link":"https://bapp.blockmeta.com/redpacket/", - "domainsMeta": { - "icon": "https://supertx.bymov.io/favicon.ico" - } + "link":"https://bapp.blockmeta.com/redpacket/" } ] } diff --git a/src/popup.js b/src/popup.js index dd67f12..2ddb958 100644 --- a/src/popup.js +++ b/src/popup.js @@ -77,11 +77,14 @@ store.dispatch(Actions.LOAD_BYTOM).then(() => { }, ); - getDomains().then((domains)=>{ + const lang = store.getters.language === 'zh'?'cn':'en' + + getDomains(lang).then(({domains, domainMeta})=>{ const _bytom = store.state.bytom.clone() if(!domains.every(v => _bytom.settings.domains.includes(v))){ _bytom.settings.domains = Array.from(new Set(_bytom.settings.domains.concat(domains))) + _bytom.settings.domainsMeta = Object.assign(_bytom.settings.domainsMeta, domainMeta) store.dispatch(Actions.UPDATE_STORED_BYTOM, _bytom) } }) diff --git a/src/prompt.js b/src/prompt.js index f3ed1b4..2a7cd21 100644 --- a/src/prompt.js +++ b/src/prompt.js @@ -79,11 +79,12 @@ store.dispatch(Actions.LOAD_BYTOM).then(() => { }, ); - getDomains().then((domains)=>{ + getDomains().then(({domains, domainMeta})=>{ const _bytom = store.state.bytom.clone() if(!domains.every(v => _bytom.settings.domains.includes(v))){ _bytom.settings.domains = Array.from(new Set(_bytom.settings.domains.concat(domains))) + _bytom.settings.domainsMeta = Object.assign(_bytom.settings.domainsMeta, domainMeta) store.dispatch(Actions.UPDATE_STORED_BYTOM, _bytom) } }) diff --git a/src/utils/utils.js b/src/utils/utils.js index fbe240d..ec662ef 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -54,21 +54,43 @@ export function removeFromArray(original, remove) { return original.filter(value => !remove.includes(value)); } -export function getDomains(){ +export function getDomains(lang = 'en'){ let domains = bappData.list.filter( l => l.link!== undefined).map(a => a.link.split('/')[2]); const crossChainLink = "crosschain.bymov.io" + let domainMeta = { + "crosschain.bymov.io":{ + icon: "https://crosschain.bymov.io/favicon.ico", + title: "MOV" + } + } + + updateDomainMeta(bappData, domainMeta, lang) + return fetch(bappRequestUrl) .then(response => response.json()) .then(json => { if(!_.isEqual(json, bappData)){ domains = json.list.filter( l => l.link!== undefined).map(a => a.link.split('/')[2]); + updateDomainMeta(json, domainMeta, lang) } domains.push(crossChainLink) - return domains; + return {domains, domainMeta}; }).catch((e)=>{ domains.push(crossChainLink) - return domains; + return {domains, domainMeta}; }); } + +function updateDomainMeta(jsonData, domainMeta, lang){ + const list = jsonData.list + for(let index in list){ + const meta = list[index].domainsMeta + if(meta){ + meta.title = jsonData[lang][index].title + const domain = list[index]['link'].split('/')[2] + domainMeta[domain] = meta + } + } +} -- 2.11.0