Compare commits

..

2 Commits

Author SHA1 Message Date
aslan 1163f5e007 Merge pull request 'adding logic in views' (#19) from RomanGolienko/Roman_applicant-site:new-design into main
Tests & Lint & Deploy to Railway / build (2.6.6, 20.x, 8.3) (push) Failing after 1m53s Details
Tests & Lint & Deploy to Railway / deploy (push) Has been skipped Details
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/19
2024-03-05 16:33:03 +03:00
ROMANGOLIENKO 33b803472d adding logic in views
Tests & Lint & Deploy to Railway / build (2.6.6, 20.x, 8.3) (pull_request) Failing after 1m50s Details
Tests & Lint & Deploy to Railway / deploy (pull_request) Has been skipped Details
2024-03-05 16:31:27 +03:00
3 changed files with 556 additions and 626 deletions

26
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": "8d490f3e9360173e41450245a26f94f7", "content-hash": "508caf2079a4111080260230b4ab3370",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@ -4035,16 +4035,16 @@
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v6.4.4", "version": "v6.4.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "7a186f64a7f02787c04e8476538624d6aa888e42" "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/7a186f64a7f02787c04e8476538624d6aa888e42", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
"reference": "7a186f64a7f02787c04e8476538624d6aa888e42", "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4128,7 +4128,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.4.4" "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
}, },
"funding": [ "funding": [
{ {
@ -4144,7 +4144,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-02-27T06:32:13+00:00" "time": "2024-03-04T21:00:47+00:00"
}, },
{ {
"name": "symfony/mailer", "name": "symfony/mailer",
@ -5084,16 +5084,16 @@
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v6.4.3", "version": "v6.4.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842" "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842", "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
"reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842", "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5147,7 +5147,7 @@
"url" "url"
], ],
"support": { "support": {
"source": "https://github.com/symfony/routing/tree/v6.4.3" "source": "https://github.com/symfony/routing/tree/v6.4.5"
}, },
"funding": [ "funding": [
{ {
@ -5163,7 +5163,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-01-30T13:55:02+00:00" "time": "2024-02-27T12:33:30+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",

File diff suppressed because it is too large Load Diff

View File

@ -11,11 +11,11 @@ Route::get('/magistr', function () {
return view('new-design.magistr'); return view('new-design.magistr');
})->name('magistr'); })->name('magistr');
Route::get('/home', [PageController::class, 'directions'])->name('home'); Route::get('/', [PageController::class, 'directions'])->name('/bakalavr-special');
Route::get('/', function () { //Route::get('/', function () {
return view('new-design.bakalavr-special'); // return view('new-design.bakalavr-special');
})->name('bakalavr-special'); //})->name('bakalavr-special');
Route::get('/course', function () { Route::get('/course', function () {
return view('menu.course'); return view('menu.course');