diff --git a/package.json b/package.json index 2b74db0..f911a2e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "axios": "^1.4.0", - "@popperjs/core": "^2.11.8", "bootstrap": "^5.3.1", "js-base64": "^3.7.5", "react": "^18.2.0", @@ -45,11 +44,8 @@ ] }, "devDependencies": { - "http-proxy-middleware": "^2.0.6", - "webpack": "^5.88.1", - "webpack-cli": "^5.1.4", - "webpack-dev-server": "^4.15.1", "autoprefixer": "^10.4.14", + "http-proxy-middleware": "^2.0.6", "nodemon": "^3.0.1", "npm-run-all": "^4.1.5", "postcss": "^8.4.27", @@ -57,6 +53,9 @@ "sass": "^1.64.1", "sirv-cli": "^2.0.2", "stylelint": "^15.10.2", - "stylelint-config-twbs-bootstrap": "^11.0.1" + "stylelint-config-twbs-bootstrap": "^11.0.1", + "webpack": "^5.88.1", + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.1" } } diff --git a/public/index.html b/public/index.html index b8b8453..f4ffae2 100644 --- a/public/index.html +++ b/public/index.html @@ -7,8 +7,11 @@ + + + + Bagman diff --git a/src/App.js b/src/App.js index 2812737..87fcc41 100644 --- a/src/App.js +++ b/src/App.js @@ -5,7 +5,8 @@ import { useState } from 'react'; import { Base64 } from 'js-base64'; import axios from 'axios'; -import {LinkToUnicorns, UnicornsScreen} from './Unicorns' +import {UnicornsScreen} from './Unicorns' +import {Navbar} from "./navbar" // TODO - kde by tohle mělo bydlet? @@ -194,11 +195,6 @@ function SaveNoteScreen({ setAlert }) { - - < LinkToUnicorns /> - - - ); } @@ -319,7 +315,6 @@ function DisplayNoteScreen( setAlert ) { { deleted === false && } { deleted === true && } - Create new secret @@ -328,8 +323,6 @@ function DisplayNoteScreen( setAlert ) { - - < LinkToUnicorns /> ); } @@ -358,6 +351,7 @@ function App() { } +
diff --git a/src/Unicorns.js b/src/Unicorns.js index acce2c0..65ce83f 100644 --- a/src/Unicorns.js +++ b/src/Unicorns.js @@ -86,30 +86,8 @@ function UnicornsScreen() { - -
-
- -
-
) } - -function LinkToUnicorns() { - return ( -
-
- Is it safe? Tell me how it works! -
-
- ) -} - -export { UnicornsScreen }; -export { LinkToUnicorns }; \ No newline at end of file +export { UnicornsScreen }; \ No newline at end of file diff --git a/src/navbar.js b/src/navbar.js new file mode 100644 index 0000000..f1f4e9f --- /dev/null +++ b/src/navbar.js @@ -0,0 +1,38 @@ +import '@popperjs/core'; + + +function Navbar() { + return ( + <> +
+ +
+ + + ) +} + +export { Navbar }; diff --git a/src/scss/custom.scss b/src/scss/custom.scss index 9d51d86..638cf9b 100644 --- a/src/scss/custom.scss +++ b/src/scss/custom.scss @@ -50,6 +50,7 @@ $btn-active-border-tint-amount: 50%; @import "../../node_modules/bootstrap/scss/card"; @import "../../node_modules/bootstrap/scss/carousel"; @import "../../node_modules/bootstrap/scss/nav"; +@import "../../node_modules/bootstrap/scss/navbar"; @import "../../node_modules/bootstrap/scss/alert"; @import "../../node_modules/bootstrap/scss/close"; @import "../../node_modules/bootstrap/scss/transitions"; @@ -77,7 +78,7 @@ body { // } .mt-a-lot { - margin-top: ($spacer * 15); + margin-top: ($spacer * 10); } .alerts {