diff --git a/app/Http/Controllers/MMCController.php b/app/Http/Controllers/MMCController.php index f591686..d039d3f 100644 --- a/app/Http/Controllers/MMCController.php +++ b/app/Http/Controllers/MMCController.php @@ -23,9 +23,9 @@ class MMCController extends Controller $project_id = $request->session()->get('project_id'); $project = Project::find($project_id); $top_auks = $project->auks()->where('parent_id', 0)->get()->sortBy('auk_name'); - if (count($top_auks)) { - $mmc = $top_auks[0]->mmcs; - } + // if (count($top_auks)) { + // $mmc = $top_auks[0]->mmcs; + // } return view('mmc.list', ['project' => $project, 'top_auks' => $top_auks]); } diff --git a/public/css/app.css b/public/css/app.css index 473d195..f3d7808 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -707,9 +707,15 @@ select { .-ml-px { margin-left: -1px; } +.mt-1 { + margin-top: 0.25rem; +} .mt-4 { margin-top: 1rem; } +.ml-4 { + margin-left: 1rem; +} .ml-1 { margin-left: 0.25rem; } @@ -722,9 +728,6 @@ select { .ml-2 { margin-left: 0.5rem; } -.ml-4 { - margin-left: 1rem; -} .mt-8 { margin-top: 2rem; } @@ -734,9 +737,6 @@ select { .-mt-px { margin-top: -1px; } -.mt-1 { - margin-top: 0.25rem; -} .-mr-2 { margin-right: -0.5rem; } @@ -797,8 +797,8 @@ select { .w-5 { width: 1.25rem; } -.w-96 { - width: 24rem; +.w-full { + width: 100%; } .w-8 { width: 2rem; @@ -806,9 +806,6 @@ select { .w-auto { width: auto; } -.w-full { - width: 100%; -} .w-4 { width: 1rem; } @@ -818,6 +815,9 @@ select { .w-48 { width: 12rem; } +.w-96 { + width: 24rem; +} .w-20 { width: 5rem; } @@ -967,14 +967,14 @@ select { --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)); } +.bg-gray-500 { + --tw-bg-opacity: 1; + background-color: rgb(107 114 128 / var(--tw-bg-opacity)); +} .bg-indigo-50 { --tw-bg-opacity: 1; background-color: rgb(238 242 255 / var(--tw-bg-opacity)); @@ -988,6 +988,9 @@ select { .p-2 { padding: 0.5rem; } +.p-1 { + padding: 0.25rem; +} .px-4 { padding-left: 1rem; padding-right: 1rem; @@ -1030,12 +1033,6 @@ select { .pt-4 { padding-top: 1rem; } -.pb-2 { - padding-bottom: 0.5rem; -} -.pl-2 { - padding-left: 0.5rem; -} .pt-8 { padding-top: 2rem; } @@ -1048,12 +1045,12 @@ select { .pb-1 { padding-bottom: 0.25rem; } -.pb-4 { - padding-bottom: 1rem; -} .pt-6 { padding-top: 1.5rem; } +.pl-2 { + padding-left: 0.5rem; +} .pt-1 { padding-top: 0.25rem; } @@ -1063,6 +1060,12 @@ select { .pr-4 { padding-right: 1rem; } +.pb-4 { + padding-bottom: 1rem; +} +.pb-2 { + padding-bottom: 0.5rem; +} .text-left { text-align: left; } @@ -1072,6 +1075,9 @@ select { .text-right { text-align: right; } +.align-top { + vertical-align: top; +} .font-sans { font-family: Nunito, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; } @@ -1079,14 +1085,14 @@ select { font-size: 0.875rem; line-height: 1.25rem; } -.text-lg { - font-size: 1.125rem; - line-height: 1.75rem; -} .text-xl { font-size: 1.25rem; line-height: 1.75rem; } +.text-lg { + font-size: 1.125rem; + line-height: 1.75rem; +} .text-base { font-size: 1rem; line-height: 1.5rem; @@ -1127,14 +1133,6 @@ select { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); } -.text-blue-500 { - --tw-text-opacity: 1; - color: rgb(59 130 246 / var(--tw-text-opacity)); -} -.text-red-500 { - --tw-text-opacity: 1; - color: rgb(239 68 68 / var(--tw-text-opacity)); -} .text-gray-800 { --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); @@ -1163,10 +1161,18 @@ 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)); } +.text-blue-500 { + --tw-text-opacity: 1; + color: rgb(59 130 246 / var(--tw-text-opacity)); +} .text-green-600 { --tw-text-opacity: 1; color: rgb(22 163 74 / var(--tw-text-opacity)); @@ -9075,14 +9081,14 @@ readers do not read off random characters that represent icons */ --tw-bg-opacity: 1; background-color: rgb(29 78 216 / 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-700:hover { + --tw-bg-opacity: 1; + background-color: rgb(55 65 81 / var(--tw-bg-opacity)); +} .hover\:bg-gray-50:hover { --tw-bg-opacity: 1; background-color: rgb(249 250 251 / var(--tw-bg-opacity)); @@ -9095,6 +9101,10 @@ 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-green-700:hover { + --tw-text-opacity: 1; + color: rgb(21 128 61 / var(--tw-text-opacity)); +} .hover\:text-blue-700:hover { --tw-text-opacity: 1; color: rgb(29 78 216 / var(--tw-text-opacity)); @@ -9107,10 +9117,6 @@ readers do not read off random characters that represent icons */ --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); } -.hover\:text-green-700:hover { - --tw-text-opacity: 1; - color: rgb(21 128 61 / var(--tw-text-opacity)); -} .hover\:text-gray-800:hover { --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); diff --git a/resources/views/mmc/list.blade.php b/resources/views/mmc/list.blade.php index a14e7b2..41077c1 100644 --- a/resources/views/mmc/list.blade.php +++ b/resources/views/mmc/list.blade.php @@ -13,46 +13,6 @@
- {{-- - -
--}} - {{--
- -
- - - - @foreach ($top_auks as $auks) - - @if (count($auks->childs)) - @include('mmc.optionChild', [ - 'childs' => $auks->childs, - 'level' => 1, - ]) - @endif - @endforeach - -
-
--}}

