RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

Compare commits

base: RomanGolienko:15c6dcc5bcf6e9a51431f6777554d9c8c256d77d
Branches Tags
RomanGolienko:main
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator
..
compare: RomanGolienko:f1cefa1184d0f425a09a236ce939dd1f35cacf46
Branches Tags
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:main
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator

No commits in common. "15c6dcc5bcf6e9a51431f6777554d9c8c256d77d" and "f1cefa1184d0f425a09a236ce939dd1f35cacf46" have entirely different histories.
15c6dcc5bc ... f1cefa1184

10 changed files with 211 additions and 302 deletions
Show Stats Expand all files Collapse all files

62
app/Http/Controllers/Api/CalculatorController.php
View File

@ -9,7 +9,6 @@ use App\Models\EntranceExamination;
use App\Models\Faculty; use App\Models\Faculty;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class CalculatorController extends Controller class CalculatorController extends Controller
{ {
public function findDirectionFromSubjects(Request $request) public function findDirectionFromSubjects(Request $request)
@ -35,63 +34,10 @@ class CalculatorController extends Controller
$faculty = Faculty::find($department->faculty_id); $faculty = Faculty::find($department->faculty_id);
return "{$acc} <tr class=\"\"> return "{$acc} <tr class=\"\">
<td id=\"faculty\"> {$faculty->name} </td> <td id=\"faculty\"> {$faculty->name} </td>
<td> <td> {$direction->name} </td>
<a class=\" border border-white rounded-3 p-2 hover1\" type=\"button\" data-bs-toggle=\"offcanvas\" data-bs-target=\"#offcanvasScrolling-{$direction->id}{$direction->id }\" aria-controls=\"offcanvasScrolling\" role=\"button\">{$direction->name}</a> <td class=\"text-end\"> {$direction->period} </td>
<div class=\"offcanvas offcanvas-bottom text-dark\" data-bs-scroll=\"true\" data-bs-backdrop=\"false\" tabindex=\"-1\" id=\"offcanvasScrolling-{$direction->id }{$direction->id }\" aria-labelledby=\"offcanvasScrollingLabel-{$direction->id}{$direction->id }\" style=\"height: 100%; font-family: Geologica-Medium;overflow-y: auto ;\"> </tr>";
<div class=\"mx-5\">
<div class=\"col-12 d-flex justify-content-end mt-4\">
<button type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\"></button>
</div>
<div class=\"row\">
<div class=\"col-xl-3 col-12\">
<div class=\"display-5 \" style=\"font-family: Geologica-Light\"> {$direction->code} </div>
<div class=\"display-5 \" > {$direction->name}</div>
</div>
</div>
<div class=\"row\">
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Уровень образования: <span style=\"font-family: Geologica-Light\">{$direction->educationLevel->name} </span> </div>
<div> Форма обучения: <span style=\"font-family: Geologica-Light\">{$direction->educationForm->name} </span></div>
</div>
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Бюджетные места: <span style=\"font-family: Geologica-Light\">{$direction->budget_places} </span> </div>
<div> Квота: <span style=\"font-family: Geologica-Light\">{$direction->quota} </span></div>
</div>
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Места на контракт: <span style=\"font-family: Geologica-Light\">{$direction->paid_places} </span> </div>
<div> Стоимость платного обучения: <span style=\"font-family: Geologica-Light\">{$direction->cost_paid_place} </span></div>
</div>
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Период обучения (в годах): <span style=\"font-family: Geologica-Light\">{$direction->period} </span> </div>
</div>
</div>
<div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
<p style=\"text-align: justify;\">{$direction->description}</p>
</div>
</div>
</div>
</td>
<td class=\"text-end\"> {$direction->period} </td>
</tr>";
}; };
$html = $directions->reduce($generateHtml, ''); $html = $directions->reduce($generateHtml, '');

37
app/Http/Requests/admin/Catalog/UpdateFacultyRequest.php
View File

