From c7d15b1943d14517380b0c978596552416b058ac Mon Sep 17 00:00:00 2001 From: xepaerz Date: Tue, 2 May 2023 23:03:18 +1000 Subject: [PATCH] add header and footer react --- pairent_frontend/Comparison.html | 2 +- pairent_frontend_react/package-lock.json | 39 +++++++++ pairent_frontend_react/package.json | 1 + .../public/images/vvsu_logo.png | Bin 0 -> 3337 bytes pairent_frontend_react/public/index.html | 10 +-- pairent_frontend_react/src/App.js | 13 ++- .../src/components/Footer/Footer.jsx | 31 +++++++ .../src/components/Footer/styles/Footer.css | 12 +++ .../src/components/Header/Header.jsx | 59 ++++++++++++++ .../src/components/Header/styles/Header.css | 77 ++++++++++++++++++ pairent_frontend_react/src/index.js | 2 +- pairent_frontend_react/src/main.css | 26 ++++++ 12 files changed, 262 insertions(+), 10 deletions(-) create mode 100644 pairent_frontend_react/public/images/vvsu_logo.png create mode 100644 pairent_frontend_react/src/components/Footer/Footer.jsx create mode 100644 pairent_frontend_react/src/components/Footer/styles/Footer.css create mode 100644 pairent_frontend_react/src/components/Header/Header.jsx create mode 100644 pairent_frontend_react/src/components/Header/styles/Header.css create mode 100644 pairent_frontend_react/src/main.css 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 0000000000000000000000000000000000000000..63449dcb80c790390c595264fb90c98a432daa9d GIT binary patch literal 3337 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 Tqw6B=00000NkvXXu0mjf>MT=} literal 0 HcmV?d00001 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 ( -
-
+ <> +
+
+
+
+