diff --git a/src/app/home/file-upload/file-upload.component.scss b/src/app/home/file-upload/file-upload.component.scss index c2d808d44..2dffd77ef 100644 --- a/src/app/home/file-upload/file-upload.component.scss +++ b/src/app/home/file-upload/file-upload.component.scss @@ -1,7 +1,6 @@ $electron-title-width: 28px; .file-upload { - height: calc(100vh - 230px); cursor: pointer; border: 1px dashed #999; border-radius: 5px; @@ -10,6 +9,7 @@ $electron-title-width: 28px; align-items: center; justify-content: center; margin: 20px; + padding: 10px; gap: 20px; .upload-icon { diff --git a/src/app/home/file-upload/file-upload.component.ts b/src/app/home/file-upload/file-upload.component.ts index deadadffd..8e73c22c6 100644 --- a/src/app/home/file-upload/file-upload.component.ts +++ b/src/app/home/file-upload/file-upload.component.ts @@ -1,6 +1,10 @@ import { Component, EventEmitter, Output } from '@angular/core'; +import { MatIconModule } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ + standalone: true, + imports: [MatIconModule, TranslateModule], selector: 'app-file-upload', templateUrl: './file-upload.component.html', styleUrls: ['./file-upload.component.scss'], @@ -12,8 +16,8 @@ export class FileUploadComponent { file: File; }> = new EventEmitter(); - /** Emits on reject event */ @Output() fileRejected: EventEmitter = new EventEmitter(); + @Output() addClicked = new EventEmitter(); allowedContentTypes = [ 'application/mpegurl', @@ -37,5 +41,6 @@ export class FileUploadComponent { file: fileList[0], }); fileReader.readAsText(fileList[0]); + this.addClicked.emit(); } } diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 585e654cb..15028718c 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -2,12 +2,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { SharedModule } from '../shared/shared.module'; import { DragDropFileUploadDirective } from './file-upload/drag-drop-file-upload.directive'; -import { FileUploadComponent } from './file-upload/file-upload.component'; import { HomeComponent } from './home.component'; import { HomeRoutingModule } from './home.routing'; import { StalkerPortalImportComponent } from './stalker-portal-import/stalker-portal-import.component'; -import { TextImportComponent } from './text-import/text-import.component'; -import { UrlUploadComponent } from './url-upload/url-upload.component'; import { XtreamCodeImportComponent } from './xtream-code-import/xtream-code-import.component'; @NgModule({ @@ -18,12 +15,6 @@ import { XtreamCodeImportComponent } from './xtream-code-import/xtream-code-impo XtreamCodeImportComponent, StalkerPortalImportComponent, ], - declarations: [ - DragDropFileUploadDirective, - HomeComponent, - FileUploadComponent, - TextImportComponent, - UrlUploadComponent, - ], + declarations: [DragDropFileUploadDirective, HomeComponent], }) export class HomeModule {} diff --git a/src/app/home/stalker-portal-import/stalker-portal-import.component.ts b/src/app/home/stalker-portal-import/stalker-portal-import.component.ts index dc0664bcd..4efb94f07 100644 --- a/src/app/home/stalker-portal-import/stalker-portal-import.component.ts +++ b/src/app/home/stalker-portal-import/stalker-portal-import.component.ts @@ -1,4 +1,4 @@ -import { Component, inject } from '@angular/core'; +import { Component, EventEmitter, Output, inject } from '@angular/core'; import { FormControl, FormGroup, @@ -43,6 +43,7 @@ import { addPlaylist } from '../../state/actions'; ], }) export class StalkerPortalImportComponent { + @Output() addClicked = new EventEmitter(); URL_REGEX = /^(http|https|file):\/\/[^ "]+$/; form = new FormGroup({ @@ -68,6 +69,7 @@ export class StalkerPortalImportComponent { this.store.dispatch( addPlaylist({ playlist: this.form.value as Playlist }) ); + this.addClicked.emit(); } transformPortalUrl(url: string) { diff --git a/src/app/home/text-import/text-import.component.scss b/src/app/home/text-import/text-import.component.scss index 875bc8ed7..9b7b1d0d0 100644 --- a/src/app/home/text-import/text-import.component.scss +++ b/src/app/home/text-import/text-import.component.scss @@ -1,8 +1,7 @@ button { margin: 0 15px; - text-transform: uppercase; } textarea { - height: calc(100vh - 300px) !important; + height: 300px !important; } diff --git a/src/app/home/text-import/text-import.component.ts b/src/app/home/text-import/text-import.component.ts index 6fcbdb040..bb95324b7 100644 --- a/src/app/home/text-import/text-import.component.ts +++ b/src/app/home/text-import/text-import.component.ts @@ -1,10 +1,25 @@ import { Component, EventEmitter, Output } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { + FormControl, + FormGroup, + ReactiveFormsModule, + Validators, +} from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatInputModule } from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ + standalone: true, selector: 'app-text-import', templateUrl: './text-import.component.html', styleUrls: ['./text-import.component.scss'], + imports: [ + MatButtonModule, + MatInputModule, + ReactiveFormsModule, + TranslateModule, + ], }) export class TextImportComponent { @Output() textAdded = new EventEmitter(); diff --git a/src/app/home/url-upload/url-upload.component.html b/src/app/home/url-upload/url-upload.component.html index 6b270ccb6..7174d0a34 100644 --- a/src/app/home/url-upload/url-upload.component.html +++ b/src/app/home/url-upload/url-upload.component.html @@ -7,11 +7,9 @@ formControlName="playlistUrl" /> - - - {{ 'HOME.URL_UPLOAD.CORS_NOTE' | translate }} - - +

+ {{ 'HOME.URL_UPLOAD.CORS_NOTE' | translate }} +