kangaroo-and-rabbit/karideo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEV] contiunue some upgrade

Browse Source
This commit is contained in:
Edouard DUPIN 2020-12-22 22:00:43 +01:00
parent 8d9b3d8448
commit 8916ad33c8
11 changed files with 134 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
front/src/app/scene/season-edit/season-edit.html
View File

@ -53,31 +53,36 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<!-- ------------------------- Cover section --------------------------------- -->
<div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
Covers Covers
</div> </div>
<div class="fill-all" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="fill-all" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
<div class="request_raw"> <div class="hide-element">
<div class="label">
Add cover:
</div>
<div class="input">
<input type="file" <input type="file"
#fileInput
(change)="onChangeCover($event.target)" (change)="onChangeCover($event.target)"
placeholder="Select a cover file" placeholder="Select a cover file"
accept=".png,.jpg,.jpeg,.webp"/>{{upload_file_value}} accept=".png,.jpg,.jpeg,.webp"/>
</div>
</div> </div>
<div class="request_raw"> <div class="request_raw">
<div class="label">
Actual Covers:
</div>
<div class="input"> <div class="input">
<div *ngFor="let element of covers_display" class="cover_div"> <div class="cover" *ngFor="let element of covers_display">
<img src="{{element.url}}" class="cover"/> <div class="cover-image">
<div class="cover_remove_div"> <img src="{{element.url}}"/>
<button class="button color-button-cancel color-shadow-black" (click)="removeCover(element.id)" type="submit"> </div>
<i class="material-icons">delete</i> Remove Cover <div class="cover-button">
<button (click)="removeCover(element.id)">
<i class="material-icons button-remove">highlight_off</i>
</button>
</div>
</div>
<div class="cover">
<div class="cover-no-image">
</div>
<div class="cover-button">
<button (click)="fileInput.click()">
<i class="material-icons button-add">add_circle_outline</i>
</button> </button>
</div> </div>
</div> </div>
@ -85,6 +90,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<!-- ------------------------- ADMIN section --------------------------------- -->
<div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
Administration Administration
</div> </div>

53
front/src/app/scene/season-edit/season-edit.less
View File

@ -1,55 +1,2 @@
.item {
font-size: 20px;
height: 21%;
width: 23%;
margin: 1%;
padding: 0;
overflow: hidden;
//box-shadow: 0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);
box-shadow: 0px 2px 4px 0 rgba(0, 0, 0, 0.6);
line-height: normal;
border: none;
font-family: "Roboto","Helvetica","Arial",sans-serif;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0;
will-change: box-shadow;
outline: none;
cursor: pointer;
text-decoration: none;
text-align: center;
vertical-align: middle;
transition-duration: 0.4s;
float:left;
display:block;
h1 {
font-size: 24px;
}
&:hover {
background-color: #F00;
}
.material-icons {
vertical-align: middle;
}
.material-icons {
position: absolute;
top: 50%;
left: 50%;
transform: ~"translate(-12px,-12px)";
line-height: 24px;
width: 24px;
}
}
.item-video {
&:hover {
background-color: #0F0;
}
}

36
front/src/app/scene/series-edit/series-edit.html
View File

@ -65,31 +65,36 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<!-- ------------------------- Cover section --------------------------------- -->
<div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
Covers Covers
</div> </div>
<div class="fill-all" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="fill-all" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
<div class="request_raw"> <div class="hide-element">
<div class="label">
Add cover:
</div>
<div class="input">
<input type="file" <input type="file"
#fileInput
(change)="onChangeCover($event.target)" (change)="onChangeCover($event.target)"
placeholder="Select a cover file" placeholder="Select a cover file"
accept=".png,.jpg,.jpeg,.webp"/>{{upload_file_value}} accept=".png,.jpg,.jpeg,.webp"/>
</div>
</div> </div>
<div class="request_raw"> <div class="request_raw">
<div class="label">
Actual Covers:
</div>
<div class="input"> <div class="input">
<div *ngFor="let element of covers_display" class="cover_div"> <div class="cover" *ngFor="let element of covers_display">
<img src="{{element.url}}" class="cover"/> <div class="cover-image">
<div class="cover_remove_div"> <img src="{{element.url}}"/>
<button class="button color-button-cancel color-shadow-black" (click)="removeCover(element.id)" type="submit"> </div>
<i class="material-icons">delete</i> Remove Cover <div class="cover-button">
<button (click)="removeCover(element.id)">
<i class="material-icons button-remove">highlight_off</i>
</button>
</div>
</div>
<div class="cover">
<div class="cover-no-image">
</div>
<div class="cover-button">
<button (click)="fileInput.click()">
<i class="material-icons button-add">add_circle_outline</i>
</button> </button>
</div> </div>
</div> </div>
@ -97,6 +102,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<!-- ------------------------- ADMIN section --------------------------------- -->
<div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
Administration Administration
</div> </div>

