prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
16 changed files with 20 additions and 20 deletions
Showing only changes of commit d9362477c2 - Show all commits

View File

@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\admin\Catalog;
namespace App\Http\Controllers\admin\Catalog\Direction;
use App\Http\Controllers\Controller;
use App\Http\Requests\admin\Catalog\StoreEducationFormRequest;
use App\Http\Requests\admin\Catalog\UpdateEducationFormRequest;
use App\Http\Requests\admin\Catalog\Direction\StoreEducationFormRequest;
use App\Http\Requests\admin\Catalog\Direction\UpdateEducationFormRequest;
use App\Models\EducationForm;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
@ -15,12 +15,12 @@ class EducationFormController extends Controller
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
$forms = EducationForm::all();
return view('admin.catalog.education_form.index', compact('forms'));
return view('admin.catalog.direction.education_form.index', compact('forms'));
}
public function create(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
return view('admin.catalog.education_form.create');
return view('admin.catalog.direction.education_form.create');
}
public function store(StoreEducationFormRequest $request)
@ -38,12 +38,12 @@ class EducationFormController extends Controller
public function show(EducationForm $educationForm): View|Factory|\Illuminate\Contracts\Foundation\Application
{
$directions = $educationForm->directions;
return view('admin.catalog.education_form.show', compact('educationForm', 'directions'));
return view('admin.catalog.direction.education_form.show', compact('educationForm', 'directions'));
}
public function edit(EducationForm $educationForm)
{
return view('admin.catalog.education_form.edit', compact('educationForm'));
return view('admin.catalog.direction.education_form.edit', compact('educationForm'));
}
public function update(UpdateEducationFormRequest $request, EducationForm $educationForm)

View File

@ -1,10 +1,10 @@
<?php
namespace App\Http\Controllers\admin\Catalog;
namespace App\Http\Controllers\admin\Catalog\Direction;
use App\Http\Controllers\Controller;
use App\Http\Requests\admin\Catalog\StoreEducationLevelRequest;
use App\Http\Requests\admin\Catalog\UpdateEducationLevelRequest;
use App\Http\Requests\admin\Catalog\Direction\StoreEducationLevelRequest;
use App\Http\Requests\admin\Catalog\Direction\UpdateEducationLevelRequest;
use App\Models\EducationLevel;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
@ -16,12 +16,12 @@ class EducationLevelController extends Controller
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
$levels = EducationLevel::all();
return view('admin.catalog.education_level.index', compact('levels'));
return view('admin.catalog.direction.education_level.index', compact('levels'));
}
public function create(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
return view('admin.catalog.education_level.create');
return view('admin.catalog.direction.education_level.create');
}
public function store(StoreEducationLevelRequest $request): RedirectResponse
@ -41,14 +41,14 @@ class EducationLevelController extends Controller
): View|Application|Factory|\Illuminate\Contracts\Foundation\Application {
$directions = $educationLevel->directions();
return view(
'admin.catalog.education_level.show',
'admin.catalog.direction.education_level.show',
compact('educationLevel', 'directions')
);
}
public function edit(EducationLevel $educationLevel)
{
return view('admin.catalog.education_level.edit', compact('educationLevel'));
return view('admin.catalog.direction.education_level.edit', compact('educationLevel'));
}
public function update(UpdateEducationLevelRequest $request, EducationLevel $educationLevel): RedirectResponse

View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\admin\Catalog;
namespace App\Http\Requests\admin\Catalog\Direction;
use Illuminate\Foundation\Http\FormRequest;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\admin\Catalog;
namespace App\Http\Requests\admin\Catalog\Direction;
use Illuminate\Foundation\Http\FormRequest;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\admin\Catalog;
namespace App\Http\Requests\admin\Catalog\Direction;
use Illuminate\Foundation\Http\FormRequest;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\admin\Catalog;
namespace App\Http\Requests\admin\Catalog\Direction;
use Illuminate\Foundation\Http\FormRequest;

View File

@ -2,10 +2,10 @@
use App\Http\Controllers\admin\AdmissionController;
use App\Http\Controllers\admin\Catalog\DepartmentController;
use App\Http\Controllers\admin\Catalog\Direction\EducationFormController;
use App\Http\Controllers\admin\Catalog\Direction\EducationLevelController;
use App\Http\Controllers\admin\Catalog\DirectionController;
use App\Http\Controllers\admin\Catalog\EducationalInstitutionController;
use App\Http\Controllers\admin\Catalog\EducationFormController;
use App\Http\Controllers\admin\Catalog\EducationLevelController;
use App\Http\Controllers\admin\Catalog\FacultyController;
use App\Http\Controllers\admin\DocumentController;
use App\Http\Controllers\admin\UserController;