diff --git a/app/Http/Controllers/MMCController.php b/app/Http/Controllers/MMCController.php index 973623d..75e566b 100644 --- a/app/Http/Controllers/MMCController.php +++ b/app/Http/Controllers/MMCController.php @@ -10,11 +10,12 @@ class MMCController extends Controller /** * Display a listing of the resource. * - * @param int $project_id + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function index($project_id) + public function index(Request $request) { + $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); return view('mmc.show', ['project' => $project]); } @@ -22,23 +23,23 @@ class MMCController extends Controller /** * Show the form for creating a new resource. * - * @param int $project_id + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function create($project_id) + public function create(Request $request) { + $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); - return view('mmc.create',['project' => $project]); + return view('mmc.create', ['project' => $project]); } /** * Store a newly created resource in storage. * - * @param int $project_id * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store($project_id,Request $request) + public function store(Request $request) { // $request->validate([ // 'username' => ['required', 'string', 'max:255'], @@ -61,11 +62,11 @@ class MMCController extends Controller /** * Display the specified resource. * - * @param int $project_id + * @param \Illuminate\Http\Request $request * @param int $id * @return \Illuminate\Http\Response */ - public function show($project_id,$id) + public function show(Request $request, $id) { // $user = User::find($id); // return view('admin.users.show', ['user' => $user]); @@ -74,10 +75,11 @@ class MMCController extends Controller /** * Show the form for editing the specified resource. * + * @param \Illuminate\Http\Request $request * @param int $id * @return \Illuminate\Http\Response */ - public function edit($id) + public function edit(Request $request, $id) { // $user = User::find($id); // return view('admin.users.edit', ['user' => $user]); @@ -111,10 +113,11 @@ class MMCController extends Controller /** * Remove the specified resource from storage. * + * @param \Illuminate\Http\Request $request * @param int $id * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy(Request $request, $id) { // User::findOrFail($id)->delete(); // return redirect()->route('users.index'); diff --git a/app/Http/Controllers/SelectProjectController.php b/app/Http/Controllers/SelectProjectController.php new file mode 100644 index 0000000..09e065c --- /dev/null +++ b/app/Http/Controllers/SelectProjectController.php @@ -0,0 +1,30 @@ +exists()) + { + $request->session()->put('project_id',$project_id); + } + else + { + $request->session()->forget('project_id'); + } + return view('dashboard'); + } +} diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index cebc3b1..f3f6917 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -17,6 +17,9 @@ $projects = Project::all()->sortBy('id');
+ @@ -29,7 +32,27 @@ $projects = Project::all()->sortBy('id'); @forelse ($projects as $project) - + + diff --git a/resources/views/documents/create.blade.php b/resources/views/documents/create.blade.php new file mode 100644 index 0000000..2560339 --- /dev/null +++ b/resources/views/documents/create.blade.php @@ -0,0 +1,61 @@ + + +

+ {{ __('Create project') }} +

+ + +
+
+
+
+
+ @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif +
+ @csrf + +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ +
+ +
+ + {{__('Cancel')}} + +
+
+ +
+
+
+
+
+ \ No newline at end of file diff --git a/resources/views/documents/edit.blade.php b/resources/views/documents/edit.blade.php new file mode 100644 index 0000000..cc22ea7 --- /dev/null +++ b/resources/views/documents/edit.blade.php @@ -0,0 +1,57 @@ + + +

+ {{ __('Edit project') }} +

+ + +
+
+
+
+
+ @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif +
+ @csrf + @method('PUT') +
+ + + +
+
+ + + +
+
+ + + +
+ +
+ +
+ + {{__('Cancel')}} + +
+
+ +
+
+
+
+
+ \ No newline at end of file diff --git a/resources/views/documents/list.blade.php b/resources/views/documents/list.blade.php new file mode 100644 index 0000000..e8f2d01 --- /dev/null +++ b/resources/views/documents/list.blade.php @@ -0,0 +1,68 @@ + + +

+ {{ __('Project list') }} +

+ + +
+
+
+
+ + + + +
+
+   + {{ __('Title') }}
{{ $project->name }} +
+ + @if (session()->get('project_id') !== null) + @if (session()->get('project_id') == $project->id) + + @else + + @endif + @else + + @endif +
+ 		{{ $project->name }} {{ $project->description }} {{ $project->mmc_path }}
+ + + + + + + @forelse ( $projects as $project) + + + + + + + @empty + + + + @endforelse +
+ {{ __('Title')}} + + {{ __('Comment')}} + + {{ __('MMC Path')}} + + {{ __('Actions')}} +
{{ $project->name }}{{ $project->description }}{{ $project->mmc_path }} +
+ + + + + + +
+ + + +
+
+
No Projects!
+
+ + + + + \ No newline at end of file diff --git a/resources/views/documents/show.blade.php b/resources/views/documents/show.blade.php new file mode 100644 index 0000000..70d0807 --- /dev/null +++ b/resources/views/documents/show.blade.php @@ -0,0 +1,51 @@ + + +

+ {{ __('Show project') }} +

+ + +
+
+
+
+
+
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ +
+
+ + {{__('Edit project')}} + +
+
+ + {{__('Cancel')}} + +
+
+ +
+
+
+
+
+ \ No newline at end of file diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 046375d..cf9c5ff 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -28,7 +28,7 @@ {{ __('Projects') }} - @isset($project) + @if (session()->get('project_id') !== null) - @endisset + @endif diff --git a/routes/web.php b/routes/web.php index fe7322b..3b7887b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -6,6 +6,7 @@ use App\Http\Controllers\MMCController; use Illuminate\Support\Facades\Route; use App\Http\Controllers\UserController; use App\Http\Controllers\ProjectController; +use App\Http\Controllers\SelectProjectController; /* |-------------------------------------------------------------------------- @@ -34,13 +35,12 @@ Route::prefix('admin')->middleware(['admin'])->group(function () { // Projects Route::resource('/projects', ProjectController::class)->middleware(['auth']); +Route::post('/project/{project}/select',SelectProjectController::class)->middleware(['auth'])->name('project.select'); -Route::get('project/{project}/mmc', [MMCController::class, 'index'])->middleware(['auth'])->name('mmc.index'); -Route::get('project/{project}/mmc/create', [MMCController::class, 'create'])->middleware(['auth'])->name('mmc.create'); -Route::get('project/{project}/mmc/{mmc}', [MMCController::class, 'show'])->middleware(['auth'])->name('mmc.show'); - -Route::resource('/documents', DocumentController::class)->middleware(['auth']); -Route::resource('/auk', AUKController::class)->middleware(['auth']); - +Route::prefix('project/'.session('project_id'))->middleware(['auth'])->group(function () { + Route::resource('/mmc', MMCController::class); + Route::resource('/documents', DocumentController::class); + Route::resource('/auk', DocumenAUKControllertController::class); +}); require __DIR__ . '/auth.php';