54
front/src/app/scene/series-edit/series-edit.less
View File

@ -1,54 +0,0 @@
.item {
font-size: 20px;
height: 21%;
width: 23%;
margin: 1%;
padding: 0;
overflow: hidden;
//box-shadow: 0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);
box-shadow: 0px 2px 4px 0 rgba(0, 0, 0, 0.6);
line-height: normal;
border: none;
font-family: "Roboto","Helvetica","Arial",sans-serif;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0;
will-change: box-shadow;
outline: none;
cursor: pointer;
text-decoration: none;
text-align: center;
vertical-align: middle;
transition-duration: 0.4s;
float:left;
display:block;
h1 {
font-size: 24px;
}
&:hover {
background-color: #F00;
}
.material-icons {
vertical-align: middle;
}
.material-icons {
position: absolute;
top: 50%;
left: 50%;
transform: ~"translate(-12px,-12px)";
line-height: 24px;
width: 24px;
}
}
.item-video {
&:hover {
background-color: #0F0;
}
}

3
front/src/app/scene/series-edit/series-edit.ts
View File

@ -4,7 +4,7 @@
* @license PROPRIETARY (see license file) * @license PROPRIETARY (see license file)
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit, ElementRef } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { fadeInAnimation } from '../../_animations/index'; import { fadeInAnimation } from '../../_animations/index';
@ -230,7 +230,6 @@ export class SeriesEditScene implements OnInit {
console.log("Can not add the cover in the video..."); console.log("Can not add the cover in the video...");
}); });
} }
removeCover(_id:number) { removeCover(_id:number) {
this.cleanConfirm(); this.cleanConfirm();
this.confirmDeleteComment = "Delete the cover ID: " + _id; this.confirmDeleteComment = "Delete the cover ID: " + _id;

36
front/src/app/scene/video-edit/video-edit.html
View File

@ -143,31 +143,36 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<!-- ------------------------- Cover section --------------------------------- -->
<div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
Covers Covers
</div> </div>
<div class="fill-all" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="fill-all" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
<div class="request_raw"> <div class="hide-element">
<div class="label">
Add covers:
</div>
<div class="input">
<input type="file" <input type="file"
#fileInput
(change)="onChangeCover($event.target)" (change)="onChangeCover($event.target)"
placeholder="Select a cover file" placeholder="Select a cover file"
accept=".png,.jpg,.jpeg,.webp"/>{{upload_file_value}} accept=".png,.jpg,.jpeg,.webp"/>
</div>
</div> </div>
<div class="request_raw"> <div class="request_raw">
<div class="label">
Actual Covers:
</div>
<div class="input"> <div class="input">
<div *ngFor="let element of covers_display" class="cover_div"> <div class="cover" *ngFor="let element of covers_display">
<img src="{{element.url}}" class="cover"/> <div class="cover-image">
<div class="cover_remove_div"> <img src="{{element.url}}"/>
<button class="button color-button-cancel color-shadow-black" (click)="removeCover(element.id)" type="submit"> </div>
<i class="material-icons">delete</i> Remove Cover <div class="cover-button">
<button (click)="removeCover(element.id)">
<i class="material-icons button-remove">highlight_off</i>
</button>
</div>
</div>
<div class="cover">
<div class="cover-no-image">
</div>
<div class="cover-button">
<button (click)="fileInput.click()">
<i class="material-icons button-add">add_circle_outline</i>
</button> </button>
</div> </div>
</div> </div>
@ -175,6 +180,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<!-- ------------------------- ADMIN section --------------------------------- -->
<div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading"> <div class="title" *ngIf="!itemIsRemoved && !itemIsNotFound && !itemIsLoading">
Administration Administration
</div> </div>

54
front/src/app/scene/video-edit/video-edit.less
View File

@ -1,54 +0,0 @@
.item {
font-size: 20px;
height: 21%;
width: 23%;
margin: 1%;
padding: 0;
overflow: hidden;
//box-shadow: 0 1px 1.5px 0 rgba(0,0,0,.12),0 1px 1px 0 rgba(0,0,0,.24);
box-shadow: 0px 2px 4px 0 rgba(0, 0, 0, 0.6);
line-height: normal;
border: none;
font-family: "Roboto","Helvetica","Arial",sans-serif;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0;
will-change: box-shadow;
outline: none;
cursor: pointer;
text-decoration: none;
text-align: center;
vertical-align: middle;
transition-duration: 0.4s;
float:left;
display:block;
h1 {
font-size: 24px;
}
&:hover {
background-color: #F00;
}
.material-icons {
vertical-align: middle;
}
.material-icons {
position: absolute;
top: 50%;
left: 50%;
transform: ~"translate(-12px,-12px)";
line-height: 24px;
width: 24px;
}
}
.item-video {
&:hover {
background-color: #0F0;
}
}

14
front/src/app/scene/video-edit/video-edit.ts
View File

@ -257,15 +257,14 @@ export class VideoEditScene implements OnInit {
if (this.data.type_id == undefined) { if (this.data.type_id == undefined) {
this.data.type_id = null; this.data.type_id = null;
} }
//this.data.series_id = null; this.data.series_id = null;
//this.data.season_id = null; this.data.season_id = null;
//this.listSeries = [{value: undefined, label: '---'}]; this.listSeries = [{value: undefined, label: '---'}];
//this.listSeason = [{value: undefined, label: '---'}]; this.listSeason = [{value: undefined, label: '---'}];
let self = this; let self = this;
this.updateNeedSend(); this.updateNeedSend();
/* if (this.data.type_id != undefined) {
if (this.type_id != undefined) { self.typeService.getSubSeries(this.data.type_id, ["id", "name"])
self.typeService.getSubSeries(this.type_id, ["id", "name"])
.then(function(response2) { .then(function(response2) {
for(let iii= 0; iii < response2.length; iii++) { for(let iii= 0; iii < response2.length; iii++) {
self.listSeries.push({value: response2[iii].id, label: response2[iii].name}); self.listSeries.push({value: response2[iii].id, label: response2[iii].name});
@ -274,7 +273,6 @@ export class VideoEditScene implements OnInit {
console.log("get response22 : " + JSON.stringify(response2, null, 2)); console.log("get response22 : " + JSON.stringify(response2, null, 2));
}); });
} }
*/
} }
onChangeUniverse(_value:any):void { onChangeUniverse(_value:any):void {

2
front/src/app/scene/video/video.ts
View File

@ -137,6 +137,8 @@ export class VideoScene implements OnInit {
} }
} }
this.generated_name += this.name; this.generated_name += this.name;
this.generated_name = this.generated_name.replace(new RegExp("&", "g"), "_");
this.generated_name = this.generated_name.replace(new RegExp("/", "g"), "_");
} }
myPeriodicCheckFunction() { myPeriodicCheckFunction() {

2
front/src/app/service/ariane.ts
View File

@ -342,7 +342,7 @@ export class ArianeService {
} }
navigateSeries(_id:number, _newWindows:boolean, _ctrl:boolean = false):void { navigateSeries(_id:number, _newWindows:boolean, _ctrl:boolean = false):void {
if (_ctrl == true) { if (_ctrl == true) {
this.navigateTypeEdit(_id, _newWindows); this.navigateSeriesEdit(_id, _newWindows);
return; return;
} }
this.genericNavigate('series', this.universe_id, this.type_id, _id, null, null, _newWindows); this.genericNavigate('series', this.universe_id, this.type_id, _id, null, null, _newWindows);

61
front/src/generic_page.less
View File

@ -214,17 +214,6 @@
float: right; float: right;
display: block; display: block;
} }
.cover_div {
float: left;
display: block;
}
.cover_remove_div {
float: left;
display: block;
}
.cover {
max-width: 30%;
}
} }
.send_value { .send_value {
width: 300px; width: 300px;
@ -232,7 +221,57 @@
padding: 10px; padding: 10px;
display: block; display: block;
} }
.hide-element {
display: none;
}
.cover {
position:relative;
width: 200px;
height: 250px;
//margin: 0 auto;
overflow:hidden;
float: left;
display: block;
.cover-image {
position:absolute;
width: 200px;
height: 250px;
img {
max-width: 100%;
max-height: 100%;
height: auto;
}
};
.cover-no-image {
position:absolute;
width: 190px;
height: 240px;
margin: 0 auto;
border: solid 5px;
border-color: rgba(0, 0, 0, 0.7);
};
.cover-button {
position: absolute;
top: 50%;
left: 50%;
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
};
button {
border: none;
background: none;
};
.button-remove {
font-size:75px;
color: #F00000;
}
.button-add {
font-size:75px;
color: #00F000;
}
}
} }