-
- @if(covers && covers.length > 0) {
-
-
-

-
- }
- @else {
-
- }
-
- @if(element) {
-
- {{episodeDisplay}} {{name}}
-
- }
- @else {
-
- Error meda: {{element?.id}}
-
- }
-
diff --git a/front/src/app/component/element-video/element-video.less b/front/src/app/component/element-video/element-video.less
deleted file mode 100644
index a7023b1..0000000
--- a/front/src/app/component/element-video/element-video.less
+++ /dev/null
@@ -1,38 +0,0 @@
-
-.videoImgContainer {
- text-align: center;
- width: 200px;
- margin: 0 auto;
- height: 250px;
- img {
- //width: 100%;
- max-height: 250px;
- max-width: 200px;
- }
- .noImage {
- height: 243px;
- width: 193px;
- border: solid 3px;
- border-color: rgba(0, 0, 0, 0.7);
- margin: auto;
- }
-}
-
-.title-small {
- height: 40px;
- width: 200px;
- font-size: 17px;
- overflow:hidden;
- display:inline-block;
- text-align: center;
- padding:auto;
- background: rgba(256, 256, 256, 0.3);
- border-radius: 7px;
-}
-
-.description-small {
- height: 30px;
- font-size: 12px;
- overflow:hidden;
- vertical-align: middle;
-}
\ No newline at end of file
diff --git a/front/src/app/component/element-video/element-video.ts b/front/src/app/component/element-video/element-video.ts
deleted file mode 100644
index bfda4b7..0000000
--- a/front/src/app/component/element-video/element-video.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2018, Edouard DUPIN, all right reserved
- * @license PROPRIETARY (see license file)
- */
-import { Injectable, Component, OnInit, Input } from '@angular/core';
-import { Track } from 'app/back-api';
-
-import { DataService } from 'app/service';
-
-@Component({
- selector: 'app-element-video',
- templateUrl: './element-video.html',
- styleUrls: ['./element-video.less']
-})
-
-@Injectable()
-export class ElementVideoComponent implements OnInit {
- // input parameters
- @Input() element: Track;
- name: string = '';
- description: string = '';
- episodeDisplay: string = '';
-
- cover: string = '';
- covers: string[];
-
- constructor(
- private dataService: DataService) {
- // nothing to do.
- }
- ngOnInit() {
- this.name = this.element.name;
- this.description = this.element.description;
- this.covers = this.dataService.getListThumbnailUrl(this.element.covers);
- }
-}
diff --git a/front/src/app/component/index.ts b/front/src/app/component/index.ts
index 99fbb8b..71366e0 100644
--- a/front/src/app/component/index.ts
+++ b/front/src/app/component/index.ts
@@ -1,18 +1,14 @@
-import { DescriptionAreaComponent } from "./description-area/description-area";
-import { ElementPlayerAudioComponent } from "./element-player-audio/element-player-audio";
-import { ElementSeasonComponent } from "./element-season/element-season";
-import { ElementSeriesComponent } from "./element-series/element-series";
-import { ElementTrackComponent } from "./element-track/element-track";
-import { ElementVideoComponent } from "./element-video/element-video";
+import { AppDescriptionArea } from "./AppDescriptionArea/AppDescriptionArea";
+import { ElementPlayerAudioComponent } from "./AppPlayerAudio/AppPlayerAudio";
+import { AppElementAlbum } from "./AppElementAlbum/AppElementAlbum";
+import { AppElementTrack } from "./AppElementTrack/AppElementTrack";
export {
- ElementSeriesComponent,
- ElementVideoComponent,
- ElementSeasonComponent,
+ AppDescriptionArea,
+ AppElementAlbum,
ElementPlayerAudioComponent,
- ElementTrackComponent,
- DescriptionAreaComponent,
+ AppElementTrack,
};
diff --git a/front/src/app/scene/album-edit/album-edit.html b/front/src/app/scene/album-edit/SceneAlbumEdit.html
similarity index 100%
rename from front/src/app/scene/album-edit/album-edit.html
rename to front/src/app/scene/album-edit/SceneAlbumEdit.html
diff --git a/front/src/app/scene/album-edit/album-edit.less b/front/src/app/scene/album-edit/SceneAlbumEdit.less
similarity index 100%
rename from front/src/app/scene/album-edit/album-edit.less
rename to front/src/app/scene/album-edit/SceneAlbumEdit.less
diff --git a/front/src/app/scene/album-edit/album-edit.ts b/front/src/app/scene/album-edit/SceneAlbumEdit.ts
similarity index 98%
rename from front/src/app/scene/album-edit/album-edit.ts
rename to front/src/app/scene/album-edit/SceneAlbumEdit.ts
index 9bf0262..58eaad6 100644
--- a/front/src/app/scene/album-edit/album-edit.ts
+++ b/front/src/app/scene/album-edit/SceneAlbumEdit.ts
@@ -17,9 +17,9 @@ export interface ElementList {
}
@Component({
- selector: 'app-album-edit',
- templateUrl: './album-edit.html',
- styleUrls: ['./album-edit.less']
+ selector: 'SceneAlbumEdit',
+ templateUrl: './SceneAlbumEdit.html',
+ styleUrls: ['./SceneAlbumEdit.less']
})
export class AlbumEditScene implements OnInit {
diff --git a/front/src/app/scene/album/album.html b/front/src/app/scene/album/SceneAlbum.html
similarity index 93%
rename from front/src/app/scene/album/album.html
rename to front/src/app/scene/album/SceneAlbum.html
index 0355fb4..5d065eb 100644
--- a/front/src/app/scene/album/album.html
+++ b/front/src/app/scene/album/SceneAlbum.html
@@ -1,6 +1,6 @@
@for (data of dataList; track data.id) {
}
diff --git a/front/src/app/scene/home/home.ts b/front/src/app/scene/home/home.ts
index ad55ff5..fd9bd9c 100644
--- a/front/src/app/scene/home/home.ts
+++ b/front/src/app/scene/home/home.ts
@@ -5,8 +5,9 @@
*/
import { Component, OnInit } from '@angular/core';
+import { HomeInterface } from 'app/component/AppElementHomeType/AppElementHomeType';
-import { ArianeService, GenderService } from 'app/service';
+import { ArianeService } from 'app/service';
@Component({
selector: 'app-home',
@@ -14,7 +15,7 @@ import { ArianeService, GenderService } from 'app/service';
styleUrls: ['./home.less']
})
export class HomeScene implements OnInit {
- dataList = [
+ dataList: HomeInterface[] = [
{
id: 1,
name: "Genders",
diff --git a/front/src/app/scene/index.ts b/front/src/app/scene/index.ts
index f28fb74..e29404e 100644
--- a/front/src/app/scene/index.ts
+++ b/front/src/app/scene/index.ts
@@ -1,9 +1,9 @@
import { GenderScene } from "./gender/gender";
import { HelpScene } from "./help/help";
import { HomeScene } from "./home/home";
-import { AlbumEditScene } from "./album-edit/album-edit";
-import { AlbumScene } from "./album/album";
-import { AlbumsScene } from "./album/albums";
+import { AlbumEditScene } from "./album-edit/SceneAlbumEdit";
+import { AlbumScene } from "./album/SceneAlbum";
+import { AlbumsScene } from "./album/SceneAlbums";
import { ArtistEditScene } from "./artist-edit/artist-edit";
import { ArtistScene } from "./artist/artist";
import { ArtistsScene } from "./artist/artists";
diff --git a/front/src/app/scene/playlist/playlist.html b/front/src/app/scene/playlist/playlist.html
index 0fa4970..bc9ec47 100644
--- a/front/src/app/scene/playlist/playlist.html
+++ b/front/src/app/scene/playlist/playlist.html
@@ -2,7 +2,7 @@
@for (data of tracks; track data.id) {
}
diff --git a/front/src/app/service/album.ts b/front/src/app/service/album.ts
index cb72d1b..9350912 100644
--- a/front/src/app/service/album.ts
+++ b/front/src/app/service/album.ts
@@ -7,10 +7,10 @@
import { Injectable } from '@angular/core';
import { Album, AlbumResource, UUID } from 'app/back-api';
-import { RESTConfig, isArrayOf } from 'app/back-api/rest-tools';
+import { RESTConfig } from 'app/back-api/rest-tools';
import { environment } from 'environments/environment';
import { GenericDataService } from './GenericDataService';
-import { DataTools, DataStore, SessionService, TypeCheck, isNumber } from '@kangaroo-and-rabbit/kar-cw';
+import { DataTools, DataStore, SessionService, TypeCheck, isNumber, isArrayOf } from '@kangaroo-and-rabbit/kar-cw';
@Injectable()
export class AlbumService extends GenericDataService
{
@@ -110,7 +110,6 @@ export class AlbumService extends GenericDataService {
},
data: {
file,
- fileName: file.name
}
}).then((value) => {
self.dataStore.updateValue(value);
diff --git a/front/src/app/service/ariane.ts b/front/src/app/service/ariane.ts
index daea519..b225030 100644
--- a/front/src/app/service/ariane.ts
+++ b/front/src/app/service/ariane.ts
@@ -14,8 +14,8 @@ import { ArtistService } from './artist';
import { AlbumService } from './album';
import { TrackService } from './track';
import { environment } from 'environments/environment';
-import { NodeSmall } from 'app/back-api';
import { isNullOrUndefined, isStringNullOrUndefined, isUndefined } from '@kangaroo-and-rabbit/kar-cw';
+import { Album, Artist, Playlist } from 'app/back-api';
export class InputOrders {
public genderId: number = undefined;
@@ -195,7 +195,7 @@ export class ArianeService {
}
let self = this;
this.playlistService.get(id)
- .then((response: NodeSmall) => {
+ .then((response: Playlist) => {
self.playlistName = response.name;
self.playlistChange.emit(self.playlistId);
}).catch((response) => {
@@ -221,7 +221,7 @@ export class ArianeService {
}
let self = this;
this.artistService.get(id)
- .then((response: NodeSmall) => {
+ .then((response: Artist) => {
self.artistName = response.name;
self.artistChange.emit(self.artistId);
}).catch((response) => {
@@ -247,7 +247,7 @@ export class ArianeService {
}
let self = this;
this.albumService.get(id)
- .then((response: NodeSmall) => {
+ .then((response: Album) => {
// self.setArtist(response.artistId);
self.albumName = response.name;
self.albumChange.emit(self.albumId);
diff --git a/front/src/app/service/artist.ts b/front/src/app/service/artist.ts
index 8aabdce..a6b495a 100644
--- a/front/src/app/service/artist.ts
+++ b/front/src/app/service/artist.ts
@@ -110,7 +110,6 @@ export class ArtistService extends GenericDataService {
},
data: {
file,
- fileName: file.name
}
}).then((value) => {
self.dataStore.updateValue(value);
diff --git a/front/src/app/service/gender.ts b/front/src/app/service/gender.ts
index afcb9bb..6d40a57 100644
--- a/front/src/app/service/gender.ts
+++ b/front/src/app/service/gender.ts
@@ -115,7 +115,6 @@ export class GenderService extends GenericDataService {
},
data: {
file,
- fileName: file.name
}
}).then((value) => {
self.dataStore.updateValue(value);
diff --git a/front/src/app/service/playlist.ts b/front/src/app/service/playlist.ts
index 2ca46ee..2de0d1c 100644
--- a/front/src/app/service/playlist.ts
+++ b/front/src/app/service/playlist.ts
@@ -115,7 +115,6 @@ export class PlaylistService extends GenericDataService {
},
data: {
file,
- fileName: file.name
}
}).then((value) => {
self.dataStore.updateValue(value);
diff --git a/front/src/app/service/track.ts b/front/src/app/service/track.ts
index db358f8..4fd89cb 100644
--- a/front/src/app/service/track.ts
+++ b/front/src/app/service/track.ts
@@ -413,7 +413,6 @@ export class TrackService extends GenericDataService