diff --git a/pairent_frontend/Comparison.html b/pairent_frontend/Comparison.html index 02a1b23..f5447c9 100644 --- a/pairent_frontend/Comparison.html +++ b/pairent_frontend/Comparison.html @@ -16,7 +16,7 @@
- +
diff --git a/pairent_frontend_react/package-lock.json b/pairent_frontend_react/package-lock.json index 7160562..6683261 100644 --- a/pairent_frontend_react/package-lock.json +++ b/pairent_frontend_react/package-lock.json @@ -14,6 +14,7 @@ "axios": "^1.4.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.11.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" } @@ -3114,6 +3115,14 @@ } } }, + "node_modules/@remix-run/router": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.6.0.tgz", + "integrity": "sha512-N13NRw3T2+6Xi9J//3CGLsK2OqC8NMme3d/YX+nh05K9YHWGcv8DycHJrqGScSP4T75o8IN6nqIMhVFU8ohg8w==", + "engines": { + "node": ">=14" + } + }, "node_modules/@rollup/plugin-babel": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", @@ -14386,6 +14395,36 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.11.0.tgz", + "integrity": "sha512-hTm6KKNpj9SDG4syIWRjCU219O0RZY8RUPobCFt9p+PlF7nnkRgMoh2DieTKvw3F3Mw6zg565HGnSv8BuoY5oQ==", + "dependencies": { + "@remix-run/router": "1.6.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.11.0.tgz", + "integrity": "sha512-Q3mK1c/CYoF++J6ZINz7EZzwlgSOZK/kc7lxIA7PhtWhKju4KfF1WHqlx0kVCIFJAWztuYVpXZeljEbds8z4Og==", + "dependencies": { + "@remix-run/router": "1.6.0", + "react-router": "6.11.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/react-scripts": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", diff --git a/pairent_frontend_react/package.json b/pairent_frontend_react/package.json index b485496..956ab44 100644 --- a/pairent_frontend_react/package.json +++ b/pairent_frontend_react/package.json @@ -9,6 +9,7 @@ "axios": "^1.4.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.11.0", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" }, diff --git a/pairent_frontend_react/public/images/vvsu_logo.png b/pairent_frontend_react/public/images/vvsu_logo.png new file mode 100644 index 0000000..63449dc Binary files /dev/null and b/pairent_frontend_react/public/images/vvsu_logo.png differ diff --git a/pairent_frontend_react/public/index.html b/pairent_frontend_react/public/index.html index 14c607a..f663895 100644 --- a/pairent_frontend_react/public/index.html +++ b/pairent_frontend_react/public/index.html @@ -2,12 +2,12 @@ - React App + Pairent + + + - + -
- -
diff --git a/pairent_frontend_react/src/App.js b/pairent_frontend_react/src/App.js index 73f1b86..69e5711 100644 --- a/pairent_frontend_react/src/App.js +++ b/pairent_frontend_react/src/App.js @@ -1,10 +1,17 @@ import React from 'react'; -import './App.css'; +import Header from './components/Header/Header'; +import Footer from './components/Footer/Footer'; +import './main.css'; function App() { return ( -
-
+ <> +
+
+
+
+