diff --git a/front/src/app/app-routing.module.ts b/front/src/app/app-routing.module.ts index 410c237..13afd9e 100644 --- a/front/src/app/app-routing.module.ts +++ b/front/src/app/app-routing.module.ts @@ -8,15 +8,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ModuleWithProviders } from '@angular/core'; -import { HomeComponent } from './scene/home/home.component'; -import { TypeComponent } from './scene/type/type.component'; +import { HomeComponent } from './scene/home/home'; +import { TypeComponent } from './scene/type/type'; import { UniversComponent } from './scene/univers/univers'; -import { GroupComponent } from './scene/group/group.component'; -import { SaisonComponent } from './scene/saison/saison.component'; -import { VideoComponent } from './scene/video/video.component'; -import { LoginComponent } from './scene/login/login.component'; -import { SignUpComponent } from './scene/sign-up/sign-up.component'; -import { SettingsComponent } from './scene/settings/settings.component'; +import { GroupComponent } from './scene/group/group'; +import { SaisonComponent } from './scene/saison/saison'; +import { VideoComponent } from './scene/video/video'; +import { LoginComponent } from './scene/login/login'; +import { SignUpComponent } from './scene/sign-up/sign-up'; +import { SettingsComponent } from './scene/settings/settings'; import { VideoEditComponent } from './scene/video-edit/video-edit'; import { GroupEditComponent } from './scene/group-edit/group-edit'; import { SaisonEditComponent } from './scene/saison-edit/saison-edit'; diff --git a/front/src/app/app.component.ts b/front/src/app/app.component.ts index 44f4126..d70bfac 100644 --- a/front/src/app/app.component.ts +++ b/front/src/app/app.component.ts @@ -5,9 +5,9 @@ */ import { Component, OnInit} from '@angular/core'; -import { UserService } from './service/user.service'; -import { SessionService } from './service/session.service'; -import { CookiesService } from './service/cookies.service'; +import { UserService } from './service/user'; +import { SessionService } from './service/session'; +import { CookiesService } from './service/cookies'; @Component({ selector: 'app-root', diff --git a/front/src/app/app.module.ts b/front/src/app/app.module.ts index 9480242..b3393b1 100644 --- a/front/src/app/app.module.ts +++ b/front/src/app/app.module.ts @@ -14,45 +14,45 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { routing } from './app-routing.module'; -import { UploadFileComponent } from './component/upload-file/upload-file.component'; -import { TopMenuComponent } from './component/top-menu/top-menu.component'; -import { ElementTypeComponent } from './component/element-type/element-type.component'; -import { ElementGroupComponent } from './component/element-group/element-group.component'; -import { ElementSaisonComponent } from './component/element-saison/element-saison.component'; -import { ElementVideoComponent } from './component/element-video/element-video.component'; -import { ModalComponent } from './component/modal/modal'; +import { UploadFileComponent } from './component/upload-file/upload-file'; +import { TopMenuComponent } from './component/top-menu/top-menu'; +import { ElementTypeComponent } from './component/element-type/element-type'; +import { ElementGroupComponent } from './component/element-group/element-group'; +import { ElementSaisonComponent } from './component/element-saison/element-saison'; +import { ElementVideoComponent } from './component/element-video/element-video'; +import { PopInComponent } from './component/popin/popin'; -import { HelpComponent } from './scene/help/help.component'; -import { LoginComponent } from './scene/login/login.component'; -import { SignUpComponent } from './scene/sign-up/sign-up.component'; -import { ValidateEmailComponent } from './scene/validate-email/validate-email.component'; -import { HomeComponent } from './scene/home/home.component'; -import { TypeComponent } from './scene/type/type.component'; +import { HelpComponent } from './scene/help/help'; +import { LoginComponent } from './scene/login/login'; +import { SignUpComponent } from './scene/sign-up/sign-up'; +import { ValidateEmailComponent } from './scene/validate-email/validate-email'; +import { HomeComponent } from './scene/home/home'; +import { TypeComponent } from './scene/type/type'; import { UniversComponent } from './scene/univers/univers'; -import { GroupComponent } from './scene/group/group.component'; -import { SaisonComponent } from './scene/saison/saison.component'; -import { VideoComponent } from './scene/video/video.component'; -import { SettingsComponent } from './scene/settings/settings.component'; -import { ErrorViewerComponent } from './scene/error-viewer/error-viewer.component'; -import { ErrorComponent } from './error/error.component'; +import { GroupComponent } from './scene/group/group'; +import { SaisonComponent } from './scene/saison/saison'; +import { VideoComponent } from './scene/video/video'; +import { SettingsComponent } from './scene/settings/settings'; +import { ErrorViewerComponent } from './scene/error-viewer/error-viewer'; +import { ErrorComponent } from './error/error'; import { VideoEditComponent } from './scene/video-edit/video-edit'; import { SaisonEditComponent } from './scene/saison-edit/saison-edit'; import { GroupEditComponent } from './scene/group-edit/group-edit'; -import { AuthService } from './service/auth.service'; -import { ArianeService } from './service/ariane.service'; -import { CookiesService } from './service/cookies.service'; -import { HttpWrapperService } from './service/http-wrapper.service'; -import { UserService } from './service/user.service'; -import { UniversService } from './service/univers.service'; -import { GroupService } from './service/group.service'; -import { DataService } from './service/data.service'; -import { TypeService } from './service/type.service'; -import { SaisonService } from './service/saison.service'; -import { VideoService } from './service/video.service'; -import { SessionService } from './service/session.service'; -import { BddService } from './service/bdd.service'; -import { ModalService } from './service/modal'; +import { AuthService } from './service/auth'; +import { ArianeService } from './service/ariane'; +import { CookiesService } from './service/cookies'; +import { HttpWrapperService } from './service/http-wrapper'; +import { UserService } from './service/user'; +import { UniversService } from './service/univers'; +import { GroupService } from './service/group'; +import { DataService } from './service/data'; +import { TypeService } from './service/type'; +import { SaisonService } from './service/saison'; +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'; @NgModule({ @@ -80,7 +80,7 @@ import { AppComponent } from './app.component'; VideoEditComponent, SaisonEditComponent, GroupEditComponent, - ModalComponent + PopInComponent ], imports: [ BrowserModule, @@ -92,7 +92,7 @@ import { AppComponent } from './app.component'; ReactiveFormsModule ], providers: [ - ModalService, + PopInService, HttpWrapperService, BddService, AuthService, diff --git a/front/src/app/component/element-group/element-group.component.html b/front/src/app/component/element-group/element-group.html similarity index 100% rename from front/src/app/component/element-group/element-group.component.html rename to front/src/app/component/element-group/element-group.html diff --git a/front/src/app/component/element-group/element-group.component.less b/front/src/app/component/element-group/element-group.less similarity index 100% rename from front/src/app/component/element-group/element-group.component.less rename to front/src/app/component/element-group/element-group.less diff --git a/front/src/app/component/element-group/element-group.component.ts b/front/src/app/component/element-group/element-group.ts similarity index 91% rename from front/src/app/component/element-group/element-group.component.ts rename to front/src/app/component/element-group/element-group.ts index 8e10af8..349cc37 100644 --- a/front/src/app/component/element-group/element-group.component.ts +++ b/front/src/app/component/element-group/element-group.ts @@ -9,12 +9,12 @@ import { Injectable, Component, OnInit, Input } from '@angular/core'; import { Router } from "@angular/router"; import { ActivatedRoute, Params } from '@angular/router'; -import { GroupService } from '../../service/group.service'; +import { GroupService } from '../../service/group'; @Component({ selector: 'app-element-group', - templateUrl: './element-group.component.html', - styleUrls: ['./element-group.component.less'] + templateUrl: './element-group.html', + styleUrls: ['./element-group.less'] }) @Injectable() diff --git a/front/src/app/component/element-saison/element-saison.component.html b/front/src/app/component/element-saison/element-saison.html similarity index 100% rename from front/src/app/component/element-saison/element-saison.component.html rename to front/src/app/component/element-saison/element-saison.html diff --git a/front/src/app/component/element-saison/element-saison.component.less b/front/src/app/component/element-saison/element-saison.less similarity index 100% rename from front/src/app/component/element-saison/element-saison.component.less rename to front/src/app/component/element-saison/element-saison.less diff --git a/front/src/app/component/element-saison/element-saison.component.ts b/front/src/app/component/element-saison/element-saison.ts similarity index 91% rename from front/src/app/component/element-saison/element-saison.component.ts rename to front/src/app/component/element-saison/element-saison.ts index 29f0112..bc869c9 100644 --- a/front/src/app/component/element-saison/element-saison.component.ts +++ b/front/src/app/component/element-saison/element-saison.ts @@ -9,12 +9,12 @@ import { Injectable, Component, OnInit, Input } from '@angular/core'; import { Router } from "@angular/router"; import { ActivatedRoute, Params } from '@angular/router'; -import { SaisonService } from '../../service/saison.service'; +import { SaisonService } from '../../service/saison'; @Component({ selector: 'app-element-saison', - templateUrl: './element-saison.component.html', - styleUrls: ['./element-saison.component.less'] + templateUrl: './element-saison.html', + styleUrls: ['./element-saison.less'] }) @Injectable() diff --git a/front/src/app/component/element-type/element-type.component.html b/front/src/app/component/element-type/element-type.html similarity index 100% rename from front/src/app/component/element-type/element-type.component.html rename to front/src/app/component/element-type/element-type.html diff --git a/front/src/app/component/element-type/element-type.component.less b/front/src/app/component/element-type/element-type.less similarity index 100% rename from front/src/app/component/element-type/element-type.component.less rename to front/src/app/component/element-type/element-type.less diff --git a/front/src/app/component/element-type/element-type.component.ts b/front/src/app/component/element-type/element-type.ts similarity index 94% rename from front/src/app/component/element-type/element-type.component.ts rename to front/src/app/component/element-type/element-type.ts index bd748c0..ca917fc 100644 --- a/front/src/app/component/element-type/element-type.component.ts +++ b/front/src/app/component/element-type/element-type.ts @@ -9,12 +9,12 @@ import { Injectable, Component, OnInit, Input } from '@angular/core'; import { Router } from "@angular/router"; import { ActivatedRoute, Params } from '@angular/router'; -import { TypeService } from '../../service/type.service'; +import { TypeService } from '../../service/type'; @Component({ selector: 'app-element-type', - templateUrl: './element-type.component.html', - styleUrls: ['./element-type.component.less'] + templateUrl: './element-type.html', + styleUrls: ['./element-type.less'] }) @Injectable() diff --git a/front/src/app/component/element-video/element-video.component.ts b/front/src/app/component/element-video/element-video.component.ts index 378b565..e69de29 100644 --- a/front/src/app/component/element-video/element-video.component.ts +++ b/front/src/app/component/element-video/element-video.component.ts @@ -1,111 +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 { AppRoutingModule } from "../app-routing.module"; - -import { Router } from "@angular/router"; -import { ActivatedRoute, Params } from '@angular/router'; -import { VideoService } from '../../service/video.service'; -import { HttpWrapperService } from '../../service/http-wrapper.service'; - -@Component({ - selector: 'app-element-video', - templateUrl: './element-video.component.html', - styleUrls: ['./element-video.component.less'] -}) - -@Injectable() -export class ElementVideoComponent implements OnInit { - // input parameters - @Input() id_video:number = -1; - @Input() display_video:boolean = false; - - error:string = ""; - - name:string = ""; - description:string = ""; - episode:number = undefined; - group_id:number = undefined; - saison_id:number = undefined; - data_id:number = -1; - time:number = undefined; - type_id:number = undefined; - generated_name:string = ""; - video_source:string = ""; - video_enable:boolean = false; - imageSource:string = null; - episode_display:string = ""; - - cover:string = ""; - covers:Array = []; - - constructor(private router: Router, - private videoService: VideoService, - private httpService: HttpWrapperService) { - - } - OnDestroy() { - this.video_source = ""; - this.video_enable = false; - } - ngOnInit() { - this.name = "ll " + this.id_video - let self = this; - //console.log("get video id: " + this.id_video); - this.videoService.get(this.id_video) - .then(function(response) { - //console.log("get response of video : " + JSON.stringify(response, null, 2)); - self.error = ""; - self.name = response.name; - self.description = response.description; - self.episode = response.episode; - if (response.episode === undefined || response.episode === null || response.episode == '') { - self.episode_display = ""; - } else { - self.episode_display = response.episode + " - "; - } - self.group_id = response.serie_id; - self.saison_id = response.saison_id; - self.data_id = response.data_id; - self.time = response.time; - self.generated_name = response.generated_name; - if (self.data_id != -1) { - self.video_source = self.httpService.createRESTCall("data/" + self.data_id); - self.video_enable = true; - } else { - self.video_source = ""; - self.video_enable = false; - } - if (response.covers == undefined || response.covers == null || response.covers.length == 0) { - self.cover = null; - //self.covers = []; - } else { - self.cover = self.videoService.getCoverUrl(response.covers[0]); - for (let iii=0; iii = []; + + constructor(private router: Router, + private videoService: VideoService, + private httpService: HttpWrapperService) { + + } + OnDestroy() { + this.video_source = ""; + this.video_enable = false; + } + ngOnInit() { + this.name = "ll " + this.id_video + let self = this; + //console.log("get video id: " + this.id_video); + this.videoService.get(this.id_video) + .then(function(response) { + //console.log("get response of video : " + JSON.stringify(response, null, 2)); + self.error = ""; + self.name = response.name; + self.description = response.description; + self.episode = response.episode; + if (response.episode === undefined || response.episode === null || response.episode == '') { + self.episode_display = ""; + } else { + self.episode_display = response.episode + " - "; + } + self.group_id = response.serie_id; + self.saison_id = response.saison_id; + self.data_id = response.data_id; + self.time = response.time; + self.generated_name = response.generated_name; + if (self.data_id != -1) { + self.video_source = self.httpService.createRESTCall("data/" + self.data_id); + self.video_enable = true; + } else { + self.video_source = ""; + self.video_enable = false; + } + if (response.covers == undefined || response.covers == null || response.covers.length == 0) { + self.cover = null; + //self.covers = []; + } else { + self.cover = self.videoService.getCoverUrl(response.covers[0]); + for (let iii=0; iii -
-
-

{{title}}

- -
-
-
- \ No newline at end of file diff --git a/front/src/app/component/modal/modal.less b/front/src/app/component/modal/modal.less deleted file mode 100644 index 1d2ad50..0000000 --- a/front/src/app/component/modal/modal.less +++ /dev/null @@ -1,59 +0,0 @@ -/* MODAL STYLES --------------------------------*/ - -/* modals are hidden by default */ -//display: none; -.fill-modal { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 800; -} - -.modal { - /* modal container fixed across whole screen */ - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - display: block; - - /* z-index must be higher than .modal-background */ - z-index: 1000; - - /* enables scrolling for tall modals */ - overflow: auto; - - .modal-body { - padding: 20px; - background: #fff; - - /* margin exposes part of the modal background */ - margin: 40px; - } -} - -.modal-background { - /* modal background fixed across whole screen */ - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - - /* semi-transparent black */ - background-color: #000; - opacity: 0.75; - - /* z-index must be below .modal and above everything else */ - z-index: 900; -} - - -body.modal-open { - /* body overflow is hidden to hide main scrollbar when modal window is open */ - overflow: hidden; -} \ No newline at end of file diff --git a/front/src/app/component/popin/popin.html b/front/src/app/component/popin/popin.html new file mode 100644 index 0000000..8fc2238 --- /dev/null +++ b/front/src/app/component/popin/popin.html @@ -0,0 +1,9 @@ +
+
+
+

{{title}}

+ +
+
+
+
\ No newline at end of file diff --git a/front/src/app/component/popin/popin.less b/front/src/app/component/popin/popin.less new file mode 100644 index 0000000..43fc557 --- /dev/null +++ b/front/src/app/component/popin/popin.less @@ -0,0 +1,59 @@ +/* popin STYLES +-------------------------------*/ + +/* popins are hidden by default */ +//display: none; +.fill-popin { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 800; +} + +.popin { + /* popin container fixed across whole screen */ + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + display: block; + + /* z-index must be higher than .popin-background */ + z-index: 1000; + + /* enables scrolling for tall popins */ + overflow: auto; + + .popin-body { + padding: 20px; + background: #fff; + + /* margin exposes part of the popin background */ + margin: 40px; + } +} + +.popin-background { + /* popin background fixed across whole screen */ + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + + /* semi-transparent black */ + background-color: #000; + opacity: 0.75; + + /* z-index must be below .popin and above everything else */ + z-index: 900; +} + + +body.popin-open { + /* body overflow is hidden to hide main scrollbar when popin window is open */ + overflow: hidden; +} \ No newline at end of file diff --git a/front/src/app/component/modal/modal.ts b/front/src/app/component/popin/popin.ts similarity index 60% rename from front/src/app/component/modal/modal.ts rename to front/src/app/component/popin/popin.ts index f929b9c..60f614f 100644 --- a/front/src/app/component/modal/modal.ts +++ b/front/src/app/component/popin/popin.ts @@ -1,60 +1,60 @@ import { Component, ElementRef, Input, OnInit, OnDestroy } from '@angular/core'; import * as $ from 'jquery'; -import { ModalService } from '../../service/modal'; +import { PopInService } from '../../service/popin'; @Component({ moduleId: module.id.toString(), - selector: 'modal', - templateUrl: './modal.html', - styleUrls: ['./modal.less'] + selector: 'popin', + templateUrl: './popin.html', + styleUrls: ['./popin.less'] }) -export class ModalComponent implements OnInit, OnDestroy { +export class PopInComponent implements OnInit, OnDestroy { @Input() id: string; @Input() title: string = 'No title'; @Input() closeOnOutClick: any = "false"; private element: any; - constructor(private modalService: ModalService, + constructor(private popInService: PopInService, private el: ElementRef) { this.element = $(el.nativeElement); } ngOnInit(): void { - let modal = this; + let self = this; // ensure id attribute exists if (!this.id) { - console.error('modal must have an id'); + console.error('popin must have an id'); return; } // move element to bottom of page (just before ) so it can be displayed above everything else this.element.appendTo('body'); if (this.closeOnOutClick == "true") { - // close modal on background click + // close popin on background click this.element.on('click', function (e: any) { let target = $(e.target); if (!target.closest('.modal-body').length) { - modal.close(); + self.close(); } }); } - // add self (this modal instance) to the modal service so it's accessible from controllers - this.modalService.add(this); + // add self (this popin instance) to the popin service so it's accessible from controllers + this.popInService.add(this); } - // remove self from modal service when directive is destroyed + // remove self from popIn service when directive is destroyed ngOnDestroy(): void { - this.modalService.remove(this.id); + this.popInService.remove(this.id); this.element.remove(); } - // open modal + // open popIn open(): void { //console.log("request element show ..."); this.element.show(); - //$('body').addClass('modal-open'); + //$('body').addClass('popin-open'); //console.log(" ==> done"); } - // close modal + // close popin close(): void { this.element.hide(); - //$('body').removeClass('modal-open'); + //$('body').removeClass('popin-open'); } } \ No newline at end of file diff --git a/front/src/app/component/top-menu/top-menu.component.html b/front/src/app/component/top-menu/top-menu.html similarity index 100% rename from front/src/app/component/top-menu/top-menu.component.html rename to front/src/app/component/top-menu/top-menu.html diff --git a/front/src/app/component/top-menu/top-menu.component.less b/front/src/app/component/top-menu/top-menu.less similarity index 100% rename from front/src/app/component/top-menu/top-menu.component.less rename to front/src/app/component/top-menu/top-menu.less diff --git a/front/src/app/component/top-menu/top-menu.component.ts b/front/src/app/component/top-menu/top-menu.ts similarity index 97% rename from front/src/app/component/top-menu/top-menu.component.ts rename to front/src/app/component/top-menu/top-menu.ts index be10159..ec3451e 100644 --- a/front/src/app/component/top-menu/top-menu.component.ts +++ b/front/src/app/component/top-menu/top-menu.ts @@ -9,13 +9,13 @@ import { Injectable, Component, OnInit } from '@angular/core'; import { Router } from "@angular/router"; import { ActivatedRoute, Params } from '@angular/router'; -import { SessionService } from '../../service/session.service'; -import { ArianeService } from '../../service/ariane.service'; +import { SessionService } from '../../service/session'; +import { ArianeService } from '../../service/ariane'; @Component({ selector: 'app-top-menu', - templateUrl: './top-menu.component.html', - styleUrls: ['./top-menu.component.less'] + templateUrl: './top-menu.html', + styleUrls: ['./top-menu.less'] }) @Injectable() export class TopMenuComponent implements OnInit { diff --git a/front/src/app/component/upload-file/upload-file.component.html b/front/src/app/component/upload-file/upload-file.html similarity index 100% rename from front/src/app/component/upload-file/upload-file.component.html rename to front/src/app/component/upload-file/upload-file.html diff --git a/front/src/app/component/upload-file/upload-file.component.less b/front/src/app/component/upload-file/upload-file.less similarity index 100% rename from front/src/app/component/upload-file/upload-file.component.less rename to front/src/app/component/upload-file/upload-file.less diff --git a/front/src/app/component/upload-file/upload-file.component.ts b/front/src/app/component/upload-file/upload-file.ts similarity index 79% rename from front/src/app/component/upload-file/upload-file.component.ts rename to front/src/app/component/upload-file/upload-file.ts index 568896c..18f5702 100644 --- a/front/src/app/component/upload-file/upload-file.component.ts +++ b/front/src/app/component/upload-file/upload-file.ts @@ -2,8 +2,8 @@ import { Component} from '@angular/core'; @Component({ selector: 'app-upload-file', - templateUrl: './upload-file.component.html', - styleUrls: ['./upload-file.component.less'] + templateUrl: './upload-file.html', + styleUrls: ['./upload-file.less'] }) export class UploadFileComponent { diff --git a/front/src/app/error/error.component.html b/front/src/app/error/error.html similarity index 100% rename from front/src/app/error/error.component.html rename to front/src/app/error/error.html diff --git a/front/src/app/error/error.component.less b/front/src/app/error/error.less similarity index 100% rename from front/src/app/error/error.component.less rename to front/src/app/error/error.less diff --git a/front/src/app/error/error.component.ts b/front/src/app/error/error.ts similarity index 79% rename from front/src/app/error/error.component.ts rename to front/src/app/error/error.ts index f0e6bdf..501a591 100644 --- a/front/src/app/error/error.component.ts +++ b/front/src/app/error/error.ts @@ -8,8 +8,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-error', - templateUrl: './error.component.html', - styleUrls: ['./error.component.less'] + templateUrl: './error.html', + styleUrls: ['./error.less'] }) export class ErrorComponent implements OnInit { diff --git a/front/src/app/scene/error-viewer/error-viewer.component.html b/front/src/app/scene/error-viewer/error-viewer.html similarity index 100% rename from front/src/app/scene/error-viewer/error-viewer.component.html rename to front/src/app/scene/error-viewer/error-viewer.html diff --git a/front/src/app/scene/error-viewer/error-viewer.component.less b/front/src/app/scene/error-viewer/error-viewer.less similarity index 100% rename from front/src/app/scene/error-viewer/error-viewer.component.less rename to front/src/app/scene/error-viewer/error-viewer.less diff --git a/front/src/app/scene/error-viewer/error-viewer.component.ts b/front/src/app/scene/error-viewer/error-viewer.ts similarity index 77% rename from front/src/app/scene/error-viewer/error-viewer.component.ts rename to front/src/app/scene/error-viewer/error-viewer.ts index 37626e9..be4c930 100644 --- a/front/src/app/scene/error-viewer/error-viewer.component.ts +++ b/front/src/app/scene/error-viewer/error-viewer.ts @@ -8,8 +8,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-error-viewer', - templateUrl: './error-viewer.component.html', - styleUrls: ['./error-viewer.component.less'] + templateUrl: './error-viewer.html', + styleUrls: ['./error-viewer.less'] }) export class ErrorViewerComponent implements OnInit { diff --git a/front/src/app/scene/group-edit/group-edit.ts b/front/src/app/scene/group-edit/group-edit.ts index bcd258f..f288507 100644 --- a/front/src/app/scene/group-edit/group-edit.ts +++ b/front/src/app/scene/group-edit/group-edit.ts @@ -11,8 +11,8 @@ import { NgForm } from '@angular/forms'; import { FormGroup, FormControl } from "@angular/forms"; import { fadeInAnimation } from '../../_animations/index'; -import { GroupService } from '../../service/group.service'; -import { DataService } from '../../service/data.service'; +import { GroupService } from '../../service/group'; +import { DataService } from '../../service/data'; export class ElementList { value: number; diff --git a/front/src/app/scene/group/group.component.html b/front/src/app/scene/group/group.html similarity index 100% rename from front/src/app/scene/group/group.component.html rename to front/src/app/scene/group/group.html diff --git a/front/src/app/scene/group/group.component.less b/front/src/app/scene/group/group.less similarity index 100% rename from front/src/app/scene/group/group.component.less rename to front/src/app/scene/group/group.less diff --git a/front/src/app/scene/group/group.component.ts b/front/src/app/scene/group/group.ts similarity index 94% rename from front/src/app/scene/group/group.component.ts rename to front/src/app/scene/group/group.ts index 61b83fe..48fd334 100644 --- a/front/src/app/scene/group/group.component.ts +++ b/front/src/app/scene/group/group.ts @@ -9,14 +9,14 @@ import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; -import { GroupService } from '../../service/group.service'; -import { ArianeService } from '../../service/ariane.service'; +import { GroupService } from '../../service/group'; +import { ArianeService } from '../../service/ariane'; import { environment } from 'environments/environment'; @Component({ selector: 'app-group', - templateUrl: './group.component.html', - styleUrls: ['./group.component.less'], + templateUrl: './group.html', + styleUrls: ['./group.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/scene/help/help.component.html b/front/src/app/scene/help/help.html similarity index 100% rename from front/src/app/scene/help/help.component.html rename to front/src/app/scene/help/help.html diff --git a/front/src/app/scene/help/help.component.less b/front/src/app/scene/help/help.less similarity index 100% rename from front/src/app/scene/help/help.component.less rename to front/src/app/scene/help/help.less diff --git a/front/src/app/scene/help/help.component.ts b/front/src/app/scene/help/help.ts similarity index 69% rename from front/src/app/scene/help/help.component.ts rename to front/src/app/scene/help/help.ts index 2989441..4c91aee 100644 --- a/front/src/app/scene/help/help.component.ts +++ b/front/src/app/scene/help/help.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-help', - templateUrl: './help.component.html', - styleUrls: ['./help.component.less'] + templateUrl: './help.html', + styleUrls: ['./help.less'] }) export class HelpComponent implements OnInit { diff --git a/front/src/app/scene/home/home.component.html b/front/src/app/scene/home/home.html similarity index 100% rename from front/src/app/scene/home/home.component.html rename to front/src/app/scene/home/home.html diff --git a/front/src/app/scene/home/home.component.less b/front/src/app/scene/home/home.less similarity index 100% rename from front/src/app/scene/home/home.component.less rename to front/src/app/scene/home/home.less diff --git a/front/src/app/scene/home/home.component.ts b/front/src/app/scene/home/home.ts similarity index 89% rename from front/src/app/scene/home/home.component.ts rename to front/src/app/scene/home/home.ts index d97ca02..29ba74b 100644 --- a/front/src/app/scene/home/home.component.ts +++ b/front/src/app/scene/home/home.ts @@ -9,14 +9,14 @@ import { Router } from "@angular/router"; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; -import { TypeService } from '../../service/type.service'; -import { ArianeService } from '../../service/ariane.service'; +import { TypeService } from '../../service/type'; +import { ArianeService } from '../../service/ariane'; import { environment } from 'environments/environment'; @Component({ selector: 'app-home', - templateUrl: './home.component.html', - styleUrls: ['./home.component.less'], + templateUrl: './home.html', + styleUrls: ['./home.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/scene/login/login.component.html b/front/src/app/scene/login/login.html similarity index 100% rename from front/src/app/scene/login/login.component.html rename to front/src/app/scene/login/login.html diff --git a/front/src/app/scene/login/login.component.less b/front/src/app/scene/login/login.less similarity index 100% rename from front/src/app/scene/login/login.component.less rename to front/src/app/scene/login/login.less diff --git a/front/src/app/scene/login/login.component.ts b/front/src/app/scene/login/login.ts similarity index 94% rename from front/src/app/scene/login/login.component.ts rename to front/src/app/scene/login/login.ts index 456d90d..bcb8c77 100644 --- a/front/src/app/scene/login/login.component.ts +++ b/front/src/app/scene/login/login.ts @@ -9,9 +9,9 @@ import { Router } from "@angular/router"; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; import { slideInOutAnimation } from '../../_animations/index'; -import { UserService } from '../../service/user.service'; -import { SessionService } from '../../service/session.service'; -import { CookiesService } from '../../service/cookies.service'; +import { UserService } from '../../service/user'; +import { SessionService } from '../../service/session'; +import { CookiesService } from '../../service/cookies'; export let checkLoginValidity = function(_value:string):boolean { @@ -43,8 +43,8 @@ declare function SHA512(param1: any): any; @Component({ selector: 'app-login', - templateUrl: './login.component.html', - styleUrls: ['./login.component.less'], + templateUrl: './login.html', + styleUrls: ['./login.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/scene/saison-edit/saison-edit.ts b/front/src/app/scene/saison-edit/saison-edit.ts index 7e0b69b..ba3bb65 100644 --- a/front/src/app/scene/saison-edit/saison-edit.ts +++ b/front/src/app/scene/saison-edit/saison-edit.ts @@ -11,8 +11,8 @@ import { NgForm } from '@angular/forms'; import { FormGroup, FormControl } from "@angular/forms"; import { fadeInAnimation } from '../../_animations/index'; -import { SaisonService } from '../../service/saison.service'; -import { DataService } from '../../service/data.service'; +import { SaisonService } from '../../service/saison'; +import { DataService } from '../../service/data'; export class ElementList { value: number; diff --git a/front/src/app/scene/saison/saison.component.html b/front/src/app/scene/saison/saison.html similarity index 100% rename from front/src/app/scene/saison/saison.component.html rename to front/src/app/scene/saison/saison.html diff --git a/front/src/app/scene/saison/saison.component.less b/front/src/app/scene/saison/saison.less similarity index 100% rename from front/src/app/scene/saison/saison.component.less rename to front/src/app/scene/saison/saison.less diff --git a/front/src/app/scene/saison/saison.component.ts b/front/src/app/scene/saison/saison.ts similarity index 91% rename from front/src/app/scene/saison/saison.component.ts rename to front/src/app/scene/saison/saison.ts index bc74fd2..4ca5fd4 100644 --- a/front/src/app/scene/saison/saison.component.ts +++ b/front/src/app/scene/saison/saison.ts @@ -9,15 +9,15 @@ import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; -import { SaisonService } from '../../service/saison.service'; -import { GroupService } from '../../service/group.service'; -import { ArianeService } from '../../service/ariane.service'; +import { SaisonService } from '../../service/saison'; +import { GroupService } from '../../service/group'; +import { ArianeService } from '../../service/ariane'; import { environment } from 'environments/environment'; @Component({ selector: 'app-saison', - templateUrl: './saison.component.html', - styleUrls: ['./saison.component.less'], + templateUrl: './saison.html', + styleUrls: ['./saison.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/scene/settings/settings.component.html b/front/src/app/scene/settings/settings.html similarity index 100% rename from front/src/app/scene/settings/settings.component.html rename to front/src/app/scene/settings/settings.html diff --git a/front/src/app/scene/settings/settings.component.less b/front/src/app/scene/settings/settings.less similarity index 100% rename from front/src/app/scene/settings/settings.component.less rename to front/src/app/scene/settings/settings.less diff --git a/front/src/app/scene/settings/settings.component.ts b/front/src/app/scene/settings/settings.ts similarity index 79% rename from front/src/app/scene/settings/settings.component.ts rename to front/src/app/scene/settings/settings.ts index b311d16..89d93a7 100644 --- a/front/src/app/scene/settings/settings.component.ts +++ b/front/src/app/scene/settings/settings.ts @@ -8,8 +8,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-settings', - templateUrl: './settings.component.html', - styleUrls: ['./settings.component.less'] + templateUrl: './settings.html', + styleUrls: ['./settings.less'] }) export class SettingsComponent implements OnInit { diff --git a/front/src/app/scene/sign-up/sign-up.component.html b/front/src/app/scene/sign-up/sign-up.html similarity index 100% rename from front/src/app/scene/sign-up/sign-up.component.html rename to front/src/app/scene/sign-up/sign-up.html diff --git a/front/src/app/scene/sign-up/sign-up.component.less b/front/src/app/scene/sign-up/sign-up.less similarity index 100% rename from front/src/app/scene/sign-up/sign-up.component.less rename to front/src/app/scene/sign-up/sign-up.less diff --git a/front/src/app/scene/sign-up/sign-up.component.ts b/front/src/app/scene/sign-up/sign-up.ts similarity index 97% rename from front/src/app/scene/sign-up/sign-up.component.ts rename to front/src/app/scene/sign-up/sign-up.ts index ba41c76..212a3ea 100644 --- a/front/src/app/scene/sign-up/sign-up.component.ts +++ b/front/src/app/scene/sign-up/sign-up.ts @@ -6,15 +6,15 @@ import { Component, OnInit } from '@angular/core'; import { Router } from "@angular/router"; -import { checkLoginValidity, checkEmailValidity, checkPasswordValidity } from '../login/login.component'; +import { checkLoginValidity, checkEmailValidity, checkPasswordValidity } from '../login/login'; import { fadeInAnimation } from '../../_animations/index'; -import { UserService } from '../../service/user.service'; +import { UserService } from '../../service/user'; @Component({ selector: 'app-sign-up', - templateUrl: './sign-up.component.html', - styleUrls: ['./sign-up.component.less'], + templateUrl: './sign-up.html', + styleUrls: ['./sign-up.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/scene/type/type.component.html b/front/src/app/scene/type/type.html similarity index 100% rename from front/src/app/scene/type/type.component.html rename to front/src/app/scene/type/type.html diff --git a/front/src/app/scene/type/type.component.less b/front/src/app/scene/type/type.less similarity index 100% rename from front/src/app/scene/type/type.component.less rename to front/src/app/scene/type/type.less diff --git a/front/src/app/scene/type/type.component.ts b/front/src/app/scene/type/type.ts similarity index 93% rename from front/src/app/scene/type/type.component.ts rename to front/src/app/scene/type/type.ts index 5f3248d..3e0d562 100644 --- a/front/src/app/scene/type/type.component.ts +++ b/front/src/app/scene/type/type.ts @@ -9,14 +9,14 @@ import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; -import { TypeService } from '../../service/type.service'; -import { ArianeService } from '../../service/ariane.service'; +import { TypeService } from '../../service/type'; +import { ArianeService } from '../../service/ariane'; import { environment } from 'environments/environment'; @Component({ selector: 'app-type', - templateUrl: './type.component.html', - styleUrls: ['./type.component.less'], + templateUrl: './type.html', + styleUrls: ['./type.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/scene/univers/univers.ts b/front/src/app/scene/univers/univers.ts index 1771990..3dfb35b 100644 --- a/front/src/app/scene/univers/univers.ts +++ b/front/src/app/scene/univers/univers.ts @@ -9,8 +9,8 @@ import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; -import { UniversService } from '../../service/univers.service'; -import { ArianeService } from '../../service/ariane.service'; +import { UniversService } from '../../service/univers'; +import { ArianeService } from '../../service/ariane'; import { environment } from 'environments/environment'; diff --git a/front/src/app/scene/validate-email/validate-email.component.html b/front/src/app/scene/validate-email/validate-email.html similarity index 100% rename from front/src/app/scene/validate-email/validate-email.component.html rename to front/src/app/scene/validate-email/validate-email.html diff --git a/front/src/app/scene/validate-email/validate-email.component.less b/front/src/app/scene/validate-email/validate-email.less similarity index 100% rename from front/src/app/scene/validate-email/validate-email.component.less rename to front/src/app/scene/validate-email/validate-email.less diff --git a/front/src/app/scene/validate-email/validate-email.component.ts b/front/src/app/scene/validate-email/validate-email.ts similarity index 98% rename from front/src/app/scene/validate-email/validate-email.component.ts rename to front/src/app/scene/validate-email/validate-email.ts index 1f0d3c1..51fe4f5 100644 --- a/front/src/app/scene/validate-email/validate-email.component.ts +++ b/front/src/app/scene/validate-email/validate-email.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-validate-email', - templateUrl: './validate-email.component.html', - styleUrls: ['./validate-email.component.less'] + templateUrl: './validate-email.html', + styleUrls: ['./validate-email.less'] }) export class ValidateEmailComponent implements OnInit { diff --git a/front/src/app/scene/video-edit/video-edit.html b/front/src/app/scene/video-edit/video-edit.html index dcf79eb..ed2d1f9 100644 --- a/front/src/app/scene/video-edit/video-edit.html +++ b/front/src/app/scene/video-edit/video-edit.html @@ -169,14 +169,14 @@ - +

Home page text:

- + - + - + diff --git a/front/src/app/scene/video-edit/video-edit.ts b/front/src/app/scene/video-edit/video-edit.ts index 8859082..68be035 100644 --- a/front/src/app/scene/video-edit/video-edit.ts +++ b/front/src/app/scene/video-edit/video-edit.ts @@ -10,17 +10,17 @@ import { Location } from '@angular/common'; import { NgForm } from '@angular/forms'; import { FormGroup, FormControl } from "@angular/forms"; import { fadeInAnimation } from '../../_animations/index'; -import { HttpWrapperService } from '../../service/http-wrapper.service'; +import { HttpWrapperService } from '../../service/http-wrapper'; import { HttpEventType, HttpResponse} from '@angular/common/http'; -import { ModalService } from '../../service/modal'; -import { TypeService } from '../../service/type.service'; -import { UniversService } from '../../service/univers.service'; -import { GroupService } from '../../service/group.service'; -import { VideoService } from '../../service/video.service'; -import { DataService } from '../../service/data.service'; -import { ArianeService } from '../../service/ariane.service'; +import { PopInService } from '../../service/popin'; +import { TypeService } from '../../service/type'; +import { UniversService } from '../../service/univers'; +import { GroupService } from '../../service/group'; +import { VideoService } from '../../service/video'; +import { DataService } from '../../service/data'; +import { ArianeService } from '../../service/ariane'; export class ElementList { value: number; @@ -106,7 +106,7 @@ export class VideoEditComponent implements OnInit { private videoService: VideoService, private httpService: HttpWrapperService, private arianeService: ArianeService, - private modalService: ModalService) { + private popInService: PopInService) { } @@ -383,14 +383,14 @@ export class VideoEditComponent implements OnInit { } newSaison() { console.log("Request new Saison..."); - this.modalService.open("custom-modal-1"); + this.popInService.open("custom-modal-1"); } newSerie() { console.log("Request new Serie..."); - this.modalService.open("custom-modal-2"); + this.popInService.open("custom-modal-2"); } closeModal(_id) { - this.modalService.close(_id); + this.popInService.close(_id); } newType() { console.log("Request new Type..."); diff --git a/front/src/app/scene/video/video.component.html b/front/src/app/scene/video/video.html similarity index 100% rename from front/src/app/scene/video/video.component.html rename to front/src/app/scene/video/video.html diff --git a/front/src/app/scene/video/video.component.less b/front/src/app/scene/video/video.less similarity index 100% rename from front/src/app/scene/video/video.component.less rename to front/src/app/scene/video/video.less diff --git a/front/src/app/scene/video/video.component.ts b/front/src/app/scene/video/video.ts similarity index 91% rename from front/src/app/scene/video/video.component.ts rename to front/src/app/scene/video/video.ts index 561e484..0996ad2 100644 --- a/front/src/app/scene/video/video.component.ts +++ b/front/src/app/scene/video/video.ts @@ -8,16 +8,16 @@ import { Component, OnInit } from '@angular/core'; import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Location } from '@angular/common'; import { fadeInAnimation } from '../../_animations/index'; -import { HttpWrapperService } from '../../service/http-wrapper.service'; -import { VideoService } from '../../service/video.service'; -import { GroupService } from '../../service/group.service'; -import { SaisonService } from '../../service/saison.service'; -import { ArianeService } from '../../service/ariane.service'; +import { HttpWrapperService } from '../../service/http-wrapper'; +import { VideoService } from '../../service/video'; +import { GroupService } from '../../service/group'; +import { SaisonService } from '../../service/saison'; +import { ArianeService } from '../../service/ariane'; @Component({ selector: 'app-video', - templateUrl: './video.component.html', - styleUrls: ['./video.component.less'], + templateUrl: './video.html', + styleUrls: ['./video.less'], animations: [fadeInAnimation], host: { '[@fadeInAnimation]': '' } }) diff --git a/front/src/app/service/ariane.service.ts b/front/src/app/service/ariane.ts similarity index 95% rename from front/src/app/service/ariane.service.ts rename to front/src/app/service/ariane.ts index 2d5d80d..c2abc4b 100644 --- a/front/src/app/service/ariane.service.ts +++ b/front/src/app/service/ariane.ts @@ -8,11 +8,11 @@ import { Injectable, Output, EventEmitter } from '@angular/core' import { Router, ActivatedRoute, ParamMap } from '@angular/router'; -import { TypeService } from 'app/service/type.service'; -import { UniversService } from 'app/service/univers.service'; -import { GroupService } from 'app/service/group.service'; -import { SaisonService } from 'app/service/saison.service'; -import { VideoService } from 'app/service/video.service'; +import { TypeService } from 'app/service/type'; +import { UniversService } from 'app/service/univers'; +import { GroupService } from 'app/service/group'; +import { SaisonService } from 'app/service/saison'; +import { VideoService } from 'app/service/video'; export class InputOrders { public type_id: number = null; diff --git a/front/src/app/service/auth.service.ts b/front/src/app/service/auth.ts similarity index 100% rename from front/src/app/service/auth.service.ts rename to front/src/app/service/auth.ts diff --git a/front/src/app/service/bdd.service.ts b/front/src/app/service/bdd.ts similarity index 97% rename from front/src/app/service/bdd.service.ts rename to front/src/app/service/bdd.ts index 446ad9a..bbc973f 100644 --- a/front/src/app/service/bdd.service.ts +++ b/front/src/app/service/bdd.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpWrapperService } from 'app/service/http-wrapper.service'; +import { HttpWrapperService } from 'app/service/http-wrapper'; import { DataInterface } from 'app/service/dataInterface'; import { environment } from 'environments/environment'; diff --git a/front/src/app/service/cookies.service.ts b/front/src/app/service/cookies.ts similarity index 100% rename from front/src/app/service/cookies.service.ts rename to front/src/app/service/cookies.ts diff --git a/front/src/app/service/data.service.ts b/front/src/app/service/data.ts similarity index 91% rename from front/src/app/service/data.service.ts rename to front/src/app/service/data.ts index 95ef31c..652a985 100644 --- a/front/src/app/service/data.service.ts +++ b/front/src/app/service/data.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpWrapperService } from 'app/service/http-wrapper.service'; +import { HttpWrapperService } from 'app/service/http-wrapper'; import { DataInterface } from 'app/service/dataInterface'; import { environment } from 'environments/environment'; diff --git a/front/src/app/service/group.service.ts b/front/src/app/service/group.ts similarity index 96% rename from front/src/app/service/group.service.ts rename to front/src/app/service/group.ts index 9834dd2..33edc46 100644 --- a/front/src/app/service/group.service.ts +++ b/front/src/app/service/group.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { HttpWrapperService } from 'app/service/http-wrapper.service'; +import { HttpWrapperService } from 'app/service/http-wrapper'; import { DataInterface } from 'app/service/dataInterface'; -import { BddService } from 'app/service/bdd.service'; +import { BddService } from 'app/service/bdd'; import { environment } from 'environments/environment'; diff --git a/front/src/app/service/http-wrapper.service.ts b/front/src/app/service/http-wrapper.ts similarity index 100% rename from front/src/app/service/http-wrapper.service.ts rename to front/src/app/service/http-wrapper.ts diff --git a/front/src/app/service/modal.ts b/front/src/app/service/modal.ts deleted file mode 100644 index 8825604..0000000 --- a/front/src/app/service/modal.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable() -export class ModalService { - private modals: any[] = []; - - constructor() { - console.log("Start Modal Service"); - } - - add(_modal: any) { - // add modal to array of active modals - this.modals.push(_modal); - } - - remove(_id: string) { - // remove modal from array of active modals - //let modalToRemove = _.findWhere(this.modals, { id: id }); - //this.modals = _.without(this.modals, modalToRemove); - } - - open(_id: string) { - console.log("Try to open pop-in: '" + _id + "'"); - // open modal specified by id - for (let iii=0; iiifind it ..."); - this.modals[iii].open(); - return; - } - } - console.log(" ==> NOT found !!!!!"); - } - - close(_id: string) { - // close modal specified by id - for (let iii=0; iiifind it ..."); + this.popins[iii].open(); + return; + } + } + console.log(" ==> NOT found !!!!!"); + } + + close(_id: string) { + // close popin specified by id + for (let iii=0; iii