From 1e2c7387ae9076936fcc35f4232b1ee62c723adb Mon Sep 17 00:00:00 2001 From: Stanislaw Adaszewski Date: Thu, 30 Jan 2020 16:33:01 +0100 Subject: [PATCH] Started working on navbar. --- frontend/package.json | 2 ++ frontend/rollup.config.js | 17 +++++++++ frontend/src/html/index.html | 2 ++ frontend/src/js/component/wb-app.js | 4 ++- frontend/src/js/component/wb-navbar.js | 49 ++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 frontend/src/js/component/wb-navbar.js diff --git a/frontend/package.json b/frontend/package.json index 1d4a9c9..30b05ca 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,8 @@ { "dependencies": { + "@fortawesome/fontawesome-free": "^5.12.0", "bootstrap": "^4.4.1", + "font-awesome": "^4.7.0", "jquery": "^3.4.1", "linkstate": "^1.1.1", "popper.js": "^1.16.1", diff --git a/frontend/rollup.config.js b/frontend/rollup.config.js index 9fafe04..2a9330a 100755 --- a/frontend/rollup.config.js +++ b/frontend/rollup.config.js @@ -24,6 +24,23 @@ export default { 'node_modules/bootstrap/dist/css/bootstrap.min.css': 'dist/css/bootstrap.min.css', 'node_modules/bootstrap/dist/js/bootstrap.min.js': 'dist/js/bootstrap.min.js', 'node_modules/jquery/dist/jquery.min.js': 'dist/js/jquery.min.js', + 'node_modules/@fortawesome/fontawesome-free/js/fontawesome.min.js': 'dist/js/fontawesome.min.js', + 'node_modules/@fortawesome/fontawesome-free/css/all.min.css': 'dist/css/all.min.css', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.eot': 'dist/webfonts/fa-regular-400.eot', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.svg': 'dist/webfonts/fa-regular-400.svg', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf': 'dist/webfonts/fa-regular-400.ttf', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff': 'dist/webfonts/fa-regular-400.woff', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2': 'dist/webfonts/fa-regular-400.woff2', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.eot': 'dist/webfonts/fa-solid-900.eot', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.svg': 'dist/webfonts/fa-solid-900.svg', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf': 'dist/webfonts/fa-solid-900.ttf', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff': 'dist/webfonts/fa-solid-900.woff', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2': 'dist/webfonts/fa-solid-900.woff2', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.eot': 'dist/webfonts/fa-brands-400.eot', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.svg': 'dist/webfonts/fa-brands-400.svg', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf': 'dist/webfonts/fa-brands-400.ttf', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff': 'dist/webfonts/fa-brands-400.woff', + 'node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2': 'dist/webfonts/fa-brands-400.woff2', verbose: true }), buble({jsx: 'h'}), diff --git a/frontend/src/html/index.html b/frontend/src/html/index.html index 711a065..8f02e32 100755 --- a/frontend/src/html/index.html +++ b/frontend/src/html/index.html @@ -2,8 +2,10 @@ + + diff --git a/frontend/src/js/component/wb-app.js b/frontend/src/js/component/wb-app.js index c86691b..a449c5e 100644 --- a/frontend/src/js/component/wb-app.js +++ b/frontend/src/js/component/wb-app.js @@ -3,12 +3,14 @@ import WBTabs from 'wb-tabs'; import WBTable from 'wb-table'; import WBPagination from 'wb-pagination'; import WBProjectListing from 'wb-project-listing'; +import WBNavbar from 'wb-navbar'; class WBApp extends Component { render({}, { activePage }) { return (
-

WBApp

+

WBApp

+ diff --git a/frontend/src/js/component/wb-navbar.js b/frontend/src/js/component/wb-navbar.js new file mode 100644 index 0000000..a11d733 --- /dev/null +++ b/frontend/src/js/component/wb-navbar.js @@ -0,0 +1,49 @@ +import { h, Component } from 'preact'; + +class WBNavbar extends Component { + render() { + return ( + + ); + } +} + +export default WBNavbar;