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 (
-
-
+ <>
+
+
+
+
+
+ >
);
}
diff --git a/pairent_frontend_react/src/components/Footer/Footer.jsx b/pairent_frontend_react/src/components/Footer/Footer.jsx
new file mode 100644
index 0000000..b3f47a8
--- /dev/null
+++ b/pairent_frontend_react/src/components/Footer/Footer.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import './styles/Footer.css';
+
+const Footer = function () {
+ return (
+
+ );
+}
+
+export default Footer;
\ No newline at end of file
diff --git a/pairent_frontend_react/src/components/Footer/styles/Footer.css b/pairent_frontend_react/src/components/Footer/styles/Footer.css
new file mode 100644
index 0000000..24f1a9a
--- /dev/null
+++ b/pairent_frontend_react/src/components/Footer/styles/Footer.css
@@ -0,0 +1,12 @@
+/*Домики на футере*/
+.footerHouses{
+ margin: 5% 0 0 5%;
+}
+
+/*Футер*/
+.footerBlock{
+ width: 100%;
+ height: 250px;
+ margin-top: -0.5%;
+ background-color: #D9D9D9;
+}
diff --git a/pairent_frontend_react/src/components/Header/Header.jsx b/pairent_frontend_react/src/components/Header/Header.jsx
new file mode 100644
index 0000000..6df5fa3
--- /dev/null
+++ b/pairent_frontend_react/src/components/Header/Header.jsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import './styles/Header.css';
+
+const Header = function () {
+ return (
+
+ );
+}
+
+export default Header;
\ No newline at end of file
diff --git a/pairent_frontend_react/src/components/Header/styles/Header.css b/pairent_frontend_react/src/components/Header/styles/Header.css
new file mode 100644
index 0000000..9808f1a
--- /dev/null
+++ b/pairent_frontend_react/src/components/Header/styles/Header.css
@@ -0,0 +1,77 @@
+header{
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ margin: 18px 0px 11px 0px;
+}
+
+.logoSection{
+ display: flex;
+ align-items: center;
+}
+
+/*Логотип*/
+.logoSection img{
+ width: 100px;
+ height: 32px;
+}
+
+.verticalLine{
+ width: 3px;
+ height: 37px;
+ margin: 0px 17px 0px 17px;
+ background-color: #A9A9A9;
+}
+
+/*Название сервиса*/
+.logoSection h1{
+ font-weight: 700;
+ font-size: 32px;
+ color: #222;
+}
+
+/*Кнопка локации*/
+.btnLocation{
+ width: 150px;
+ height: 28px;
+ margin-left: 37px;
+ border-radius: 40px;
+ background-color: #CCC;
+ font-size: 15px;
+}
+
+/*Навигация*/
+nav {
+ display: flex;
+ align-items: center;
+}
+
+nav div{
+ margin-right: 55px;
+}
+
+nav a, svg{
+ transition: 0.3s;
+ fill: #222;
+}
+
+nav svg:hover{
+ fill: #0050A1;
+}
+
+nav a:hover{
+ color: #0050A1;
+}
+
+/*Горизонтальная линия под шапкой*/
+.horizontalLine{
+ width: 100%;
+ height: 1px;
+ background-color: #CCC;
+}
+
+/*Личный кабинет*/
+.userIcon{
+ border-radius: 20px;
+ background-color: #fff;
+}
diff --git a/pairent_frontend_react/src/index.js b/pairent_frontend_react/src/index.js
index 217069b..53db434 100644
--- a/pairent_frontend_react/src/index.js
+++ b/pairent_frontend_react/src/index.js
@@ -3,4 +3,4 @@ import ReactDOM from 'react-dom/client';
import App from './App';
const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render();
+root.render();
diff --git a/pairent_frontend_react/src/main.css b/pairent_frontend_react/src/main.css
new file mode 100644
index 0000000..9f3fd83
--- /dev/null
+++ b/pairent_frontend_react/src/main.css
@@ -0,0 +1,26 @@
+*{
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ font-family: 'Inter', sans-serif;
+ color: #000;
+}
+
+button{
+ cursor: pointer;
+ border: 0;
+}
+
+a{
+ text-decoration: none;
+}
+
+main{
+ margin: 0 5% 0 5%;
+}
+
+.horizontalLine{
+ width: 100%;
+ height: 1px;
+ background-color: #CCC;
+}