From 039005482e5ef91cc1bfbea7757fea1c036bbc0f Mon Sep 17 00:00:00 2001 From: Yousef-Taha1 <166398882+Yousef-Taha1@users.noreply.github.com> Date: Mon, 10 Jun 2024 17:00:50 +0200 Subject: [PATCH] Frontend navbar finished maybe? (#111) --- frontend/package-lock.json | 42 ++++++++ frontend/package.json | 1 + frontend/src/App.tsx | 26 +---- frontend/src/Components/Friends.tsx | 10 ++ frontend/src/Components/Inventory.tsx | 10 ++ frontend/src/Components/Navbar/Navbar.tsx | 106 ++++++++++--------- frontend/src/Components/PetPage.tsx | 10 ++ node/code/modules/display_handler/forg (1).c | 0 8 files changed, 134 insertions(+), 71 deletions(-) create mode 100644 frontend/src/Components/Friends.tsx create mode 100644 frontend/src/Components/Inventory.tsx create mode 100644 frontend/src/Components/PetPage.tsx create mode 100644 node/code/modules/display_handler/forg (1).c diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 37043ea0..3db573d5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,6 +14,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-oidc-context": "^3.1.0", + "react-router-dom": "^6.23.1", "reactjs-popup": "^2.0.6" }, "devDependencies": { @@ -690,6 +691,15 @@ "url": "https://opencollective.com/popperjs" } }, + "node_modules/@remix-run/router": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz", + "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.17.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.17.2.tgz", @@ -3037,6 +3047,38 @@ "react": ">=16.8.0" } }, + "node_modules/react-router": { + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz", + "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.16.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz", + "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.16.1", + "react-router": "6.23.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/reactjs-popup": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/reactjs-popup/-/reactjs-popup-2.0.6.tgz", diff --git a/frontend/package.json b/frontend/package.json index 077b8d9b..e1580ba2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,6 +16,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-oidc-context": "^3.1.0", + "react-router-dom": "^6.23.1", "reactjs-popup": "^2.0.6" }, "devDependencies": { diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index d855b45e..13b9bdbd 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -29,9 +29,11 @@ function App() { if (auth.isAuthenticated) { return ( +
- Hello -
-Welcome to the Friends Page!
+Welcome to the Inventory Page!
+