PAYDAY/PaydayFrontend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PAYDAY:11eb1c02a48cb2ceb5835c3ba21e64b12f351a1c
Branches Tags
PAYDAY:main
PAYDAY:front
..
compare: PAYDAY:9ff5fafd63b625b8115d9c64845e5c762cde7f00
Branches Tags
PAYDAY:main
PAYDAY:front

No commits in common. "11eb1c02a48cb2ceb5835c3ba21e64b12f351a1c" and "9ff5fafd63b625b8115d9c64845e5c762cde7f00" have entirely different histories.
11eb1c02a4 ... 9ff5fafd63

14 changed files with 5 additions and 445 deletions
Show Stats Expand all files Collapse all files

2
react-app/public/index.html
View File

@ -9,7 +9,7 @@
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>PayDay</title>
<title>React App</title>
</head>
<body>

0
react-app/src/components/app/css/app.css → react-app/src/components/app/app.css
View File

6
react-app/src/components/app/app.js vendored
View File

@ -1,9 +1,6 @@
import { Component } from "react";
import Header from "../header/header";
import Main from "../main/main";
import "./css/app.css";
import "./css/bootstrap-grid.min.css";
import "./css/bootstrap.min.css";
import "./app.css";
class App extends Component {
state = {};
@ -12,7 +9,6 @@ class App extends Component {
return (
<div className="app">
<Header />
<Main />
</div>
);
}

0
react-app/src/components/app/css/bootstrap-grid.min.css → react-app/src/components/header/css/bootstrap-grid.min.css vendored
View File

0
react-app/src/components/app/css/bootstrap.min.css → react-app/src/components/header/css/bootstrap.min.css vendored
View File

2
react-app/src/components/header/header.js vendored
View File

@ -1,6 +1,8 @@
import { Component } from "react";
import "./css/header.css";
import "./css/bootstrap-grid.min.css";
import "./css/bootstrap.min.css";
import logo from "./img/logo/logoPayDay.png";

46
react-app/src/components/main/css/main.css
View File

@ -1,46 +0,0 @@
.universe {
position: relative;
min-height: 640px;
padding: 22px 0 30px 0;
background: -webkit-gradient(
linear,
left bottom,
left top,
from(#ececec),
to(#ececec)
),
#e8e8e8;
background: linear-gradient(0deg, #ececec 0%, #ececec 100%), #e8e8e8;
}
.universe_input_block {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
position: relative;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
height: 50px;
margin-bottom: 25px;
}
.universe_input {
padding-left: 20px;
height: 100%;
border-radius: 40px;
display: block;
width: 100%;
border: 0px;
}
.universe_input:focus {
outline: none;
border: 1px solid gray;
}
.universe_search {
height: 35px;
width: 35px;
position: absolute;
right: 30px;
} /*# sourceMappingURL=style.css.map */

10
react-app/src/components/main/img/search.svg
View File

@ -1,10 +0,0 @@
<svg width="35" height="36" viewBox="0 0 35 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1_33)">
<path d="M34.8925 34.7695C34.8925 35.0977 34.7967 35.3848 34.6052 35.6309C34.4137 35.877 34.149 36 33.8111 36C33.5183 36 33.2648 35.8887 33.0508 35.666L19.7874 21.8848C18.7061 22.8105 17.5233 23.5195 16.2392 24.0117C14.9551 24.5039 13.6035 24.75 12.1842 24.75C11.0916 24.75 10.0384 24.6035 9.02462 24.3105C8.01086 24.0176 7.06468 23.6016 6.18609 23.0625C5.30749 22.5234 4.50775 21.8789 3.78685 21.1289C3.06595 20.3789 2.4408 19.541 1.91139 18.6152C1.38198 17.6895 0.982106 16.7051 0.711769 15.6621C0.441432 14.6191 0.300632 13.5234 0.289368 12.375C0.289368 11.2383 0.430168 10.1426 0.711769 9.08789C0.99337 8.0332 1.39324 7.04883 1.91139 6.13477C2.42953 5.2207 3.04906 4.38867 3.76995 3.63867C4.49085 2.88867 5.29623 2.23828 6.18609 1.6875C7.07595 1.13672 8.02213 0.720703 9.02462 0.439453C10.0271 0.158203 11.0803 0.0117188 12.1842 0C13.2768 0 14.33 0.146484 15.3437 0.439453C16.3575 0.732422 17.3037 1.14844 18.1823 1.6875C19.0609 2.22656 19.8606 2.87109 20.5815 3.62109C21.3024 4.37109 21.9276 5.20898 22.457 6.13477C22.9864 7.06055 23.3863 8.04492 23.6566 9.08789C23.9269 10.1309 24.0677 11.2266 24.079 12.375C24.079 13.8398 23.8425 15.2402 23.3694 16.5762C22.8963 17.9121 22.2148 19.1484 21.3249 20.2852L22.288 21.2871C22.7611 21.7793 23.3356 22.3652 24.0114 23.0449C24.6873 23.7246 25.4194 24.4688 26.2079 25.2773C26.9964 26.0859 27.7961 26.9121 28.6071 27.7559C29.4182 28.5996 30.201 29.4199 30.9557 30.2168C31.7104 31.0137 32.3806 31.7344 32.9663 32.3789C33.5521 33.0234 34.0195 33.5566 34.3687 33.9785C34.7179 34.4004 34.8925 34.6641 34.8925 34.7695ZM12.1842 22.5C13.5246 22.5 14.7862 22.2363 15.9689 21.709C17.1516 21.1816 18.1823 20.4551 19.0609 19.5293C19.9395 18.6035 20.6322 17.5312 21.1391 16.3125C21.646 15.0938 21.905 13.7812 21.9163 12.375C21.9163 10.9805 21.6629 9.66797 21.156 8.4375C20.6491 7.20703 19.9507 6.13477 19.0609 5.2207C18.171 4.30664 17.1404 3.58594 15.9689 3.05859C14.7974 2.53125 13.5359 2.26172 12.1842 2.25C10.8438 2.25 9.58219 2.51367 8.39947 3.04102C7.21675 3.56836 6.18609 4.29492 5.30749 5.2207C4.4289 6.14648 3.73616 7.21875 3.22928 8.4375C2.7224 9.65625 2.46333 10.9688 2.45206 12.375C2.45206 13.7695 2.7055 15.082 3.21238 16.3125C3.71927 17.543 4.41763 18.6152 5.30749 19.5293C6.19735 20.4434 7.22801 21.1641 8.39947 21.6914C9.57093 22.2188 10.8325 22.4883 12.1842 22.5Z" fill="#03D764"/>
</g>
<defs>
<clipPath id="clip0_1_33">
<rect width="34.6031" height="36" fill="white" transform="translate(0.289368)"/>
</clipPath>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

44
react-app/src/components/main/main.js vendored
View File

@ -1,44 +0,0 @@
import { Component } from "react";
import Slider from "../slider/slider";
import Universe from "../universe/universe";
import "./css/main.css";
import searchLogo from "./img/search.svg";
class Main extends Component {
state = {
universeData: [],
};
render() {
return (
<section className="universe">
<div className="container container_flex">
<div className="row">
<div className="universe_input_block col-md-12">
<input
type="text"
className="universe_input"
placeholder="Введите название вуза или суза..."
/>
<img
src={searchLogo}
alt="search"
className="universe_search"
/>
</div>
<section className="universe-section">
{/* Генерация университетов из списка на основе пропсов*/}
<Universe />
</section>
</div>
</div>
{/* Переключение активного слайдера в зависимости от секции */}
<Slider />
</section>
);
}
}
export default Main;

24
react-app/src/components/slider/css/slider.css
View File

@ -1,24 +0,0 @@
.universe_slid {
height: 18px;
width: 112px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
position: absolute;
bottom: 30px;
left: 50%;
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
}
.universe_slid_active {
width: 20px;
margin-right: 8px;
border-radius: 50%;
background-color: #fff;
}
.universe_slid_disable {
width: 20px;
margin-right: 8px;
border-radius: 50%;
background-color: #aeaeae;
}

20
react-app/src/components/slider/slider.js vendored
View File

@ -1,20 +0,0 @@
import { Component } from "react";
import "./css/slider.css";
class Slider extends Component {
state = {};
render() {
return (
<div className="universe_slid">
<span className="universe_slid_active"></span>
<span className="universe_slid_disable"></span>
<span className="universe_slid_disable"></span>
<span className="universe_slid_disable"></span>
</div>
);
}
}
export default Slider;

40
react-app/src/components/universe/css/universe.css
View File

@ -1,40 +0,0 @@
.universe_card {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
-ms-flex-line-pack: center;
align-content: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin-left: 30px;
height: 205px;
width: 205px;
background-color: #fff;
border-radius: 44px;
}
.universe_card_text {
color: #2a2a2a;
font-size: 24px;
font-style: normal;
font-weight: 500;
}
.universe_card_text span {
color: #50d400;
font-family: Inter;
font-size: 16px;
font-style: normal;
font-weight: 500;
line-height: normal;
}
.universe_icon {
height: 130px;
width: 130px;
}

20
react-app/src/components/universe/universe.js vendored
View File

@ -1,20 +0,0 @@
import { Component } from "react";
import "./css/universe.css";
// import logo from "./img/logo/logoPayDay.png";
class Universe extends Component {
state = {};
render() {
return (
<div className="col-2 universe_card universe_card_text">
<img src={"none"} alt="universe" className="universe_icon" />
ЮФУ <span>от 135т руб</span>
</div>
);
}
}
export default Universe;

236
src/css/style.css
View File

File diff suppressed because one or more lines are too long