Compare commits

...

3 Commits

Author SHA1 Message Date
aslan 686896e9cf Merge pull request 'login page redesign' (#5) from RomanGolienko/Roman_applicant-site:pages into main
Tests & Lint & Deploy to Railway / build (8.1) (push) Successful in 1m36s Details
Tests & Lint & Deploy to Railway / deploy (8.1) (push) Failing after 1m10s Details
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/5
Reviewed-by: aslan <aslan@aslan.ru>
2024-01-16 15:52:15 +03:00
Holiienko Roman 3cf7a116c3 adding new pages, file landing page now based on 'home.blade.php' 2024-01-12 15:59:03 +03:00
Holiienko Roman 05d928595a login page redesign 2024-01-12 12:33:51 +03:00
8 changed files with 336 additions and 131 deletions

View File

@ -7,14 +7,14 @@
<!-- Email Address -->
<div>
<x-input-label for="email" :value="__('Email')" />
<x-input-label for="email" :value="'Электронная почта'" />
<x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
<x-input-error :messages="$errors->get('email')" class="mt-2" />
</div>
<!-- Password -->
<div class="mt-4">
<x-input-label for="password" :value="__('Password')" />
<x-input-label for="password" :value="'Пароль'" />
<x-text-input id="password" class="block mt-1 w-full"
type="password"
@ -28,27 +28,27 @@
<div class="block mt-4">
<label for="remember_me" class="inline-flex items-center">
<input id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember">
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Remember me') }}</span>
<span class="ms-2 text-sm text-gray-600 dark:text-gray-400">Запомнить меня</span>
</label>
</div>
<div class="flex items-center justify-end mt-4">
@if (Route::has('password.request'))
<a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800" href="{{ route('password.request') }}">
{{ __('Forgot your password?') }}
{{ __('Забыли пароль?') }}
</a>
@endif
<x-primary-button class="ms-3">
{{ __('Log in') }}
Войти
</x-primary-button>
</div>
<div class="flex items-center justify-center mt-4">
{{--<div class="flex items-center justify-center mt-4">
@if (Route::has('register'))
<a> Нет аккаунта? </a>
<a href="{{ route('register') }}">Зарегистрируйтесь</a>
@endif
</div>
</div> --}}
</form>
</x-guest-layout>

View File

@ -1,3 +1,7 @@
<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150']) }}>
{{--<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150']) }}>
{{ $slot }}
</button>
--}}
<button {{ $attributes->merge(['type' => 'submit', 'class' => ' transition ease-in-out duration-150 px-4 py-2 text-white rounded rounded-5 ', 'style' => 'background-color: #019870']) }}>
{{ $slot }}
</button>

View File

@ -2,119 +2,8 @@
@section('content')
<main>
<!-- hero section -->
<div class="tp-hero__section pt-130 theme-bg p-relative fix">
<div class="container">
<div class="row">
<div class="col-lg-7">
<div class="tp-hero__content pt-200">
<h3 class="tp-hero__title text-white mb-15">Поступление абитуриентов</h3>
<h5 class="title text-white">Выбирай! Решай! Действуй!</h5>
<div class="tp-hero__btn-wrappper d-md-flex align-items-center">
<div class="hero-btn-2">
<a href="https://youtu.be/dCjrFbqhwNw?t=49"
class="tp-play-btn d-flex align-items-center popup-video">
<i class="arrow_triangle-right"></i>
<span>Приветственное видео</span>
</a>
</div>
</div>
</div>
</div>
<div class="col-lg-5">
<div class="tp-hero__img">
<img src="{{ URL::to('img/hero/head_fon.jpg') }}" style="max-width: 100%; border-radius: 20px; " alt="hero">
</div>
</div>
</div>
</div>
<div class="tp-hero__shapes">
<div class="tp-hero__shapes-1">
<img src="{{ URL::to('img/icons/book-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-2">
<img src="{{ URL::to('img/icons/circle-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-3">
<img src="{{ URL::to('img/icons/dots-shapes.png') }}" alt="">
</div>
<div class="tp-hero__shapes-4">
<img src="{{ URL::to('img/icons/line-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-5">
<img src="{{ URL::to('img/icons/lines-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-6">
<img src="{{ URL::to('img/icons/role-shape.png') }}" alt="">
</div>
</div>
</div>
<!-- hero section end -->
<!-- brnad section start -->
<div class="tp-brand__section">
<div class="container">
<div class="row justify-content-center">
<div class="col-lg-12">
<div class="tp-brand__box white-bg pt-40">
<div class="row">
<div class="col-xl-4 col-md-6">
<h3>Факультеты</h3>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="tp-brand_slider">
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/agrar_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/eco_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/ecolog_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/fis_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/farm_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/inz_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/lech_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/med_inst.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/mezd_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/pediatr_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/posl_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/stomat_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/tech_fak.png') }}" alt="">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- brnad section end -->
<!-- service area start -->
<div class="tp-feature__section pt-120 pb-30">
<div class="container">
@ -131,7 +20,7 @@
<div class="tp-feature__icon">
<img style="max-width: 26%;" src="{{ URL::to('img/courses/doconline.png') }}" alt="">
</div>
<h3 class="tp-feature__title"><a href="test-course.php">Подать<br />документы<br />онлайн</a></h3>
<h3 class="tp-feature__title"><a href="{{ url('course') }}">Подать<br />документы<br />онлайн</a></h3>
</div>
</div>
@ -140,7 +29,7 @@
<div class="tp-feature__icon">
<img style="max-width: 26%;" src="{{ URL::to('img/courses/abit.png') }}" alt="">
</div>
<h3 class="tp-feature__title"><a href="test-abitur.php">Абитуриенту</a> </h3>
<h3 class="tp-feature__title"><a href="{{ url('abitur') }}">Абитуриенту</a> </h3>
</div>
</div>

View File

@ -15,14 +15,14 @@
@vite(['resources/css/app.css', 'resources/js/app.js'])
</head>
<body class="font-sans text-gray-900 antialiased" >
<div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900">
<div>
<div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900" style="background-color:#006147">
<div class="d-flex justify-content-center align-items-center text-center">
<a href="/">
<x-application-logo class="w-20 h-20 fill-current text-gray-500" />
<img src="{{ URL::to('svg/img/schit.svg') }}" style="max-width: 60%; display: unset " alt="" />
</a>
</div>
<div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg">
<div class="w-full sm:max-w-md mt-6 px-6 py-4 shadow-md overflow-hidden sm:rounded-lg" style="background-color: whitesmoke">
{{ $slot }}
</div>
</div>

View File

@ -134,6 +134,8 @@
<li>
<a href="contact.html">Контакты</a>
</li>
{{-- Добавляет на хедер страницы кнопку "вход", имя которой меняется, если вы уже авторизованы
<li>
@if (Route::has('login'))
@ -149,7 +151,7 @@
@endif
</li>
--}}
</ul>
</nav>
</div>
@ -221,6 +223,118 @@
<div class="body-overlay"></div>
<!-- offcanvas area end -->
<!-- hero section -->
<div class="tp-hero__section pt-130 theme-bg p-relative fix">
<div class="container">
<div class="row">
<div class="col-lg-7">
<div class="tp-hero__content pt-200">
<h3 class="tp-hero__title text-white mb-15">Поступление абитуриентов</h3>
<h5 class="title text-white">Выбирай! Решай! Действуй!</h5>
<div class="tp-hero__btn-wrappper d-md-flex align-items-center">
<div class="hero-btn-2">
<a href="https://youtu.be/dCjrFbqhwNw?t=49"
class="tp-play-btn d-flex align-items-center popup-video">
<i class="arrow_triangle-right"></i>
<span>Приветственное видео</span>
</a>
</div>
</div>
</div>
</div>
<div class="col-lg-5">
<div class="tp-hero__img">
<img src="{{ URL::to('img/hero/head_fon.jpg') }}" style="max-width: 100%; border-radius: 20px; " alt="hero">
</div>
</div>
</div>
</div>
<div class="tp-hero__shapes">
<div class="tp-hero__shapes-1">
<img src="{{ URL::to('img/icons/book-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-2">
<img src="{{ URL::to('img/icons/circle-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-3">
<img src="{{ URL::to('img/icons/dots-shapes.png') }}" alt="">
</div>
<div class="tp-hero__shapes-4">
<img src="{{ URL::to('img/icons/line-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-5">
<img src="{{ URL::to('img/icons/lines-shape.png') }}" alt="">
</div>
<div class="tp-hero__shapes-6">
<img src="{{ URL::to('img/icons/role-shape.png') }}" alt="">
</div>
</div>
</div>
<!-- hero section end -->
<!-- brnad section start -->
<div class="tp-brand__section">
<div class="container">
<div class="row justify-content-center">
<div class="col-lg-12">
<div class="tp-brand__box white-bg pt-40">
<div class="row">
<div class="col-xl-4 col-md-6">
<h3>Факультеты</h3>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="tp-brand_slider">
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/agrar_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/eco_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/ecolog_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/fis_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/farm_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/inz_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/lech_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/med_inst.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/mezd_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/pediatr_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/posl_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/stomat_fak.png') }}" alt="">
</div>
<div class="tp-brand__item">
<img src="{{ URL::to('img/brand/tech_fak.png') }}" alt="">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- brnad section end -->
@yield('content')

View File

@ -0,0 +1,102 @@
@extends('layouts.layout')
@section('content')
<style>
.buttonHover{
transition: .3s all;
}
.buttonHover:hover{
background-color : #006147;
transform: scale(1.03);
color: #e0e0e0;
}
</style>
<div class="container mt-4">
<div class="row d-flex justify-content-center align-items-center">
<div class="col-8">
<a href="web-consultations.php">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Онлайн-консультации для поступающих и родителей </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Калькулятор ЕГЭ </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="postup.php">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Для поступающих на программы бакалавриата, специалитета, магистратуры </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="postup-col.php">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Для поступающих на программы среднего профессионального образования (колледж) </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Для поступающих на обучение по договорам об оказании платных образовательных услуг </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Для поступающих на программы ординатуры </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Для поступающих на программы аспирантуры </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Часто задаваемые вопросы (бакалавриат, специалитет, магистратура) </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Видеоматериалы для поступающих </div>
</h4>
</a>
</div>
<div class="col-8">
<a href="ui-4.html#">
<h4>
<div class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">Экран приема 2023 </div>
</h4>
</a>
</div>
</div>
</div>
@endsection

View File

@ -0,0 +1,90 @@
@extends('layouts.layout')
@section('content')
<style>
.accordionHover{
transition: .3s all;
}
.accordionHover:hover{
background-color : #006147;
transform: scale(1.03);
color: #fff;
}
.accordion-button:not(.collapsed) {
color: #006147;
background-color: #fff;
box-shadow: inset 0 -1px 0 rgba(0,0,0,.125);
}
.accordion-button:focus {
z-index: 3;
border-color: #479f76;
outline: 0;
box-shadow: 0 0 0 0.25rem rgba(0,131,16,.69);
}
.accordion-button:not(.collapsed)::after{
background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg width='16' height='16' xmlns='http://www.w3.org/2000/svg' fill='%230c63e4'%3e%3cg%3e%3ctitle%3eLayer 1%3c/title%3e%3cpath fill='%23396849' fill-rule='evenodd' d='m1.646,4.646a0.5,0.5 0 0 1 0.708,0l5.646,5.647l5.646,-5.647a0.5,0.5 0 0 1 0.708,0.708l-6,6a0.5,0.5 0 0 1 -0.708,0l-6,-6a0.5,0.5 0 0 1 0,-0.708z' id='svg_1'/%3e%3c/g%3e%3c/svg%3e");
}
</style>
<!-- transform: scale(1.2); -->
<!--<div class="container py-5" id="featured-3">
<br><br><br><br><br>
<h1 class="text-dark col-12 d-flex justify-content-center">Подача документов онлайн с помощью информационных систем МГТУ: <br><br></h1>
<div class="d-flex justify-content-center">
<div class="col-4 px-2 m-3 element-1 " >
<a href="https://portal.mkgtu.ru/" target="_blank">
<span style="color: #005951;">
<h3 class="m-2 fs-2 text-body-emphasis"> По образовательным программам высшего образования </h3>
</span>
</a>
</div>
<div class="col-4 px-2 m-3 element-1">
<a href="https://mkgtu.ru/auth/" target="_blank">
<span style="color: #005951;">
<h3 class="m-2 fs-2 text-body-emphasis">По образовательным программам среднего профессионального образования (колледж)</h3>
</span>
</a>
</div>
</div>
</div>
-->
<div class="pt-4 container justify-content-md-center col-6 accordion accordion-flush" id="accordionFlushExample">
<div class="accordion-item">
<h2 class="accordion-header" id="flush-headingOne">
<button class="accordion-button collapsed accordionHover" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
По образовательным программам высшего образования
</button>
</h2>
<div id="flush-collapseOne" class="accordion-collapse collapse" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlushExample">
<div class="accordion-body tp-feature__title">
<br><h2><a href="https://portal.mkgtu.ru/" target="_blank">По образовательным программам высшего образования</a></h2>
<br><h3><a href="https://mkgtu.ru/abitur/%D0%98%D0%BD%D1%81%D1%82%D1%80%D1%83%D0%BA%D1%86%D0%B8%D1%8F%20%D0%BF%D0%BE%20%D1%80%D0%B0%D0%B1%D0%BE%D1%82%D0%B5%20%D1%81%20%D0%BB%D0%B8%D1%87%D0%BD%D1%8B%D0%BC%20%D0%BA%D0%B0%D0%B1%D0%B8%D0%BD%D0%B5%D1%82%D0%BE%D0%BC%20%D0%B0%D0%B1%D0%B8%D1%82%D1%83%D1%80%D0%B8%D0%B5%D0%BD%D1%82%D0%B0%202023.pdf" target="_blank">Инструкция по работе с личным кабинетом абитуриента</a></h3><br>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="flush-headingTwo">
<button class="accordion-button collapsed accordionHover" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseTwo" aria-expanded="false" aria-controls="flush-collapseTwo">
По образовательным программам среднего профессионального образования (колледж)
</button>
</h2>
<div id="flush-collapseTwo" class="accordion-collapse collapse" aria-labelledby="flush-headingTwo" data-bs-parent="#accordionFlushExample">
<div class="accordion-body tp-feature__title">
<br><h2> <a href="https://mkgtu.ru/auth/" target="_blank">По&nbsp;образовательным программам среднего профессионального образования (колледж)</a> </h2><br>
<br><h3> <a href="https://mkgtu.ru/abitur/1.pdf" target="_blank">Инструкция по работе с личным кабинетом абитуриента</a></h3><br>
</div>
</div>
</div>
</div>
@endsection

View File

@ -16,13 +16,19 @@ use Illuminate\Support\Facades\Route;
*/
Route::get('/', function () {
return view('welcome');
return view('home');
})->name('home');
Route::resource('/users', UserController::class);
Route::get('/test', function () {
return view('test');
Route::get('/home', function () {
return view('home');
});
Route::get('/course', function () {
return view('pages.course');
});
Route::get('/abitur', function () {
return view('pages.abitur');
});