Merge branch 'Titohma-master'

angular.json

@@ -148,7 +148,8 @@
   "cli": {
     "schematicCollections": [
       "@ionic/angular-toolkit"
-    ]
+    ],
+    "analytics": false
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "les-sagas-mp3",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "author": "Les Sagas MP3",
   "homepage": "https://github.com/Les-Sagas-MP3",
   "scripts": {

src/app/app-routing.module.ts

@@ -7,6 +7,14 @@ const routes: Routes = [
     redirectTo: 'news',
     pathMatch: 'full'
   },
+  {
+    path: 'news',
+    loadChildren: () => import('./pages/news/list-news/list-news.module').then( m => m.ListNewsPageModule)
+  },
+  {
+    path: 'news/:id',
+    loadChildren: () => import('./pages/news/view-news/view-news.module').then( m => m.ViewNewsPageModule)
+  },
   {
     path: 'sagas',
     loadChildren: () => import('./pages/sagas/list-sagas/list-sagas.module').then(m => m.ListSagasPageModule)
@@ -16,41 +24,37 @@ const routes: Routes = [
     loadChildren: () => import('./pages/sagas/view-saga/view-saga.module').then(m => m.ViewSagaPageModule)
   },
   {
-    path: 'news',
-    loadChildren: () => import('./pages/news/list-news/list-news.module').then(m => m.ListNewsPageModule)
+    path: 'sagas/:id/edit',
+    loadChildren: () => import('./pages/sagas/edit-saga/edit-saga.module').then( m => m.EditSagaPageModule)
   },
   {
-    path: 'news/:id',
-    loadChildren: () => import('./pages/news/view-news/view-news.module').then(m => m.ViewNewsPageModule)
+    path: 'sagas/:sagaId/seasons/:seasonId',
+    loadChildren: () => import('./pages/episodes/list-episodes/list-episodes.module').then( m => m.ListEpisodesPageModule)
   },
   {
-    path: 'login',
-    loadChildren: () => import('./pages/login/login.module').then(m => m.LoginPageModule)
+    path: 'sagas/:sagaId/seasons/:seasonId/edit',
+    loadChildren: () => import('./pages/sagas/edit-season/edit-season.module').then( m => m.EditSeasonPageModule)
   },
   {
-    path: 'signup',
-    loadChildren: () => import('./pages/signup/signup.module').then(m => m.SignupPageModule)
+    path: 'sagas/:saga/episode/:episode',
+    loadChildren: () => import('./pages/episodes/play-episode/play-episode.module').then( m => m.PlayEpisodePageModule)
   },
   {
-    path: 'sync',
-    loadChildren: () => import('./pages/admin/sync/sync.module').then(m => m.SyncPageModule)
+    path: 'sagas/:saga/episode/:episode/edit',
+    loadChildren: () => import('./pages/episodes/edit-episode/edit-episode.module').then( m => m.EditEpisodePageModule)
   },
   {
-    path: 'sagas/:sagaId/seasons/:seasonId',
-    loadChildren: () => import('./pages/sagas/episodes/list-episodes/list-episodes.module').then(m => m.ListEpisodesPageModule)
+    path: 'login',
+    loadChildren: () => import('./pages/login/login.module').then(m => m.LoginPageModule)
   },
   {
-    path: 'sagas/:sagaId/seasons/:seasonId/edit',
-    loadChildren: () => import('./pages/sagas/edit-season/edit-season.module').then(m => m.EditSeasonPageModule)
+    path: 'signup',
+    loadChildren: () => import('./pages/signup/signup.module').then(m => m.SignupPageModule)
   },
   {
-    path: 'sagas/:saga/episode/:episode',
-    loadChildren: () => import('./pages/sagas/episodes/play-episode/play-episode.module').then(m => m.PlayEpisodePageModule)
+    path: 'sync',
+    loadChildren: () => import('./pages/admin/sync/sync.module').then(m => m.SyncPageModule)
   },
-  {
-    path: 'sagas/:saga/episode/:episode/edit',
-    loadChildren: () => import('./pages/sagas/episodes/edit-episode/edit-episode.module').then(m => m.EditEpisodePageModule)
-  }
 
 ];
 

src/app/entities/saga.ts

@@ -1,4 +1,4 @@
-import { SagaModel } from '../models/saga.model';
+import { SagaModel } from '../models/saga/saga.model';
 import { Author } from './author';
 import { Category } from './category';
 import { Season } from './season';

src/app/models/saga.model.ts → src/app/models/saga/saga.model.ts

@@ -1,4 +1,4 @@
-import { AuditModel } from './audit.model';
+import { AuditModel } from '../audit.model';
 
 export class SagaModel extends AuditModel {
 

src/app/pages/sagas/episodes/edit-episode/edit-episode.page.ts → src/app/pages/episodes/edit-episode/edit-episode.page.ts

@@ -108,6 +108,7 @@ export class EditEpisodePage implements OnInit {
               this.episodeService.update(episode)
                 .subscribe(data => {
                   console.debug(data);
+                  this.navCtrl.navigateForward("sagas/" + this.saga.id)
                   loading.dismiss();
                 }, error => {
                   console.error(error);
@@ -118,6 +119,7 @@ export class EditEpisodePage implements OnInit {
           this.episodeService.update(episode)
           .subscribe(data => {
             console.debug(data);
+            this.navCtrl.navigateForward("sagas/" + this.saga.id)
             loading.dismiss();
           }, error => {
             console.error(error);

src/app/pages/sagas/episodes/list-episodes/list-episodes.page.html → src/app/pages/episodes/list-episodes/list-episodes.page.html

@@ -21,5 +21,10 @@
         <ion-icon name="play-outline"></ion-icon> {{ episode.displayedNumber }} - {{ episode.title }}
       </ion-label>
     </ion-item>
+    <ion-item button="true" (click)="addEpisode()" *ngIf="authService.currentTokenValue">
+        <ion-label>
+            < Ajouter un épisode >
+        </ion-label>
+    </ion-item>
   </ion-list>
 </ion-content>

src/app/pages/sagas/episodes/list-episodes/list-episodes.page.ts → src/app/pages/episodes/list-episodes/list-episodes.page.ts

@@ -4,6 +4,7 @@ import { ActionSheetController, LoadingController } from '@ionic/angular';
 import { Episode } from 'src/app/entities/episode';
 import { Saga } from 'src/app/entities/saga';
 import { Season } from 'src/app/entities/season';
+import { EpisodeModel } from 'src/app/models/episode.model';
 import { AuthService } from 'src/app/services/auth/auth.service';
 import { ConfigService } from 'src/app/services/config/config.service';
 import { EpisodesService } from 'src/app/services/episodes/episodes.service';
@@ -45,12 +46,24 @@ export class ListEpisodesPage implements OnInit {
               this.season = Season.fromModel(data);
               this.episodeService.getAllByIds(this.season.episodesRef)
                 .subscribe(data => {
-                  this.season.episodes = Episode.fromModels(data);
+                  this.season.episodes = Episode.fromModels(data).sort((first, second) => 0 - (first.number > second.number ? -1 : 1));
                   loading.dismiss();
                 })
             });
         });
     });
   }
 
+  addEpisode() {
+    var episode = new EpisodeModel();
+    if(this.season.episodes.length > 0) {
+      episode.number = this.season.episodes[this.season.episodes.length - 1].number + 1;
+    }
+    episode.seasonRef = this.season.id;
+    this.episodeService.create(episode)
+      .subscribe(data => {
+        this.ngOnInit();     
+      });
+  }
+
 }

src/app/pages/sagas/edit-saga/edit-saga-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EditSagaPage } from './edit-saga.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EditSagaPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EditSagaPageRoutingModule {}

src/app/pages/sagas/edit-saga/edit-saga.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EditSagaPageRoutingModule } from './edit-saga-routing.module';
+
+import { EditSagaPage } from './edit-saga.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IonicModule,
+    EditSagaPageRoutingModule
+  ],
+  declarations: [EditSagaPage]
+})
+export class EditSagaPageModule {}

src/app/pages/sagas/edit-saga/edit-saga.page.html

@@ -0,0 +1,64 @@
+<ion-header [translucent]="true">
+  <ion-toolbar color="primary">
+    <ion-buttons slot="start">
+      <ion-menu-button></ion-menu-button>
+      <ion-back-button></ion-back-button>
+    </ion-buttons>
+    <ion-buttons slot="primary">
+      <ion-button routerDirection="backward" *ngIf="authService.currentTokenValue" type="submit" (click)="save()">
+        <ion-icon name="save"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>{{ saga.title }}</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <form [formGroup]="sagaForm" novalidate>
+    <ion-list lines="full" class="ion-no-margin">
+      <ion-list-header lines="full">
+        <ion-label>Informations</ion-label>
+      </ion-list-header>
+      <ion-item>
+        <ion-label position="floating">Titre</ion-label>
+        <ion-input type="string" value="{{ saga.title }}" formControlName="title"></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">URL</ion-label>
+        <ion-input value="{{ saga.url }}" formControlName="url"></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">URL Wiki</ion-label>
+        <ion-input value="{{ saga.urlWiki }}" formControlName="urlWiki"></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Etat</ion-label>
+        <ion-input value="{{ saga.status }}" formControlName="status"></ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Synopsis</ion-label>
+        <ion-textarea value="{{ saga.synopsis }}" formControlName="synopsis"></ion-textarea>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Origine</ion-label>
+        <ion-textarea value="{{ saga.origin }}" formControlName="origin"></ion-textarea>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Génèse</ion-label>
+        <ion-textarea value="{{ saga.genese }}" formControlName="genese"></ion-textarea>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Récompenses</ion-label>
+        <ion-textarea value="{{ saga.awards }}" formControlName="awards"></ion-textarea>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Bannière</ion-label>
+        <ion-input class="fileUpload" type="file" formControlName="banner" (change)="onBannerChange($event)">{{ bannerSource }}</ion-input>
+      </ion-item>
+      <ion-item>
+        <ion-label position="floating">Pochette</ion-label>
+        <ion-input class="fileUpload" type="file" formControlName="cover" (change)="onCoverChange($event)">{{ coverSource }}</ion-input>
+      </ion-item>
+    </ion-list>
+  </form>
+</ion-content>

src/app/pages/sagas/edit-saga/edit-saga.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EditSagaPage } from './edit-saga.page';
+
+describe('EditSagaPage', () => {
+  let component: EditSagaPage;
+  let fixture: ComponentFixture<EditSagaPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EditSagaPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EditSagaPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});