diff --git a/.gitignore b/.gitignore index 858c10a..ef88dda 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ yarn-error.log /docker /docker/db /docker/db/data - +/docker/db/data/#innodb_redo +/docker/db/data/#innodb_temp diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php index 5f720f3..b7ed42f 100644 --- a/app/Services/DirectonHtmlBuilder.php +++ b/app/Services/DirectonHtmlBuilder.php @@ -55,10 +55,16 @@ class DirectonHtmlBuilder
'; - foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { - $EGE .= '' . $key . ' - ' . '' . $el . '
' ; + if (array_key_exists('ЕГЭ', $direction['entrance_examinations'])){ + foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { + $EGE .= '' . $key . ' - ' . '' . $el . '
' ; + } + $EGE .= '
'; + } else { + $EGE = ''; } - $EGE .= ''; + + $po_viboru = '
Предметы по выбору diff --git a/app/Services/DirectonHtmlBuilderForCalculator.php b/app/Services/DirectonHtmlBuilderForCalculator.php index 8eb8786..ec61a9f 100644 --- a/app/Services/DirectonHtmlBuilderForCalculator.php +++ b/app/Services/DirectonHtmlBuilderForCalculator.php @@ -55,11 +55,14 @@ class DirectonHtmlBuilderForCalculator

'; - foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { - $EGE .= '' . $key . ' - ' . '' . $el . '
' ; + if (array_key_exists('ЕГЭ', $direction['entrance_examinations'])) { + foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { + $EGE .= '' . $key . ' - ' . '' . $el . '
'; + } + $EGE .= '
'; + } else { + $EGE = ''; } - $EGE .= ''; - $po_viboru = '
Предметы по выбору
@@ -182,7 +185,7 @@ class DirectonHtmlBuilderForCalculator return "
-
+
diff --git a/public/img/front-page/bakalavr-special/photo.png b/public/img/front-page/bakalavr-special/photo.png new file mode 100644 index 0000000..541a73d Binary files /dev/null and b/public/img/front-page/bakalavr-special/photo.png differ diff --git a/public/img/front-page/eye.png b/public/img/front-page/eye.png deleted file mode 100644 index dc51748..0000000 Binary files a/public/img/front-page/eye.png and /dev/null differ diff --git a/public/img/front-page/visually-impaired-mode-icon.png b/public/img/front-page/visually-impaired-mode-icon.png new file mode 100644 index 0000000..5db6e17 Binary files /dev/null and b/public/img/front-page/visually-impaired-mode-icon.png differ diff --git a/resources/views/layouts/new-design-layout.blade.php b/resources/views/layouts/new-design-layout.blade.php index 9bb0664..fe23a26 100644 --- a/resources/views/layouts/new-design-layout.blade.php +++ b/resources/views/layouts/new-design-layout.blade.php @@ -27,8 +27,7 @@ - - + diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php index bd3edf1..d141eba 100644 --- a/resources/views/new-design/bakalavr-special.blade.php +++ b/resources/views/new-design/bakalavr-special.blade.php @@ -76,6 +76,7 @@ + @@ -88,7 +89,7 @@ style="height: 100%; ">
+ src="{{ URL::to('img/front-page/bakalavr-special/photo.png') }}" alt="">
@@ -601,51 +600,58 @@ @php $out = array_chunk($all_news, 4, true); + //echo '
' . print_r($out, 1) . '
' @endphp + @foreach($out as $id => $page) -