@ -15,31 +15,20 @@ class UpdateFacultyRequest extends FormRequest
{ {
return [ return [
'position' => 'required|int|numeric|max:255', 'position' => 'required|int|numeric|max:255',
'name' => ['required', 'string', 'max:255', "unique:faculties,name,{$this->faculty->id}",],
'description' => 'string', 'description' => 'string',
'slug' => ['required', 'string', 'max:255', "unique:faculties,slug,{$this->faculty->id}",], 'slug' => [
'educational_institution_id' => 'required|int|numeric|max:1000', 'required',
]; 'string',
} 'max:255',
"unique:faculties,slug,{$this->faculty->id}",
public function messages(): array ],
{ 'educational_institution_id' => 'required|int|numeric|max:255',
return [ 'name' => [
'position.required' => 'Поле позиция обязательно.', 'required',
'position.int' => 'Позиция должно быть целым числом.', 'string',
'position.numeric' => 'Позиция должно быть числом.', 'max:255',
'position.max' => 'Позиция не должен быть больше :max', "unique:faculties,name,{$this->faculty->id}",
'name.required' => 'Поле название обязательно.', ],
'name.string' => 'Поле название должен быть строкой.',
'name.max' => 'Поле название не должен превышать :max символов.',
'name.unique' => 'Название уже занят.',
'description.string' => 'Поле описание должен быть строкой.',
'slug.string' => 'Поле URL должен быть строкой.',
'slug.max' => 'Поле URL не должен превышать :max символов.',
'educational_institution_id.required' => 'Поле учебное заведение обязательно.',
'educational_institution_id.int' => 'Учебное заведение должно быть целым числом.',
'educational_institution_id.numeric' => 'Учебное заведение должно быть числом.',
'educational_institution_id.max' => 'Поле учебное заведение не должен быть больше :max.',
]; ];
} }
} }

68
app/Services/DirectonHtmlBuilder.php
View File

@ -1,68 +0,0 @@
<?php
namespace App\Services;
use App\Models\Direction;
class DirectonHtmlBuilder
{
private Direction $direction;
public function __construct($direction)
{
$this->direction = $direction;
}
public function getHTML()
{
$direction = $this->direction;
return "<div class=\"offcanvas offcanvas-bottom\" data-bs-scroll=\"true\" data-bs-backdrop=\"false\" tabindex=\"-1\" id=\"offcanvasScrolling-{$direction->id }\" aria-labelledby=\"offcanvasScrollingLabel-{$direction->id}\" style=\"height: 100%; font-family: Geologica-Medium;overflow-y: auto ;\">
<div class=\"mx-5\">
<div class=\"col-12 d-flex justify-content-end mt-4\">
<button type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\"></button>
</div>
<div class=\"row\">
<div class=\"col-xl-3 col-12\">
<div class=\"display-5 \" style=\"font-family: Geologica-Light\"> {$direction->code} </div>
<div class=\"display-5 \" > {$direction->name}</div>
</div>
</div>
<div class=\"row\">
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Уровень образования: <span style=\"font-family: Geologica-Light\">{$direction->educationLevel->name} </span> </div>
<div> Форма обучения: <span style=\"font-family: Geologica-Light\">{$direction->educationForm->name} </span></div>
</div>
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Бюджетные места: <span style=\"font-family: Geologica-Light\">{$direction->budget_places} </span> </div>
<div> Квота: <span style=\"font-family: Geologica-Light\">{$direction->quota} </span></div>
</div>
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Места на контракт: <span style=\"font-family: Geologica-Light\">{$direction->paid_places} </span> </div>
<div> Стоимость платного обучения: <span style=\"font-family: Geologica-Light\">{$direction->cost_paid_place} </span></div>
</div>
<div class=\"col-xl-3 col-12\">
<br>
<br>
<div> Период обучения (в годах): <span style=\"font-family: Geologica-Light\">{$direction->period} </span> </div>
</div>
</div>
<div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
<p style=\"text-align: justify;\">{$direction->description}</p>
</div>
</div>
</div> ";
}
}

14
composer.json
View File

