From 2acdc8d50dea2a4d17436e3abed0909674246619 Mon Sep 17 00:00:00 2001 From: Mantas Muliarcikas Date: Fri, 30 Aug 2024 01:43:21 +0300 Subject: [PATCH] Moved file uploader component to FileUploadMerchantPortalGui module --- .../Components/app/components.module.ts | 17 ++- .../file-upload-list.component.html | 6 + .../file-upload-list.component.less | 0 .../file-upload-list.component.ts | 15 ++ .../file-upload-list.module.ts | 13 ++ .../file-upload-table.component.html | 1 - .../file-upload-table.component.less | 30 ---- .../file-upload-table.component.ts | 40 ------ .../file-upload-table.module.ts | 12 -- .../app/file-uploader}/file-upload.service.ts | 0 .../file-uploader.component.html} | 36 ++--- .../file-uploader.component.less} | 4 +- .../file-uploader/file-uploader.component.ts} | 8 +- .../file-uploader/file-uploader.module.ts} | 8 +- .../app/progress/progress.component.html | 0 .../app/progress/progress.component.less | 0 .../app/progress/progress.component.ts | 0 .../app/progress/progress.module.ts | 0 .../Presentation/Components/icons/files.ts | 0 .../Presentation/Components/icons/index.ts | 0 .../Presentation/Components/icons/messages.ts | 0 .../Presentation/List/index.twig | 53 ++++++- .../Presentation/Products/index.twig | 131 ------------------ .../Components/app/components.module.ts | 19 --- .../ZedUi/Presentation/Components/entry.ts | 5 - .../Presentation/Partials/file-upload.twig | 24 ---- 26 files changed, 121 insertions(+), 301 deletions(-) create mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.html create mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.less create mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.ts create mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.module.ts delete mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.html delete mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.less delete mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.ts delete mode 100644 src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.module.ts rename src/Pyz/Zed/{ZedUi/Presentation/Components/app/media-file-upload => FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader}/file-upload.service.ts (100%) rename src/Pyz/Zed/{ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.html => FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.html} (75%) rename src/Pyz/Zed/{ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.less => FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.less} (96%) rename src/Pyz/Zed/{ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.ts => FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.ts} (95%) rename src/Pyz/Zed/{ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.module.ts => FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.module.ts} (71%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/app/progress/progress.component.html (100%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/app/progress/progress.component.less (100%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/app/progress/progress.component.ts (100%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/app/progress/progress.module.ts (100%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/icons/files.ts (100%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/icons/index.ts (100%) rename src/Pyz/Zed/{ZedUi => FileUploadMerchantPortalGui}/Presentation/Components/icons/messages.ts (100%) delete mode 100644 src/Pyz/Zed/ProductMerchantPortalGui/Presentation/Products/index.twig delete mode 100644 src/Pyz/Zed/ZedUi/Presentation/Components/app/components.module.ts delete mode 100644 src/Pyz/Zed/ZedUi/Presentation/Components/entry.ts delete mode 100644 src/Pyz/Zed/ZedUi/Presentation/Partials/file-upload.twig diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/components.module.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/components.module.ts index fe6bd9e21c..0aa6f18a4b 100644 --- a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/components.module.ts +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/components.module.ts @@ -1,12 +1,21 @@ import { NgModule } from '@angular/core'; import { WebComponentsModule } from '@spryker/web-components'; -import {FileUploadTableComponent} from "./file-upload-table/file-upload-table.component"; -import {FileUploadTableModule} from "./file-upload-table/file-upload-table.module"; +import { ButtonLinkComponent, ButtonLinkModule } from '@spryker/button'; +import {FileUploadListComponent} from "./file-upload-list/file-upload-list.component"; +import {FileUploadListModule} from "./file-upload-list/file-upload-list.module"; +import {FileUploaderComponent} from "./file-uploader/file-uploader.component"; +import {FileUploaderModule} from "./file-uploader/file-uploader.module"; @NgModule({ imports: [ - WebComponentsModule.withComponents([FileUploadTableComponent]), - FileUploadTableModule, + WebComponentsModule.withComponents([ + FileUploadListComponent, + FileUploaderComponent, + ButtonLinkComponent, + ]), + FileUploadListModule, + ButtonLinkModule, + FileUploaderModule, ], }) export class ComponentsModule {} diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.html b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.html new file mode 100644 index 0000000000..83d92845f6 --- /dev/null +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.less b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.less new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.ts new file mode 100644 index 0000000000..e257583cda --- /dev/null +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.component.ts @@ -0,0 +1,15 @@ +import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; +import { TableConfig } from '@spryker/table'; + +@Component({ + selector: 'mp-file-upload-list', + templateUrl: './file-upload-list.component.html', + styleUrls: ['./file-upload-list.component.less'], + changeDetection: ChangeDetectionStrategy.OnPush, + encapsulation: ViewEncapsulation.None, +}) +export class FileUploadListComponent { + @Input() tableConfig: TableConfig; + @Input() tableId?: string; +} + diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.module.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.module.ts new file mode 100644 index 0000000000..145bdcf764 --- /dev/null +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-list/file-upload-list.module.ts @@ -0,0 +1,13 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { TableModule } from '@spryker/table'; +import { HeadlineModule } from '@spryker/headline'; + +import { FileUploadListComponent } from './file-upload-list.component'; + +@NgModule({ + imports: [CommonModule, TableModule, HeadlineModule], + declarations: [FileUploadListComponent], + exports: [FileUploadListComponent], +}) +export class FileUploadListModule {} diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.html b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.html deleted file mode 100644 index 751d65118a..0000000000 --- a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.less b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.less deleted file mode 100644 index 094c3426c0..0000000000 --- a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.less +++ /dev/null @@ -1,30 +0,0 @@ -@import '~@spryker/styles/src/lib/themes/default/variables/index.less'; - -.mp-file-upload-table { - &--inner { - background: @gray-lighter; - padding: var(--spy-order-file-upload-table-padding, 20px); - display: block; - } - - &--order-items { - .spy-table-search-feature, - .ant-table-features--top .spy-table-features-renderer__content { - width: 100%; - } - - .spy-table-filters-feature__item { - flex: 1; - } - } - - &--file-upload { - .spy-table-column-list:has(.spy-table-column-text) { - flex-wrap: nowrap; - - .spy-table-column-text { - white-space: normal; - } - } - } -} diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.ts deleted file mode 100644 index 39687e68b1..0000000000 --- a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { - booleanAttribute, - ChangeDetectionStrategy, - Component, - HostBinding, - Input, - OnInit, - ViewEncapsulation, -} from '@angular/core'; -import { TableConfig } from '@spryker/table'; -import { TableRowActionBase } from '@spryker/table.feature.row-actions'; -import { ToJson } from '@spryker/utils'; - -@Component({ - selector: 'mp-file-upload-table', - templateUrl: './file-upload-table.component.html', - styleUrls: ['./file-upload-table.component.less'], - changeDetection: ChangeDetectionStrategy.OnPush, - encapsulation: ViewEncapsulation.None, -}) -export class FileUploadTableComponent implements OnInit { - @Input() @ToJson() config: TableConfig; - @Input() @ToJson() action: TableRowActionBase; - @Input() tableId?: string; - - @HostBinding('class.mp-file-upload-table') mainClass = true; - @HostBinding('class.mp-file-upload-table--inner') - @Input({ transform: booleanAttribute }) - inner = true; - - protected _config: TableConfig; - - ngOnInit(): void { - if (this.config?.rowActions && this.action) { - this.config.rowActions.click = this.action.id; - this.config.rowActions.actions.push(this.action); - this.config = { ...this.config }; - } - } -} diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.module.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.module.ts deleted file mode 100644 index d9cd3f25f3..0000000000 --- a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-upload-table/file-upload-table.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { TableModule } from '@spryker/table'; - -import { FileUploadTableComponent } from './file-upload-table.component'; - -@NgModule({ - imports: [CommonModule, TableModule], - declarations: [FileUploadTableComponent], - exports: [FileUploadTableComponent], -}) -export class FileUploadTableModule {} diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/file-upload.service.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-upload.service.ts similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/file-upload.service.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-upload.service.ts diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.html b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.html similarity index 75% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.html rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.html index 41ade7cbaf..fea34ad43f 100644 --- a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.html +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.html @@ -8,7 +8,7 @@ @if (!showProgress) { @if (!files?.length) { -
+
} @@ -16,15 +16,15 @@
- + - + @if (files?.length) { -
+
@for (file of files; track file.id; let index = $index) {
- {{ index + 1 }}. {{ file.name }} + {{ index + 1 }}. {{ file.name }} {{ fileSize(file) }}
@@ -49,21 +49,21 @@ } } @else { @if (uploadingFiles$ | async; as files) { -
+
@for (file$ of files; track $index; let index = $index) { @if (file$ | async; as file) { -
+
{{ index + 1 }}. {{ file.name }} @if (file.url && showCdn) { -
- {{ file.url }} +
+ {{ file.url }} {{ this.translations?.copy }} @@ -77,7 +77,7 @@ } } -
+
@if ((uploadingFiles$ | async)?.length) { @if (showProgress) { @@ -89,7 +89,7 @@ }
diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.less b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.less similarity index 96% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.less rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.less index 8c954f339d..60090894e6 100644 --- a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.less +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.less @@ -1,10 +1,10 @@ @import '~@spryker/styles/src/lib/themes/default/variables/index.less'; -.ant-modal:has(.mp-media-file-upload__footer) { +.ant-modal:has(.mp-file-uploader__footer) { min-width: 800px; } -.mp-media-file-upload { +.mp-file-uploader { &__area { display: flex; flex-direction: column; diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.ts similarity index 95% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.ts index c0b9342be0..87f77d77ed 100644 --- a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.component.ts +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.component.ts @@ -29,13 +29,13 @@ export interface FileData { } @Component({ - selector: 'mp-media-file-upload', - templateUrl: './media-file-upload.component.html', - styleUrls: ['./media-file-upload.component.less'], + selector: 'mp-file-uploader', + templateUrl: './file-uploader.component.html', + styleUrls: ['./file-uploader.component.less'], changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, }) -export class MediaFileUploadComponent implements OnDestroy, OnInit { +export class FileUploaderComponent implements OnDestroy, OnInit { @Input() importUrl = '/file-upload-merchant-portal-gui/upload/get-upload-url'; @Input() hookUrl = '/file-upload-merchant-portal-gui/upload/save-upload-data'; @Input() downloadUrl: string; diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.module.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.module.ts similarity index 71% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.module.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.module.ts index 9a4b07c5dd..80707ebd06 100644 --- a/src/Pyz/Zed/ZedUi/Presentation/Components/app/media-file-upload/media-file-upload.module.ts +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/file-uploader/file-uploader.module.ts @@ -5,11 +5,11 @@ import { IconModule } from '@spryker/icon'; import { ModalModule } from '@spryker/modal'; import { IconFilesModule } from '../../icons'; import { ProgressModule } from '../progress/progress.module'; -import { MediaFileUploadComponent } from './media-file-upload.component'; +import { FileUploaderComponent } from './file-uploader.component'; @NgModule({ imports: [IconModule, IconFilesModule, CommonModule, ModalModule, ButtonModule, ButtonLinkModule, ProgressModule], - declarations: [MediaFileUploadComponent], - exports: [MediaFileUploadComponent], + declarations: [FileUploaderComponent], + exports: [FileUploaderComponent], }) -export class MediaFileUploadModule {} +export class FileUploaderModule {} diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.component.html b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.component.html similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.component.html rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.component.html diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.component.less b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.component.less similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.component.less rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.component.less diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.component.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.component.ts similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.component.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.component.ts diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.module.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.module.ts similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/app/progress/progress.module.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/app/progress/progress.module.ts diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/icons/files.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/icons/files.ts similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/icons/files.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/icons/files.ts diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/icons/index.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/icons/index.ts similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/icons/index.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/icons/index.ts diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/icons/messages.ts b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/icons/messages.ts similarity index 100% rename from src/Pyz/Zed/ZedUi/Presentation/Components/icons/messages.ts rename to src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/Components/icons/messages.ts diff --git a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/List/index.twig b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/List/index.twig index 3a8a50303c..bc21a0ac43 100644 --- a/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/List/index.twig +++ b/src/Pyz/Zed/FileUploadMerchantPortalGui/Presentation/List/index.twig @@ -6,13 +6,52 @@ {% endblock %} {% block content %} - + {% set fileUploaderConfig = { + data: [ + { + size: 2, + errorSize: 'The file should be less then 2MB' | trans, + types: ['image/png', 'image/jpeg'], + }, + ], + translations: { + mb: 'MB' | trans, + copy: 'Copy' | trans, + errorType: data.errorType | default(''), + }, + }%} + + +

{{ 'File Uploads' | trans }}

+
+
+ + {% block textData %} +
    +
  • {{ 'You can upload multiple images' | trans }}
    • +
  • {{ 'Max allowed single image size - 2MB' | trans }}
    • +
+ {{ 'Import Images' | trans }} + {{ 'Choose or drag your images' | trans }} + {{ 'Import Images' | trans }} + {% endblock %} - - - + {{ 'Cancel' | trans }} + {{ 'Upload' | trans }} + {{ 'Back' | trans }} + {{ 'Show Progress' | trans }} + +
+
+ {% endblock %} diff --git a/src/Pyz/Zed/ProductMerchantPortalGui/Presentation/Products/index.twig b/src/Pyz/Zed/ProductMerchantPortalGui/Presentation/Products/index.twig deleted file mode 100644 index 6b21c09c3f..0000000000 --- a/src/Pyz/Zed/ProductMerchantPortalGui/Presentation/Products/index.twig +++ /dev/null @@ -1,131 +0,0 @@ -{# -@var productAbstractTableConfiguration \Generated\Shared\Transfer\GuiTableConfigurationTransfer -#} - -{% extends '@ZedUi/Layout/merchant-layout-main.twig' %} -{% import _self as view %} - -{% block headSubTitle %} - {{- 'Products' | trans -}} -{% endblock %} - -{% block content %} - {% set actionConfig = '{ - "type": "drawer", - "component": "ajax-form", - "options": { - "inputs": { - "action": "' ~ url(urlCreateProductAbstract) ~ '" - } - } - }' %} - - -

{{ 'Products' | trans }}

-
-
- {% set mediaData = [ - { - size: 15, - errorSize: 'The file should be less then %size% MB' | trans({ - '%size%': 15, - }), - types: 'text/csv', - }, - ] %} - - {% embed 'ZedUi/Partials/file-upload.twig' with { - data: { - errorType: 'Only %types% file formats are allowed' | trans({ - '%types%': 'text/csv' - }), - download: '/import_template.csv', - fileData: mediaData, - } - } %} - {% block textData %} - {{ 'Import Products' | trans }} - {{ 'Choose or drag your csv file' | trans }} - {{ 'Download Template' | trans }} - {{ 'Import Products' | trans }} - {% endblock %} - {% endembed %} -
- -
- {% set imagesTypes = constant('Pyz\\Shared\\FileUpload\\FileUploadConfig::ACCEPTED_IMAGE_CONTENT_TYPES') | join(', ') %} - {% set videoTypes = constant('Pyz\\Shared\\FileUpload\\FileUploadConfig::ACCEPTED_VIDEO_CONTENT_TYPES') | join(', ') %} - {% set docTypes = constant('Pyz\\Shared\\FileUpload\\FileUploadConfig::ACCEPTED_DOCUMENT_CONTENT_TYPES') | join(', ') %} - {% set types = "#{imagesTypes}, #{videoTypes}, #{docTypes}" %} - - {% set mediaData = [ - { - size: 2, - errorSize: 'The file should be less then %size% MB' | trans({ - '%size%': 2, - }), - types: imagesTypes, - }, - { - size: 100, - errorSize: 'The file should be less then %size% MB' | trans({ - '%size%': 100, - }), - types: videoTypes, - }, - { - size: 25, - errorSize: 'The file should be less then %size% MB' | trans({ - '%size%': 25, - }), - types: docTypes, - } - ] %} - - {% embed 'ZedUi/Partials/file-upload.twig' with { - data: { - errorType: 'Only %types% file formats are allowed' | trans({ - '%types%': types - }), - multiple: true, - fileData: mediaData, - } - } %} - {% block textData %} -
    -
  • - {{ 'Maximum %value% media can be uploaded in one upload.' | trans({ - '%value%': 20, - }) }} -
    • -
  • - {{ 'Maximum %value% media can be uploaded in one upload.' | trans({ - '%value%': 20, - }) }} -
    • -
  • - {{ 'Maximum %value% media can be uploaded in one upload.' | trans({ - '%value%': 20, - }) }} -
    • -
- {{ 'Import Media' | trans }} - {{ 'Choose or drag your media' | trans }} - {{ 'Import Media' | trans }} - {% endblock %} - {% endembed %} -
- - - {{ 'Create Product' | trans }} - -
- -{% endblock %} diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/app/components.module.ts b/src/Pyz/Zed/ZedUi/Presentation/Components/app/components.module.ts deleted file mode 100644 index 5b1c53e741..0000000000 --- a/src/Pyz/Zed/ZedUi/Presentation/Components/app/components.module.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { NgModule } from '@angular/core'; -import { ComponentsModule as CoreComponentsModule } from '@mp/zed-ui'; -import { ButtonLinkComponent, ButtonLinkModule } from '@spryker/button'; -import { WebComponentsModule } from '@spryker/web-components'; -import { MediaFileUploadComponent } from './media-file-upload/media-file-upload.component'; -import { MediaFileUploadModule } from './media-file-upload/media-file-upload.module'; - -@NgModule({ - imports: [ - CoreComponentsModule, - WebComponentsModule.withComponents([ - ButtonLinkComponent, - MediaFileUploadComponent, - ]), - ButtonLinkModule, - MediaFileUploadModule, - ], -}) -export class ComponentsModule {} diff --git a/src/Pyz/Zed/ZedUi/Presentation/Components/entry.ts b/src/Pyz/Zed/ZedUi/Presentation/Components/entry.ts deleted file mode 100644 index 5febded5b0..0000000000 --- a/src/Pyz/Zed/ZedUi/Presentation/Components/entry.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { registerNgModule } from '@mp/zed-ui'; - -import { ComponentsModule } from './app/components.module'; - -registerNgModule(ComponentsModule); diff --git a/src/Pyz/Zed/ZedUi/Presentation/Partials/file-upload.twig b/src/Pyz/Zed/ZedUi/Presentation/Partials/file-upload.twig deleted file mode 100644 index 3c7d5f0293..0000000000 --- a/src/Pyz/Zed/ZedUi/Presentation/Partials/file-upload.twig +++ /dev/null @@ -1,24 +0,0 @@ -{% set translations = { - mb: 'MB' | trans, - copy: 'Copy' | trans, - errorType: data.errorType | default(''), -} %} - - - {% block textData %}{% endblock %} - - {{ 'Cancel' | trans }} - {{ 'Upload' | trans }} - {{ 'Back' | trans }} - {{ 'Show Progress' | trans }} -