Compare commits
No commits in common. "4f35b1df09e52f76e2bf963a19856045a7cfe7cc" and "58cfa5874eebfd258403177af1cf945dd42b02d3" have entirely different histories.
4f35b1df09
...
58cfa5874e
4
react-app/src/components/app/app.js
vendored
4
react-app/src/components/app/app.js
vendored
@ -12,11 +12,7 @@ class App extends Component {
|
|||||||
return (
|
return (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<Header />
|
<Header />
|
||||||
<div class="fixed"></div>
|
|
||||||
<Main />
|
<Main />
|
||||||
<footer>
|
|
||||||
<span>Copyrited By PayDay</span>
|
|
||||||
</footer>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -332,64 +332,4 @@ header {
|
|||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
background-color: #aeaeae;
|
background-color: #aeaeae;
|
||||||
}
|
|
||||||
.navigation .container_flex {
|
|
||||||
display: -webkit-box;
|
|
||||||
display: -ms-flexbox;
|
|
||||||
display: flex;
|
|
||||||
-webkit-box-pack: center;
|
|
||||||
-ms-flex-pack: center;
|
|
||||||
justify-content: center;
|
|
||||||
-webkit-box-align: center;
|
|
||||||
-ms-flex-align: center;
|
|
||||||
align-items: center;
|
|
||||||
} /*# sourceMappingURL=style.css.map */
|
|
||||||
.navigation_choise {
|
|
||||||
position: fixed;
|
|
||||||
background: -webkit-gradient(
|
|
||||||
linear,
|
|
||||||
left bottom,
|
|
||||||
left top,
|
|
||||||
from(#ececec),
|
|
||||||
to(#ececec)
|
|
||||||
),
|
|
||||||
#e8e8e8;
|
|
||||||
background: linear-gradient(0deg, #ececec 0%, #ececec 100%), #e8e8e8;
|
|
||||||
display: -webkit-box;
|
|
||||||
display: -ms-flexbox;
|
|
||||||
display: flex;
|
|
||||||
-webkit-box-pack: center;
|
|
||||||
-ms-flex-pack: center;
|
|
||||||
justify-content: center;
|
|
||||||
-webkit-box-align: center;
|
|
||||||
-ms-flex-align: center;
|
|
||||||
align-items: center;
|
|
||||||
height: 50px;
|
|
||||||
width: 100%;
|
|
||||||
bottom: 50px;
|
|
||||||
}
|
|
||||||
footer {
|
|
||||||
width: 100%;
|
|
||||||
bottom: 0px;
|
|
||||||
position: fixed;
|
|
||||||
background-color: #fff;
|
|
||||||
height: 50px;
|
|
||||||
display: -webkit-box;
|
|
||||||
display: -ms-flexbox;
|
|
||||||
display: flex;
|
|
||||||
-webkit-box-pack: center;
|
|
||||||
-ms-flex-pack: center;
|
|
||||||
justify-content: center;
|
|
||||||
-webkit-box-align: center;
|
|
||||||
-ms-flex-align: center;
|
|
||||||
align-items: center;
|
|
||||||
-ms-flex-line-pack: center;
|
|
||||||
align-content: center;
|
|
||||||
}
|
|
||||||
footer span {
|
|
||||||
width: 200px;
|
|
||||||
color: #20d37d;
|
|
||||||
font-size: 20px;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 500;
|
|
||||||
} /*# sourceMappingURL=style.css.map */
|
} /*# sourceMappingURL=style.css.map */
|
||||||
|
6
react-app/src/components/main/main.js
vendored
6
react-app/src/components/main/main.js
vendored
@ -2,7 +2,6 @@ import { Component } from "react";
|
|||||||
|
|
||||||
import UniverseList from "../universe/universe-list";
|
import UniverseList from "../universe/universe-list";
|
||||||
import NavigationList from "../navigation/navigation-list";
|
import NavigationList from "../navigation/navigation-list";
|
||||||
import CreditsList from "../navigation-credits/navigation-credits";
|
|
||||||
|
|
||||||
//генерятся из get запроса (будет ссылка в universeData вместо #)
|
//генерятся из get запроса (будет ссылка в universeData вместо #)
|
||||||
import KubGu from "./img/kubgu.jpg";
|
import KubGu from "./img/kubgu.jpg";
|
||||||
@ -69,13 +68,12 @@ class Main extends Component {
|
|||||||
//Из UniverseList приходит текущий выбранный вуз, он отправляется в NavigationList
|
//Из UniverseList приходит текущий выбранный вуз, он отправляется в NavigationList
|
||||||
<>
|
<>
|
||||||
{/* тут проиходит переключение слайдеров (мб стоит сделать как список) */}
|
{/* тут проиходит переключение слайдеров (мб стоит сделать как список) */}
|
||||||
{/* <UniverseList
|
<UniverseList
|
||||||
data={universeData}
|
data={universeData}
|
||||||
picturesList={picturesList}
|
picturesList={picturesList}
|
||||||
onUniverseProps={this.onClickToUniverse}
|
onUniverseProps={this.onClickToUniverse}
|
||||||
/> */}
|
/>
|
||||||
{/* <NavigationList /> */}
|
{/* <NavigationList /> */}
|
||||||
<CreditsList />
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB |
@ -1,29 +0,0 @@
|
|||||||
import { Component } from "react";
|
|
||||||
import AlphaPng from "./img/alpha.png";
|
|
||||||
|
|
||||||
class CreditItem extends Component {
|
|
||||||
state = {};
|
|
||||||
|
|
||||||
render() {
|
|
||||||
const { name, credit, pic, onUniverseProps } = this.props;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div class="col-12 navigation_card navigation_bank_text">
|
|
||||||
<div class="navigation_bank">
|
|
||||||
<img
|
|
||||||
src={AlphaPng}
|
|
||||||
alt="navigation"
|
|
||||||
class="navigation_icon"
|
|
||||||
/>
|
|
||||||
Альфа Банк <span>на 15 лет</span>
|
|
||||||
</div>
|
|
||||||
<div class="navigation_credit">
|
|
||||||
<span class="navigation_credit_cost">10000 рублей/мес</span>
|
|
||||||
<span class="navigation_credit_prosent">6% в год</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default CreditItem;
|
|
@ -1,44 +0,0 @@
|
|||||||
import { Component } from "react";
|
|
||||||
|
|
||||||
import CreditItem from "../nav-credit-item/nav-credit-item";
|
|
||||||
|
|
||||||
class CreditsList extends Component {
|
|
||||||
state = {};
|
|
||||||
|
|
||||||
render() {
|
|
||||||
// const credits = data.map((item, index) => {
|
|
||||||
// return <CreditItem key={index} />;
|
|
||||||
// });
|
|
||||||
|
|
||||||
return (
|
|
||||||
<section class="navigation">
|
|
||||||
<div class="container container_flex">
|
|
||||||
<div class="navigation_fixed"></div>
|
|
||||||
<div class="navigation_banks" id="navigation">
|
|
||||||
<div class="navigation_banks_univer ">СпбГУ</div>
|
|
||||||
<div class="navigation_banks_speciality ">
|
|
||||||
09.03.04 - Программная инженерия
|
|
||||||
</div>
|
|
||||||
<div class="navigation_banks_sort navigation_banks_sort_hamburger">
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
<span></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<CreditItem />
|
|
||||||
<div class="row row-cols-lg-10 g-5 g-lg-3"></div>
|
|
||||||
</div>
|
|
||||||
<div class="navigation_choise">
|
|
||||||
<div class="navigation_slid">
|
|
||||||
<span class="navigation_slid_disable"></span>
|
|
||||||
<span class="navigation_slid_active"></span>
|
|
||||||
<span class="navigation_slid_disable"></span>
|
|
||||||
<span class="navigation_slid_disable"></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default CreditsList;
|
|
@ -39,7 +39,6 @@ class NavigationList extends Component {
|
|||||||
<NavigationItem />
|
<NavigationItem />
|
||||||
<NavigationItem />
|
<NavigationItem />
|
||||||
<NavigationItem />
|
<NavigationItem />
|
||||||
{/* {navigations} */}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="navigation_slid">
|
<div className="navigation_slid">
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user