From 72c40734dda351619c9a8d0b9a13a7ab8b0d1404 Mon Sep 17 00:00:00 2001 From: UkuJoeMP Date: Thu, 26 Jun 2025 13:10:03 -0500 Subject: [PATCH 1/4] Good --- package-lock.json | 14 +++++++------- package.json | 2 +- src/front/utils/navLinks.jsx | 0 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 src/front/utils/navLinks.jsx diff --git a/package-lock.json b/package-lock.json index 59f2197cd8..3787f2b1e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.3", - "vite": "^4.4.8" + "vite": "^4.5.14" }, "engines": { "node": ">=20.0.0" @@ -4335,9 +4335,9 @@ } }, "node_modules/vite": { - "version": "4.5.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.9.tgz", - "integrity": "sha512-qK9W4xjgD3gXbC0NmdNFFnVFLMWSNiR3swj957yutwzzN16xF/E7nmtAyp1rT9hviDroQANjE4HK3H4WqWdFtw==", + "version": "4.5.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.14.tgz", + "integrity": "sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==", "dev": true, "license": "MIT", "dependencies": { @@ -7323,9 +7323,9 @@ } }, "vite": { - "version": "4.5.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.9.tgz", - "integrity": "sha512-qK9W4xjgD3gXbC0NmdNFFnVFLMWSNiR3swj957yutwzzN16xF/E7nmtAyp1rT9hviDroQANjE4HK3H4WqWdFtw==", + "version": "4.5.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.14.tgz", + "integrity": "sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==", "dev": true, "requires": { "esbuild": "^0.18.10", diff --git a/package.json b/package.json index e868941c68..8ad13fd6e8 100755 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eslint-plugin-react": "^7.33.1", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.3", - "vite": "^4.4.8" + "vite": "^4.5.14" }, "babel": { "presets": [ diff --git a/src/front/utils/navLinks.jsx b/src/front/utils/navLinks.jsx new file mode 100644 index 0000000000..e69de29bb2 From a0e204f9b2aa198a961847c889c1d2887db2537f Mon Sep 17 00:00:00 2001 From: "Jose M. Pinto" Date: Thu, 26 Jun 2025 22:03:43 +0000 Subject: [PATCH 2/4] navbar-part-1 --- package-lock.json | 43 ++++++++++++++++++++++++++ package.json | 1 + src/front/assets/img/LogoNavbar.svg | 15 +++++++++ src/front/components/Navbar.jsx | 48 +++++++++++++++++++++++------ src/front/main.jsx | 1 + src/front/utils/navLinks.js | 6 ++++ 6 files changed, 105 insertions(+), 9 deletions(-) create mode 100644 src/front/assets/img/LogoNavbar.svg create mode 100644 src/front/utils/navLinks.js diff --git a/package-lock.json b/package-lock.json index 59f2197cd8..ae3dee50a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@fortawesome/free-brands-svg-icons": "^6.7.2", "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/react-fontawesome": "^0.2.2", + "bootstrap": "^5.3.7", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -1005,6 +1006,17 @@ "node": ">= 8" } }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@remix-run/router": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.22.0.tgz", @@ -1326,6 +1338,25 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "node_modules/bootstrap": { + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz", + "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT", + "peerDependencies": { + "@popperjs/core": "^2.11.8" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -5097,6 +5128,12 @@ "fastq": "^1.6.0" } }, + "@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "peer": true + }, "@remix-run/router": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.22.0.tgz", @@ -5329,6 +5366,12 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "bootstrap": { + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz", + "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==", + "requires": {} + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index e868941c68..08f6331763 100755 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "@fortawesome/free-brands-svg-icons": "^6.7.2", "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/react-fontawesome": "^0.2.2", + "bootstrap": "^5.3.7", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/front/assets/img/LogoNavbar.svg b/src/front/assets/img/LogoNavbar.svg new file mode 100644 index 0000000000..7e278118e1 --- /dev/null +++ b/src/front/assets/img/LogoNavbar.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/front/components/Navbar.jsx b/src/front/components/Navbar.jsx index 30d43a2636..3b382b4eb1 100644 --- a/src/front/components/Navbar.jsx +++ b/src/front/components/Navbar.jsx @@ -1,18 +1,48 @@ import { Link } from "react-router-dom"; +import { navLinks } from "../utils/navLinks"; +import LogoNavbar from "../assets/img/LogoNavbar.svg"; +import 'bootstrap/dist/css/bootstrap.min.css'; +import 'bootstrap/dist/js/bootstrap.bundle.min.js'; + export const Navbar = () => { return ( -