From 05d928595a42400577e06a7b77195677d6ef1baf Mon Sep 17 00:00:00 2001 From: Holiienko Roman Date: Fri, 12 Jan 2024 12:33:51 +0300 Subject: [PATCH 1/2] login page redesign --- resources/views/auth/login.blade.php | 16 ++++++++-------- .../views/components/primary-button.blade.php | 6 +++++- resources/views/layouts/guest.blade.php | 10 +++++----- routes/web.php | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 57c5c2a..ae06bf6 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -2,19 +2,19 @@ -
+ @csrf
- +
- +
@if (Route::has('password.request')) - {{ __('Forgot your password?') }} + {{ __('Забыли пароль?') }} @endif - {{ __('Log in') }} + {{ __('Войти') }}
-
+ {{--
@if (Route::has('register')) Нет аккаунта? Зарегистрируйтесь @endif -
+
--}}
diff --git a/resources/views/components/primary-button.blade.php b/resources/views/components/primary-button.blade.php index 99bf389..bd2fb85 100644 --- a/resources/views/components/primary-button.blade.php +++ b/resources/views/components/primary-button.blade.php @@ -1,3 +1,7 @@ - +--}} + diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 4b369b6..6e86674 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -14,15 +14,15 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) - -
-
+ +
+
- +
-
+
{{ $slot }}
diff --git a/routes/web.php b/routes/web.php index b15cfad..49e77d0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Route; */ Route::get('/', function () { - return view('welcome'); + return view('test'); })->name('home'); Route::resource('/users', UserController::class); From 3cf7a116c312c455ac80343fdc5eb1a780052383 Mon Sep 17 00:00:00 2001 From: Holiienko Roman Date: Fri, 12 Jan 2024 15:59:03 +0300 Subject: [PATCH 2/2] adding new pages, file landing page now based on 'home.blade.php' --- resources/views/auth/login.blade.php | 8 +- .../views/{test.blade.php => home.blade.php} | 115 +---------------- resources/views/layouts/layout.blade.php | 116 +++++++++++++++++- resources/views/pages/abitur.blade.php | 102 +++++++++++++++ resources/views/pages/course.blade.php | 90 ++++++++++++++ routes/web.php | 12 +- 6 files changed, 322 insertions(+), 121 deletions(-) rename resources/views/{test.blade.php => home.blade.php} (75%) create mode 100644 resources/views/pages/abitur.blade.php create mode 100644 resources/views/pages/course.blade.php diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index ae06bf6..bd61e94 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -7,14 +7,14 @@
- +
- +
@@ -40,7 +40,7 @@ @endif - {{ __('Войти') }} + Войти
diff --git a/resources/views/test.blade.php b/resources/views/home.blade.php similarity index 75% rename from resources/views/test.blade.php rename to resources/views/home.blade.php index 931ea60..21f3348 100644 --- a/resources/views/test.blade.php +++ b/resources/views/home.blade.php @@ -2,119 +2,8 @@ @section('content')
- -
-
-
-
-
-

Поступление абитуриентов

-
Выбирай! Решай! Действуй!
-
-
- - - Приветственное видео - -
-
-
-
-
-
- hero -
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
-
-

Факультеты

-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
-
-
-
-
-
- -
@@ -131,7 +20,7 @@
-

Подать
документы
онлайн

+

Подать
документы
онлайн

@@ -140,7 +29,7 @@
-

Абитуриенту

+

Абитуриенту

diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php index 3b590b5..e8a982e 100644 --- a/resources/views/layouts/layout.blade.php +++ b/resources/views/layouts/layout.blade.php @@ -134,6 +134,8 @@
  • Контакты
    • + + {{-- Добавляет на хедер страницы кнопку "вход", имя которой меняется, если вы уже авторизованы
  • @if (Route::has('login')) @@ -149,7 +151,7 @@ @endif
    • - + --}} @@ -221,6 +223,118 @@
    + +
    +
    +
    +
    +
    +

    Поступление абитуриентов

    +
    Выбирай! Решай! Действуй!
    +
    +
    + + + Приветственное видео + +
    +
    +
    +
    +
    +
    + hero +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    +

    Факультеты

    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + @yield('content') diff --git a/resources/views/pages/abitur.blade.php b/resources/views/pages/abitur.blade.php new file mode 100644 index 0000000..96b013d --- /dev/null +++ b/resources/views/pages/abitur.blade.php @@ -0,0 +1,102 @@ + +@extends('layouts.layout') +@section('content') + + + + + +
    +
    +
    + +

    +
    Онлайн-консультации для поступающих и родителей
    +

    +     +
    + +
    + +

    +
    Калькулятор ЕГЭ
    +

    +     +
    + +
    + +

    +
    Для поступающих на программы бакалавриата, специалитета, магистратуры
    +

    +     +
    + +
    + +

    +
    Для поступающих на программы среднего профессионального образования (колледж)
    +

    +     +
    + +
    + +

    +
    Для поступающих на обучение по договорам об оказании платных образовательных услуг
    +

    +     +
    + +
    + +

    +
    Для поступающих на программы ординатуры
    +

    +     +
    + +
    + +

    +
    Для поступающих на программы аспирантуры
    +

    +     +
    + +
    + +

    +
    Часто задаваемые вопросы (бакалавриат, специалитет, магистратура)
    +

    +     +
    + +
    + +

    +
    Видеоматериалы для поступающих
    +

    +     +
    + +
    + +

    +
    Экран приема 2023
    +

    +     +
    +
    +
    + +@endsection diff --git a/resources/views/pages/course.blade.php b/resources/views/pages/course.blade.php new file mode 100644 index 0000000..c3217ee --- /dev/null +++ b/resources/views/pages/course.blade.php @@ -0,0 +1,90 @@ + +@extends('layouts.layout') +@section('content') + + + + + + + + + + + +
    +
    +

    + +

    + +
    +
    +

    + +

    + +
    +
    + +@endsection diff --git a/routes/web.php b/routes/web.php index 49e77d0..5c3161a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,13 +16,19 @@ use Illuminate\Support\Facades\Route; */ Route::get('/', function () { - return view('test'); + 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'); });