Dinamika/mmc_info
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Image displaying continue

Browse Source
This commit is contained in:
Александр Бабкин
2022-07-14 22:45:19 +03:00
parent 36698241ed
commit cce02034f4
5 changed files with 120 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/MMCController.php
View File

@@ -77,8 +77,23 @@ class MMCController extends Controller
*/
public function show(Request $request, $id)
{
// $user = User::find($id);
// return view('admin.users.show', ['user' => $user]);
$project_id = $request->session()->get('project_id');
$project = Project::find($project_id);
$mmc = MMC::find($id);
$auk = $mmc->auks()->first();
$filePath = $project->mmc_path . '/' . $auk->auk_path . '/' . $auk->image_dir . '/' . $mmc->filename;
if(strcasecmp(substr($mmc->filename, -3, 3), 'svg') == 0 )
{
// $svg = file_get_contents($filePath);
// return response()->header('Content-Type', 'image/svg+xml')->file($filePath);
// file($filePath)->header('Content-Type', 'image/svg+xml');
}
else
{
return response()->file($filePath);
}
}
/**

166
public/css/app.css
View File

@@ -707,15 +707,6 @@ 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;
}
@@ -728,6 +719,12 @@ select {
.ml-2 {
margin-left: 0.5rem;
}
.mt-4 {
margin-top: 1rem;
}
.ml-4 {
margin-left: 1rem;
}
.mt-8 {
margin-top: 2rem;
}
@@ -743,12 +740,15 @@ select {
.mt-3 {
margin-top: 0.75rem;
}
.mt-6 {
margin-top: 1.5rem;
.mt-1 {
margin-top: 0.25rem;
}
.mb-4 {
margin-bottom: 1rem;
}
.mt-6 {
margin-top: 1.5rem;
}
.block {
display: block;
}
@@ -797,9 +797,6 @@ select {
.w-5 {
width: 1.25rem;
}
.w-full {
width: 100%;
}
.w-8 {
width: 2rem;
}
@@ -818,6 +815,9 @@ select {
.w-96 {
width: 24rem;
}
.w-full {
width: 100%;
}
.w-20 {
width: 5rem;
}
@@ -904,12 +904,12 @@ select {
.rounded-md {
border-radius: 0.375rem;
}
.rounded-full {
border-radius: 9999px;
}
.rounded-lg {
border-radius: 0.5rem;
}
.rounded-full {
border-radius: 9999px;
}
.rounded {
border-radius: 0.25rem;
}
@@ -924,12 +924,12 @@ select {
.border {
border-width: 1px;
}
.border-b {
border-bottom-width: 1px;
}
.border-t {
border-top-width: 1px;
}
.border-b {
border-bottom-width: 1px;
}
.border-b-2 {
border-bottom-width: 2px;
}
@@ -948,13 +948,13 @@ select {
--tw-border-opacity: 1;
border-color: rgb(243 244 246 / var(--tw-border-opacity));
}
.border-transparent {
border-color: transparent;
}
.border-indigo-400 {
--tw-border-opacity: 1;
border-color: rgb(129 140 248 / var(--tw-border-opacity));
}
.border-transparent {
border-color: transparent;
}
.bg-white {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -967,17 +967,17 @@ select {
--tw-bg-opacity: 1;
background-color: rgb(59 130 246 / var(--tw-bg-opacity));
}
.bg-gray-800 {
.bg-indigo-50 {
--tw-bg-opacity: 1;
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
background-color: rgb(238 242 255 / var(--tw-bg-opacity));
}
.bg-gray-500 {
--tw-bg-opacity: 1;
background-color: rgb(107 114 128 / var(--tw-bg-opacity));
}
.bg-indigo-50 {
.bg-gray-800 {
--tw-bg-opacity: 1;
background-color: rgb(238 242 255 / var(--tw-bg-opacity));
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
}
.fill-current {
fill: currentColor;
@@ -1007,10 +1007,6 @@ select {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
.py-12 {
padding-top: 3rem;
padding-bottom: 3rem;
}
.py-4 {
padding-top: 1rem;
padding-bottom: 1rem;
@@ -1023,16 +1019,14 @@ select {
padding-top: 0.25rem;
padding-bottom: 0.25rem;
}
.py-12 {
padding-top: 3rem;
padding-bottom: 3rem;
}
.px-1 {
padding-left: 0.25rem;
padding-right: 0.25rem;
}
.pr-2 {
padding-right: 0.5rem;
}
.pt-4 {
padding-top: 1rem;
}
.pt-8 {
padding-top: 2rem;
}
@@ -1042,15 +1036,18 @@ select {
.pb-3 {
padding-bottom: 0.75rem;
}
.pt-4 {
padding-top: 1rem;
}
.pb-1 {
padding-bottom: 0.25rem;
}
.pt-6 {
padding-top: 1.5rem;
}
.pl-2 {
padding-left: 0.5rem;
}
.pr-2 {
padding-right: 0.5rem;
}
.pt-1 {
padding-top: 0.25rem;
}
@@ -1063,6 +1060,9 @@ select {
.pb-4 {
padding-bottom: 1rem;
}
.pt-6 {
padding-top: 1.5rem;
}
.pb-2 {
padding-bottom: 0.5rem;
}
@@ -1085,10 +1085,6 @@ select {
font-size: 0.875rem;
line-height: 1.25rem;
}
.text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.text-lg {
font-size: 1.125rem;
line-height: 1.75rem;
@@ -1097,6 +1093,10 @@ select {
font-size: 1rem;
line-height: 1.5rem;
}
.text-xl {
font-size: 1.25rem;
line-height: 1.75rem;
}
.text-xs {
font-size: 0.75rem;
line-height: 1rem;
@@ -1116,12 +1116,12 @@ select {
.leading-5 {
line-height: 1.25rem;
}
.leading-tight {
line-height: 1.25;
}
.leading-7 {
line-height: 1.75rem;
}
.leading-tight {
line-height: 1.25;
}
.tracking-widest {
letter-spacing: 0.1em;
}
@@ -1133,14 +1133,6 @@ select {
--tw-text-opacity: 1;
color: rgb(55 65 81 / var(--tw-text-opacity));
}
.text-gray-800 {
--tw-text-opacity: 1;
color: rgb(31 41 55 / 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));
@@ -1161,18 +1153,34 @@ select {
--tw-text-opacity: 1;
color: rgb(17 24 39 / var(--tw-text-opacity));
}
.text-red-500 {
.text-gray-800 {
--tw-text-opacity: 1;
color: rgb(239 68 68 / var(--tw-text-opacity));
color: rgb(31 41 55 / var(--tw-text-opacity));
}
.text-white {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
}
.text-green-500 {
--tw-text-opacity: 1;
color: rgb(34 197 94 / var(--tw-text-opacity));
}
.text-indigo-700 {
--tw-text-opacity: 1;
color: rgb(67 56 202 / 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-indigo-600 {
--tw-text-opacity: 1;
color: rgb(79 70 229 / var(--tw-text-opacity));
}
.text-green-600 {
--tw-text-opacity: 1;
color: rgb(22 163 74 / var(--tw-text-opacity));
@@ -1181,14 +1189,6 @@ select {
--tw-text-opacity: 1;
color: rgb(220 38 38 / var(--tw-text-opacity));
}
.text-indigo-700 {
--tw-text-opacity: 1;
color: rgb(67 56 202 / var(--tw-text-opacity));
}
.text-indigo-600 {
--tw-text-opacity: 1;
color: rgb(79 70 229 / var(--tw-text-opacity));
}
.underline {
-webkit-text-decoration-line: underline;
text-decoration-line: underline;
@@ -9077,22 +9077,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 {
--tw-bg-opacity: 1;
background-color: rgb(29 78 216 / 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 {
.hover\:bg-blue-700:hover {
--tw-bg-opacity: 1;
background-color: rgb(55 65 81 / var(--tw-bg-opacity));
background-color: rgb(29 78 216 / 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-gray-700:hover {
--tw-bg-opacity: 1;
background-color: rgb(55 65 81 / var(--tw-bg-opacity));
}
.hover\:text-gray-500:hover {
--tw-text-opacity: 1;
color: rgb(107 114 128 / var(--tw-text-opacity));
@@ -9101,10 +9101,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-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));
}
.hover\:text-blue-700:hover {
--tw-text-opacity: 1;
color: rgb(29 78 216 / var(--tw-text-opacity));
@@ -9113,14 +9121,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-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));
@@ -9136,6 +9136,10 @@ readers do not read off random characters that represent icons */
--tw-border-opacity: 1;
border-color: rgb(209 213 219 / var(--tw-border-opacity));
}
.focus\:border-indigo-700:focus {
--tw-border-opacity: 1;
border-color: rgb(67 56 202 / var(--tw-border-opacity));
}
.focus\:border-indigo-300:focus {
--tw-border-opacity: 1;
border-color: rgb(165 180 252 / var(--tw-border-opacity));
@@ -9144,10 +9148,6 @@ readers do not read off random characters that represent icons */
--tw-border-opacity: 1;
border-color: rgb(17 24 39 / var(--tw-border-opacity));
}
.focus\:border-indigo-700:focus {
--tw-border-opacity: 1;
border-color: rgb(67 56 202 / var(--tw-border-opacity));
}
.focus\:bg-gray-100:focus {
--tw-bg-opacity: 1;
background-color: rgb(243 244 246 / var(--tw-bg-opacity));

5
resources/views/components/svg.blade.php Normal file
View File

@@ -0,0 +1,5 @@
@php
$filePath = $project->mmc_path . '/' . $auk->auk_path . '/' . $auk->image_dir . '/' . $mmc->filename;
$svg = file_get_contents($filePath);
@endphp
{{ $svg }}

14
resources/views/mmc/list.blade.php
View File

@@ -49,8 +49,20 @@
<td class="p-1 border border-gray-200 text-xs">
{{ date('d.m.Y H:i:s', $mmc['mtime']) }}</td>
<td>
@if (strcasecmp(substr($mmc->filename, -3, 3), 'jpg') == 0)
<img height="50"
src="{{ 'file://' . $project->mmc_path . '/' . $top_auk->auk_path . '/' . $top_auk->image_dir . '/' . $mmc->filename }}">
src="{{ route('mmc.show', $mmc->id) }}">
@endif
@if (strcasecmp(substr($mmc->filename, -3, 3), 'svg') == 0)
<svg>
@include('components.svg', [
'project' => $project,
'auk' => $top_auk,
'mmc' => $mmc,
])
</svg>
@endif
{{-- <img height="50" src="{{ route('mmc.show', $mmc->id) }}"> --}}
</td>
</tr>

2
routes/web.php
View File

@@ -37,7 +37,7 @@ Route::prefix('admin')->middleware(['admin'])->group(function () {
Route::resource('/projects', ProjectController::class)->middleware(['auth']);
Route::post('/project/{project}/select',SelectProjectController::class)->middleware(['auth'])->name('project.select');
Route::resource('/mmc', MMCController::class)->middleware(['auth'])->only(['index','create']);
Route::resource('/mmc', MMCController::class)->middleware(['auth'])->only(['index','create','show']);
Route::get('/mmc/scan/{auk}', [MMCController::class, 'scan'])->middleware(['auth'])->name('mmc.scan');
Route::post('/mmc/load/{auk}', [MMCController::class, 'load'])->middleware(['auth'])->name('mmc.load');
Route::resource('/documents', DocumentController::class)->except('show')->middleware(['auth']);