failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
F4ilji
2026-04-13 14:37:57 +05:00
parent 5eb5a7bc06
commit 2e77978d5c
16 changed files with 241 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Containers/Dashboard/Actions/ContentBuilder/UploadContentBuilderFilesAction.php
+56
View File
@@ -0,0 +1,56 @@
<?php
namespace App\Containers\Dashboard\Actions\ContentBuilder;
use App\Containers\Dashboard\Tasks\Files\UploadFileTask;
use Illuminate\Http\UploadedFile;
class UploadContentBuilderFilesAction
{
public function __construct(
private readonly UploadFileTask $uploadFileTask,
) {}
/**
* Загружает массив файлов и возвращает метаданные
*
* @param UploadedFile[] $files Массив загруженных файлов
* @return array[] Массив метаданных файлов ['path', 'url', 'original_name', 'extension', 'size']
*/
public function run(array $files): array
{
$results = [];
foreach ($files as $file) {
if (!$file instanceof UploadedFile) {
continue;
}
$uploadResult = $this->uploadFileTask->run($file);
$results[] = [
'path' => $uploadResult['path'],
'url' => $uploadResult['url'],
'title' => $uploadResult['original_name'],
'expansion' => strtolower($file->getClientOriginalExtension()),
'size' => $this->formatFileSize($file->getSize()),
];
}
return $results;
}
/**
* Форматирует размер файла в читаемый вид
*/
private function formatFileSize(int $bytes): string
{
$units = ['B', 'KB', 'MB', 'GB'];
$bytes = max($bytes, 0);
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
$pow = min($pow, count($units) - 1);
$bytes /= (1 << (10 * $pow));
return round($bytes, 2) . ' ' . $units[$pow];
}
}
app/Containers/Dashboard/UI/WEB/Controllers/PageController.php
+28
View File
@@ -3,6 +3,7 @@
namespace App\Containers\Dashboard\UI\WEB\Controllers;
use App\Containers\AppStructure\Models\Page;
use App\Containers\Dashboard\Actions\ContentBuilder\UploadContentBuilderFilesAction;
use App\Containers\Dashboard\Actions\Pages\CreatePageAction;
use App\Containers\Dashboard\Actions\Pages\DeletePageAction;
use App\Containers\Dashboard\Actions\Pages\ListPagesAction;
@@ -10,6 +11,7 @@ use App\Containers\Dashboard\Actions\Pages\UpdatePageAction;
use App\Containers\Dashboard\UI\WEB\Requests\StorePageRequest;
use App\Containers\Dashboard\UI\WEB\Requests\UpdatePageRequest;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Inertia\Inertia;
@@ -21,6 +23,7 @@ class PageController extends Controller
private readonly CreatePageAction $createPageAction,
private readonly UpdatePageAction $updatePageAction,
private readonly DeletePageAction $deletePageAction,
private readonly UploadContentBuilderFilesAction $uploadContentBuilderFilesAction,
) {}
/**
@@ -115,4 +118,29 @@ class PageController extends Controller
->with('error', 'Ошибка при удалении страницы: ' . $e->getMessage());
}
}
/**
* Загружает файлы для ContentBuilder и возвращает метаданные
*/
public function uploadFiles(Request $request): JsonResponse
{
$request->validate([
'files' => 'required|array',
'files.*' => 'required|file|mimes:pdf,docx,xlsx,pptx,zip,doc,xls,ppt|max:524288',
]);
try {
$results = $this->uploadContentBuilderFilesAction->run($request->file('files'));
return response()->json([
'success' => true,
'files' => $results,
]);
} catch (\Exception $e) {
return response()->json([
'success' => false,
'error' => 'Ошибка при загрузке файлов: ' . $e->getMessage(),
], 500);
}
}
}
app/Containers/Dashboard/UI/WEB/Routes/web.php
+1
View File
@@ -364,6 +364,7 @@ Route::middleware(['access-check', 'dashboard.auth'])->group(function () {
Route::get('/', [PageController::class, 'index'])->name('index');
Route::get('/create', [PageController::class, 'create'])->name('create');
Route::post('/', [PageController::class, 'store'])->name('store');
Route::post('/upload-files', [PageController::class, 'uploadFiles'])->name('upload-files');
Route::get('/{page}/edit', [PageController::class, 'edit'])->name('edit');
Route::put('/{page}', [PageController::class, 'update'])->name('update');
Route::delete('/{page}', [PageController::class, 'destroy'])->name('destroy');
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/ContactBlock.vue
+2 -1
View File
@@ -23,7 +23,7 @@
export default {
name: 'ContactBlock',
props: { modelValue: { type: Object, required: true } },
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() { return { contacts: [] }; },
async mounted() {
try {
@@ -34,6 +34,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/CustomFormBlock.vue
+2 -1
View File
@@ -35,7 +35,7 @@
export default {
name: 'CustomFormBlock',
props: { modelValue: { type: Object, required: true } },
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() { return { forms: [] }; },
async mounted() {
try {
@@ -46,6 +46,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
},
updateSettings(field, value) {
this.update('settings', { ...this.modelValue.settings, [field]: value });
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/FastFilesBlock.vue
+63 -8
View File
@@ -22,12 +22,22 @@
</div>
</div>
<!-- Upload Progress -->
<div v-if="uploading" class="flex items-center gap-2 p-3 bg-primary/5 border border-primary/20 rounded-lg">
<svg class="animate-spin h-4 w-4 text-primary" fill="none" viewBox="0 0 24 24">
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
</svg>
<span class="text-sm text-primary">Загрузка файлов...</span>
</div>
<input
type="file"
@change="handleFilesUpload"
:disabled="uploading"
accept=".pdf,.docx,.xlsx,.pptx,.zip"
multiple
class="w-full px-3 py-2 border border-layer-line rounded-lg bg-white text-foreground focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent"
class="w-full px-3 py-2 border border-layer-line rounded-lg bg-white text-foreground focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent disabled:opacity-50 disabled:cursor-not-allowed"
/>
<p class="text-xs text-muted-foreground-1">
PDF, DOCX, XLSX, PPTX, ZIP
@@ -41,21 +51,66 @@ export default {
props: {
modelValue: { type: Object, required: true }
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() {
return {
uploading: false
};
},
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
},
removeFile(index) {
this.update('path', this.modelValue.path.filter((_, i) => i !== index));
},
handleFilesUpload(event) {
async handleFilesUpload(event) {
const files = Array.from(event.target.files);
const newPaths = [...this.modelValue.path];
files.forEach(file => {
newPaths.push(URL.createObjectURL(file));
});
this.update('path', newPaths);
if (files.length === 0) return;
// Reset input to allow selecting same files again
event.target.value = '';
await this.uploadFilesToServer(files);
},
async uploadFilesToServer(files) {
if (files.length === 0) return;
this.uploading = true;
try {
const formData = new FormData();
files.forEach(file => {
formData.append('files[]', file);
});
const response = await fetch(route('dashboard.pages.upload-files'), {
method: 'POST',
headers: {
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]')?.content ?? '',
'Accept': 'application/json',
},
body: formData,
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const result = await response.json();
if (result.success && result.files) {
const newPaths = result.files.map(file => file.path);
this.update('path', [...this.modelValue.path, ...newPaths]);
} else {
console.error('File upload failed:', result.error);
}
} catch (error) {
console.error('File upload error:', error);
} finally {
this.uploading = false;
}
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/FilesBlock.vue
+71 -15
View File
@@ -33,12 +33,22 @@
</div>
</div>
<!-- Upload Progress -->
<div v-if="uploading" class="flex items-center gap-2 p-3 bg-primary/5 border border-primary/20 rounded-lg">
<svg class="animate-spin h-4 w-4 text-primary" fill="none" viewBox="0 0 24 24">
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
</svg>
<span class="text-sm text-primary">Загрузка файлов...</span>
</div>
<input
type="file"
@change="handleFilesUpload"
:disabled="uploading"
accept=".pdf,.docx,.xlsx,.pptx,.zip"
multiple
class="w-full px-3 py-2 border border-layer-line rounded-lg bg-white text-foreground focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent"
class="w-full px-3 py-2 border border-layer-line rounded-lg bg-white text-foreground focus:outline-none focus:ring-2 focus:ring-primary focus:border-transparent disabled:opacity-50 disabled:cursor-not-allowed"
/>
<p class="text-xs text-muted-foreground-1">
PDF, DOCX, XLSX, PPTX, ZIP. Макс. 512MB
@@ -60,10 +70,16 @@ export default {
props: {
modelValue: { type: Object, required: true }
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() {
return {
uploading: false
};
},
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
},
updateFile(index, field, value) {
const files = [...this.modelValue.file];
@@ -71,24 +87,64 @@ export default {
this.update('file', files);
},
addFile() {
this.update('file', [...this.modelValue.file, { title: '', path: '', expansion: '', size: '', time_added: Date.now() }]);
this.update('file', [...this.modelValue.file, { title: '', path: '', expansion: '', size: '', time_added: Math.floor(Date.now() / 1000) }]);
},
removeFile(index) {
this.update('file', this.modelValue.file.filter((_, i) => i !== index));
},
handleFilesUpload(event) {
async handleFilesUpload(event) {
const files = Array.from(event.target.files);
files.forEach(file => {
const extension = file.name.split('.').pop().toLowerCase();
const size = (file.size / (1024 * 1024)).toFixed(2) + ' MB';
this.update('file', [...this.modelValue.file, {
title: file.name,
path: URL.createObjectURL(file),
expansion: extension,
size: size,
time_added: Date.now()
}]);
});
if (files.length === 0) return;
// Reset input to allow selecting same files again
event.target.value = '';
await this.uploadFilesToServer(files);
},
async uploadFilesToServer(files) {
if (files.length === 0) return;
this.uploading = true;
try {
const formData = new FormData();
files.forEach(file => {
formData.append('files[]', file);
});
const response = await fetch(route('dashboard.pages.upload-files'), {
method: 'POST',
headers: {
'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]')?.content ?? '',
'Accept': 'application/json',
},
body: formData,
});
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const result = await response.json();
if (result.success && result.files) {
const newFiles = result.files.map(file => ({
title: file.title,
path: file.path,
expansion: file.expansion,
size: file.size,
time_added: Math.floor(Date.now() / 1000)
}));
this.update('file', [...this.modelValue.file, ...newFiles]);
} else {
console.error('File upload failed:', result.error);
}
} catch (error) {
console.error('File upload error:', error);
} finally {
this.uploading = false;
}
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/HeadingBlock.vue
+2 -1
View File
@@ -41,13 +41,14 @@ export default {
required: true
}
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
methods: {
update(field, value) {
this.$emit('update:modelValue', {
...this.modelValue,
[field]: value
});
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/PageItemBlock.vue
+2 -1
View File
@@ -23,7 +23,7 @@
export default {
name: 'PageItemBlock',
props: { modelValue: { type: Object, required: true } },
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() { return { pages: [] }; },
async mounted() {
try {
@@ -34,6 +34,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/PageResourceListBlock.vue
+2 -1
View File
@@ -23,7 +23,7 @@
export default {
name: 'PageResourceListBlock',
props: { modelValue: { type: Object, required: true } },
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() { return { resources: [] }; },
async mounted() {
try {
@@ -34,6 +34,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/PersonBlock.vue
+2 -1
View File
@@ -88,10 +88,11 @@ export default {
props: {
modelValue: { type: Object, required: true }
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
},
updateInfo(index, field, value) {
const info = [...this.modelValue.info];
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/PostItemBlock.vue
+2 -1
View File
@@ -23,7 +23,7 @@
export default {
name: 'PostItemBlock',
props: { modelValue: { type: Object, required: true } },
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() { return { posts: [] }; },
async mounted() {
try {
@@ -34,6 +34,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/PostListBlock.vue
+2 -1
View File
@@ -37,7 +37,7 @@
export default {
name: 'PostListBlock',
props: { modelValue: { type: Object, required: true } },
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() { return { categories: [] }; },
async mounted() {
try {
@@ -48,6 +48,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/SliderBlock.vue
+2 -1
View File
@@ -28,7 +28,7 @@ export default {
props: {
modelValue: { type: Object, required: true }
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
data() {
return { sliders: [] };
},
@@ -44,6 +44,7 @@ export default {
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
}
}
}
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/StepperBlock.vue
+2 -1
View File
@@ -79,10 +79,11 @@ export default {
props: {
modelValue: { type: Object, required: true }
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
},
updateStep(index, field, value) {
const steps = [...this.modelValue.steps];
resources/js/Pages/Dashboard/Components/ContentBuilder/blocks/VideoBlock.vue
+2 -1
View File
@@ -41,10 +41,11 @@ export default {
props: {
modelValue: { type: Object, required: true }
},
emits: ['update:modelValue'],
emits: ['update:modelValue', 'update'],
methods: {
update(field, value) {
this.$emit('update:modelValue', { ...this.modelValue, [field]: value });
this.$emit('update');
},
handleFileUpload(event) {
const file = event.target.files[0];