From 6bafca0eb601cbd5b4399e0d2104acbcee0ef732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=91=D0=B0=D0=B1=D0=BA=D0=B8=D0=BD?= Date: Fri, 1 Jul 2022 21:45:15 +0300 Subject: [PATCH] Document create continue --- app/Http/Controllers/DocumentController.php | 19 ++- public/css/app.css | 126 +++++++++----------- resources/views/admin/users/edit.blade.php | 35 +++--- resources/views/components/select.blade.php | 5 + resources/views/documents/create.blade.php | 13 +- resources/views/documents/list.blade.php | 22 ++-- 6 files changed, 112 insertions(+), 108 deletions(-) create mode 100644 resources/views/components/select.blade.php diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php index bd1bcd0..6e5f012 100644 --- a/app/Http/Controllers/DocumentController.php +++ b/app/Http/Controllers/DocumentController.php @@ -18,7 +18,7 @@ class DocumentController extends Controller { $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); - $documents = Document::find($project_id); + $documents = Document::where('project_id',$project_id)->get(); return view('documents.list', ['project' => $project, 'documents' => $documents]); } @@ -32,7 +32,7 @@ class DocumentController extends Controller { $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); - $documents = Document::find($project_id); + $documents = Document::where('project_id',$project_id)->get(); return view('documents.create', ['project' => $project, 'documents' => $documents]); } @@ -44,7 +44,20 @@ class DocumentController extends Controller */ public function store(Request $request) { - // + $project_id = $request->session()->get('project_id'); + $request->validate([ + 'name' => ['required', 'string', 'max:255'], + 'parent_id' => ['required', 'integer'], + ]); + + // $user = + Document::create([ + 'project_id' => $project_id, + 'name' => $request->name, + 'parent_id' => $request->parent_id, + ]); + + return redirect(route('documents.index')); } /** diff --git a/public/css/app.css b/public/css/app.css index 05c8433..5402dae 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -697,6 +697,9 @@ select { .z-50 { z-index: 50; } +.m-2 { + margin: 0.5rem; +} .mx-auto { margin-left: auto; margin-right: auto; @@ -713,6 +716,9 @@ select { .mt-4 { margin-top: 1rem; } +.ml-4 { + margin-left: 1rem; +} .ml-1 { margin-left: 0.25rem; } @@ -725,9 +731,6 @@ select { .ml-2 { margin-left: 0.5rem; } -.ml-4 { - margin-left: 1rem; -} .mt-8 { margin-top: 2rem; } @@ -743,12 +746,12 @@ select { .mt-3 { margin-top: 0.75rem; } -.mb-4 { - margin-bottom: 1rem; -} .mt-6 { margin-top: 1.5rem; } +.mb-4 { + margin-bottom: 1rem; +} .block { display: block; } @@ -797,9 +800,6 @@ select { .w-5 { width: 1.25rem; } -.w-96 { - width: 24rem; -} .w-full { width: 100%; } @@ -821,15 +821,15 @@ select { .w-20 { width: 5rem; } +.w-96 { + width: 24rem; +} .max-w-7xl { max-width: 80rem; } .max-w-6xl { max-width: 72rem; } -.max-w-xl { - max-width: 36rem; -} .flex-1 { flex: 1 1 0%; } @@ -907,15 +907,15 @@ select { .rounded-md { border-radius: 0.375rem; } -.rounded-full { - border-radius: 9999px; -} .rounded-lg { border-radius: 0.5rem; } .rounded { border-radius: 0.25rem; } +.rounded-full { + border-radius: 9999px; +} .rounded-l-md { border-top-left-radius: 0.375rem; border-bottom-left-radius: 0.375rem; @@ -939,9 +939,6 @@ select { .border-l-4 { border-left-width: 4px; } -.border-r { - border-right-width: 1px; -} .border-gray-300 { --tw-border-opacity: 1; border-color: rgb(209 213 219 / var(--tw-border-opacity)); @@ -961,10 +958,6 @@ select { --tw-border-opacity: 1; border-color: rgb(129 140 248 / var(--tw-border-opacity)); } -.border-gray-400 { - --tw-border-opacity: 1; - border-color: rgb(156 163 175 / var(--tw-border-opacity)); -} .bg-white { --tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity)); @@ -973,14 +966,6 @@ select { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); } -.bg-blue-500 { - --tw-bg-opacity: 1; - background-color: rgb(59 130 246 / var(--tw-bg-opacity)); -} -.bg-gray-500 { - --tw-bg-opacity: 1; - background-color: rgb(107 114 128 / var(--tw-bg-opacity)); -} .bg-gray-800 { --tw-bg-opacity: 1; background-color: rgb(31 41 55 / var(--tw-bg-opacity)); @@ -989,6 +974,14 @@ select { --tw-bg-opacity: 1; background-color: rgb(238 242 255 / var(--tw-bg-opacity)); } +.bg-blue-500 { + --tw-bg-opacity: 1; + background-color: rgb(59 130 246 / var(--tw-bg-opacity)); +} +.bg-gray-500 { + --tw-bg-opacity: 1; + background-color: rgb(107 114 128 / var(--tw-bg-opacity)); +} .fill-current { fill: currentColor; } @@ -1034,24 +1027,18 @@ select { padding-left: 0.25rem; padding-right: 0.25rem; } -.pr-2 { - padding-right: 0.5rem; -} -.pl-2 { - padding-left: 0.5rem; -} .pt-8 { padding-top: 2rem; } -.pt-4 { - padding-top: 1rem; -} .pt-2 { padding-top: 0.5rem; } .pb-3 { padding-bottom: 0.75rem; } +.pt-4 { + padding-top: 1rem; +} .pb-1 { padding-bottom: 0.25rem; } @@ -1067,6 +1054,12 @@ select { .pr-4 { padding-right: 1rem; } +.pr-2 { + padding-right: 0.5rem; +} +.pl-2 { + padding-left: 0.5rem; +} .text-center { text-align: center; } @@ -1117,9 +1110,6 @@ select { .tracking-widest { letter-spacing: 0.1em; } -.tracking-wider { - letter-spacing: 0.05em; -} .text-gray-500 { --tw-text-opacity: 1; color: rgb(107 114 128 / var(--tw-text-opacity)); @@ -1132,14 +1122,6 @@ select { --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); } -.text-red-500 { - --tw-text-opacity: 1; - color: rgb(239 68 68 / var(--tw-text-opacity)); -} -.text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); -} .text-gray-200 { --tw-text-opacity: 1; color: rgb(229 231 235 / var(--tw-text-opacity)); @@ -1160,6 +1142,10 @@ select { --tw-text-opacity: 1; color: rgb(17 24 39 / var(--tw-text-opacity)); } +.text-red-500 { + --tw-text-opacity: 1; + color: rgb(239 68 68 / var(--tw-text-opacity)); +} .text-green-500 { --tw-text-opacity: 1; color: rgb(34 197 94 / var(--tw-text-opacity)); @@ -1172,6 +1158,10 @@ select { --tw-text-opacity: 1; color: rgb(22 163 74 / var(--tw-text-opacity)); } +.text-white { + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); +} .text-red-600 { --tw-text-opacity: 1; color: rgb(220 38 38 / var(--tw-text-opacity)); @@ -9072,22 +9062,22 @@ readers do not read off random characters that represent icons */ --tw-border-opacity: 1; border-color: rgb(209 213 219 / var(--tw-border-opacity)); } -.hover\:bg-blue-700:hover { +.hover\:bg-gray-100:hover { --tw-bg-opacity: 1; - background-color: rgb(29 78 216 / var(--tw-bg-opacity)); + background-color: rgb(243 244 246 / var(--tw-bg-opacity)); } .hover\:bg-gray-700:hover { --tw-bg-opacity: 1; background-color: rgb(55 65 81 / var(--tw-bg-opacity)); } -.hover\:bg-gray-100:hover { - --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); -} .hover\:bg-gray-50:hover { --tw-bg-opacity: 1; background-color: rgb(249 250 251 / var(--tw-bg-opacity)); } +.hover\:bg-blue-700:hover { + --tw-bg-opacity: 1; + background-color: rgb(29 78 216 / var(--tw-bg-opacity)); +} .hover\:text-gray-500:hover { --tw-text-opacity: 1; color: rgb(107 114 128 / var(--tw-text-opacity)); @@ -9096,6 +9086,18 @@ readers do not read off random characters that represent icons */ --tw-text-opacity: 1; color: rgb(156 163 175 / var(--tw-text-opacity)); } +.hover\:text-gray-700:hover { + --tw-text-opacity: 1; + color: rgb(55 65 81 / var(--tw-text-opacity)); +} +.hover\:text-gray-800:hover { + --tw-text-opacity: 1; + color: rgb(31 41 55 / var(--tw-text-opacity)); +} +.hover\:text-gray-900:hover { + --tw-text-opacity: 1; + color: rgb(17 24 39 / var(--tw-text-opacity)); +} .hover\:text-green-700:hover { --tw-text-opacity: 1; color: rgb(21 128 61 / var(--tw-text-opacity)); @@ -9108,18 +9110,6 @@ readers do not read off random characters that represent icons */ --tw-text-opacity: 1; color: rgb(185 28 28 / var(--tw-text-opacity)); } -.hover\:text-gray-700:hover { - --tw-text-opacity: 1; - color: rgb(55 65 81 / var(--tw-text-opacity)); -} -.hover\:text-gray-900:hover { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} -.hover\:text-gray-800:hover { - --tw-text-opacity: 1; - color: rgb(31 41 55 / var(--tw-text-opacity)); -} .focus\:z-10:focus { z-index: 10; } diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 7827eeb..6192af0 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -11,46 +11,51 @@
@if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
@endif
@csrf @method('PUT') - +
- +
- +
- +
-
- - {{__('Cancel')}} + + {{ __('Cancel') }}
@@ -61,4 +66,4 @@
- \ No newline at end of file + diff --git a/resources/views/components/select.blade.php b/resources/views/components/select.blade.php new file mode 100644 index 0000000..620c226 --- /dev/null +++ b/resources/views/components/select.blade.php @@ -0,0 +1,5 @@ +@props(['disabled' => false]) + + diff --git a/resources/views/documents/create.blade.php b/resources/views/documents/create.blade.php index 14e6571..a451c9b 100644 --- a/resources/views/documents/create.blade.php +++ b/resources/views/documents/create.blade.php @@ -31,13 +31,12 @@
- {{-- - - --}} - + + + @foreach($documents as $document) + + @endforeach +
diff --git a/resources/views/documents/list.blade.php b/resources/views/documents/list.blade.php index 15f10ab..a61ab1c 100644 --- a/resources/views/documents/list.blade.php +++ b/resources/views/documents/list.blade.php @@ -15,30 +15,22 @@ - {{--
+
- - - @forelse ( $projects as $project) + @forelse ( $documents as $document) - - - + @empty - + @endforelse
{{ __('Title')}} - {{ __('Comment')}} - - {{ __('MMC Path')}} - {{ __('Actions')}}
{{ $project->name }}{{ $project->description }}{{ $project->mmc_path }}{{ $document->name }}
- + {{-- @@ -50,17 +42,17 @@ - + --}}
No Projects!No Documents!
-
--}} +