Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Seterator/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,10 @@ public IActionResult Privacy()
{
return View();
}

public IActionResult About()
{
return View();
}
}
}
7 changes: 7 additions & 0 deletions Seterator/Views/Home/About.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@{
ViewData["Title"] = "О нас";
}

<div id="about-component"></div>

<script src="/dist/HomeAbout.js"></script>
27 changes: 27 additions & 0 deletions Seterator/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Seterator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"bootstrap": "^4.4.1",
"bootstrap-vue": "^2.10.1",
"jquery": "^3.5.0",
"vue": "^2.6.11"
"swiper": "^5.4.5",
"vue": "^2.6.11",
"vue-awesome-swiper": "^4.1.1"
},
"devDependencies": {
"css-loader": "^3.4.2",
Expand Down
1 change: 1 addition & 0 deletions Seterator/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = {
Layout: './wwwroot/js/Pages/Layout/Layout.js',
Home: './wwwroot/js/Pages/Home/Index.js',
HomePrivacy: './wwwroot/js/Pages/Home/Privacy.js',
HomeAbout: './wwwroot/js/Pages/Home/About.js',
Account: './wwwroot/js/Pages/Account/Index.js',
CompetitionCreate: './wwwroot/js/Pages/Competition/Create.js',
CompetitionDetails: './wwwroot/js/Pages/Competition/Details.js',
Expand Down
1 change: 1 addition & 0 deletions Seterator/webpack.dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {
Layout: './wwwroot/js/Pages/Layout/Layout.js',
Home: './wwwroot/js/Pages/Home/Index.js',
HomePrivacy: './wwwroot/js/Pages/Home/Privacy.js',
HomeAbout: './wwwroot/js/Pages/Home/About.js',
Account: './wwwroot/js/Pages/Account/Index.js',
CompetitionCreate: './wwwroot/js/Pages/Competition/Create.js',
CompetitionDetails: './wwwroot/js/Pages/Competition/Details.js',
Expand Down
2 changes: 1 addition & 1 deletion Seterator/wwwroot/components/Footer/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<b-col cols="6" sm="6" md="4" class="f-column">
<div class="list-header">Навигация</div>
<div><a href="/">Главная</a></div>
<div><a class="disable" href="#">О нас</a></div>
<div><a href="/Home/About">О нас</a></div>
</b-col>
<b-col cols="6" sm="6" md="4" class="f-column">
<div class="list-header">Пользователь</div>
Expand Down
170 changes: 170 additions & 0 deletions Seterator/wwwroot/components/Home/About.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<template>
<div class="about container">
<div class="about__header">
<h2 class="about__title">О нас</h2>
<div class="about__description">
На данной странице Вы сможете ознакомиться с нашей командой, наставниками и партнерами проекта.
</div>
</div>

<about-team
:propTeam="team"
:propMentors="mentors"
/>
</div>
</template>

<script>
import AboutTeamComponent from './AboutTeam.vue';

export default {
components: {
'about-team': AboutTeamComponent
},
data() {
return {
team: [
{
avatarSrc: '/img/About/team_lead.png',
username: 'Александр Новожилов',
status: 'Team lead',
description: '',
},
{
avatarSrc: '/img/About/prokazin.jpeg',
username: 'Михаил Проказин',
status: 'CTO',
description: '',
},
{
avatarSrc: '/img/About/designer.jpeg',
username: 'Василий Птицын',
status: 'Web-designer',
description: '',
},
{
avatarSrc: '/img/About/semenov.jpeg',
username: 'Семён Семенов',
status: 'Ведущий Frontend-разработчик',
description: '',
},
{
avatarSrc: '/img/About/kseniya.jpeg',
username: 'Ксения Платонова',
status: 'Иллюстратор',
description: '',
},
{
avatarSrc: '/img/About/belousov.jpeg',
username: 'Иван Белоусов',
status: 'Мобильный разработчик',
description: '',
},
{
avatarSrc: '/img/About/anastasia.jpeg',
username: 'Анастасия Загинайко',
status: 'Графический дизайнер',
description: '',
},
{
avatarSrc: '/img/About/bogdan.jpeg',
username: 'Богдан Котиков',
status: 'Программист',
description: '',
},
{
avatarSrc: '/img/About/max.png',
username: 'Максим Добряков',
status: 'Юрист',
description: '',
},
],
mentors: [
{
avatarSrc: '/img/About/team_lead.png',
username: 'Александр Новожилов',
status: 'Team lead',
description: '',
link: '',
},
{
avatarSrc: '/img/About/prokazin.jpeg',
username: 'Михаил Проказин',
status: 'CTO',
description: '',
link: '',
},
{
avatarSrc: '/img/About/designer.jpeg',
username: 'Василий Птицын',
status: 'Web-designer',
description: '',
link: '',
},
{
avatarSrc: '/img/About/semenov.jpeg',
username: 'Семён Семенов',
status: 'Ведущий Frontend-разработчик',
description: 'Лучший в команде',
link: 'https://github.com/semen1032',
},
{
avatarSrc: '/img/About/kseniya.jpeg',
username: 'Ксения Платонова',
status: 'Иллюстратор',
description: '',
link: '',
},
{
avatarSrc: '/img/About/belousov.jpeg',
username: 'Иван Белоусов',
status: 'Мобильный разработчик',
description: '',
link: '',
},
{
avatarSrc: '/img/About/anastasia.jpeg',
username: 'Анастасия Загинайко',
status: 'Графический дизайнер',
description: '',
link: '',
},
{
avatarSrc: '/img/About/bogdan.jpeg',
username: 'Богдан Котиков',
status: 'Программист',
description: '',
link: '',
},
{
avatarSrc: '/img/About/max.png',
username: 'Максим Добряков',
status: 'Юрист',
description: '',
link: '',
},
]
}
}
}
</script>

<style scoped>
.about {
margin-bottom: 50px;
}
.about__header {
max-width: 400px;
margin-bottom: 40px;
}

.about__title {
font-family: 'Merriweather', serif;
font-weight: 600;
font-size: 24pt;
}

.about__description {
margin-top: 20px;
}
</style>
Loading