Merge pull request 'adding photos, refactoring reception-screen.blade.php' (#11) from RomanGolienko/Roman_applicant-site:main into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/11

resources/views/home.blade.php

@@ -138,17 +138,17 @@
 
         <div class="container">
             <div class="row">
-                <div class="col rounded-3 me-4  border border-dark " style="background-color: #e9ecef;">
+                <div class="col rounded-3 me-4  border border-secondary-subtle " style="background-color: #e9ecef;">
 
                     <div class="row position-relative">
 
-                        <div class="px-0"><img src="{{ URL::to('img/bg/photo.jpg') }}" alt=""
+                        <div class="px-0"><img src="{{ URL::to('img/front-page/bakalavriat.jpg') }}" alt=""
                                                class="img-fluid rounded-3"></div>
 
                     </div>
 
                     <div class="row mt-4 m-2 p-1 ">
-                        <h1 class="text-secondary fw-bolder pt-2 px-3 text-center"> Бакалавриат</h1>
+                        <h1 class="text-secondary text-center pb-4"> Бакалавриат</h1>
                         <p class="text-secondary rounded-3 fw-light fs-5"> Lorem Ipsum - это текст-"рыба", часто
                             используемый в печати и вэб-дизайне. Lorem Ipsum является стандартной "рыбой" для текстов на
                             латинице с начала XVI века. В то время некий безымянный печатник создал большую коллекцию
@@ -160,9 +160,9 @@
                 </div>
 
                 <div class="col ">
-                    <div class="row border border-dark rounded-3 " style="background-color: #e9ecef;">
+                    <div class="row border border-secondary-subtle rounded-3 " style="background-color: #e9ecef;">
                         <div class="col-6 imageBackgroundCover"
-                             style="background-image: url({{ URL::to('img/bg/2.jpg') }}); border-top-left-radius: 3px; border-bottom-left-radius: 3px;  border-top-right-radius: 30px;">
+                             style="background-image: url({{ URL::to('img/front-page/magistratura.jpg') }}); border-top-left-radius: 3px; border-bottom-left-radius: 3px;  border-top-right-radius: 30px;">
 
 
                         </div>
@@ -185,9 +185,9 @@
 
                     </div>
 
-                    <div class="row border border-dark rounded-3  mt-4" style="background-color: #e9ecef;">
+                    <div class="row border border-secondary-subtle rounded-3  mt-4" style="background-color: #e9ecef;">
                         <div class="col-6 imageBackgroundCover"
-                             style="background-image: url({{ URL::to('img/bg/3.jpg') }}); border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-bottom-right-radius: 30px; ">
+                             style="background-image: url({{ URL::to('img/front-page/aspirantura.jpg') }}); border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-bottom-right-radius: 30px; ">
 
 
                         </div>
@@ -218,7 +218,7 @@
         <div class="container mt-4">
             <div class="row">
                 <div class="col ">
-                    <div class="row border border-dark rounded-3 " style="background-color: #e9ecef;">
+                    <div class="row border border-secondary-subtle rounded-3 " style="background-color: #e9ecef;">
 
                         <div class="col">
                             <div class=" mt-3">
@@ -236,10 +236,10 @@
 
                         </div>
                         <div class="col-6 imageBackgroundCover"
-                             style="background-image: url({{ URL::to('img/bg/2.jpg') }}); border-top-right-radius: 3px; border-bottom-right-radius: 3px;  border-top-left-radius: 30px;"></div>
+                             style="background-image: url({{ URL::to('img/front-page/SPO.jpg') }}); border-top-right-radius: 3px; border-bottom-right-radius: 3px;  border-top-left-radius: 30px;"></div>
                     </div>
 
-                    <div class="row border border-dark rounded-3  mt-4" style="background-color: #e9ecef;">
+                    <div class="row border border-secondary-subtle rounded-3  mt-4" style="background-color: #e9ecef;">
 
 
                         <div class="col">
@@ -258,21 +258,21 @@
 
                         </div>
                         <div class="col-6 imageBackgroundCover"
-                             style="background-image: url({{ URL::to('img/bg/3.jpg') }}); border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 30px; "></div>
+                             style="background-image: url({{ URL::to('img/front-page/dop-obrazovanie.jpg') }}); border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 30px; "></div>
                     </div>
 
                 </div>
-                <div class="col rounded-3 ms-4  border border-dark " style="background-color: #e9ecef;">
+                <div class="col rounded-3 ms-4  border border-secondary-subtle " style="background-color: #e9ecef;">
 
                     <div class="row position-relative">
 
-                        <div class="px-0"><img src="{{ URL::to('img/bg/photo.jpg') }}" alt=""
+                        <div class="px-0"><img src="{{ URL::to('img/front-page/podgotovitelnie-kursi.jpg') }}" alt=""
                                                class="img-fluid rounded-3"></div>
 
                     </div>
 
                     <div class="row mt-4 m-2 p-1 ">
-                        <h1 class="text-secondary fw-bolder pt-2 px-3 text-center"> Подготовительные курсы</h1>
+                        <h1 class="text-secondary text-center pb-4"> Подготовительные курсы</h1>
                         <p class="text-secondary rounded-3 fw-light fs-5"> Lorem Ipsum - это текст-"рыба", часто
                             используемый в печати и вэб-дизайне. Lorem Ipsum является стандартной "рыбой" для текстов на
                             латинице с начала XVI века. В то время некий безымянный печатник создал большую коллекцию
@@ -288,7 +288,7 @@
         </div>
         <div class="container mt-4">
             <div class="row">
-                <div class="col rounded-3 border border-dark" style="background-color: #e9ecef;">
+                <div class="col rounded-3 border border-secondary-subtle" style="background-color: #e9ecef;">
                     <div class="row">
                         <div class="col mt-3">
                             <h1 class=" text-secondary text-center "> Довузовская подготовка</h1>
@@ -305,12 +305,12 @@
                     </div>
                     <div class="row">
                         <div class="col imageBackgroundCover"
-                             style="background-image: url({{ URL::to('img/bg/2.jpg') }});">
+                             style="background-image: url({{ URL::to('img/front-page/dovuzovskaya-podgotovka.jpg') }});">
-                            <br><br><br><br><br><br><br><br><br><br><br><br></div>
+                            <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br></div>
                     </div>
                 </div>
 
-                <div class="col ms-4 rounded-3 border border-dark" style="background-color: #e9ecef;">
+                <div class="col ms-4 rounded-3 border border-secondary-subtle" style="background-color: #e9ecef;">
                     <div class="row">
                         <div class="col mt-3">
                             <h1 class=" text-secondary text-center "> Ординатура</h1>
@@ -327,8 +327,8 @@
                     </div>
                     <div class="row">
                         <div class="col imageBackgroundCover"
-                             style="background-image: url({{ URL::to('img/bg/2.jpg') }});">
+                             style="background-image: url({{ URL::to('img/front-page/ordinatura.jpg') }});">
-                            <br><br><br><br><br><br><br><br><br><br><br><br></div>
+                            <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br></div>
                     </div>
                 </div>
 

resources/views/layouts/applicant-layout.blade.php

@@ -332,7 +332,7 @@
 
         line-height: 140%;
         color: #222222;
-        margin: 12px 0;
+
         text-align: justify;
     }
     a {

resources/views/menu/abitur.blade.php

@@ -27,7 +27,7 @@
             </div>
 
             <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="https://old.mkgtu.ru/postup_calc.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">
@@ -115,7 +115,7 @@
             </div>
 
             <div class="col-8">
-                <a href="#">
+                <a href="{{ route('reception-screens')  }}">
                     <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">

resources/views/menu/reception-screen.blade.php

@@ -1,49 +1,86 @@
 @extends('layouts.applicant-layout')
 @section('content')
 
+{{--    <style>--}}
+{{--        .buttonHover {--}}
+{{--            transition: .3s all;--}}
+{{--        }--}}
+
+{{--        .buttonHover:hover {--}}
+{{--            background-color: #006147;--}}
+{{--            transform: scale(1.03);--}}
+{{--            color: #e0e0e0;--}}
+{{--        }--}}
+{{--    </style>--}}
+
+{{--    <div class="container my-4">--}}
+{{--        <div class="row d-flex justify-content-center align-items-center">--}}
+{{--            @foreach($receptionScreens as $receptionScreen)--}}
+{{--            <div class="col-8">--}}
+{{--                <a href="{{ route('web-consultations')  }}">--}}
+{{--                    <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">--}}
+{{--                            {{ $receptionScreen->name }}--}}
+{{--                        </div>--}}
+{{--                    </h4>--}}
+{{--                </a>--}}
+{{--            </div>--}}
+{{--                @foreach($receptionScreen->files as $file)--}}
+{{--                    <div class="col-8">--}}
+{{--                        <a href="{{  $file->url }}">{{ $file->name }}</a>--}}
+{{--                    </div>--}}
+{{--                @endforeach--}}
+{{--            @endforeach--}}
+{{--            <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>--}}
+{{--    </div>--}}
 <style>
-        .buttonHover {
+    .accordion-button:not(.collapsed)
-            transition: .3s all;
+    {
+        color:#006147;
+        background-color: rgb(255, 255, 255);
+        box-shadow:inset 0 -1px 0 rgba(0,0,0,.125)
+    }
+    .accordion-button:focus {
+        z-index: 3;
+        border-color: #006147;
+        outline: 0;
+        box-shadow: 0 0 0 0.25rem #006147;
     }
 
-        .buttonHover:hover {
-            background-color: #006147;
-            transform: scale(1.03);
-            color: #e0e0e0;
-        }
 </style>
-
 <div class="container my-4">
-        <div class="row d-flex justify-content-center align-items-center">
+    <div class="accordion" id="accordionPanelsStayOpenExample">
+
         @foreach($receptionScreens as $receptionScreen)
-            <div class="col-8">
+            <?php $tmp = str_replace(' ','', $receptionScreen->name) ?>
-                <a href="{{ route('web-consultations')  }}">
+        <div class="accordion-item">
-                    <h4>
+            <h2 class="accordion-header">
-                        <div
+                <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-<?php echo $tmp ?> " aria-expanded="true" aria-controls="panelsStayOpen-<?php echo $tmp ?>">
-                            class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">
                     {{ $receptionScreen->name }}
-                        </div>
+                </button>
-                    </h4>
+            </h2>
-                </a>
+            <div id="panelsStayOpen-<?php echo $tmp ?>" class="accordion-collapse collapse show">
-            </div>
+                <div class="accordion-body">
                     @foreach($receptionScreen->files as $file)
                         <div class="col-8">
                             <a href="{{  $file->url }}">{{ $file->name }}</a>
                         </div>
                     @endforeach
+                </div>
+            </div>
+        </div>
         @endforeach
-            <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>
-    </div>
-
-
 @endsection