Выберите АУК:

@@ -62,26 +22,50 @@ @forelse ($top_auks as $top_auk) - + @@ -99,7 +83,6 @@ @endforelse
{{ $top_auk->auk_name }} + {{ $top_auk->auk_name }} - +
+ + + + + + @forelse ($top_auk->mmcs as $mmc) - - - - + + + + + + + @empty - - - - + + + @endforelse
+ {{ __('File') }} + + {{ __('Size') }} + + {{ __('MTime') }} + + {{ __('Image') }} +
{{ $mmc->filename }}
+ {{ $mmc->filename }}{{ $mmc['size'] }} + + {{ date('d.m.Y H:i:s', $mmc['mtime']) }} + +
No MMC - - - -
No MMC + + + +
- {{--
--}}
diff --git a/resources/views/mmc/scan.blade.php b/resources/views/mmc/scan.blade.php index 28f3c3f..02ab982 100644 --- a/resources/views/mmc/scan.blade.php +++ b/resources/views/mmc/scan.blade.php @@ -1,7 +1,7 @@

- {{ $project->name }}: {{ __('Scan MMC') }} + {{ $project->name }}: {{ __('Scan MMC') }}: {{ $AUK->auk_name }}

@@ -9,49 +9,53 @@
-
+

{{ $AUK->auk_name }}

- - - - - - {{-- + + + @endforelse +
- {{ __('File') }} - - {{ __('Size') }} - - {{ __('MTime') }} - + + + + + + + {{-- --}} + + @forelse ($MMC as $image) + + + + + {{-- --}} - @forelse ($MMC as $image) - - - - - {{-- --}} - - @empty - - - - @endforelse -
+ {{ __('File') }} + + {{ __('Size') }} + + {{ __('MTime') }} + {{ __('ATime') }}
{{ $image['filename'] }}{{ $image['size'] }}{{ date('d.m.Y H:i:s', $image['mtime']) }}{{ $image['atime'] }}
{{ $image['filename'] }}{{ $image['size'] }}{{ $image['mtime'] }}{{ $image['atime'] }}
No Images! -
- @if (count($MMC)) - -
+ @empty +
No Images! +
+ @if (count($MMC)) + + @csrf - - @for($i = 0; $i < count($MMC); $i++) - - - - {{-- --}} + + @for ($i = 0; $i < count($MMC); $i++) + + + + {{-- --}} @endfor
- @endif + @endif + -