Compare commits
No commits in common. "77a0aacf021c1c3b63ef676ca0f7f5a4f911fd68" and "e874cf99f43f808ada8d515b19039346b03e989a" have entirely different histories.
77a0aacf02
...
e874cf99f4
|
@ -1,93 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
|
||||||
|
|
||||||
use App\Http\Requests\StoreFileRequest;
|
|
||||||
use App\Http\Requests\StoreReceptionScreenRequest;
|
|
||||||
use App\Http\Requests\UpdateFileRequest;
|
|
||||||
use App\Http\Requests\UpdateReceptionScreenRequest;
|
|
||||||
use App\Models\File;
|
|
||||||
use App\Models\ReceptionScreen;
|
|
||||||
use App\Services\WorkWithFiles;
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Contracts\View\Factory;
|
|
||||||
use Illuminate\Contracts\View\View;
|
|
||||||
use Illuminate\Foundation\Application;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class FileController extends Controller
|
|
||||||
{
|
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
$this->middleware('auth');
|
|
||||||
}
|
|
||||||
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
|
|
||||||
{
|
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$files = File::all()->sortBy('position');
|
|
||||||
return view('files.index', compact('files'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function create($idReceptionScreen = null): View
|
|
||||||
{
|
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$receptionScreens = ReceptionScreen::pluck('name', 'id');
|
|
||||||
$idsReceptionScreens = $receptionScreens->keys()->toArray();
|
|
||||||
$files = File::where('reception_screen_id', '=', $idReceptionScreen)->get();
|
|
||||||
return view('files.create', compact('receptionScreens', 'idsReceptionScreens', 'idReceptionScreen', 'files'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function store(StoreFileRequest $request)
|
|
||||||
{
|
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$content = $request->file('url');
|
|
||||||
WorkWithFiles::saveFileToUploads($content);
|
|
||||||
$newPath = WorkWithFiles::renameFile($content);
|
|
||||||
|
|
||||||
$validated = $request->validated();
|
|
||||||
$file = new File();
|
|
||||||
$file->name = $validated['name'];
|
|
||||||
$file->url = $newPath;
|
|
||||||
$file->position = $validated['position'];
|
|
||||||
$file->reception_screen_id = $validated['idReceptionScreen'];
|
|
||||||
$file->save();
|
|
||||||
return redirect()->route('files.index');
|
|
||||||
}
|
|
||||||
public function edit(int $idFile)
|
|
||||||
{
|
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$file = (new File())->find($idFile);
|
|
||||||
$files = File::where('reception_screen_id', '=', $file->reception_screen_id)->get();
|
|
||||||
|
|
||||||
$receptionScreens = ReceptionScreen::pluck('name', 'id');
|
|
||||||
$idsReceptionScreens = $receptionScreens->keys()->toArray();
|
|
||||||
$idReceptionScreen = $file->reception_screen_id;
|
|
||||||
return view('files.edit', compact('receptionScreens', 'idsReceptionScreens', 'idReceptionScreen', 'files', 'file'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function update(UpdateFileRequest $request, File $file)
|
|
||||||
{
|
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$validated = $request->validated();
|
|
||||||
|
|
||||||
$file->name = $validated['name'];
|
|
||||||
$file->position = $validated['position'];
|
|
||||||
$file->reception_screen_id = $validated['idReceptionScreen'];
|
|
||||||
$file->save();
|
|
||||||
return redirect()->route('admin-reception-screen.index');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function destroy($idFile)
|
|
||||||
{
|
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$file = (new File())->find($idFile);
|
|
||||||
$file->delete();
|
|
||||||
return redirect()->route('admin-reception-screen.index');
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -18,8 +18,6 @@ class ReceptionScreenController extends Controller
|
||||||
}
|
}
|
||||||
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
|
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
|
||||||
{
|
{
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$receptionScreens = ReceptionScreen::all()->sortBy('position');
|
$receptionScreens = ReceptionScreen::all()->sortBy('position');
|
||||||
return view('admin-reception-screen.index', compact('receptionScreens'));
|
return view('admin-reception-screen.index', compact('receptionScreens'));
|
||||||
}
|
}
|
||||||
|
@ -34,8 +32,6 @@ class ReceptionScreenController extends Controller
|
||||||
|
|
||||||
public function store(StoreReceptionScreenRequest $request)
|
public function store(StoreReceptionScreenRequest $request)
|
||||||
{
|
{
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$validated = $request->validated();
|
$validated = $request->validated();
|
||||||
$receptionScreen = new ReceptionScreen();
|
$receptionScreen = new ReceptionScreen();
|
||||||
$receptionScreen->name = $validated['name'];
|
$receptionScreen->name = $validated['name'];
|
||||||
|
@ -56,8 +52,6 @@ class ReceptionScreenController extends Controller
|
||||||
|
|
||||||
public function update(UpdateReceptionScreenRequest $request, $id)
|
public function update(UpdateReceptionScreenRequest $request, $id)
|
||||||
{
|
{
|
||||||
abort_if(Auth::guest(), 403);
|
|
||||||
|
|
||||||
$validated = $request->validated();
|
$validated = $request->validated();
|
||||||
$receptionScreen = new ReceptionScreen();
|
$receptionScreen = new ReceptionScreen();
|
||||||
$currentReceptionScreen = $receptionScreen->find($id);
|
$currentReceptionScreen = $receptionScreen->find($id);
|
||||||
|
|
|
@ -6,6 +6,10 @@ use Illuminate\Http\Request;
|
||||||
|
|
||||||
class UploadFileController extends Controller
|
class UploadFileController extends Controller
|
||||||
{
|
{
|
||||||
|
public function index()
|
||||||
|
{
|
||||||
|
return view('uploadfile');
|
||||||
|
}
|
||||||
public function showUploadFile(Request $request)
|
public function showUploadFile(Request $request)
|
||||||
{
|
{
|
||||||
$file = $request->file('image');
|
$file = $request->file('image');
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Requests;
|
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
|
|
||||||
class StoreFileRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*/
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'name' => 'max:255',
|
|
||||||
'position' => 'int|max:255',
|
|
||||||
'url' => 'file',
|
|
||||||
'idReceptionScreen' => 'int|max:255',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Requests;
|
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
|
|
||||||
class UpdateFileRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*/
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'name' => 'required|max:255',
|
|
||||||
'position' => 'required||int|max:255',
|
|
||||||
'idReceptionScreen' => 'int|max:255',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Services;
|
|
||||||
|
|
||||||
use Carbon\Carbon;
|
|
||||||
|
|
||||||
class WorkWithFiles
|
|
||||||
{
|
|
||||||
public static function saveFileToUploads($content)
|
|
||||||
{
|
|
||||||
$destinationPath = 'uploads';
|
|
||||||
$content->move($destinationPath, $content->getClientOriginalName());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function renameFile($content)
|
|
||||||
{
|
|
||||||
$nameChunks = explode('.', $content->getClientOriginalName());
|
|
||||||
array_splice($nameChunks, 1);
|
|
||||||
$timestamp = Carbon::now();
|
|
||||||
$name = implode('.', $nameChunks);
|
|
||||||
$newName = "{$name}{$timestamp}.{$content->getClientOriginalExtension()}";
|
|
||||||
|
|
||||||
$dir = __DIR__;
|
|
||||||
$path = "{$dir}/../../public/uploads/";
|
|
||||||
$oldName = $content->getClientOriginalName();
|
|
||||||
rename("{$path}{$oldName}", "{$path}{$newName}");
|
|
||||||
return "{$path}{$newName}";
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1047,16 +1047,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v10.42.0",
|
"version": "v10.41.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "fef1aff874a6749c44f8e142e5764eab8cb96890"
|
"reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/fef1aff874a6749c44f8e142e5764eab8cb96890",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/da31969bd35e6ee0bbcd9e876f88952dc754b012",
|
||||||
"reference": "fef1aff874a6749c44f8e142e5764eab8cb96890",
|
"reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1248,7 +1248,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-01-23T15:07:56+00:00"
|
"time": "2024-01-16T15:23:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/prompts",
|
"name": "laravel/prompts",
|
||||||
|
@ -2131,16 +2131,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nesbot/carbon",
|
"name": "nesbot/carbon",
|
||||||
"version": "2.72.2",
|
"version": "2.72.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/briannesbitt/Carbon.git",
|
"url": "https://github.com/briannesbitt/Carbon.git",
|
||||||
"reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130"
|
"reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e7edc41b58d65509baeb0d4a14c8fa41d627130",
|
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
|
||||||
"reference": "3e7edc41b58d65509baeb0d4a14c8fa41d627130",
|
"reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -2234,35 +2234,35 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-01-19T00:21:53+00:00"
|
"time": "2023-12-08T23:47:49+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nette/schema",
|
"name": "nette/schema",
|
||||||
"version": "v1.3.0",
|
"version": "v1.2.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nette/schema.git",
|
"url": "https://github.com/nette/schema.git",
|
||||||
"reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
|
"reference": "0462f0166e823aad657c9224d0f849ecac1ba10a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
|
"url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a",
|
||||||
"reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
|
"reference": "0462f0166e823aad657c9224d0f849ecac1ba10a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"nette/utils": "^4.0",
|
"nette/utils": "^2.5.7 || ^3.1.5 || ^4.0",
|
||||||
"php": "8.1 - 8.3"
|
"php": "7.1 - 8.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"nette/tester": "^2.4",
|
"nette/tester": "^2.3 || ^2.4",
|
||||||
"phpstan/phpstan-nette": "^1.0",
|
"phpstan/phpstan-nette": "^1.0",
|
||||||
"tracy/tracy": "^2.8"
|
"tracy/tracy": "^2.7"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "1.3-dev"
|
"dev-master": "1.2-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -2294,9 +2294,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/nette/schema/issues",
|
"issues": "https://github.com/nette/schema/issues",
|
||||||
"source": "https://github.com/nette/schema/tree/v1.3.0"
|
"source": "https://github.com/nette/schema/tree/v1.2.5"
|
||||||
},
|
},
|
||||||
"time": "2023-12-11T11:54:22+00:00"
|
"time": "2023-10-05T20:37:59+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nette/utils",
|
"name": "nette/utils",
|
||||||
|
@ -6230,16 +6230,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/dbal",
|
"name": "doctrine/dbal",
|
||||||
"version": "3.7.3",
|
"version": "3.7.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/dbal.git",
|
"url": "https://github.com/doctrine/dbal.git",
|
||||||
"reference": "ce594cbc39a4866c544f1a970d285ff0548221ad"
|
"reference": "0ac3c270590e54910715e9a1a044cc368df282b2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/dbal/zipball/ce594cbc39a4866c544f1a970d285ff0548221ad",
|
"url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2",
|
||||||
"reference": "ce594cbc39a4866c544f1a970d285ff0548221ad",
|
"reference": "0ac3c270590e54910715e9a1a044cc368df282b2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -6255,14 +6255,14 @@
|
||||||
"doctrine/coding-standard": "12.0.0",
|
"doctrine/coding-standard": "12.0.0",
|
||||||
"fig/log-test": "^1",
|
"fig/log-test": "^1",
|
||||||
"jetbrains/phpstorm-stubs": "2023.1",
|
"jetbrains/phpstorm-stubs": "2023.1",
|
||||||
"phpstan/phpstan": "1.10.56",
|
"phpstan/phpstan": "1.10.42",
|
||||||
"phpstan/phpstan-strict-rules": "^1.5",
|
"phpstan/phpstan-strict-rules": "^1.5",
|
||||||
"phpunit/phpunit": "9.6.15",
|
"phpunit/phpunit": "9.6.13",
|
||||||
"psalm/plugin-phpunit": "0.18.4",
|
"psalm/plugin-phpunit": "0.18.4",
|
||||||
"slevomat/coding-standard": "8.13.1",
|
"slevomat/coding-standard": "8.13.1",
|
||||||
"squizlabs/php_codesniffer": "3.8.1",
|
"squizlabs/php_codesniffer": "3.7.2",
|
||||||
"symfony/cache": "^5.4|^6.0|^7.0",
|
"symfony/cache": "^5.4|^6.0",
|
||||||
"symfony/console": "^4.4|^5.4|^6.0|^7.0",
|
"symfony/console": "^4.4|^5.4|^6.0",
|
||||||
"vimeo/psalm": "4.30.0"
|
"vimeo/psalm": "4.30.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
|
@ -6323,7 +6323,7 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/doctrine/dbal/issues",
|
"issues": "https://github.com/doctrine/dbal/issues",
|
||||||
"source": "https://github.com/doctrine/dbal/tree/3.7.3"
|
"source": "https://github.com/doctrine/dbal/tree/3.7.2"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
@ -6339,7 +6339,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-01-21T07:53:09+00:00"
|
"time": "2023-11-19T08:06:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/deprecations",
|
"name": "doctrine/deprecations",
|
||||||
|
@ -6728,16 +6728,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/pint",
|
"name": "laravel/pint",
|
||||||
"version": "v1.13.10",
|
"version": "v1.13.9",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/pint.git",
|
"url": "https://github.com/laravel/pint.git",
|
||||||
"reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf"
|
"reference": "e3e269cc5d874c8efd2dc7962b1c7ff2585fe525"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/pint/zipball/e2b5060885694ca30ac008c05dc9d47f10ed1abf",
|
"url": "https://api.github.com/repos/laravel/pint/zipball/e3e269cc5d874c8efd2dc7962b1c7ff2585fe525",
|
||||||
"reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf",
|
"reference": "e3e269cc5d874c8efd2dc7962b1c7ff2585fe525",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -6748,8 +6748,8 @@
|
||||||
"php": "^8.1.0"
|
"php": "^8.1.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"friendsofphp/php-cs-fixer": "^3.47.1",
|
"friendsofphp/php-cs-fixer": "^3.47.0",
|
||||||
"illuminate/view": "^10.41.0",
|
"illuminate/view": "^10.40.0",
|
||||||
"larastan/larastan": "^2.8.1",
|
"larastan/larastan": "^2.8.1",
|
||||||
"laravel-zero/framework": "^10.3.0",
|
"laravel-zero/framework": "^10.3.0",
|
||||||
"mockery/mockery": "^1.6.7",
|
"mockery/mockery": "^1.6.7",
|
||||||
|
@ -6790,20 +6790,20 @@
|
||||||
"issues": "https://github.com/laravel/pint/issues",
|
"issues": "https://github.com/laravel/pint/issues",
|
||||||
"source": "https://github.com/laravel/pint"
|
"source": "https://github.com/laravel/pint"
|
||||||
},
|
},
|
||||||
"time": "2024-01-22T09:04:15+00:00"
|
"time": "2024-01-16T17:39:29+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/sail",
|
"name": "laravel/sail",
|
||||||
"version": "v1.27.2",
|
"version": "v1.27.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/sail.git",
|
"url": "https://github.com/laravel/sail.git",
|
||||||
"reference": "2276a8d9d6cfdcaad98bf67a34331d100149d5b6"
|
"reference": "9dc648978e4276f2bfd37a076a52e3bd9394777f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/sail/zipball/2276a8d9d6cfdcaad98bf67a34331d100149d5b6",
|
"url": "https://api.github.com/repos/laravel/sail/zipball/9dc648978e4276f2bfd37a076a52e3bd9394777f",
|
||||||
"reference": "2276a8d9d6cfdcaad98bf67a34331d100149d5b6",
|
"reference": "9dc648978e4276f2bfd37a076a52e3bd9394777f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -6855,7 +6855,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-01-21T17:13:42+00:00"
|
"time": "2024-01-13T18:46:48+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mockery/mockery",
|
"name": "mockery/mockery",
|
||||||
|
@ -7366,16 +7366,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpstan/phpstan",
|
"name": "phpstan/phpstan",
|
||||||
"version": "1.10.57",
|
"version": "1.10.56",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpstan/phpstan.git",
|
"url": "https://github.com/phpstan/phpstan.git",
|
||||||
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
|
"reference": "27816a01aea996191ee14d010f325434c0ee76fa"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
|
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/27816a01aea996191ee14d010f325434c0ee76fa",
|
||||||
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
|
"reference": "27816a01aea996191ee14d010f325434c0ee76fa",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -7424,7 +7424,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-01-24T11:51:34+00:00"
|
"time": "2024-01-15T10:43:00+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
|
@ -7749,16 +7749,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "10.5.9",
|
"version": "10.5.8",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe"
|
"reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08f4fa74d5fbfff1ef22abffee47aaedcaea227e",
|
||||||
"reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
|
"reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -7830,7 +7830,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.9"
|
"source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.8"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
@ -7846,7 +7846,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2024-01-22T14:35:40+00:00"
|
"time": "2024-01-19T07:07:27+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psr/cache",
|
"name": "psr/cache",
|
||||||
|
|
|
@ -14,7 +14,7 @@ return new class extends Migration
|
||||||
Schema::create('files', function (Blueprint $table) {
|
Schema::create('files', function (Blueprint $table) {
|
||||||
$table->id();
|
$table->id();
|
||||||
$table->string('name');
|
$table->string('name');
|
||||||
$table->string('description')->nullable();
|
$table->string('description');
|
||||||
$table->string('url');
|
$table->string('url');
|
||||||
$table->integer('position');
|
$table->integer('position');
|
||||||
$table->foreignId('reception_screen_id')->constrained('reception_screens');
|
$table->foreignId('reception_screen_id')->constrained('reception_screens');
|
||||||
|
|
|
@ -43,11 +43,11 @@
|
||||||
<tr>
|
<tr>
|
||||||
<th scope="row">{{ $file->position }}</th>
|
<th scope="row">{{ $file->position }}</th>
|
||||||
<td>{{ $file->name }}</td>
|
<td>{{ $file->name }}</td>
|
||||||
<td><a href="{{ route("files.edit", $file) }}"
|
<td><a href="{{ route("admin-reception-screen.edit", $file) }}"
|
||||||
class="btn btn-secondary">редактировать</a>
|
class="btn btn-secondary">редактировать</a>
|
||||||
<a rel="nofollow" data-method="delete"
|
<a rel="nofollow" data-method="delete"
|
||||||
data-confirm="Вы действительно хотите удалить?"
|
data-confirm="Вы действительно хотите удалить?"
|
||||||
href="{{ route('files.destroy', $file) }}"
|
href="{{ route('admin-reception-screen.destroy', $file) }}"
|
||||||
class="btn btn-danger">
|
class="btn btn-danger">
|
||||||
удалить
|
удалить
|
||||||
</a>
|
</a>
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<a href="{{ route('files.create', $receptionScreen->id) }}"
|
<a href="{{ route('admin-reception-screen.create') }}"
|
||||||
class="btn btn-primary">
|
class="btn btn-primary">
|
||||||
Добавить файл
|
Добавить файл
|
||||||
</a>
|
</a>
|
||||||
|
@ -68,8 +68,7 @@
|
||||||
@else
|
@else
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="3">
|
<td colspan="3">
|
||||||
@php($idReceptionScreen = $receptionScreen->id)
|
<a href="{{ route('admin-reception-screen.create') }}" class="btn btn-primary">Добавить
|
||||||
<a href="{{ route('files.create', $idReceptionScreen) }}" class="btn btn-primary">Добавить
|
|
||||||
файл</a>
|
файл</a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -79,5 +78,11 @@
|
||||||
</table>
|
</table>
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
{{ Form::open(array('url' => route('uploadfile'), 'method' => 'POST', 'files'=>'true')) }}
|
||||||
|
Select the file to upload.
|
||||||
|
{{ Form::file('image') }}
|
||||||
|
{{ Form::submit('Upload File')}}
|
||||||
|
{{Form::close()}}
|
||||||
</div>
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,79 +0,0 @@
|
||||||
@extends('layouts.admin-layout')
|
|
||||||
@section('content')
|
|
||||||
@auth()
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<h1 class="">Прикрепить файл</h1>
|
|
||||||
{{ Form::open(array('url' => route('files.store'), 'method' => 'POST', 'files'=>'true')) }}
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('url', 'Путь к файлу') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::file('url', ['class' => 'form-control']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('url') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('name', 'Имя файла') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::text('name', '', ['class' => 'form-control']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('name') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('position', 'Позиция') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::text('position', 0, ['class' => 'form-control']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('name') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('idReceptionScreen', 'Пункт экрана приема') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::select('idReceptionScreen', $receptionScreens, $idReceptionScreen, $idsReceptionScreens,['class' => 'form-select']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('idReceptionScreen') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-4">
|
|
||||||
{{ Form::submit('Загрузить файл', ['class' => 'btn btn-primary'])}}
|
|
||||||
</div>
|
|
||||||
{{Form::close()}}
|
|
||||||
</div>
|
|
||||||
@if($idReceptionScreen !== null)
|
|
||||||
<div class="col">
|
|
||||||
<h2>Файлы пункта Экрана Приема: {{ $receptionScreens[$idReceptionScreen] }}</h2>
|
|
||||||
<table class="table">
|
|
||||||
<thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Позиция</th>
|
|
||||||
<th scope="col">Название</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach($files as $file)
|
|
||||||
<tr>
|
|
||||||
<th scope="row">{{ $file->position }}</th>
|
|
||||||
<th scope="row">{{ $file->name }}</th>
|
|
||||||
@endforeach
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
@endauth
|
|
||||||
@endsection
|
|
|
@ -1,68 +0,0 @@
|
||||||
@extends('layouts.admin-layout')
|
|
||||||
@section('content')
|
|
||||||
@auth()
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<h1 class="">Изменить файл</h1>
|
|
||||||
{{ Form::open(array('url' => route('files.update', $file), 'method' => 'PATCH', 'files'=>'true')) }}
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('name', 'Имя файла') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::text('name', $file->name, ['class' => 'form-control']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('name') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('position', 'Позиция') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::text('position', $file->position, ['class' => 'form-control']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('name') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::label('idReceptionScreen', 'Пункт экрана приема') }}
|
|
||||||
</div>
|
|
||||||
<div class="mt-2">
|
|
||||||
{{ Form::select('idReceptionScreen', $receptionScreens, $idReceptionScreen, $idsReceptionScreens,['class' => 'form-select']) }}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
@if ($errors->any())
|
|
||||||
{{ $errors->first('idReceptionScreen') }}
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
<div class="mt-4">
|
|
||||||
{{ Form::submit('Загрузить файл', ['class' => 'btn btn-primary'])}}
|
|
||||||
</div>
|
|
||||||
{{Form::close()}}
|
|
||||||
</div>
|
|
||||||
@if($idReceptionScreen !== null)
|
|
||||||
<div class="col">
|
|
||||||
<h2>Файлы пункта Экрана Приема: {{ $receptionScreens[$idReceptionScreen] }}</h2>
|
|
||||||
<table class="table">
|
|
||||||
<thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Позиция</th>
|
|
||||||
<th scope="col">Название</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach($files as $file)
|
|
||||||
<tr>
|
|
||||||
<th scope="row">{{ $file->position }}</th>
|
|
||||||
<th scope="row">{{ $file->name }}</th>
|
|
||||||
@endforeach
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
@endauth
|
|
||||||
@endsection
|
|
|
@ -1,36 +0,0 @@
|
||||||
@extends('layouts.admin-layout')
|
|
||||||
@section('content')
|
|
||||||
<div class="container">
|
|
||||||
<h2>Файлы</h2>
|
|
||||||
<br>
|
|
||||||
<a href="{{ route('files.create') }}" class="btn btn-primary">Добавить файл</a>
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<table class="table">
|
|
||||||
<thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
|
|
||||||
<tr>
|
|
||||||
<th scope="col">Позиция</th>
|
|
||||||
<th scope="col">Название файла</th>
|
|
||||||
<th scope="col">Экран Приема</th>
|
|
||||||
<th scope="col">действия</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach($files as $file)
|
|
||||||
<tr>
|
|
||||||
<th scope="row">{{ $file->position }}</th>
|
|
||||||
<td>{{ $file->name }}</td>
|
|
||||||
<td>{{ $file->receptionScreen->name }}</td>
|
|
||||||
<td><a href="{{ route("files.edit", $file) }}" class="btn btn-secondary">редактировать</a>
|
|
||||||
<a rel="nofollow" data-method="delete" data-confirm="Вы действительно хотите удалить?"
|
|
||||||
href="{{ route('files.destroy', $file) }}" class="btn btn-danger">
|
|
||||||
удалить
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
@endforeach
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
</div>
|
|
||||||
@endsection
|
|
|
@ -33,5 +33,11 @@
|
||||||
</table>
|
</table>
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
{{ Form::open(array('url' => route('uploadfile'), 'method' => 'POST', 'files'=>'true')) }}
|
||||||
|
Select the file to upload.
|
||||||
|
{{ Form::file('image') }}
|
||||||
|
{{ Form::submit('Upload File')}}
|
||||||
|
{{Form::close()}}
|
||||||
</div>
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Controllers\FileController;
|
|
||||||
use App\Http\Controllers\ReceptionScreenController;
|
use App\Http\Controllers\ReceptionScreenController;
|
||||||
use App\Http\Controllers\ProfileController;
|
use App\Http\Controllers\ProfileController;
|
||||||
use App\Http\Controllers\UploadFileController;
|
use App\Http\Controllers\UploadFileController;
|
||||||
|
@ -22,15 +21,10 @@ Route::get('/', function () {
|
||||||
return view('home');
|
return view('home');
|
||||||
})->name('home');
|
})->name('home');
|
||||||
|
|
||||||
Route::resource('/users', UserController::class)->middleware(['auth', 'verified']);
|
Route::resources([
|
||||||
Route::resource('/admin-reception-screen', ReceptionScreenController::class)->middleware(['auth', 'verified']);
|
'/users' => UserController::class,
|
||||||
//Route::resource('/files', FileController::class)->middleware(['auth', 'verified']);
|
'/admin-reception-screen' => ReceptionScreenController::class
|
||||||
Route::get('/files', [FileController::class, 'index'])->name('files.index');
|
]);
|
||||||
Route::post('/files', [FileController::class, 'store'])->name('files.store');
|
|
||||||
Route::get('/files/create/{file?}', [FileController::class, 'create'])->name('files.create');
|
|
||||||
Route::patch('/files/{file}', [FileController::class, 'update'])->name('files.update');
|
|
||||||
Route::delete('files/{file}', [FileController::class, 'destroy'])->name('files.destroy');
|
|
||||||
Route::get('/files/edit/{file}', [FileController::class, 'edit'])->name('files.edit');
|
|
||||||
|
|
||||||
Route::get('/course', function () {
|
Route::get('/course', function () {
|
||||||
return view('menu.course');
|
return view('menu.course');
|
||||||
|
|
Loading…
Reference in New Issue