Merge pull request #1 from crypto-meetup-dev/master

get from base

.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+node_js:
+ - "8"
+cache: npm
+dist: trusty
+# Build Lifecycle
+install:
+ - npm install
+
+before_script:
+ - npm run lint
+
+script:
+ - npm run build

package.json

@@ -5,6 +5,7 @@
  "scripts": {
  "serve": "vue-cli-service serve",
  "build": "vue-cli-service build",
+ "test": "npm run lint",
  "lint": "vue-cli-service lint"
  },
  "dependencies": {

src/i18n/en.js

@@ -41,8 +41,22 @@ export default {
  cmu_creator: 'Created by CryptoMeetup Team',
  powered_by: 'Powered By',
 
- stake_number_alert: '',
- stake_successful_alert: '',
- stake_pay_attention_alert: '',
- stake_coniii9firm: '',
+ stake_number_alert: 'How many CMU do you want to stake? (Enter as: 1.0000 CMU, retain the last four decimal places)',
+ stake_successful_alert: 'CMU token Stake successful',
+ stake_pay_attention_alert: 'Pay attention to My Staked changes later',
+ stake_confirmed_btn: 'Confirmed',
+ unstake_alert: 'Unstake will revoke all staked CMU',
+ claim_success: 'Claim success',
+ wait_alert: 'Please wait a moment',
+ claim_fail: 'Claim failed',
+ buy_cmu_alert: 'How many EOS equivalent CMU do you want to purchase? (Enter as: 1.0000 EOS, retain the last four decimal places)',
+ buy_cmu_success_alert: 'CMU token purchase was successful',
+ after_buy_cmu_alert: 'Pay attention to CMU balance changes later',
+ buy_cmu_alert: 'How many CMUs do you want to sell? (Enter as: 1.0000 CMU, retain the last four decimal places',
+ ok: 'OK',
+ sell_cmu_success_alert: 'CMU sold successfully',
+ after_sell_cmu_alert: 'Pay attention to EOS balance changes later',
+ scatter_login_fail: 'Failed to log in Scatter The users Scatter is locked. They have been notified and should unlock before continuing': 'Scatter登入失败：用户的Scatter钱包已被锁定，在进行下一步之前用户已经被通知',
+ scatter_login_success: 'You successful login in with scatter',
+
 };

src/i18n/zh.js

@@ -43,22 +43,21 @@ export default {
  cmu_creator: '由Cryptomeetup（币聚）团队倾力打造',
  powered_by: 'Powered By',
 
- // 一些其他的翻译
- 'How many CMU do you want to stake? (Enter as: 1.0000 CMU, retain the last four decimal places)': '你要抵押多少CMU？ （输入如： 1.0000 CMU， 保留后四位小数点）',
- 'CMU token Stake successful': 'CMU 代币抵押成功',
- 'Pay attention to My Staked changes later': '稍后留意 My Staked',
- Comfirmed: '确认',
- 'The revocation of the stake will revoke all staked CMU': '撤销抵押会将全部抵押CMU撤销',
- 'Successful extraction': '提取成功',
- 'Please wait patiently': '请耐心等待',
- 'Extraction failed': '提取失败',
- 'How many EOS equivalent CMUs do you want to purchase? (Enter as: 1.0000 EOS, retain the last four decimal places)': '你要购买多少EOS等值的CMU？ （输入如： 1.0000 EOS， 保留后四位小数点）',
- 'CMU token purchase was successful': 'CMU 代币购买成功',
- 'Pay attention to CMU balance changes later': '稍后留意 CMU 余额变动',
- 'How many CMUs do you want to sell? (Enter as: 1.0000 CMU, retain the last four decimal places': '你要卖出多少CMU？ （输入如： 1.0000 CMU，保留后四位小数点）',
+ stake_number_alert: '你要抵押多少CMU？ （输入如： 1.0000 CMU， 保留后四位小数点）',
+ stake_successful_alert: 'CMU 代币抵押成功',
+ stake_pay_attention_alert: '稍后留意 My Staked',
+ stake_confirmed_btn: '确认',
+ unstake_alert: '撤销抵押会将全部抵押CMU撤销',
+ claim_success: '提取成功',
+ wait_alert: '请耐心等待',
+ claim_fail: '提取失败',
+ buy_cmu_alert: '你要购买多少EOS等值的CMU？ （输入如： 1.0000 EOS， 保留后四位小数点）',
+ buy_cmu_success_alert: 'CMU 代币购买成功',
+ after_buy_cmu_alert: '稍后留意 CMU 余额变动',
+ buy_cmu_alert: '你要卖出多少CMU？ （输入如： 1.0000 CMU，保留后四位小数点）',
  ok: '好的',
- 'CMU sold successfully': 'CMU 成功卖出',
- 'Pay attention to EOS balance changes later': '稍后留意 EOS 余额变动',
- 'Failed to log in Scatter The users Scatter is locked. They have been notified and should unlock before continuing': 'Scatter登入失败：用户的Scatter钱包已被锁定，在进行下一步之前用户已经被通知',
- 'You successful login in with scatter': '成功使用Scatter钱包登录',
+ sell_cmu_success_alert: 'CMU 成功卖出',
+ after_sell_cmu_alert: '稍后留意 EOS 余额变动',
+ scatter_login_fail: 'Scatter登入失败：用户的Scatter钱包已被锁定，在进行下一步之前用户已经被通知',
+ scatter_login_success: '成功使用Scatter钱包登录',
 };

src/main.js

@@ -17,7 +17,7 @@ delete L.Icon.Default.prototype._getIconUrl;
 L.Icon.Default.mergeOptions({
  iconRetinaUrl: require('leaflet/dist/images/marker-icon-2x.png'),
  iconUrl: require('leaflet/dist/images/marker-icon.png'),
- shadowUrl: require('leaflet/dist/images/marker-shadow.png')
+ shadowUrl: require('leaflet/dist/images/marker-shadow.png'),
 });
 
 CountryCode.registerLocale(require('i18n-iso-countries/langs/en.json'));

src/views/Map.vue

@@ -25,7 +25,7 @@ export default {
  url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
  // url: 'http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png',
  // url: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png',
- }
+ };
  },
  mounted() {
  if ('geolocation' in navigator) {