diff --git a/package.json b/package.json index 23f84404..bb7d8524 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@fortawesome/vue-fontawesome": "^0.0.22", "axios": "^0.18.0", "bootstrap": "^4.0.0", + "element-ui": "^2.3.9", "jquery": "^3.3.1", "js-cookie": "^2.2.0", "popper.js": "^1.14.1", diff --git a/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf new file mode 100644 index 00000000..73bc90f4 Binary files /dev/null and b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf differ diff --git a/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff new file mode 100644 index 00000000..28da65d4 Binary files /dev/null and b/public/fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index a446c42a..774f9597 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/lang-zh-CN.05f1eac96ac4b1a58972.js": "/js/lang-zh-CN.05f1eac96ac4b1a58972.js", - "/js/lang-es.7f2b93b9c03c518567a9.js": "/js/lang-es.7f2b93b9c03c518567a9.js", - "/js/lang-en.592895da306250f00312.js": "/js/lang-en.592895da306250f00312.js", + "/js/lang-zh-CN.c0da3973e52421a8cfe5.js": "/js/lang-zh-CN.c0da3973e52421a8cfe5.js", + "/js/lang-es.f4a1a5b4a30e92527b46.js": "/js/lang-es.f4a1a5b4a30e92527b46.js", + "/js/lang-en.0f790217417404ecc662.js": "/js/lang-en.0f790217417404ecc662.js", "/js/app.js": "/js/app.js", "/css/app.css": "/css/app.css" } \ No newline at end of file diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 525edb8e..c7bb2bd5 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -3,16 +3,21 @@ import store from '~/store' import router from '~/router' import i18n from '~/plugins/i18n' import App from '~/components/App' +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +import locale from 'element-ui/lib/locale/lang/en' import '~/plugins' import '~/components' Vue.config.productionTip = false +Vue.use(ElementUI, { locale }) /* eslint-disable no-new */ new Vue({ i18n, store, router, + el: '#app', ...App }) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 6f8a26a0..80171cd7 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -1,15 +1,119 @@ + \ No newline at end of file diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 8f61071f..9ba961dc 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -27,6 +27,7 @@ $polyfills = [ {{ config('app.name') }} +
@@ -44,6 +45,7 @@ $polyfills = [ + @endif