@ -12,25 +12,25 @@
"fakerphp/faker": "^1.23.1", "fakerphp/faker": "^1.23.1",
"guzzlehttp/guzzle": "^7.8.1", "guzzlehttp/guzzle": "^7.8.1",
"imangazaliev/didom": "^2.0.1", "imangazaliev/didom": "^2.0.1",
"laravel/framework": "^10.47.0", "laravel/framework": "^10.46.0",
"laravel/sanctum": "^3.3.3", "laravel/sanctum": "^3.3.3",
"laravel/tinker": "^2.9.0", "laravel/tinker": "^2.9.0",
"laravel/ui": "^4.5.0", "laravel/ui": "^4.4.0",
"laravelcollective/html": "^6.4.1", "laravelcollective/html": "^6.4.1",
"league/flysystem": "^3.25.0", "league/flysystem": "^3.24.0",
"twbs/bootstrap": "5.2.3" "twbs/bootstrap": "5.2.3"
}, },
"require-dev": { "require-dev": {
"laravel/breeze": "^1.29.1", "laravel/breeze": "^1.29.0",
"laravel/pint": "^1.14.0", "laravel/pint": "^1.14.0",
"laravel/sail": "^1.28.2", "laravel/sail": "^1.28.1",
"mockery/mockery": "^1.6.7", "mockery/mockery": "^1.6.7",
"nunomaduro/collision": "^7.10.0", "nunomaduro/collision": "^7.10.0",
"phpunit/phpunit": "^10.5.12", "phpunit/phpunit": "^10.5.11",
"spatie/laravel-ignition": "^2.4.2", "spatie/laravel-ignition": "^2.4.2",
"barryvdh/laravel-ide-helper": "^2.15.1", "barryvdh/laravel-ide-helper": "^2.15.1",
"squizlabs/php_codesniffer": "^3.9.0", "squizlabs/php_codesniffer": "^3.9.0",
"phpstan/phpstan": "^1.10.60" "phpstan/phpstan": "^1.10.59"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

120
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a8ef8e1a8cc4569e75864f1e869dcb34", "content-hash": "d33acbf60a62d946e0b4a7923aab2689",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@ -1162,16 +1162,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v10.47.0", "version": "v10.46.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "fce29b8de62733cdecbe12e3bae801f83fff2ea4" "reference": "5e95946a8283a8d5c015035793f9c61c297e937f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/fce29b8de62733cdecbe12e3bae801f83fff2ea4", "url": "https://api.github.com/repos/laravel/framework/zipball/5e95946a8283a8d5c015035793f9c61c297e937f",
"reference": "fce29b8de62733cdecbe12e3bae801f83fff2ea4", "reference": "5e95946a8283a8d5c015035793f9c61c297e937f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1364,7 +1364,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2024-03-05T15:18:36+00:00" "time": "2024-02-27T16:46:54+00:00"
}, },
{ {
"name": "laravel/prompts", "name": "laravel/prompts",
@ -1617,16 +1617,16 @@
}, },
{ {
"name": "laravel/ui", "name": "laravel/ui",
"version": "v4.5.0", "version": "v4.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/ui.git", "url": "https://github.com/laravel/ui.git",
"reference": "da3811f409297d13feccd5858ce748e7474b3d11" "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/ui/zipball/da3811f409297d13feccd5858ce748e7474b3d11", "url": "https://api.github.com/repos/laravel/ui/zipball/7335d7049b2cde345c029e9d2de839b80af62bc0",
"reference": "da3811f409297d13feccd5858ce748e7474b3d11", "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1637,8 +1637,8 @@
"php": "^8.0" "php": "^8.0"
}, },
"require-dev": { "require-dev": {
"orchestra/testbench": "^7.35|^8.15|^9.0", "orchestra/testbench": "^7.0|^8.0|^9.0",
"phpunit/phpunit": "^9.3|^10.4|^11.0" "phpunit/phpunit": "^9.3|^10.4"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -1673,9 +1673,9 @@
"ui" "ui"
], ],
"support": { "support": {
"source": "https://github.com/laravel/ui/tree/v4.5.0" "source": "https://github.com/laravel/ui/tree/v4.4.0"
}, },
"time": "2024-03-04T13:58:27+00:00" "time": "2024-01-12T15:56:45+00:00"
}, },
{ {
"name": "laravelcollective/html", "name": "laravelcollective/html",
@ -1940,16 +1940,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "3.25.0", "version": "3.24.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "4c44347133618cccd9b3df1729647a1577b4ad99" "reference": "b25a361508c407563b34fac6f64a8a17a8819675"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4c44347133618cccd9b3df1729647a1577b4ad99", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675",
"reference": "4c44347133618cccd9b3df1729647a1577b4ad99", "reference": "b25a361508c407563b34fac6f64a8a17a8819675",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1977,7 +1977,7 @@
"friendsofphp/php-cs-fixer": "^3.5", "friendsofphp/php-cs-fixer": "^3.5",
"google/cloud-storage": "^1.23", "google/cloud-storage": "^1.23",
"microsoft/azure-storage-blob": "^1.1", "microsoft/azure-storage-blob": "^1.1",
"phpseclib/phpseclib": "^3.0.36", "phpseclib/phpseclib": "^3.0.34",
"phpstan/phpstan": "^1.10", "phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.5.11|^10.0", "phpunit/phpunit": "^9.5.11|^10.0",
"sabre/dav": "^4.6.0" "sabre/dav": "^4.6.0"
@ -2014,7 +2014,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/thephpleague/flysystem/issues", "issues": "https://github.com/thephpleague/flysystem/issues",
"source": "https://github.com/thephpleague/flysystem/tree/3.25.0" "source": "https://github.com/thephpleague/flysystem/tree/3.24.0"
}, },
"funding": [ "funding": [
{ {
@ -2026,7 +2026,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-03-09T17:06:45+00:00" "time": "2024-02-04T12:10:17+00:00"
}, },
{ {
"name": "league/flysystem-local", "name": "league/flysystem-local",
@ -2502,16 +2502,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v5.0.2", "version": "v5.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69",
"reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2554,9 +2554,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1"
}, },
"time": "2024-03-05T20:51:40+00:00" "time": "2024-02-21T19:24:10+00:00"
}, },
{ {
"name": "nunomaduro/termwind", "name": "nunomaduro/termwind",
@ -6207,16 +6207,16 @@
}, },
{ {
"name": "composer/pcre", "name": "composer/pcre",
"version": "3.1.2", "version": "3.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/pcre.git", "url": "https://github.com/composer/pcre.git",
"reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
"reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6258,7 +6258,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/composer/pcre/issues", "issues": "https://github.com/composer/pcre/issues",
"source": "https://github.com/composer/pcre/tree/3.1.2" "source": "https://github.com/composer/pcre/tree/3.1.1"
}, },
"funding": [ "funding": [
{ {
@ -6274,7 +6274,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-03-07T15:38:35+00:00" "time": "2023-10-11T07:11:09+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
@ -6744,16 +6744,16 @@
}, },
{ {
"name": "laravel/breeze", "name": "laravel/breeze",
"version": "v1.29.1", "version": "v1.29.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/breeze.git", "url": "https://github.com/laravel/breeze.git",
"reference": "22c53b84b7fff91b01a318d71a10dfc251e92849" "reference": "f4c4cb2197cd96a3d8a913c7b8437291d8bde5af"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/breeze/zipball/22c53b84b7fff91b01a318d71a10dfc251e92849", "url": "https://api.github.com/repos/laravel/breeze/zipball/f4c4cb2197cd96a3d8a913c7b8437291d8bde5af",
"reference": "22c53b84b7fff91b01a318d71a10dfc251e92849", "reference": "f4c4cb2197cd96a3d8a913c7b8437291d8bde5af",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6802,7 +6802,7 @@
"issues": "https://github.com/laravel/breeze/issues", "issues": "https://github.com/laravel/breeze/issues",
"source": "https://github.com/laravel/breeze" "source": "https://github.com/laravel/breeze"
}, },
"time": "2024-03-04T14:35:21+00:00" "time": "2024-02-21T14:14:23+00:00"
}, },
{ {
"name": "laravel/pint", "name": "laravel/pint",
@ -6872,16 +6872,16 @@
}, },
{ {
"name": "laravel/sail", "name": "laravel/sail",
"version": "v1.28.2", "version": "v1.28.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/sail.git", "url": "https://github.com/laravel/sail.git",
"reference": "057777403b8ab79222dcc04983beaab10b6de6a0" "reference": "f84e444a3dbc1811803cd2a050bdd54ff6f5eef8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/sail/zipball/057777403b8ab79222dcc04983beaab10b6de6a0", "url": "https://api.github.com/repos/laravel/sail/zipball/f84e444a3dbc1811803cd2a050bdd54ff6f5eef8",
"reference": "057777403b8ab79222dcc04983beaab10b6de6a0", "reference": "f84e444a3dbc1811803cd2a050bdd54ff6f5eef8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6930,7 +6930,7 @@
"issues": "https://github.com/laravel/sail/issues", "issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail" "source": "https://github.com/laravel/sail"
}, },
"time": "2024-03-04T14:58:29+00:00" "time": "2024-02-23T00:24:47+00:00"
}, },
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
@ -7448,16 +7448,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.60", "version": "1.10.59",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe" "reference": "e607609388d3a6d418a50a49f7940e8086798281"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/95dcea7d6c628a3f2f56d091d8a0219485a86bbe", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
"reference": "95dcea7d6c628a3f2f56d091d8a0219485a86bbe", "reference": "e607609388d3a6d418a50a49f7940e8086798281",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7506,20 +7506,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-03-07T13:30:19+00:00" "time": "2024-02-20T13:59:13+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "10.1.13", "version": "10.1.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8" "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d51c3aec14896d5e80b354fad58e998d1980f8f8", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/842f72662d6b9edda84c4b6f13885fd9cd53dc63",
"reference": "d51c3aec14896d5e80b354fad58e998d1980f8f8", "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7576,7 +7576,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.13" "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.12"
}, },
"funding": [ "funding": [
{ {
@ -7584,7 +7584,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-03-09T16:54:15+00:00" "time": "2024-03-02T07:22:05+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@ -7831,16 +7831,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "10.5.12", "version": "10.5.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b" "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/41a9886b85ac7bf3929853baf96b95361cd69d2b", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4",
"reference": "41a9886b85ac7bf3929853baf96b95361cd69d2b", "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7912,7 +7912,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy", "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.12" "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11"
}, },
"funding": [ "funding": [
{ {
@ -7928,7 +7928,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-03-09T12:04:07+00:00" "time": "2024-02-25T14:05:00+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",

1
public/img/front-page/icons8-checkmark (1).svg
View File

@ -1 +0,0 @@
<svg fill="#1A1A1A" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" width="50px" height="50px"><path d="M 42.875 8.625 C 42.84375 8.632813 42.8125 8.644531 42.78125 8.65625 C 42.519531 8.722656 42.292969 8.890625 42.15625 9.125 L 21.71875 40.8125 L 7.65625 28.125 C 7.410156 27.8125 7 27.675781 6.613281 27.777344 C 6.226563 27.878906 5.941406 28.203125 5.882813 28.597656 C 5.824219 28.992188 6.003906 29.382813 6.34375 29.59375 L 21.25 43.09375 C 21.46875 43.285156 21.761719 43.371094 22.050781 43.328125 C 22.339844 43.285156 22.59375 43.121094 22.75 42.875 L 43.84375 10.1875 C 44.074219 9.859375 44.085938 9.425781 43.875 9.085938 C 43.664063 8.746094 43.269531 8.566406 42.875 8.625 Z"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 708 B

2
resources/views/admin/catalog/faculty/create.blade.php
View File

@ -74,7 +74,7 @@
@endif @endif
</div> </div>
<div class="mt-3"> <div class="mt-3">
{{ Form::submit('Создать', ['class' => 'btn btn-primary']) }} {{ Form::submit('создать', ['class' => 'btn btn-primary']) }}
</div> </div>
</div> </div>
{{ Form::close() }} {{ Form::close() }}

48
resources/views/admin/catalog/faculty/edit.blade.php
View File

@ -1,85 +1,75 @@
@php use App\Helpers\PositionHelper; @endphp
@extends('layouts.admin_layout') @extends('layouts.admin_layout')
@section('content') @section('content')
@auth() @auth()
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h1 class=""> Редактировать факультет</h1> <h1 class=""> Создать факультет</h1>
{{ Form::open(['url' => route('faculties.update', $faculty), 'method' => 'PATCH', 'class' => 'needs-validation', 'novalidate']) }} {{ Form::open(['url' => route('faculties.update', $faculty), 'method' => 'PATCH', 'class' => '']) }}
<div class="col"> <div class="col">
<div class="mt-3"> <div class="mt-3">
{{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position')]) }} {{ Form::label('position', 'Позиция') }}
<span class="text-danger">*</span>
</div> </div>
<div class="mt-1"> <div class="mt-1">
{{ Form::number('position', $faculty->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position'), 'required']) }} {{ Form::text('position', $faculty->position, ['class' => 'form-control']) }}
<div class="invalid-feedback">
Поле "Позиция" обязательно!
</div>
</div> </div>
<div class="text-danger"> <div>
@if ($errors->any()) @if ($errors->any())
{{ $errors->first('position') }} {{ $errors->first('position') }}
@endif @endif
</div> </div>
<div class="mt-3"> <div class="mt-3">
{{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.name')]) }} {{ Form::label('name', 'Название') }}
<span class="text-danger">*</span>
</div> </div>
<div class="mt-1"> <div class="mt-1">
{{ Form::text('name', $faculty->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.name'), 'required']) }} {{ Form::text('name', $faculty->name, ['class' => 'form-control']) }}
<div class="invalid-feedback">
Поле "Название" обязательно!
</div>
</div> </div>
<div class="text-danger"> <div>
@if ($errors->any()) @if ($errors->any())
{{ $errors->first('name') }} {{ $errors->first('name') }}
@endif @endif
</div> </div>
<div class="mt-3"> <div class="mt-3">
{{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.description')]) }} {{ Form::label('description', 'Описание') }}
</div> </div>
<div class="mt-1"> <div class="mt-1">
{{ Form::text('description', $faculty->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.description')]) }} {{ Form::text('description', $faculty->description, ['class' => 'form-control']) }}
</div> </div>
<div class="text-danger"> <div>
@if ($errors->any()) @if ($errors->any())
{{ $errors->first('description') }} {{ $errors->first('description') }}
@endif @endif
</div> </div>
<div class="mt-3"> <div class="mt-3">
{{ Form::label('educational_institution_id', 'Учебное заведение', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.educational_institution_id')]) }} {{ Form::label('educational_institution_id', 'Учебное заведение') }}
<span class="text-danger">*</span>
</div> </div>
<div class="mt-1"> <div class="mt-1">
{{ Form::select('educational_institution_id', $educationalInstitutions, $faculty->educationalInstitution->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.educational_institution_id')]) }} {{ Form::select('educational_institution_id', $educationalInstitutions, $faculty->educationalInstitution->id, ['class' => 'form-select']) }}
</div> </div>
<div class="text-danger"> <div>
@if ($errors->any()) @if ($errors->any())
{{ $errors->first('educational_institution_id') }} {{ $errors->first('educational_institution_id') }}
@endif @endif
</div> </div>
<div class="mt-3"> <div class="mt-3">
{{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }} {{ Form::label('slug', 'URL') }}
</div> </div>
<div class="mt-1"> <div class="mt-1">
{{ Form::text('slug', $faculty->slug, ['class' => 'form-control','data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }} {{ Form::text('slug', $faculty->slug, ['class' => 'form-control']) }}
</div> </div>
<div class="text-danger"> <div>
@if ($errors->any()) @if ($errors->any())
{{ $errors->first('slug') }} {{ $errors->first('slug') }}
@endif @endif
</div> </div>
<div class="mt-3"> <div class="mt-3">
{{ Form::submit('Изменить', ['class' => 'btn btn-primary']) }} {{ Form::submit('создать', ['class' => 'btn btn-primary']) }}
</div> </div>
</div> </div>
{{ Form::close() }} {{ Form::close() }}
</div> </div>
</div> </div>
@endauth @endauth
@include('layouts.bootstrap_validation')
@endsection @endsection

158
resources/views/new-design/bakalavr-special.blade.php
View File

@ -48,7 +48,7 @@
color: unset; color: unset;
} }
a:hover{ a:hover{
color: unset;
} }
@ -126,20 +126,19 @@
left: 0; left: 0;
height: 25px; height: 25px;
width: 25px; width: 25px;
background-color: transparent; background-color: rgba(255, 255, 255, 0.18);
border: 1px solid rgb(241, 241, 241); border: 1px solid rgba(255, 255, 255, 0.2);
border-radius: 8px; border-radius: 5px;
} }
/* On mouse-over, add a grey background color */ /* On mouse-over, add a grey background color */
.checkbox1:hover input ~ .checkmark { .checkbox1:hover input ~ .checkmark {
background-color: rgba(64, 160, 241, 0.85); background-color: rgba(44, 131, 204, 0.85);
} }
/* When the checkbox is checked, add a blue background */ /* When the checkbox is checked, add a blue background */
.checkbox1 input:checked ~ .checkmark { .checkbox1 input:checked ~ .checkmark {
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
} }
/* Create the checkmark/indicator (hidden when not checked) */ /* Create the checkmark/indicator (hidden when not checked) */
@ -172,14 +171,12 @@
/* width */ /* width */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 15px; width: 15px;
transition: 0.3s;
background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229));
} }
/* Track */ /* Track */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background: #bdbdbd; background: #FFFFFF;
box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
border-radius: 20px; border-radius: 20px;
@ -190,18 +187,15 @@
height: 30px; height: 30px;
width: 8px; width: 8px;
background-image: linear-gradient(to right, rgba(38, 159, 239, 0.6), 20%, rgba(2, 142, 229, 0.6)); background: #eaeaea;
opacity: 0.1; box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
border-radius: 10px; border-radius: 10px;
transition: 0.3s;
} }
/* Handle on hover */ /* Handle on hover */
::-webkit-scrollbar-thumb:hover { ::-webkit-scrollbar-thumb:hover {
background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229)); background: #bebebe;
transition: 0.3s;
} }
@ -243,9 +237,9 @@
<a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;"> <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">
<div class="hover2"> Все контакты</div> <div class="hover2"> Все контакты</div>
</a> </a>
{{-- <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">--}} <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">
{{-- <div class="hover2"> RU </div>--}} <div class="hover2"> RU </div>
{{-- </a>--}} </a>
{{-- <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}} {{-- <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}}
</div> </div>
@ -324,7 +318,7 @@
</div> </div>
<div class="row d-flex justify-content-md-start justify-content-center"> <div class="row d-flex justify-content-md-start justify-content-center">
@php use App\Services\DirectonHtmlBuilder; @endphp
@foreach($faculties as $faculty) @foreach($faculties as $faculty)
<div class="mt-xl-5 col-xxl-4 col-md-6 col-10 "> <div class="mt-xl-5 col-xxl-4 col-md-6 col-10 ">
@ -364,11 +358,57 @@
<tr> <tr>
<td> <td>
<a class=" border border-dark rounded-3 p-2 hover1" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasScrolling-{{ $direction->id }}" aria-controls="offcanvasScrolling" role="button">{{ $direction->name }}</a> <a class="" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasScrolling-{{ $direction->id }}" aria-controls="offcanvasScrolling" role="button">{{ $direction->name }}</a>
@php <div class="offcanvas offcanvas-bottom" data-bs-scroll="true" data-bs-backdrop="false" tabindex="-1" id="offcanvasScrolling-{{ $direction->id }}" aria-labelledby="offcanvasScrollingLabel-{{ $direction->id }}" style="height: 100%; font-family: Geologica-Medium;overflow-y: auto ;">
$DirectonHtmlBuilder = new DirectonHtmlBuilder($direction); <div class="mx-5">
echo $DirectonHtmlBuilder->getHTML(); <div class="col-12 d-flex justify-content-end mt-4">
@endphp <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
</div>
<div class="row">
<div class="col-xl-3 col-12">
<div class="display-5 " style="font-family: Geologica-Light">{{ $direction->code }} </div>
<div class="display-5 " > {{ $direction->name }}</div>
</div>
</div>
<div class="row">
<div class="col-xl-3 col-12">
<br>
<br>
<div class=" "> Уровень образования: <span style="font-family: Geologica-Light">{{ $direction->educationLevel->name }} </span> </div>
<div class=" "> Форма обучения: <span style="font-family: Geologica-Light">{{ $direction->educationForm->name }} </span></div>
</div>
<div class="col-xl-3 col-12">
<br>
<br>
<div class=" "> Бюджетные места: <span style="font-family: Geologica-Light">{{ $direction->budget_places }} </span> </div>
<div class=" "> Квота: <span style="font-family: Geologica-Light">{{ $direction->quota }} </span></div>
</div>
<div class="col-xl-3 col-12">
<br>
<br>
<div class=" "> Места на контракт: <span style="font-family: Geologica-Light">{{ $direction->paid_places }} </span> </div>
<div class=" "> Стоимость платного обучения: <span style="font-family: Geologica-Light">{{ $direction->cost_paid_place }} </span></div>
</div>
<div class="col-xl-3 col-12">
<br>
<br>
<div class=" "> Период обучения (в годах): <span style="font-family: Geologica-Light">{{ $direction->period }} </span> </div>
</div>
</div>
{{-- <p class="display-5 " style="font-family: Geologica-Light">{{ $direction->code }} </p>--}}
{{-- <p class="display-5 " > {{ $direction->name }}</p>--}}
<div class="offcanvas-body mt-2" style="font-family: Geologica-ExtraLight">
<p style="text-align: justify;">{{ $direction->description }}</p>
<p style="text-align: justify;">{{ $direction->description }}</p>
</div>
</div>
</div>
</td> </td>
<td> {{ $direction->code }} </td> <td> {{ $direction->code }} </td>
@ -416,7 +456,6 @@
<div class="text-white display-6" > Выберите предметы ЕГЭ</div> <div class="text-white display-6" > Выберите предметы ЕГЭ</div>
<form class="text-white mt-4 fs-4 calcul" style=" font-family: Geologica-ExtraLight"> <form class="text-white mt-4 fs-4 calcul" style=" font-family: Geologica-ExtraLight">
<script src="{{ URL::to('https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js')}}"></script>
@foreach($subjects as $id => $name) @foreach($subjects as $id => $name)
@if($name == "Русский язык" || $name == "математика" ) @if($name == "Русский язык" || $name == "математика" )
@ -438,26 +477,22 @@
</form> </form>
<div class="row d-md-block d-flex ms-md-3 justify-content-center"> <div class="row d-md-block d-flex ms-md-3 justify-content-center">
<a role="button" style="border-radius: 11px; font-family: Geologica-ExtraLight" class="hover3 unclearall mt-4 col-5 text-white p-2 border border-white d-inline-flex justify-content-center shadow"> Сбросить фильтр </a> <button style="border-radius: 11px; font-family: Geologica-ExtraLight" class="mt-4 col-5 text-white p-2 border border-white d-inline-flex justify-content-center shadow checkbox_clear"> Сбросить фильтр </button>
<script>
function checkAll(checkEm) {
var cbs = document.getElementsByTagName('input');
<script type="text/javascript"> for (var i = 0; i < cbs.length; i++) {
function uncheckAll() { if (cbs[i].type == 'checkbox') {
if (cbs[i].name == 'my_form_tasks[]') {
document.querySelectorAll('input[type="checkbox"]') cbs[i].checked = checkEm;
.forEach(el => el.checked = false); }
}
}
} }
document.querySelector('button').addEventListener('click', uncheckAll)
</script> </script>
</div> </div>
<script>window.onload = function() { <script>window.onload = function() {
$(".unclearall").click(function(){
$('input[type="checkbox"]').prop('checked',false);
return false;
})
$(".calcul input").click(function(){ $(".calcul input").click(function(){
$('.text-remove').remove(); $('.text-remove').remove();
let selected = []; let predmets=''; let selected = []; let predmets='';
@ -465,15 +500,14 @@
selected.push($(this).val()); selected.push($(this).val());
predmets += $(this).val()+','; predmets += $(this).val()+',';
}); });
console.log(selected);
$.ajax({ url: "{{ route('calculator') }}", dataType: 'json', cache:false,type: "POST",data: 'ajx=get_napr&format=html&predmets='+JSON.stringify(selected), $.ajax({ url: "{{ route('calculator') }}", dataType: 'json', cache:false,type: "POST",data: 'ajx=get_napr&format=html&predmets='+JSON.stringify(selected),
success: function(data) { success: function(data) {
$(".calcul_rez").html('<tr><th class="fs-5"> Факультет </th><th class="fs-5"> Направление </th><th class="fs-5" style="text-align: right;"> Период обучения (в годах)</th></tr>'); $(".calcul_rez").html('<tr><th> Факультет </th><th> Направление </th><th align="right"> Период обучения (в годах)</th></tr>');
$(".calcul_rez").append(data.html); $(".calcul_rez").append(data.html);
console.log(data);
}}); }});
}); });
}; };
@ -483,17 +517,39 @@
<div class="col-md-6 mt-md-0 mt-5 col-12"> <div class="col-md-6 mt-md-0 mt-5 col-12">
<div class="d-flex border border-white py-5 justify-content-center align-items-center" style="border-radius: 50px; min-height: 200px;"> <div class="d-md-flex d-none border border-white py-5 justify-content-center" style="border-radius: 50px;">
<div class="col-12 text-remove text-white w-100 text-center fs-4" style="font-family: Geologica-ExtraLight">Выберите предметы</div> <table class="table1 text-white mx-0 p-2 calcul_rez" style="width: 90%; font-family: Geologica-ExtraLight;">
<div class="table-responsive ps-5 " style="width: 90%"> <span class="text-remove">Выберите предметы</span>
<table class=" text-white px-5 calcul_rez" style="width: 90%; font-family: Geologica-ExtraLight;">
</table>
</table>
</div>
</div> </div>
<div class="d-md-none d-flex border border-white py-5 justify-content-center " style="border-radius: 50px;">
<table class="table1 text-white mx-0 p-2 calcul_rez " style="width: 90%; font-family: Geologica-ExtraLight; font-size: 13px;">
<tr class="">
<td id="faculty"> Технологический факультет </td>
<td> Строительство </td>
<td class="text-end"> 4 года</td>
</tr>
<tr class="">
<td id="faculty"> Технологический факультет </td>
<td> Технологические машины и оборудование </td>
<td class="text-end"> 4 года</td>
</tr>
<tr class="">
<td> Технологический факультет </td>
<td> Продукты питания из растительного сырья </td>
<td class="text-end"> 4 года</td>
</tr>
<tr class="">
<td> Технологический факультет </td>
<td> Строительство </td>
<td class="text-end"> 4 года</td>
</tr>
</table>
</div>
</div> </div>

3
routes/pages.php
View File

@ -19,9 +19,6 @@ Route::get('/', function () {
return view('new-design.bakalavr-special', compact('faculties')); return view('new-design.bakalavr-special', compact('faculties'));
})->name('bakalavr-special'); })->name('bakalavr-special');
Route::get('/course', function () { Route::get('/course', function () {
return view('menu.course'); return view('menu.course');
})->name('course'); })->name('course');