Mercurial > gemma
changeset 1700:0c0e658fcfc8
merge
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Mon, 07 Jan 2019 11:35:35 +0100 |
parents | 836a95ec419b (diff) f1c3fe8b79f5 (current diff) |
children | f4bd67daaaff |
files | |
diffstat | 2 files changed, 105 insertions(+), 108 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/fontawesome.js Mon Jan 07 11:02:48 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -import Vue from "vue"; -import { library } from "@fortawesome/fontawesome-svg-core"; -import { - faAngleDown, - faAngleLeft, - faAngleRight, - faAngleUp, - faBars, - faBook, - faChartArea, - faCheck, - faCity, - faClipboardCheck, - faClock, - faCloudUploadAlt, - faCopy, - faDrawPolygon, - faExclamationTriangle, - faEye, - faEyeSlash, - faFilePdf, - faFolderPlus, - faInfo, - faLayerGroup, - faMapMarkedAlt, - faMinus, - faPaperPlane, - faPencilAlt, - faPlay, - faPlus, - faPowerOff, - faRuler, - faSearch, - faShip, - faSortAmountDown, - faSortAmountUp, - faSpinner, - faStar, - faTasks, - faTimes, - faTrash, - faUpload, - faUser, - faUsersCog, - faWater, - faWrench -} from "@fortawesome/free-solid-svg-icons"; -import { faAdn } from "@fortawesome/free-brands-svg-icons"; - -library.add( - faAdn, - faAngleDown, - faAngleLeft, - faAngleRight, - faAngleUp, - faBars, - faBook, - faChartArea, - faCheck, - faCity, - faClipboardCheck, - faClock, - faCloudUploadAlt, - faCopy, - faDrawPolygon, - faExclamationTriangle, - faEye, - faEyeSlash, - faFilePdf, - faFolderPlus, - faInfo, - faLayerGroup, - faMapMarkedAlt, - faMinus, - faPaperPlane, - faPencilAlt, - faPlay, - faPlus, - faPowerOff, - faRuler, - faSearch, - faShip, - faSortAmountDown, - faSortAmountUp, - faSpinner, - faStar, - faTasks, - faTimes, - faTrash, - faUpload, - faUser, - faUsersCog, - faWater, - faWrench -); - -import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; -Vue.component("font-awesome-icon", FontAwesomeIcon); - -export { Vue };
--- a/client/src/main.js Mon Jan 07 11:02:48 2019 +0100 +++ b/client/src/main.js Mon Jan 07 11:35:35 2019 +0100 @@ -26,12 +26,111 @@ import "../node_modules/ol/ol.css"; import "../node_modules/highlight.js/styles/paraiso-dark.css"; import "../node_modules/vue-snotify/styles/material.css"; +import VTooltip from "v-tooltip"; +import { library } from "@fortawesome/fontawesome-svg-core"; +import { + faAngleDown, + faAngleLeft, + faAngleRight, + faAngleUp, + faBars, + faBook, + faChartArea, + faCheck, + faCity, + faClipboardCheck, + faClock, + faCloudUploadAlt, + faCopy, + faDrawPolygon, + faExclamationTriangle, + faEye, + faEyeSlash, + faFilePdf, + faFolderPlus, + faInfo, + faLayerGroup, + faMapMarkedAlt, + faMinus, + faPaperPlane, + faPencilAlt, + faPlay, + faPlus, + faPowerOff, + faRuler, + faSearch, + faShip, + faSortAmountDown, + faSortAmountUp, + faSpinner, + faStar, + faTasks, + faTimes, + faTrash, + faUpload, + faUser, + faUsersCog, + faWater, + faWrench +} from "@fortawesome/free-solid-svg-icons"; +import { faAdn } from "@fortawesome/free-brands-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; import VueClipboard from "vue-clipboard2"; +library.add( + faAdn, + faAngleDown, + faAngleLeft, + faAngleRight, + faAngleUp, + faBars, + faBook, + faChartArea, + faCheck, + faCity, + faClipboardCheck, + faClock, + faCloudUploadAlt, + faCopy, + faDrawPolygon, + faExclamationTriangle, + faEye, + faEyeSlash, + faFilePdf, + faFolderPlus, + faInfo, + faLayerGroup, + faMapMarkedAlt, + faMinus, + faPaperPlane, + faPencilAlt, + faPlay, + faPlus, + faPowerOff, + faRuler, + faSearch, + faShip, + faSortAmountDown, + faSortAmountUp, + faSpinner, + faStar, + faTasks, + faTimes, + faTrash, + faUpload, + faUser, + faUsersCog, + faWater, + faWrench +); import ToggleButton from "vue-js-toggle-button"; Vue.use(ToggleButton); +Vue.component("font-awesome-icon", FontAwesomeIcon); + +Vue.use(VTooltip); + const options = { toast: { position: SnotifyPosition.centerBottom @@ -75,13 +174,11 @@ }); Vue.config.productionTip = false; -let app; -import("./fontawesome").then(() => { - app = new Vue({ - router, - store, - render: h => h(App) - }).$mount("#app"); -}); + +const app = new Vue({ + router, + store, + render: h => h(App) +}).$mount("#app"); export default app;