diff --git a/src/App.vue b/src/App.vue index 77a95d1..9f1deb3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -16,8 +16,16 @@ + + + diff --git a/src/main.js b/src/main.js index b3d64fd..308b06a 100644 --- a/src/main.js +++ b/src/main.js @@ -4,16 +4,21 @@ import Vue from 'vue'; import infiniteScroll from 'vue-infinite-scroll'; -import ElementUI from 'element-ui'; +// import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; -import locale from 'element-ui/lib/locale/lang/en'; +import lang from 'element-ui/lib/locale/lang/en'; +import locale from 'element-ui/lib/locale'; +import { Loading } from 'element-ui'; import App from './App'; import router from './router'; Vue.config.productionTip = false; Vue.use(infiniteScroll); -Vue.use(ElementUI, { locale }); + +// Vue.use(ElementUI, { lang }); +locale.use(lang); +Vue.use(Loading.directive); /* eslint-disable no-new */ new Vue({ diff --git a/src/router/index.js b/src/router/index.js index 93d6fb5..4ebfa6b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,6 +2,7 @@ import Vue from 'vue'; import Router from 'vue-router'; import Homepage from '@/components/Homepage'; import Bots from '@/components/Bots'; +import Categories from '@/components/Categories'; Vue.use(Router); @@ -17,5 +18,10 @@ export default new Router({ name: 'bots', component: Bots, }, + { + path: '/categories', + name: 'categories', + component: Categories, + }, ], }); diff --git a/src/utils/FormatNumber.js b/src/utils/FormatNumber.js new file mode 100644 index 0000000..4e7a9a6 --- /dev/null +++ b/src/utils/FormatNumber.js @@ -0,0 +1,14 @@ + +export default { + methods: { + formatNumber(valueInt) { + let valueStr = valueInt.toString(); + if (valueStr.length > 6) { + valueStr = `${Number((valueInt / 1000000).toFixed(2))}M`; + } else if (valueStr.length > 3) { + valueStr = `${(valueInt / 1000).toFixed()}k`; + } + return valueStr; + }, + }, +}; diff --git a/test/e2e/specs/test.js b/test/e2e/specs/test.js index ee3514e..891b4ba 100644 --- a/test/e2e/specs/test.js +++ b/test/e2e/specs/test.js @@ -11,9 +11,6 @@ module.exports = { browser .url(devServer) .waitForElementVisible('#app', 5000) - .assert.elementPresent('.hello') - .assert.containsText('h1', 'Welcome to Your Vue.js App') - .assert.elementCount('img', 1) .end(); }, }; diff --git a/test/unit/specs/HelloWorld.spec.js b/test/unit/specs/HelloWorld.spec.js deleted file mode 100644 index bf56fbd..0000000 --- a/test/unit/specs/HelloWorld.spec.js +++ /dev/null @@ -1,11 +0,0 @@ -import Vue from 'vue'; -import HelloWorld from '@/components/HelloWorld'; - -describe('HelloWorld.vue', () => { - it('should render correct contents', () => { - const Constructor = Vue.extend(HelloWorld); - const vm = new Constructor().$mount(); - expect(vm.$el.querySelector('.hello h1').textContent) - .toEqual('Welcome to Your Vue.js App'); - }); -});