Skip to content

S
spring-boot-admin
Commit 15c85206 by Johannes Edmeier
Options

Upgrade fontawesome

parent e5a91d06
Showing with 108 additions and 81 deletions
spring-boot-admin-server-ui/package-lock.json
...@@ -153,9 +153,9 @@ ...@@ -153,9 +153,9 @@
"dev": true "dev": true
}, },
"globals": { "globals": {
"version": "11.5.0", "version": "11.7.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
"integrity": "sha512-hYyf+kI8dm3nORsiiXUQigOU62hDLfJ9G01uyGMxhc6BKsircrUhC4uJPQPUSuq2GrTmiiEt7ewxlMdBewfmKQ==", "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
"dev": true "dev": true
} }
} }
...@@ -179,47 +179,47 @@ ...@@ -179,47 +179,47 @@
} }
} }
}, },
"@fortawesome/fontawesome": { "@fortawesome/fontawesome-common-types": {
"version": "1.1.8", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.8.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.0.tgz",
"integrity": "sha512-c0/MtkPVT0fmiFcCyYoPjkG9PkMOvfrZw2+0BaJ+Rh6UEcK1AR/LaRgrHHjUkbAbs9LXxQJhFS8CJ4uSnK2+JA==", "integrity": "sha512-raAiqWiXGZeQpFzz5fpLa6EQR3kSAK1cT5qaUanB9h4FatXvKEOPutDyeGQsF0hRtGfMb518Mzc7+LjBPDJCOg=="
},
"@fortawesome/fontawesome-svg-core": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.0.tgz",
"integrity": "sha512-Wqh3kxcxeFCCLN3LevXJaZiBZ9V8ggOUpcQC+TBIaQIPNtMmUwsghLVpI6ojYKjoIvKi1nyAR9wpOTUVoxl4rA==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.1.7" "@fortawesome/fontawesome-common-types": "^0.2.0"
} }
}, },
"@fortawesome/fontawesome-common-types": { "@fortawesome/free-brands-svg-icons": {
"version": "0.1.7", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.7.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.1.0.tgz",
"integrity": "sha512-ego8jRVSHfq/iq4KRZJKQeUAdi3ZjGNrqw4oPN3fNdvTBnLCSntwVCnc37bsAJP9UB8MhrTfPnZYxkv2vpS4pg==" "integrity": "sha512-ILEJHR7Wiz9kJMtMgRh3EXNZmxUZW6z+3JQEN1TL02+aME7q+sHn3H8oOClti9XuIx5HckmbfevpBrl+fzeWCw==",
},
"@fortawesome/fontawesome-free-brands": {
"version": "5.0.13",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.13.tgz",
"integrity": "sha512-xC/sEPpfcJPvUbud2GyscLCLQlE2DVBYaTHVwuyVGliYBdYejSEYMINU8FN5A0xhO68yCbpCfMlBv6Gqby+jww==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.1.7" "@fortawesome/fontawesome-common-types": "^0.2.0"
} }
}, },
"@fortawesome/fontawesome-free-regular": { "@fortawesome/free-regular-svg-icons": {
"version": "5.0.13", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.13.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.1.0.tgz",
"integrity": "sha512-36lz9Idww1L4QaaTcv7GZiOeIP9emJFDUsedvRovI10kmwyd6rN0PKkIjnq0FB4foLhX4Rou8vnbCCmjtqiLug==", "integrity": "sha512-VKkfgrEjso9Dsc4TgV5UKqtgxs7bv2sgIsulf6X2rwsVDQqIKOxTZ2tcftGSa4wvRPIJ3lNcrmEMLwDWub593w==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.1.7" "@fortawesome/fontawesome-common-types": "^0.2.0"
} }
}, },
"@fortawesome/fontawesome-free-solid": { "@fortawesome/free-solid-svg-icons": {
"version": "5.0.13", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.13.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.1.0.tgz",
"integrity": "sha512-b+krVnqkdDt52Yfev0x0ZZgtxBQsLw00Zfa3uaVWIDzpNZVtrEXuxldUSUaN/ihgGhSNi8VpvDAdNPVgCKOSxw==", "integrity": "sha512-MijNhBFEporjnyg1BDnyBWwypFa+RkmQFqX94NZa7xWGIKirvujw2JG0BRR9jQZPFHcI4pRzhXMxBxUUi786yA==",
"requires": { "requires": {
"@fortawesome/fontawesome-common-types": "^0.1.7" "@fortawesome/fontawesome-common-types": "^0.2.0"
} }
}, },
"@fortawesome/vue-fontawesome": { "@fortawesome/vue-fontawesome": {
"version": "0.0.23", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.0.23.tgz", "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.0.tgz",
"integrity": "sha512-znVU9w6BjjiTyK0rwd09bMLdW/hIH/bb2v9jXVXeV41ui3jRU6vxZtei+QUZuVJN1TcKC84i1ZyWPln85ZN9XA==" "integrity": "sha512-FBbNA1ymu46UDjfbzMmVWhEeTineUiWHoU1WTsauodC9tQRj96/d0gBUQl3UkM3wMJ18jMq2H5+nXCuNq0SsZw=="
}, },
"@types/strip-bom": { "@types/strip-bom": {
"version": "3.0.0", "version": "3.0.0",
...@@ -234,9 +234,9 @@ ...@@ -234,9 +234,9 @@
"dev": true "dev": true
}, },
"@vue/test-utils": { "@vue/test-utils": {
"version": "1.0.0-beta.19", "version": "1.0.0-beta.20",
"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.19.tgz", "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.20.tgz",
"integrity": "sha1-oexFIIH2x6n6JFR44t4ieVOjBFU=", "integrity": "sha1-70UFNBuALz3hwGs8uGUTeMhzcfo=",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.4" "lodash": "^4.17.4"
...@@ -609,17 +609,25 @@ ...@@ -609,17 +609,25 @@
"dev": true "dev": true
}, },
"autoprefixer": { "autoprefixer": {
"version": "8.6.2", "version": "8.6.3",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.2.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.3.tgz",
"integrity": "sha512-cv9v1mYYBcAnZq4MHseJ9AIdjQmNahnpCpPO46oTkQJS2GggsBp2azHjNpAuQ95Epvsg+AIsyjYhfI9YwFxGSA==", "integrity": "sha512-KkQyCHBxma7R2eoEkjja/RHUBw+Fc1nY46LdV62fzJI5D7i8mLLCtAZ/AVR3UbXhDZ8mUz4C/PF4lZrbiHa1ZQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"browserslist": "^3.2.8", "browserslist": "^3.2.8",
"caniuse-lite": "^1.0.30000851", "caniuse-lite": "^1.0.30000856",
"normalize-range": "^0.1.2", "normalize-range": "^0.1.2",
"num2fraction": "^1.2.2", "num2fraction": "^1.2.2",
"postcss": "^6.0.22", "postcss": "^6.0.22",
"postcss-value-parser": "^3.2.3" "postcss-value-parser": "^3.2.3"
},
"dependencies": {
"caniuse-lite": {
"version": "1.0.30000856",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz",
"integrity": "sha512-x3mYcApHMQemyaHuH/RyqtKCGIYTgEA63fdi+VBvDz8xUSmRiVWTLeyKcoGQCGG6UPR9/+4qG4OKrTa6aSQRKg==",
"dev": true
}
} }
}, },
"aws-sign2": { "aws-sign2": {
...@@ -726,9 +734,9 @@ ...@@ -726,9 +734,9 @@
} }
}, },
"babel-eslint": { "babel-eslint": {
"version": "8.2.3", "version": "8.2.5",
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.3.tgz", "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.5.tgz",
"integrity": "sha512-0HeSTtaXg/Em7FCUWxwOT+KeFSO1O7LuRuzhk7g+1BjwdlQGlHq4OyMi3GqGxrNfEq8jEi6Hmt5ylEQUhurgiQ==", "integrity": "sha512-TcdEGCHHquOPQOlH6Fe6MLwPWWWJLdeKhcGoLfOTShETpoH8XYWhjWJw38KCKaTca7c/EdxLolnbakixKxnXDg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "7.0.0-beta.44", "@babel/code-frame": "7.0.0-beta.44",
...@@ -3894,9 +3902,9 @@ ...@@ -3894,9 +3902,9 @@
} }
}, },
"eslint-plugin-html": { "eslint-plugin-html": {
"version": "4.0.3", "version": "4.0.5",
"resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-4.0.3.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-4.0.5.tgz",
"integrity": "sha512-ArFnlfQxwYSz/CP0zvk8Cy3MUhcDpT3o6jgO8eKD/b8ezcLVBrgkYzmMv+7S/ya+Yl9pN+Cz2tsgYp/zElkQzA==", "integrity": "sha512-yULqYldzhYXTwZEaJXM30HhfgJdtTzuVH3LeoANybESHZ5+2ztLD72BsB2wR124/kk/PvQqZofDFSdNIk+kykw==",
"dev": true, "dev": true,
"requires": { "requires": {
"htmlparser2": "^3.8.2" "htmlparser2": "^3.8.2"
......
spring-boot-admin-server-ui/package.json
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
"test:watch": "jest --watch" "test:watch": "jest --watch"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome": "^1.1.8", "@fortawesome/fontawesome-svg-core": "^1.2.0",
"@fortawesome/fontawesome-free-brands": "^5.0.13", "@fortawesome/free-brands-svg-icons": "^5.1.0",
"@fortawesome/fontawesome-free-regular": "^5.0.13", "@fortawesome/free-regular-svg-icons": "^5.1.0",
"@fortawesome/fontawesome-free-solid": "^5.0.13", "@fortawesome/free-solid-svg-icons": "^5.1.0",
"@fortawesome/vue-fontawesome": "0.0.23", "@fortawesome/vue-fontawesome": "^0.1.0",
"ansi_up": "^3.0.0", "ansi_up": "^3.0.0",
"axios": "^0.18.0", "axios": "^0.18.0",
"bulma": "^0.7.1", "bulma": "^0.7.1",
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
"yamljs": "^0.3.0" "yamljs": "^0.3.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/test-utils": "^1.0.0-beta.19", "@vue/test-utils": "^1.0.0-beta.20",
"autoprefixer": "^8.6.2", "autoprefixer": "^8.6.3",
"babel-core": "^6.26.3", "babel-core": "^6.26.3",
"babel-eslint": "^8.2.3", "babel-eslint": "^8.2.5",
"babel-jest": "^23.0.1", "babel-jest": "^23.0.1",
"babel-loader": "^7.1.4", "babel-loader": "^7.1.4",
"babel-plugin-lodash": "^3.3.4", "babel-plugin-lodash": "^3.3.4",
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
"css-mqpacker": "^6.0.2", "css-mqpacker": "^6.0.2",
"eslint": "^4.19.1", "eslint": "^4.19.1",
"eslint-loader": "^1.9.0", "eslint-loader": "^1.9.0",
"eslint-plugin-html": "^4.0.3", "eslint-plugin-html": "^4.0.5",
"eslint-plugin-vue": "^4.5.0", "eslint-plugin-vue": "^4.5.0",
"extract-text-webpack-plugin": "^3.0.2", "extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
......
spring-boot-admin-server-ui/src/main/frontend/utils/fontawesome.js
...@@ -14,36 +14,55 @@ ...@@ -14,36 +14,55 @@
* limitations under the License. * limitations under the License.
*/ */
import fontawesome from '@fortawesome/fontawesome'; import {library} from '@fortawesome/fontawesome-svg-core';
import faGithub from '@fortawesome/fontawesome-free-brands/faGithub'; import {faGithub} from '@fortawesome/free-brands-svg-icons/faGithub';
import faGitter from '@fortawesome/fontawesome-free-brands/faGitter'; import {faGitter} from '@fortawesome/free-brands-svg-icons/faGitter';
import faStackOverflow from '@fortawesome/fontawesome-free-brands/faStackOverflow'; import {faStackOverflow} from '@fortawesome/free-brands-svg-icons/faStackOverflow';
import farTimesCircle from '@fortawesome/fontawesome-free-regular/faTimesCircle'; import {faTimesCircle as farTimesCircle} from '@fortawesome/free-regular-svg-icons/faTimesCircle';
import faBan from '@fortawesome/fontawesome-free-solid/faBan'; import {faBan} from '@fortawesome/free-solid-svg-icons/faBan';
import faBell from '@fortawesome/fontawesome-free-solid/faBell'; import {faBell} from '@fortawesome/free-solid-svg-icons/faBell';
import faBellSlash from '@fortawesome/fontawesome-free-solid/faBellSlash'; import {faBellSlash} from '@fortawesome/free-solid-svg-icons/faBellSlash';
import faBook from '@fortawesome/fontawesome-free-solid/faBook'; import {faBook} from '@fortawesome/free-solid-svg-icons/faBook';
import faCheck from '@fortawesome/fontawesome-free-solid/faCheck'; import {faCheck} from '@fortawesome/free-solid-svg-icons/faCheck';
import faDownload from '@fortawesome/fontawesome-free-solid/faDownload'; import {faDownload} from '@fortawesome/free-solid-svg-icons/faDownload';
import faExclamation from '@fortawesome/fontawesome-free-solid/faExclamation'; import {faExclamation} from '@fortawesome/free-solid-svg-icons/faExclamation';
import faExclamationTriangle from '@fortawesome/fontawesome-free-solid/faExclamationTriangle'; import {faExclamationTriangle} from '@fortawesome/free-solid-svg-icons/faExclamationTriangle';
import faMinusCircle from '@fortawesome/fontawesome-free-solid/faMinusCircle'; import {faMinusCircle} from '@fortawesome/free-solid-svg-icons/faMinusCircle';
import faPencilAlt from '@fortawesome/fontawesome-free-solid/faPencilAlt'; import {faPencilAlt} from '@fortawesome/free-solid-svg-icons/faPencilAlt';
import faQuestionCircle from '@fortawesome/fontawesome-free-solid/faQuestionCircle'; import {faQuestionCircle} from '@fortawesome/free-solid-svg-icons/faQuestionCircle';
import faSignOutAlt from '@fortawesome/fontawesome-free-solid/faSignOutAlt'; import {faSignOutAlt} from '@fortawesome/free-solid-svg-icons/faSignOutAlt';
import faStepBackward from '@fortawesome/fontawesome-free-solid/faStepBackward'; import {faStepBackward} from '@fortawesome/free-solid-svg-icons/faStepBackward';
import faStepForward from '@fortawesome/fontawesome-free-solid/faStepForward'; import {faStepForward} from '@fortawesome/free-solid-svg-icons/faStepForward';
import faTimesCircle from '@fortawesome/fontawesome-free-solid/faTimesCircle'; import {faTimesCircle} from '@fortawesome/free-solid-svg-icons/faTimesCircle';
import faTrash from '@fortawesome/fontawesome-free-solid/faTrash'; import {faTrash} from '@fortawesome/free-solid-svg-icons/faTrash';
import faUserCircle from '@fortawesome/fontawesome-free-solid/faUserCircle'; import {faUserCircle} from '@fortawesome/free-solid-svg-icons/faUserCircle';
import FontAwesomeIcon from '@fortawesome/vue-fontawesome'; import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
library.add(
//solid //solid
fontawesome.library.add(faTrash, faDownload, faStepForward, faStepBackward, faCheck, faQuestionCircle, faBan, faTimesCircle, faMinusCircle, faExclamation, faTrash,
faBook, faSignOutAlt, faExclamationTriangle, faPencilAlt, faBell, faBellSlash, faUserCircle); faDownload,
//regular faStepForward,
fontawesome.library.add(farTimesCircle); faStepBackward,
faCheck,
faQuestionCircle,
faBan,
faTimesCircle,
faMinusCircle,
faExclamation,
faBook,
faSignOutAlt,
faExclamationTriangle,
faPencilAlt,
faBell,
faBellSlash,
faUserCircle,
//regular,
farTimesCircle,
//brands //brands
fontawesome.library.add(faGithub, faStackOverflow, faGitter); faGithub,
faStackOverflow,
faGitter
);
export default FontAwesomeIcon; export default FontAwesomeIcon;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment