-
diff --git a/front/src/app/app.component.ts b/front/src/app/app.component.ts
index 5936ca3..a72b4f4 100644
--- a/front/src/app/app.component.ts
+++ b/front/src/app/app.component.ts
@@ -5,9 +5,8 @@
*/
import { Component, OnInit } from '@angular/core';
-import { UserService } from './service/user';
-import { SessionService } from './service/session';
-import { CookiesService } from './service/cookies';
+import { ActivatedRoute, Router } from '@angular/router';
+import { UserService, SessionService } from './service';
@Component({
selector: 'app-root',
@@ -18,41 +17,29 @@ import { CookiesService } from './service/cookies';
})
export class AppComponent implements OnInit {
title: string = 'Karideo';
+ autoConnectedDone: boolean = false;
isConnected: boolean = false;
- constructor(private cookiesService: CookiesService,
- private userService: UserService,
- private sessionService: SessionService) {
+ constructor(
+ private router: Router,
+ private userService: UserService,
+ private sessionService: SessionService) {
}
ngOnInit() {
- let login = this.cookiesService.get('yota-login');
- let password = this.cookiesService.get('yota-password');
+ this.autoConnectedDone = false;
this.isConnected = false;
- if(login !== '' &&
- password !== '' &&
- password.length > 40) {
- console.log(`Get previous connection ... ${ login }:xxxxxx`);
- let self = this;
- this.userService.loginSha(login, password)
- .then((response: any) => {
- console.log('auto log ==> OK');
- self.sessionService.create(response.session,
- response.login,
- response.email,
- response.admin,
- response.avatar);
- this.isConnected = true;
- // self.router.navigate(['home']);
- }).catch((response: any) => {
- console.log('auto log ==> Error');
- self.cookiesService.remove('yota-login');
- self.cookiesService.remove('yota-password');
- this.isConnected = true;
- // this force the need to refresh after connection ...
- });
- }
+ let self = this;
+ this.sessionService.change.subscribe((isConnected) => {
+ console.log(`receive event from session ...${ isConnected}`);
+ self.isConnected = isConnected;
+ self.autoConnectedDone = true;
+ });
+
+ this.userService.checkAutoConnect().finally(() => {
+ self.autoConnectedDone = true;
+ });
}
}
diff --git a/front/src/app/app.module.ts b/front/src/app/app.module.ts
index af1754b..4cf059e 100644
--- a/front/src/app/app.module.ts
+++ b/front/src/app/app.module.ts
@@ -24,41 +24,12 @@ import { PopInCreateType } from './popin/create-type/create-type';
import { PopInUploadProgress } from './popin/upload-progress/upload-progress';
import { PopInDeleteConfirm } from './popin/delete-confirm/delete-confirm';
-import { HelpScene } from './scene/help/help';
-import { LoginScene } from './scene/login/login';
-import { SignUpScene } from './scene/sign-up/sign-up';
-import { ValidateEmailScene } from './scene/validate-email/validate-email';
-import { HomeScene } from './scene/home/home';
-import { TypeScene } from './scene/type/type';
-import { UniverseScene } from './scene/universe/universe';
-import { SeriesScene } from './scene/series/series';
-import { SeasonScene } from './scene/season/season';
-import { VideoScene } from './scene/video/video';
-import { SettingsScene } from './scene/settings/settings';
-import { ErrorViewerScene } from './scene/error-viewer/error-viewer';
-import { ErrorComponent } from './error/error';
-import { VideoEditScene } from './scene/video-edit/video-edit';
-import { UploadScene } from './scene/upload/upload';
-import { SeasonEditScene } from './scene/season-edit/season-edit';
-import { SeriesEditScene } from './scene/series-edit/series-edit';
-
-import { AuthService } from './service/auth';
-import { ArianeService } from './service/ariane';
-import { CookiesService } from './service/cookies';
-import { HttpWrapperService } from './service/http-wrapper';
-//import { HttpOAuthWrapperService } from './service/http-oauth-wrapper';
-import { UserService } from './service/user';
-import { UniverseService } from './service/universe';
-import { SeriesService } from './service/series';
-import { DataService } from './service/data';
-import { TypeService } from './service/type';
-import { SeasonService } from './service/season';
-import { VideoService } from './service/video';
-import { SessionService } from './service/session';
-import { BddService } from './service/bdd';
-import { PopInService } from './service/popin';
-
import { AppComponent } from './app.component';
+import { ErrorComponent } from './error/error';
+import { HomeScene, ErrorViewerScene, HelpScene, SsoScene, TypeScene, UniverseScene, SeriesScene, SeasonScene, VideoScene, SettingsScene,
+ VideoEditScene, SeasonEditScene, SeriesEditScene, UploadScene } from './scene';
+import { PopInService, HttpWrapperService, SessionService, CookiesService, StorageService, UserService, SSOService, BddService, TypeService,
+ DataService, UniverseService, SeriesService, SeasonService, VideoService, ArianeService } from './service';
@NgModule({
declarations: [
@@ -77,22 +48,20 @@ import { AppComponent } from './app.component';
PopInUploadProgress,
PopInDeleteConfirm,
- HelpScene,
- LoginScene,
- SignUpScene,
- ValidateEmailScene,
HomeScene,
+ ErrorViewerScene,
+ HelpScene,
+ SsoScene,
TypeScene,
UniverseScene,
SeriesScene,
SeasonScene,
VideoScene,
SettingsScene,
- ErrorViewerScene,
VideoEditScene,
SeasonEditScene,
SeriesEditScene,
- UploadScene
+ UploadScene,
],
imports: [
BrowserModule,
@@ -105,11 +74,12 @@ import { AppComponent } from './app.component';
providers: [
PopInService,
HttpWrapperService,
- BddService,
- AuthService,
SessionService,
CookiesService,
+ StorageService,
UserService,
+ SSOService,
+ BddService,
TypeService,
DataService,
UniverseService,
@@ -122,16 +92,16 @@ import { AppComponent } from './app.component';
AppComponent,
TopMenuComponent,
UploadFileComponent,
+ ErrorComponent,
ElementTypeComponent,
ElementSeriesComponent,
ElementSeasonComponent,
ElementVideoComponent,
- ErrorComponent,
PopInCreateType,
PopInComponent,
PopInUploadProgress,
- PopInDeleteConfirm
+ PopInDeleteConfirm,
],
bootstrap: [
AppComponent
diff --git a/front/src/app/component/data-image/data-image.html b/front/src/app/component/data-image/data-image.html
index 46c7397..086f576 100644
--- a/front/src/app/component/data-image/data-image.html
+++ b/front/src/app/component/data-image/data-image.html
@@ -1,4 +1,2 @@
-
-
- 
-
\ No newline at end of file
+
+
-
-
-
+
+ 
diff --git a/front/src/app/component/element-type/element-type.ts b/front/src/app/component/element-type/element-type.ts
index 3a88227..7ae4aea 100644
--- a/front/src/app/component/element-type/element-type.ts
+++ b/front/src/app/component/element-type/element-type.ts
@@ -4,8 +4,10 @@
* @license PROPRIETARY (see license file)
*/
import { Injectable, Component, OnInit, Input } from '@angular/core';
+import { isArrayOf, isNumberFinite } from '../../utils';
import { TypeService } from '../../service/type';
+import { NodeData } from '../..//model';
@Component({
selector: 'app-element-type',
@@ -13,86 +15,50 @@ import { TypeService } from '../../service/type';
styleUrls: [ './element-type.less' ]
})
-@Injectable()
+//@Injectable()
export class ElementTypeComponent implements OnInit {
// input parameters
@Input() idType:number = -1;
- imageSource:string = '';
- name:string = '';
- error:string = '';
- description:string = '';
- countvideo:number = null;
- countserie:number = null;
+ public name: string = 'rr';
+ public description: string = 'sdqdfqsd';
- cover:string = '';
- covers:Array = [];
+ public imageSource:string; // TODO: remove this ...
+ public error:string;
+ public countvideo:number;
+ public countserie:number;
+
+ public covers: string[];
constructor(private typeService: TypeService) {
}
ngOnInit() {
- this.name = `ll ${ this.idType}`;
let self = this;
- console.log(`get parameter id: ${ this.idType}`);
+ //console.log(`get parameter id: ${ this.idType}`);
this.typeService.get(this.idType)
- .then((response) => {
+ .then((response: NodeData) => {
+ //console.log("Get element ! " + JSON.stringify(response));
self.error = '';
self.name = response.name;
self.description = response.description;
- if(response.covers === undefined || response.covers === null || response.covers.length === 0) {
- self.cover = null;
- // self.covers = [];
+ if(!isArrayOf(response.covers, isNumberFinite) || response.covers.length === 0) {
+ self.covers = undefined;
} else {
- self.cover = self.typeService.getCoverThumbnailUrl(response.covers[0]);
+ self.covers = [];
for(let iii = 0; iii < response.covers.length; iii++) {
self.covers.push(self.typeService.getCoverThumbnailUrl(response.covers[iii]));
}
}
- switch (self.name) {
- case 'Documentary':
- self.imageSource = 'assets/images/type_documentary.svg';
- break;
- case 'Movie':
- self.imageSource = 'assets/images/type_film.svg';
- break;
- case 'Annimation':
- self.imageSource = 'assets/images/type_annimation.svg';
- break;
- case 'Short Films':
- self.imageSource = 'assets/images/type_film-short.svg';
- break;
- case 'tv show':
- self.imageSource = 'assets/images/type_tv-show.svg';
- break;
- case 'Anniation tv show':
- self.imageSource = 'assets/images/type_tv-show-annimation.svg';
- break;
- case 'Theater':
- self.imageSource = 'assets/images/type_theater.svg';
- break;
- case 'One man show':
- self.imageSource = 'assets/images/type_one-man-show.svg';
- break;
- case 'Concert':
- self.imageSource = 'assets/images/type_concert.svg';
- break;
- case 'Opera':
- self.imageSource = 'assets/images/type_opera.svg';
- break;
- default:
- break;
- }
}).catch((response) => {
self.error = 'Can not get the data';
- self.name = '';
- self.description = '';
- self.imageSource = '';
- self.cover = null;
+ self.name = undefined;
+ self.description = undefined;
+ self.imageSource = undefined;
self.covers = [];
});
this.typeService.countVideo(this.idType)
- .then((response) => {
+ .then((response: number) => {
self.countvideo = response;
}).catch((response) => {
self.countvideo = 0;
diff --git a/front/src/app/component/element-video/element-video.html b/front/src/app/component/element-video/element-video.html
index df40737..f4b01de 100644
--- a/front/src/app/component/element-video/element-video.html
+++ b/front/src/app/component/element-video/element-video.html
@@ -2,7 +2,7 @@
-
- -->
+
diff --git a/front/src/app/component/popin/popin.ts b/front/src/app/component/popin/popin.ts
index 02f38c3..c77a889 100644
--- a/front/src/app/component/popin/popin.ts
+++ b/front/src/app/component/popin/popin.ts
@@ -6,7 +6,7 @@
import { Component, Input, Output, OnInit, OnDestroy, EventEmitter } from '@angular/core';
-import { PopInService } from '../../service/popin';
+import { PopInService } from '../../service';
@Component({
// moduleId: module.id.toString(),
diff --git a/front/src/app/component/top-menu/top-menu.html b/front/src/app/component/top-menu/top-menu.html
index 172be15..67cb3ee 100644
--- a/front/src/app/component/top-menu/top-menu.html
+++ b/front/src/app/component/top-menu/top-menu.html
@@ -12,7 +12,7 @@
-
- /
+ /
/
+ /
/
+ /
+
diff --git a/front/src/app/component/top-menu/top-menu.ts b/front/src/app/component/top-menu/top-menu.ts
index f8610df..c23e193 100644
--- a/front/src/app/component/top-menu/top-menu.ts
+++ b/front/src/app/component/top-menu/top-menu.ts
@@ -8,8 +8,7 @@ import { Injectable, Component, OnInit } from '@angular/core';
// import { AppRoutingModule } from "../app-routing.module";
import { Router } from '@angular/router';
-import { SessionService } from '../../service/session';
-import { ArianeService } from '../../service/ariane';
+import { UserService, SessionService, SSOService, ArianeService } from '../../service';
@Component({
selector: 'app-top-menu',
@@ -42,25 +41,27 @@ export class TopMenuComponent implements OnInit {
constructor(private router: Router,
private sessionService: SessionService,
- private arianeService: ArianeService) {
+ private arianeService: ArianeService,
+ private userService: UserService,
+ private ssoService: SSOService) {
}
ngOnInit() {
+ let self = this;
this.sessionService.change.subscribe((isConnected) => {
- console.log(`receive event from session ...${ isConnected}`);
+ console.log(`TOP-MENU: receive event from session ...${isConnected}`);
if(isConnected === false) {
- this.login = null;
- this.avatar = null;
- this.displayUserMenu = false;
+ self.login = null;
+ self.avatar = null;
+ self.displayUserMenu = false;
} else {
- this.login = this.sessionService.getLogin();
- this.avatar = this.sessionService.getAvatar();
- this.displayUserMenu = false;
- console.log(` login:${ this.sessionService.getLogin()}`);
- console.log(` avatar:${ this.avatar}`);
+ self.updateIsJusteLogged();
}
});
+ if (this.sessionService.islogged()) {
+ this.updateIsJusteLogged();
+ }
this.arianeService.typeChange.subscribe((typeId: number) => {
this.arianeTypeId = typeId;
this.arianeTypeName = this.arianeService.getTypeName();
@@ -87,54 +88,22 @@ export class TopMenuComponent implements OnInit {
this.updateEditShow();
});
}
- updateEditShow():void {
- this.editShow = /* this.arianeTypeId !== null
- || this.arianeUniverseId !== null
- ||*/ this.arianeSeriesId !== null ||
- this.arianeSeasonId !== null ||
- this.arianeVideoId !== null;
+
+ private updateIsJusteLogged(): void {
+ this.login = this.sessionService.getLogin();
+ this.avatar = this.sessionService.getAvatar();
+ this.displayUserMenu = false;
+ console.log(` login:${this.sessionService.getLogin()}`);
+ console.log(` avatar:${this.avatar}`);
+
}
+
onAvatar(): void {
console.log(`onAvatar() ${ this.displayUserMenu}`);
this.displayUserMenu = !this.displayUserMenu;
this.displayEditMenu = false;
}
- onEdit(): void {
- console.log('onEdit()');
- this.displayEditMenu = !this.displayEditMenu;
- this.displayUserMenu = false;
- }
- onSubEditVideo(event: any): void {
- console.log('onSubEdit()');
- this.displayEditMenu = false;
- this.displayUserMenu = false;
- this.arianeService.navigateVideoEdit(this.arianeVideoId, event.which === 2);
- }
- onSubEditSeason(event: any): void {
- console.log('onSubEdit()');
- this.displayEditMenu = false;
- this.displayUserMenu = false;
- this.arianeService.navigateSeasonEdit(this.arianeSeasonId, event.which === 2);
- }
- onSubEditSeries(event: any): void {
- console.log('onSubEdit()');
- this.displayEditMenu = false;
- this.displayUserMenu = false;
- this.arianeService.navigateSeriesEdit(this.arianeSeriesId, event.which === 2);
- }
- onSubEditUniverse(event: any): void {
- console.log('onSubEdit()');
- this.displayEditMenu = false;
- this.displayUserMenu = false;
- this.arianeService.navigateUniverseEdit(this.arianeUniverseId, event.which === 2);
- }
- onSubEditType(event: any): void {
- console.log('onSubEditType()');
- this.displayEditMenu = false;
- this.displayUserMenu = false;
- this.arianeService.navigateTypeEdit(this.arianeTypeId, event.which === 2);
- }
onHome(event: any): void {
console.log('onHome()');
@@ -143,29 +112,23 @@ export class TopMenuComponent implements OnInit {
onSignIn(event: any): void {
console.log('onSignIn()');
- // Session.destroy();
- this.router.navigate([ 'signup' ]);
+ this.ssoService.requestSignIn();
}
- onLogin(event: any): void {
- console.log('onLogin()');
- // Session.destroy();
- this.router.navigate([ 'login' ]);
+ onSignUp(event: any): void {
+ console.log('onSignIn()');
+ this.ssoService.requestSignUp();
this.displayUserMenu = false;
}
onLogout(event: any): void {
console.log('onLogout()');
- this.sessionService.destroy();
- this.router.navigate([ 'home' ]);
+ this.ssoService.requestSignOut();
+ this.userService.logOut();
+ this.router.navigate(['home']);
this.displayUserMenu = false;
}
- onAddMedia(event: any): void {
- console.log('onAddMedia()');
- this.router.navigate([ 'upload' ]);
- this.displayUserMenu = false;
- }
onSetting(event: any): void {
console.log('onSetting()');
@@ -204,4 +167,52 @@ export class TopMenuComponent implements OnInit {
console.log(`onArianeSeason(${ this.arianeSeasonId })`);
this.arianeService.navigateSeason(this.arianeSeasonId, event.which === 2);
}
+
+ updateEditShow():void {
+ this.editShow = /* this.arianeTypeId !== null
+ || this.arianeUniverseId !== null
+ ||*/ this.arianeSeriesId !== null ||
+ this.arianeSeasonId !== null ||
+ this.arianeVideoId !== null;
+ }
+ onEdit(): void {
+ console.log('onEdit()');
+ this.displayEditMenu = !this.displayEditMenu;
+ this.displayUserMenu = false;
+ }
+ onSubEditVideo(event: any): void {
+ console.log('onSubEdit()');
+ this.displayEditMenu = false;
+ this.displayUserMenu = false;
+ this.arianeService.navigateVideoEdit(this.arianeVideoId, event.which === 2);
+ }
+ onSubEditSeason(event: any): void {
+ console.log('onSubEdit()');
+ this.displayEditMenu = false;
+ this.displayUserMenu = false;
+ this.arianeService.navigateSeasonEdit(this.arianeSeasonId, event.which === 2);
+ }
+ onSubEditSeries(event: any): void {
+ console.log('onSubEdit()');
+ this.displayEditMenu = false;
+ this.displayUserMenu = false;
+ this.arianeService.navigateSeriesEdit(this.arianeSeriesId, event.which === 2);
+ }
+ onSubEditUniverse(event: any): void {
+ console.log('onSubEdit()');
+ this.displayEditMenu = false;
+ this.displayUserMenu = false;
+ this.arianeService.navigateUniverseEdit(this.arianeUniverseId, event.which === 2);
+ }
+ onSubEditType(event: any): void {
+ console.log('onSubEditType()');
+ this.displayEditMenu = false;
+ this.displayUserMenu = false;
+ this.arianeService.navigateTypeEdit(this.arianeTypeId, event.which === 2);
+ }
+ onAddMedia(event: any): void {
+ console.log('onAddMedia()');
+ this.router.navigate([ 'upload' ]);
+ this.displayUserMenu = false;
+ }
}
diff --git a/front/src/app/model/index.ts b/front/src/app/model/index.ts
new file mode 100644
index 0000000..b6bb283
--- /dev/null
+++ b/front/src/app/model/index.ts
@@ -0,0 +1,8 @@
+import { Media, isMedia } from "./media";
+import { NodeData, isNodeData } from "./node";
+
+
+export {
+ NodeData, isNodeData,
+ Media, isMedia,
+}
\ No newline at end of file
diff --git a/front/src/app/model/media.ts b/front/src/app/model/media.ts
new file mode 100644
index 0000000..8a517f4
--- /dev/null
+++ b/front/src/app/model/media.ts
@@ -0,0 +1,51 @@
+import { isObject, isNumberFinite, isString, isOptionalOf, isOptionalArrayOf } from "../utils";
+import { isNodeData, NodeData } from "./node";
+
+
+ export interface Media extends NodeData {
+ dataId?: number;
+ typeId?: number;
+ universeId?: number;
+ seriesId?: number;
+ seasonId?: number;
+ episode?: number;
+ date?: number;
+ time?: number;
+ ageLimit?: string;
+ };
+
+
+
+export function isMedia(data: any): data is Media {
+ if (!isNodeData(data) as any) {
+ return false;
+ }
+ if (!isOptionalOf(data.dataId, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.typeId, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.universeId, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.seriesId, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.seasonId, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.episode, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.date, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.time, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalOf(data.ageLimit, isString)) {
+ return false;
+ }
+ return true;
+}
diff --git a/front/src/app/model/node.ts b/front/src/app/model/node.ts
new file mode 100644
index 0000000..073ae7a
--- /dev/null
+++ b/front/src/app/model/node.ts
@@ -0,0 +1,34 @@
+import { isArrayOf, isNumberFinite, isObject, isOptionalOf, isOptionalArrayOf, isString } from "../utils";
+
+
+
+export interface NodeData {
+ id: number;
+ name: string;
+ description?: string;
+ parentId?: number;
+ covers?: number[];
+};
+
+
+export function isNodeData(data: any): data is NodeData {
+ if (!isObject(data)) {
+ return false;
+ }
+ if (!isNumberFinite(data.id)) {
+ return false;
+ }
+ if (!isString(data.name)) {
+ return false;
+ }
+ if (!isOptionalOf(data.description, isString)) {
+ return false;
+ }
+ if (!isOptionalOf(data.parentId, isNumberFinite)) {
+ return false;
+ }
+ if (!isOptionalArrayOf(data.cover, isNumberFinite)) {
+ return false;
+ }
+ return true;
+}
\ No newline at end of file
diff --git a/front/src/app/popin/delete-confirm/delete-confirm.ts b/front/src/app/popin/delete-confirm/delete-confirm.ts
index fa6ecc4..f70e146 100644
--- a/front/src/app/popin/delete-confirm/delete-confirm.ts
+++ b/front/src/app/popin/delete-confirm/delete-confirm.ts
@@ -6,7 +6,7 @@
import { Injectable, Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { PopInService } from '../../service/popin';
+import { PopInService } from '../../service';
@Component({
selector: 'delete-confirm',
diff --git a/front/src/app/popin/upload-progress/upload-progress.ts b/front/src/app/popin/upload-progress/upload-progress.ts
index 5217684..981f384 100644
--- a/front/src/app/popin/upload-progress/upload-progress.ts
+++ b/front/src/app/popin/upload-progress/upload-progress.ts
@@ -7,7 +7,7 @@
import { Injectable, Component, OnInit, Input, SimpleChanges } from '@angular/core';
import { Router } from '@angular/router';
-import { PopInService } from '../../service/popin';
+import { PopInService } from '../../service';
@Component({
selector: 'upload-progress',
diff --git a/front/src/app/scene/help/help.html b/front/src/app/scene/help/help.html
index e8940f2..5451a87 100644
--- a/front/src/app/scene/help/help.html
+++ b/front/src/app/scene/help/help.html
@@ -1,3 +1,9 @@
-
-
\ No newline at end of file
+- help works! -
+
+
diff --git a/front/src/app/scene/help/help.less b/front/src/app/scene/help/help.less
index e69de29..d5b3918 100644
--- a/front/src/app/scene/help/help.less
+++ b/front/src/app/scene/help/help.less
@@ -0,0 +1,70 @@
+
+.title {
+ //background-color: green;
+ font-size: 45px;
+ font-weight: bold;
+ line-height: 60px;
+ width:100%;
+ align: left;
+ text-align: center;
+ vertical-align: middle;
+ margin: 10px 0 10px 0;
+ text-shadow: 1px 1px 2px white, 0 0 1em white, 0 0 0.2em white;
+ text-transform: uppercase;
+ font-family: "Roboto","Helvetica","Arial",sans-serif;
+}
+.item-home {
+ background-color: rgba(200, 200, 200, 0.5);
+ font-size: 20px;
+ height: 190px;
+ width: 200px;
+ margin: 5px;
+ 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: rgba(200, 200, 200, 1);
+ //box-shadow: 0px 2px 4px 0 rgba(255, 0, 0, 0.6);
+ }
+
+ .material-icons {
+ vertical-align: middle;
+ }
+
+ .material-icons {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: ~"translate(-12px,-12px)";
+ line-height: 24px;
+ width: 24px;
+ }
+}
+
+@media all and (min-width: 1310px) {
+ .colomn_mutiple {
+ width: ~"calc(210px * 5)";
+ margin: auto;
+ }
+}
diff --git a/front/src/app/scene/help/help.ts b/front/src/app/scene/help/help.ts
index f35eba5..9dd1140 100644
--- a/front/src/app/scene/help/help.ts
+++ b/front/src/app/scene/help/help.ts
@@ -14,10 +14,25 @@ import { ArianeService } from '../../service/ariane';
styleUrls: [ './help.less' ]
})
export class HelpScene implements OnInit {
+ page = '';
+
constructor(private route: ActivatedRoute,
private arianeService: ArianeService) { }
ngOnInit() {
this.arianeService.updateManual(this.route.snapshot.paramMap);
+ const page = this.route.snapshot.paramMap.get('page');
+ if (page == null) {
+ this.page = undefined;
+ } else {
+ this.page = page;
+ }
+ console.error(`MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM`);
+ console.error(`get parameter update: ${this.page}`);
+ console.error(`MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM`);
+ }
+
+ onSelectType(_event: any, _idSelected: number):void {
+
}
}
diff --git a/front/src/app/scene/index.ts b/front/src/app/scene/index.ts
new file mode 100644
index 0000000..0565eb4
--- /dev/null
+++ b/front/src/app/scene/index.ts
@@ -0,0 +1,34 @@
+import { ErrorViewerScene } from "./error-viewer/error-viewer";
+import { HelpScene } from "./help/help";
+import { HomeScene } from "./home/home";
+import { SeasonEditScene } from "./season-edit/season-edit";
+import { SeasonScene } from "./season/season";
+import { SeriesEditScene } from "./series-edit/series-edit";
+import { SeriesScene } from "./series/series";
+import { SettingsScene } from "./settings/settings";
+import { SsoScene } from "./sso/sso";
+import { TypeScene } from "./type/type";
+import { UniverseScene } from "./universe/universe";
+import { UploadScene } from "./upload/upload";
+import { VideoEditScene } from "./video-edit/video-edit";
+import { VideoScene } from "./video/video";
+
+
+export {
+ ErrorViewerScene,
+ HelpScene,
+ HomeScene,
+ SsoScene,
+ SettingsScene,
+ SeasonScene,
+ SeasonEditScene,
+ SeriesScene,
+ SeriesEditScene,
+ TypeScene,
+ UniverseScene,
+ UploadScene,
+ VideoScene,
+ VideoEditScene,
+};
+
+
diff --git a/front/src/app/scene/login/login.html b/front/src/app/scene/login/login.html
deleted file mode 100644
index 6d198a1..0000000
--- a/front/src/app/scene/login/login.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
+ Karauth (SSO identity manager) Help area.
+
+
+ Help
+
+
+
-
-
diff --git a/front/src/app/scene/login/login.ts b/front/src/app/scene/login/login.ts
deleted file mode 100644
index 2a271c3..0000000
--- a/front/src/app/scene/login/login.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2018, Edouard DUPIN, all right reserved
- * @license PROPRIETARY (see license file)
- */
-
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Router } from '@angular/router';
-import { Location } from '@angular/common';
-import { UserService } from '../../service/user';
-import { SessionService } from '../../service/session';
-import { CookiesService } from '../../service/cookies';
-import { ArianeService } from '../../service/ariane';
-
-
-export function checkLoginValidity(value:string):boolean {
- let regexCheck = new RegExp('^[a-zA-Z0-9_\\.-]+$');
- if(regexCheck.test(value)) {
- return true;
- }
- return false;
-}
-
-export function checkEmailValidity(value:string):boolean {
- let regexCheck = new RegExp('^[a-zA-Z0-9_\\.@-]+@[a-zA-Z0-9_\\.-]+\\.[a-zA-Z]+$');
- if(regexCheck.test(value)) {
- return true;
- }
- return false;
-}
-
-export function checkPasswordValidity(value:string):boolean {
- let regexCheck = new RegExp('^[a-zA-Z0-9_\\.@ %:;,=}{\\?\\!\\*\\+\\(\\)\\[\\]\\|&#%~/\\\\\\<\\>-£€]+$');
- if(regexCheck.test(value)) {
- return true;
- }
- return false;
-}
-
-
-declare function SHA512(param1: any): any;
-
-@Component({
- selector: 'app-login',
- templateUrl: './login.html',
- styleUrls: [ './login.less' ]
-})
-export class LoginScene implements OnInit {
- public loginOK:boolean = false;
- public loginHelp:string = '';
- public login:string = '';
- public passOK:boolean = false;
- public passHelp:string = '';
- public password:string = '';
- public loginButtonDisabled:boolean = true;
- public error:string = '';
- public loginType:string = 'Username/E-mail';
-
- public rememberMe:boolean = true;
-
- constructor(private router: Router,
- private route: ActivatedRoute,
- private locate: Location,
- private cookiesService: CookiesService,
- private userService: UserService,
- private sessionService: SessionService,
- private arianeService: ArianeService) {
-
- }
-
- ngOnInit() {
- // If already loaded ==> jusp in the home page ...
- this.arianeService.updateManual(this.route.snapshot.paramMap);
- }
-
- updateButtonVisibility():void {
- if(this.loginOK === true &&
- this.passOK === true) {
- this.loginButtonDisabled = false;
- } else {
- this.loginButtonDisabled = true;
- }
- this.error = '';
- }
-
- /**
- * Check the login writing rules
- */
- checkLogin(newValue:string):void {
- this.login = newValue;
- if(this.login === null) {
- this.loginOK = false;
- this.loginHelp = '';
- this.updateButtonVisibility();
- return;
- }
- if(this.login.length < 6) {
- this.loginOK = false;
- this.loginHelp = 'Need 6 characters';
- this.loginType = 'Username/E-mail';
- this.updateButtonVisibility();
- return;
- }
- if(checkLoginValidity(this.login) === true) {
- this.loginOK = true;
- this.loginHelp = '';
- this.loginType = 'Username';
- } else if(checkEmailValidity(this.login) === true) {
- this.loginOK = true;
- this.loginHelp = '';
- this.loginType = 'E-mail';
- } else {
- this.loginOK = false;
- this.loginHelp = 'Not valid: characters, numbers, "_-." and email format: you@example.com';
- }
- this.updateButtonVisibility();
- }
-
- /**
- * Check the password writing rules
- */
- checkPassword(newValue:string):void {
- this.password = newValue;
- if(this.password === null) {
- this.passOK = false;
- this.passHelp = '';
- this.updateButtonVisibility();
- return;
- }
- if(this.password.length < 6) {
- this.passOK = false;
- this.passHelp = 'Need 6 characters';
- } else if(checkPasswordValidity(this.password) === true) {
- this.passOK = true;
- this.passHelp = '';
- } else {
- this.passOK = false;
- this.passHelp = 'Not valid: characters, numbers and "_-:;.,?!*+=}{([|)]% @&~#/\\<>"';
- }
- this.updateButtonVisibility();
- }
- onLogin():void {
- this.sessionService.destroy();
- let self = this;
- this.userService.login(this.login, this.password)
- .then((response) => {
- self.error = 'Login ...';
- self.sessionService.create(response.sessionId,
- response.login,
- response.email,
- response.role,
- response.avatar);
- if(self.rememberMe === true) {
- self.cookiesService.set('yota-login', response.login, 120);
- self.cookiesService.set('yota-password', SHA512(self.password), 60);
- }
- self.router.navigate([ 'home' ]);
- }).catch((response) => {
- self.error = 'Wrong e-mail/login or password';
- });
- }
- onCancel():void {
- console.log(`onCancel ... '${ this.login }':'${ this.password }'`);
- this.locate.back();
- }
-}
-
-
diff --git a/front/src/app/scene/season/season.ts b/front/src/app/scene/season/season.ts
index 951dfd4..4e7f051 100644
--- a/front/src/app/scene/season/season.ts
+++ b/front/src/app/scene/season/season.ts
@@ -41,6 +41,7 @@ export class SeasonScene implements OnInit {
let self = this;
this.seasonService.get(this.idSeason)
.then((response:any) => {
+ console.log("Get element ! " + JSON.stringify(response));
self.name = response.name;
self.seriesId = response.parentId;
self.description = response.description;
diff --git a/front/src/app/scene/series-edit/series-edit.ts b/front/src/app/scene/series-edit/series-edit.ts
index c02e712..81f520e 100644
--- a/front/src/app/scene/series-edit/series-edit.ts
+++ b/front/src/app/scene/series-edit/series-edit.ts
@@ -45,8 +45,8 @@ export class SeriesEditScene implements OnInit {
uploadFileValue:string = '';
selectedFiles:FileList;
- seasonsCount:string = null;
- videoCount:string = null;
+ seasonsCount: string = null;
+ videoCount: string = null;
coversDisplay:Array- settings works! -
+
+
diff --git a/front/src/app/scene/settings/settings.less b/front/src/app/scene/settings/settings.less
index e69de29..d5b3918 100644
--- a/front/src/app/scene/settings/settings.less
+++ b/front/src/app/scene/settings/settings.less
@@ -0,0 +1,70 @@
+
+.title {
+ //background-color: green;
+ font-size: 45px;
+ font-weight: bold;
+ line-height: 60px;
+ width:100%;
+ align: left;
+ text-align: center;
+ vertical-align: middle;
+ margin: 10px 0 10px 0;
+ text-shadow: 1px 1px 2px white, 0 0 1em white, 0 0 0.2em white;
+ text-transform: uppercase;
+ font-family: "Roboto","Helvetica","Arial",sans-serif;
+}
+.item-home {
+ background-color: rgba(200, 200, 200, 0.5);
+ font-size: 20px;
+ height: 190px;
+ width: 200px;
+ margin: 5px;
+ 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: rgba(200, 200, 200, 1);
+ //box-shadow: 0px 2px 4px 0 rgba(255, 0, 0, 0.6);
+ }
+
+ .material-icons {
+ vertical-align: middle;
+ }
+
+ .material-icons {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: ~"translate(-12px,-12px)";
+ line-height: 24px;
+ width: 24px;
+ }
+}
+
+@media all and (min-width: 1310px) {
+ .colomn_mutiple {
+ width: ~"calc(210px * 5)";
+ margin: auto;
+ }
+}
diff --git a/front/src/app/scene/settings/settings.ts b/front/src/app/scene/settings/settings.ts
index a629f52..f521646 100644
--- a/front/src/app/scene/settings/settings.ts
+++ b/front/src/app/scene/settings/settings.ts
@@ -14,10 +14,25 @@ import { ArianeService } from '../../service/ariane';
styleUrls: [ './settings.less' ]
})
export class SettingsScene implements OnInit {
+ page = '';
+
constructor(private route: ActivatedRoute,
private arianeService: ArianeService) { }
ngOnInit() {
this.arianeService.updateManual(this.route.snapshot.paramMap);
+ const page = this.route.snapshot.paramMap.get('page');
+ if (page == null) {
+ this.page = undefined;
+ } else {
+ this.page = page;
+ }
+ console.error(`MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM`);
+ console.error(`get parameter update: ${this.page}`);
+ console.error(`MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM`);
+ }
+
+ onSelectType(_event: any, _idSelected: number):void {
+
}
}
diff --git a/front/src/app/scene/sign-up/sign-up.html b/front/src/app/scene/sign-up/sign-up.html
deleted file mode 100644
index cde347d..0000000
--- a/front/src/app/scene/sign-up/sign-up.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
+ Karauth (SSO identity manager)
+
+
+ Global settings.
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/front/src/app/scene/sign-up/sign-up.less b/front/src/app/scene/sign-up/sign-up.less
deleted file mode 100644
index ae64e9d..0000000
--- a/front/src/app/scene/sign-up/sign-up.less
+++ /dev/null
@@ -1,162 +0,0 @@
-
-.right{
- width:50%;
- height:100%;
- right:0;
- margin:0;
- padding:0;
- border:0;
- float:right;
- display:block;
-}
-.left{
- width:50%;
- height:100%;
- left:0;
- margin:0;
- padding:0;
- border:0;
- float:left;
- display:block;
-
- color: white;
-
- .comment {
- background-image: url("../../../assets/images/comments.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- /*background-attachment: fixed;*/
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
- .share {
- background-image: url("../../../assets/images/share.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- /*background-attachment: fixed;*/
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
- .time {
- background-image: url("../../../assets/images/time.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- /*background-attachment: fixed;*/
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
-}
-input[type=text], input[type=password] {
- width: 100%;
- padding: 12px 35px 12px 15px;
- margin: 8px 0;
- display: inline-block;
- border: 1px solid #ccc;
- box-sizing: border-box;
-}
-.global-help {
- position:relative;
- max-width:500px;
- padding: 16px 32px 16px 32px;
-
- top: 50%;
- left: 50%;
- transform: ~"translate(-50%, -50%)";
- font-size: 30px;
-
- font-weight: 600;
- text-align: left;
- line-height: 200%;
-}
-
-.container-global {
- position:relative;
- max-width:400px;
- padding: 16px 32px 16px 32px;
-
- top: 50%;
- left: 50%;
- transform: ~"translate(-50%, -50%)";
- box-shadow: 0px 8px 20px 0 rgba(0, 0, 0, 0.9);
-}
-
-.container {
- padding: 16px 0 0 0;
-}
-
-span.psw {
- float: right;
- padding-top: 16px;
-}
-
-
-.help {
- color: #E44;
- font-size: 14px;
-}
-
-.forgot {
- color: #00B;
- font-size: 14px;
- float: right;
- buttum: 0;
- line-height: 24px;
-}
-
-.commmon-policy {
- font-size: 13px;
- font-weight: 300;
- text-align: center;
-}
-.icon-right-load {
- background: white url("../../../assets/images/load.svg") right no-repeat;
- background-size: 35px;
- padding-right: 17px;
-}
-.icon-right-validate {
- background: white url("../../../assets/images/validate.svg") right no-repeat;
- background-size: 35px;
- padding-right: 17px;
-}
-.icon-right-not-validate {
- background: white url("../../../assets/images/validate-not.svg") right no-repeat;
- background-size: 35px;
- padding-right: 17px;
-}
-.error {
- background-color: #f44336;
- position: absolute;
- z-index: 10;
- display: block;
- max-width: 450px;
- padding: 5px 8px;
- margin: 2px 0 0;
- font-size: 16px;
- font-weight: 400;
- border-style: solid;
- border-width: 0px;
- box-sizing: border-box;
-
- &:after, &:before {
- bottom: 100%;
- left: 25px;
- border: solid transparent;
- content: " ";
- height: 0;
- width: 0;
- position: absolute;
- pointer-events: none;
- }
-
- &:after {
- border-bottom-color: #f44336;
- border-width: 10px;
- margin-left: -10px;
- }
-}
diff --git a/front/src/app/scene/sign-up/sign-up.ts b/front/src/app/scene/sign-up/sign-up.ts
deleted file mode 100644
index a82ae17..0000000
--- a/front/src/app/scene/sign-up/sign-up.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2018, Edouard DUPIN, all right reserved
- * @license PROPRIETARY (see license file)
- */
-
-import { Component, OnInit } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
-import { checkLoginValidity, checkEmailValidity, checkPasswordValidity } from '../login/login';
-import { UserService } from '../../service/user';
-import { ArianeService } from '../../service/ariane';
-
-
-@Component({
- selector: 'app-sign-up',
- templateUrl: './sign-up.html',
- styleUrls: [ './sign-up.less' ]
-})
-
-export class SignUpScene implements OnInit {
- private signUpIconWrong:string = 'icon-right-not-validate';
- private signUpIconWait:string = 'icon-right-load';
- private signUpIconRight:string = 'icon-right-validate';
-
- public login:string = '';
- public loginOK:boolean = false;
- public loginHelp:string = '';
- public loginIcon:string = '';
-
- public email:string = '';
- public emailOK:boolean = false;
- public emailHelp:string = '';
- public emailIcon:string = '';
-
- public password:string = '';
- public passOK:boolean = false;
- public passHelp:string = '';
- public passIcon:string = '';
-
- public signUpButtonDisabled:boolean = true;
- public error:string = '';
-
- public rememberMe:boolean = true;
-
-
- constructor(private userService: UserService,
- private router: Router,
- private route: ActivatedRoute,
- private arianeService: ArianeService) {
-
- }
-
- ngOnInit() {
- this.arianeService.updateManual(this.route.snapshot.paramMap);
- }
-
-
- updateButtonVisibility():void {
- if(this.loginOK === true &&
- this.passOK === true &&
- this.emailOK === true) {
- this.signUpButtonDisabled = false;
- } else {
- this.signUpButtonDisabled = true;
- }
- this.error = '';
- }
- checkLogin(newValue:string):void {
- // this.userService.loginSha("loooogin", "ekljkj", true);
- this.login = newValue;
- if(this.login === null ||
- this.login.length === 0) {
- this.loginOK = false;
- this.loginIcon = '';
- this.loginHelp = '';
- this.updateButtonVisibility();
- return;
- }
- if(this.login.length < 6) {
- this.loginOK = false;
- this.loginHelp = 'Need 6 characters';
- this.loginIcon = '';
- this.updateButtonVisibility();
- return;
- }
- if(checkLoginValidity(this.login) === true) {
- this.loginOK = false;
- // this.loginHelp = "check in progress...";
- this.loginIcon = this.signUpIconWait;
- let self = this;
- this.userService.checkLogin(this.login).then(() => {
- // check if the answer is correct with the question
- if(newValue !== self.login) {
- return;
- }
- // the login exist ... ==> it is found...
- self.loginOK = false;
- self.loginHelp = 'Login already used ...';
- self.loginIcon = self.signUpIconWrong;
- self.updateButtonVisibility();
- }, (error: number) => {
- console.log(`1 ${ self}`);
- // check if the answer is correct with the question
- if(newValue !== self.login) {
- return;
- }
- if(error === 404) {
- self.loginOK = true;
- self.loginHelp = '';
- self.loginIcon = self.signUpIconRight;
- self.updateButtonVisibility();
- return;
- }
- console.log(`Status ${ error}`);
- self.loginOK = false;
- self.loginHelp = 'Login already used ...';
- self.loginIcon = self.signUpIconWrong;
- self.updateButtonVisibility();
- });
- } else {
- this.loginOK = false;
- this.loginHelp = 'Not valid: characters, numbers and "_-."';
- }
- this.updateButtonVisibility();
- }
-
- checkEmail(newValue:string):void {
- this.email = newValue;
- if(this.email === null ||
- this.email.length === 0) {
- this.emailOK = false;
- this.updateButtonVisibility();
- this.emailIcon = '';
- this.emailHelp = '';
- return;
- }
- if(this.email.length < 6) {
- this.emailOK = false;
- this.emailHelp = 'Need 6 characters';
- this.updateButtonVisibility();
- this.passIcon = '';
- return;
- }
- if(checkEmailValidity(this.email) === true) {
- this.emailOK = false;
- this.emailHelp = '';
- // this.loginHelp = "check in progress...";
- this.emailIcon = this.signUpIconWait;
- let self = this;
- this.userService.checkEMail(this.email).then(() => {
- // check if the answer is correct with the question
- if(newValue !== self.email) {
- return;
- }
- // the email exist ... ==> it is found...
- self.emailOK = false;
- self.emailHelp = 'email already used ...';
- self.emailIcon = self.signUpIconWrong;
- self.updateButtonVisibility();
- }, (error: number) => {
- // check if the answer is correct with the question
- if(newValue !== self.email) {
- return;
- }
- if(error === 404) {
- self.emailOK = true;
- self.emailHelp = '';
- self.emailIcon = self.signUpIconRight;
- self.updateButtonVisibility();
- return;
- }
- console.log(`Status ${ error}`);
- self.emailOK = false;
- self.emailHelp = 'email already used ...';
- self.emailIcon = self.signUpIconWrong;
- self.updateButtonVisibility();
- });
- } else {
- this.emailOK = false;
- this.emailHelp = 'Not valid: characters, numbers, "_-." and email format: you@example.com';
- }
- this.updateButtonVisibility();
- }
-
- checkPassword(newValue:string):void {
- this.password = newValue;
- console.log(`ooooooooooooooo ${ this.password}`);
- if(this.password === null) {
- this.passOK = false;
- this.passHelp = '';
- this.updateButtonVisibility();
- return;
- }
- if(this.password.length < 6) {
- this.passOK = false;
- this.passHelp = 'Need 6 characters';
- } else if(checkPasswordValidity(this.password) === true) {
- this.passOK = true;
- this.passHelp = '';
- } else {
- this.passOK = false;
- this.passHelp = 'Not valid: characters, numbers and "_-:;.,?!*+=}{([|)]% @&~#/\\<>"';
- }
- this.updateButtonVisibility();
- }
- onSignUp():void {
- console.log('Validate ... ');
- if(this.signUpButtonDisabled === true) {
- // ... notify user ...
- console.log('Not permited action ... ==> control does not validate this action ...');
- return;
- }
- let self = this;
- // disable the currect button
- this.signUpButtonDisabled = true;
- this.userService.create(this.login, this.email, this.password).then(
- (value) => {
- console.log('User created');
- self.router.navigate([ 'login' ]);
- // send a generic message in the pop-up enevts... self.emailHelp = "email already used ... (error 2)";
- }, (value) => {
- console.log('User NOT created');
- // send a generic message in the pop-up enevts... self.emailHelp = "email already used ... (error 2)";
- });
- }
- onCancel():void {
- console.log(`onCancel ... '${ this.login }':'${ this.password }'`);
- // $rootScope.currentModal = "";
- }
-}
-
diff --git a/front/src/app/scene/sso/sso.html b/front/src/app/scene/sso/sso.html
new file mode 100644
index 0000000..c8b11a5
--- /dev/null
+++ b/front/src/app/scene/sso/sso.html
@@ -0,0 +1,28 @@
+
+
diff --git a/front/src/app/scene/login/login.less b/front/src/app/scene/sso/sso.less
similarity index 95%
rename from front/src/app/scene/login/login.less
rename to front/src/app/scene/sso/sso.less
index ae5a620..2d1d549 100644
--- a/front/src/app/scene/login/login.less
+++ b/front/src/app/scene/sso/sso.less
@@ -28,6 +28,11 @@ input[type=text], input[type=password] {
margin: 2% 2%;
width: 45%;
}
+.containerCenter {
+ text-align: center;
+ margin: 15px 0 0 0;
+}
+
.imgContainer {
text-align: center;
diff --git a/front/src/app/scene/sso/sso.ts b/front/src/app/scene/sso/sso.ts
new file mode 100644
index 0000000..6b3e1fc
--- /dev/null
+++ b/front/src/app/scene/sso/sso.ts
@@ -0,0 +1,86 @@
+/** @file
+ * @author Edouard DUPIN
+ * @copyright 2018, Edouard DUPIN, all right reserved
+ * @license PROPRIETARY (see license file)
+ */
+
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SSOService, UserService } from '../../service';
+
+@Component({
+ selector: 'app-sso',
+ templateUrl: './sso.html',
+ styleUrls: [ './sso.less' ]
+})
+export class SsoScene implements OnInit {
+ ssoData: string;
+ token: string;
+ keepConnected: boolean
+ userName: string
+
+ constructor(
+ private router: Router,
+ private route: ActivatedRoute,
+ private ssoService: SSOService,
+ private userService: UserService) {
+ console.error("retreive data after SSO");
+ }
+
+ ngOnInit() {
+ let self = this;
+ console.error("retreive data after SSO ng-init");
+ const ssoData = this.route.snapshot.paramMap.get('data');
+ if (ssoData == null) {
+ this.ssoData = undefined;
+ } else {
+ this.ssoData = ssoData;
+ }
+ const token = this.route.snapshot.paramMap.get('token');
+ if (token == null) {
+ this.token = undefined;
+ } else {
+ this.token = token;
+ }
+ const keepConnected = this.route.snapshot.paramMap.get('keepConnected');
+ if (keepConnected == null) {
+ this.keepConnected = undefined;
+ } else {
+ this.keepConnected = keepConnected === 'true';
+ }
+ console.error(`ssoData: '${ssoData}'`);
+ console.error(`token: '${token}'`);
+ console.error(`keepConnected: '${keepConnected}'`);
+ if (this.token !== '__CANCEL__' && this.token !== '__FAIL__' && this.token !== '__LOGOUT__') {
+ const destination = (this.ssoData);
+ console.error(`ssoData (decoded): '${destination}'`);
+ // sample : ZZ**DST:home
+ const realDst = this.ssoService.unHashLocalData(destination);
+ console.error(`realDst: '${realDst}'`);
+ this.userService.startSession(this.token, this.keepConnected).then((userName: string) => {
+ self.userName = userName;
+ setTimeout(function(){
+ self.router.navigate([ realDst ], { replaceUrl:true });
+ }, 2000); // 2 seconds
+ }).catch(() => {
+ this.token = "ERROR_ME";
+ })
+ } else if (this.token === '__LOGOUT__') {
+ this.userService.removeSession();
+ const destination = (this.ssoData);
+ console.error(`ssoData (decoded): '${destination}'`);
+ // sample : ZZ**DST:home
+ const realDst = this.ssoService.unHashLocalData(destination);
+ console.error(`realDst: '${realDst}'`);
+ setTimeout(function(){
+ self.router.navigate([ realDst ], { replaceUrl:true });
+ }, 2000); // 2 seconds
+ } else {
+ this.userService.removeSession();
+ }
+ }
+
+
+}
+
+
diff --git a/front/src/app/scene/type/type.ts b/front/src/app/scene/type/type.ts
index f146df3..5bb0a6b 100644
--- a/front/src/app/scene/type/type.ts
+++ b/front/src/app/scene/type/type.ts
@@ -65,7 +65,7 @@ export class TypeScene implements OnInit {
self.covers = [];
self.cover = null;
});
- this.typeService.getSubSeries(this.typeId, [ 'id', 'name' ])
+ this.typeService.getSubSeries(this.typeId)
.then((response) => {
console.log(` ==> get answer sub-series: ${JSON.stringify(response)}`);
self.seriessError = '';
@@ -75,7 +75,7 @@ export class TypeScene implements OnInit {
self.seriessError = 'Wrong e-mail/login or password';
self.seriess = [];
});
- this.typeService.getSubVideo(this.typeId, [ 'id', 'name' ])
+ this.typeService.getSubVideo(this.typeId)
.then((response) => {
console.log(` ==> get answer sub-video: ${JSON.stringify(response)}`);
self.videosError = '';
diff --git a/front/src/app/scene/upload/upload.ts b/front/src/app/scene/upload/upload.ts
index e084301..24fce96 100644
--- a/front/src/app/scene/upload/upload.ts
+++ b/front/src/app/scene/upload/upload.ts
@@ -175,7 +175,7 @@ export class UploadScene implements OnInit {
let self = this;
this.updateNeedSend();
if(this.typeId !== null) {
- self.typeService.getSubSeries(this.typeId, [ 'id', 'name' ])
+ self.typeService.getSubSeries(this.typeId)
.then((response2) => {
for(let iii = 0; iii < response2.length; iii++) {
self.listSeries.push({ value: response2[iii].id, label: response2[iii].name });
@@ -573,7 +573,7 @@ export class UploadScene implements OnInit {
self.saisonId = null;
// set 1 find the ID of the season:
- this.seriesService.getSeason(this.seriesId, [ 'id', 'name' ])
+ this.seriesService.getSeason(this.seriesId)
.then((response: any[]) => {
// console.log("find season: " + response.length);
for(let iii = 0; iii < response.length; iii++) {
diff --git a/front/src/app/scene/validate-email/validate-email.html b/front/src/app/scene/validate-email/validate-email.html
deleted file mode 100644
index 14ce452..0000000
--- a/front/src/app/scene/validate-email/validate-email.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/front/src/app/scene/validate-email/validate-email.less b/front/src/app/scene/validate-email/validate-email.less
deleted file mode 100644
index 0c64ce2..0000000
--- a/front/src/app/scene/validate-email/validate-email.less
+++ /dev/null
@@ -1,122 +0,0 @@
-sign {
- .full-back{
- position:absolute;
- width:100%;
- height:100%;
- right:100;
- background-color:#2b3137;
-
- background-image: url("../../../assets/images/ikon_gray.svg");
- background-repeat: no-repeat;
- /*
- background-size: contain;
- */
- background-size: 80%;
- background-attachment: fixed;
- background-position: 50% 50%;
-
- z-index:-1;
- }
-
- .left{
- width:50%;
- height:100%;
- left:0;
- margin:0;
- padding:0;
- border:0;
- float:left;
- display:block;
-
- color: white;
-
- .comment {
- background-image: url("../../../assets/images/comments.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- background-attachment: fixed;
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
- .share {
- background-image: url("../../../assets/images/share.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- background-attachment: fixed;
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
- .forget {
- background-image: url("../../../assets/images/erase.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- background-attachment: fixed;
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
- .time {
- background-image: url("../../../assets/images/time.svg");
- background-repeat: no-repeat;
- background-size: 45px;
- background-attachment: fixed;
- background-position: 0% 50%;
- padding: 0 0 0 58px;
- margin: 17px 0 17px 0;
- text-shadow:0px 0px 4px #2b3137;
- }
- }
-
- .global-help {
- color: white;
- text-shadow:0px 0px 4px #2b3137;
- position:relative;
- max-width:500px;
- padding: 16px 32px 16px 32px;
-
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- font-size: 30px;
-
- font-weight: 600;
- text-align: center;
- line-height: 200%;
- .big-one {
- font-size: 90px;
- }
- }
- .sender {
- position: fixed;
- display: block;
- float: buttom;
- top: 80%;
- left:50%;
- transform: translate(-50%, 0%);
- //background-color: #4CAF50;
- //padding: 14px 20px;
- margin: 1%;
- vertical-align: middle;
- width:350px;
- }
- .last-update {
- position: fixed;
- display: block;
- float: buttom;
- top: 90%;
- left:50%;
- transform: translate(-50%, 0%);
- //background-color: transparent;
- //background-color: #2b3137;
- //padding: 14px 20px;
- margin: 1%;
- vertical-align: middle;
- width:350px;
- color:white;
- }
-}
\ No newline at end of file
diff --git a/front/src/app/scene/validate-email/validate-email.ts b/front/src/app/scene/validate-email/validate-email.ts
deleted file mode 100644
index e92174a..0000000
--- a/front/src/app/scene/validate-email/validate-email.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2018, Edouard DUPIN, all right reserved
- * @license PROPRIETARY (see license file)
- */
-
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ArianeService } from '../../service/ariane';
-
-@Component({
- selector: 'app-validate-email',
- templateUrl: './validate-email.html',
- styleUrls: [ './validate-email.less' ]
-})
-export class ValidateEmailScene implements OnInit {
- constructor(private route: ActivatedRoute,
- private arianeService: ArianeService
- ) {
-
- }
-
- ngOnInit() {
- this.arianeService.updateManual(this.route.snapshot.paramMap);
- }
-
- onSend() {
- }
- onCheck() {
- }
-}
-
-/*
-
-
-app.controller("controlerValidateEmail", function($scope, $http, $rootScope, AuthService) {
- $scope.sendButtonDisabled = false;
- $scope.syncButtonDisabled = false;
- $scope.error = "";
-
- $scope.rememberMe = true;
-
- $rootScope.currentModalCanRemove = true;
-
- $scope.updateButtonVisibility = function() {
- if ( $scope.loginOK == true
- && $scope.passOK == true
- && $scope.emailOK == true) {
- $scope.signUpButtonDisabled = false;
- } else {
- $scope.signUpButtonDisabled = true;
- }
- $scope.error = "";
- }
-
- $scope.checkLogin = function() {
- if ( $scope.login == null
- || $scope.login.length == 0) {
- $scope.loginOK = false;
- $scope.loginIcon = "";
- $scope.loginHelp = "";
- $scope.updateButtonVisibility();
- return;
- }
- if ($scope.login.length < 6) {
- $scope.loginOK = false;
- $scope.loginHelp = "Need 6 characters";
- $scope.loginIcon = "";
- $scope.updateButtonVisibility();
- return;
- }
- if (checkLoginValidity($scope.login) == true) {
- $scope.loginOK = false;
- //$scope.loginHelp = "check in progress...";
- $scope.loginIcon = signUp_iconWait;
- let data = {
- "login": $scope.login
- }
- let connectionAdresse = createRESTCall("user/check/login");
- let config = {
- params: data
- };
- let tmpLogin = "" + $scope.login;
- console.log("call " + connectionAdresse + " data=" + JSON.stringify(data, null, 2));
- $http.get(connectionAdresse, config)
- .then(function(response) {
- // check if the answer is correct with the question
- if (tmpLogin !== $scope.login) {
- return;
- }
- console.log("Status " + response.status);
- console.log("data " + JSON.stringify(response.data, null, 2));
- if (response.status == 200) {
- // the login exist ... ==> it is found...
- $scope.loginOK = false;
- $scope.loginHelp = "Login already used ...";
- $scope.loginIcon = signUp_iconWrong;
- return;
- }
- $scope.loginOK = false;
- $scope.loginHelp = "Login already used ... (error 2)";
- }, function(response) {
- // check if the answer is correct with the question
- if (tmpLogin !== $scope.login) {
- return;
- }
- if (response.status == 404) {
- $scope.loginOK = true;
- $scope.loginHelp = "";
- $scope.loginIcon = signUp_iconRight;
- return;
- }
- console.log("Status " + response.status);
- console.log("data " + JSON.stringify(response.data, null, 2));
- $scope.loginOK = false;
- $scope.loginHelp = "Login already used ...";
- $scope.loginIcon = signUp_iconWrong;
- });
- } else {
- $scope.loginOK = false;
- $scope.loginHelp = 'Not valid: characters, numbers and "_-."';
- }
- $scope.updateButtonVisibility();
- }
-
- $scope.checkEmail = function() {
- if ( $scope.email == null
- || $scope.email.length == 0) {
- $scope.emailOK = false;
- $scope.updateButtonVisibility();
- $scope.emailIcon = "";
- $scope.emailHelp = "";
- return;
- }
- if ($scope.email.length < 6) {
- $scope.emailOK = false;
- $scope.emailHelp = "Need 6 characters";
- $scope.updateButtonVisibility();
- $scope.passIcon = "";
- return;
- }
- if (checkEmailValidity($scope.email) == true) {
- $scope.emailOK = true;
- $scope.emailHelp = "";
- //$scope.loginHelp = "check in progress...";
- $scope.emailIcon = signUp_iconWait;
- let data = {
- "e-mail": $scope.email
- }
- let connectionAdresse = createRESTCall("user/check/email");
- let config = {
- params: data
- };
- let tmpEmail = "" + $scope.email;
- console.log("call " + connectionAdresse + " data=" + JSON.stringify(data, null, 2));
- $http.get(connectionAdresse, config)
- .then(function(response) {
- // check if the answer is correct with the question
- if (tmpEmail !== $scope.email) {
- return;
- }
- console.log("Status " + response.status);
- console.log("data " + JSON.stringify(response.data, null, 2));
- if (response.status == 200) {
- // the email exist ... ==> it is found...
- $scope.emailOK = false;
- $scope.emailHelp = "email already used ...";
- $scope.emailIcon = signUp_iconWrong;
- return;
- }
- $scope.emailOK = false;
- $scope.emailHelp = "email already used ... (error 2)";
- }, function(response) {
- // check if the answer is correct with the question
- if (tmpEmail !== $scope.email) {
- return;
- }
- if (response.status == 404) {
- $scope.emailOK = true;
- $scope.emailHelp = "";
- $scope.emailIcon = signUp_iconRight;
- return;
- }
- console.log("Status " + response.status);
- console.log("data " + JSON.stringify(response.data, null, 2));
- $scope.emailOK = false;
- $scope.emailHelp = "email already used ...";
- $scope.emailIcon = signUp_iconWrong;
- });
- } else {
- $scope.emailOK = false;
- $scope.emailHelp = 'Not valid: characters, numbers, "_-." and email format: you@example.com';
- }
- $scope.updateButtonVisibility();
- }
-
- $scope.checkPassword = function() {
- if ($scope.password == null) {
- $scope.passOK = false;
- $scope.passHelp = "";
- $scope.updateButtonVisibility();
- return;
- }
- if ($scope.password.length < 6) {
- $scope.passOK = false;
- $scope.passHelp = "Need 6 characters";
- } else {
- if (checkPasswordValidity($scope.password) == true) {
- $scope.passOK = true;
- $scope.passHelp = "";
- } else {
- $scope.passOK = false;
- $scope.passHelp = 'Not valid: characters, numbers and "_-:;.,?!*+=}{([|)]% @&~#/\<>"';
- }
- }
- $scope.updateButtonVisibility();
- }
- $scope.onSignUp = function() {
- if ($scope.signUpButtonDisabled == true) {
- // TODO: ... notify user ...
- console.log("Not permited action ... ==> control does not validate this action ...");
- return;
- }
- let data = {
- "methode": "v0",
- "login": $scope.login,
- "e-mail": $scope.email,
- "password": btoa(CryptoJS.SHA1($scope.password)) // btoa encode i base64
- }
- let connectionAdresse = createRESTCall("user/add");
- let config = {
- headers: {
- "Content-Type": "application/json"
- }
- };
- let tmpEmail = "" + $scope.email;
- console.log("call " + connectionAdresse + " data=" + JSON.stringify(data, null, 2));
- $http.post(connectionAdresse, data, config)
- .then(function(response) {
- console.log("Status " + response.status);
- console.log("data " + JSON.stringify(response.data, null, 2));
- if (response.status == 200) {
-
- return;
- }
- $scope.emailOK = false;
- $scope.emailHelp = "email already used ... (error 2)";
- }, function(response) {
- console.log("Status " + response.status);
- console.log("data " + JSON.stringify(response.data, null, 2));
- });
- }
- $scope.onCancel = function() {
- console.log("onCancel ... '" + $scope.login + "':'" + $scope.password + "'");
- $rootScope.currentModal = "";
- }
-});
-
-
-*/
diff --git a/front/src/app/scene/video-edit/video-edit.ts b/front/src/app/scene/video-edit/video-edit.ts
index 32b0a79..fec6ffc 100644
--- a/front/src/app/scene/video-edit/video-edit.ts
+++ b/front/src/app/scene/video-edit/video-edit.ts
@@ -15,6 +15,7 @@ import { SeriesService } from '../../service/series';
import { VideoService } from '../../service/video';
import { ArianeService } from '../../service/ariane';
import { UploadProgress } from '../../popin/upload-progress/upload-progress';
+import { NodeData } from '../../model';
export interface ElementList {
value?: number;
@@ -248,8 +249,8 @@ export class VideoEditScene implements OnInit {
let self = this;
this.updateNeedSend();
if(this.data.typeId !== undefined) {
- self.typeService.getSubSeries(this.data.typeId, [ 'id', 'name' ])
- .then((response2) => {
+ self.typeService.getSubSeries(this.data.typeId)
+ .then((response2: NodeData[]) => {
for(let iii = 0; iii < response2.length; iii++) {
self.listSeries.push({ value: response2[iii].id, label: response2[iii].name });
}
@@ -273,8 +274,8 @@ export class VideoEditScene implements OnInit {
this.listSeason = [ { value: undefined, label: '---' } ];
let self = this;
if(this.data.seriesId !== undefined) {
- self.seriesService.getSeason(this.data.seriesId, [ 'id', 'name' ])
- .then((response3) => {
+ self.seriesService.getSeason(this.data.seriesId)
+ .then((response3: NodeData[]) => {
for(let iii = 0; iii < response3.length; iii++) {
self.listSeason.push({ value: response3[iii].id, label: `season ${ response3[iii].name}` });
}
diff --git a/front/src/app/scene/video/video.html b/front/src/app/scene/video/video.html
index 4eb500c..7a363cc 100644
--- a/front/src/app/scene/video/video.html
+++ b/front/src/app/scene/video/video.html
@@ -19,7 +19,7 @@
-
-
-
-
- email
-
- Waiting email validation ...
-
-
-
+
@@ -29,12 +29,12 @@