src/app/app-routing.module.ts

@@ -8,7 +8,14 @@ const routes: Routes = [
     loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
   },
 
- 
+  {
+    path: 'prompt-evento',
+    loadChildren: () => import('./prompt-evento/prompt-evento.module').then( m => m.PromptEventoPageModule)
+  },
+  {
+    path: 'perfil-discoteca',
+    loadChildren: () => import('./perfil-discoteca/perfil-discoteca.module').then( m => m.PerfilDiscotecaPageModule)
+  },
 ];
 @NgModule({
   imports: [

src/app/app.module.ts

@@ -8,10 +8,9 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { PerfilDiscotecaPage } from './perfil-discoteca/perfil-discoteca.page';
 
 @NgModule({
-  declarations: [AppComponent, PerfilDiscotecaPage],
+  declarations: [AppComponent],
   entryComponents: [],
   imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
   providers: [

src/app/perfil-discoteca/perfil-discoteca-routing.module.ts

@@ -1,17 +1,13 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule, ChildrenOutletContexts } from '@angular/router';
+import { Routes, RouterModule } from '@angular/router';
+
 import { PerfilDiscotecaPage } from './perfil-discoteca.page';
-import { PromptEventoPage} from '../prompt-evento/prompt-evento.page'
 
 const routes: Routes = [
   {
     path: '',
-    component: PerfilDiscotecaPage,
+    component: PerfilDiscotecaPage
-
+  }
-  },
-
-
- 
 ];
 
 @NgModule({

src/app/perfil-discoteca/perfil-discoteca.module.ts

@@ -1,22 +1,19 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+
 import { IonicModule } from '@ionic/angular';
+
 import { PerfilDiscotecaPageRoutingModule } from './perfil-discoteca-routing.module';
+
 import { PerfilDiscotecaPage } from './perfil-discoteca.page';
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
 
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    PerfilDiscotecaPageRoutingModule,
+    PerfilDiscotecaPageRoutingModule
-    ExploreContainerComponentModule,
-  ],
-
-  exports: [
-      PerfilDiscotecaPage
   ],
   declarations: [PerfilDiscotecaPage]
 })

src/app/perfil-discoteca/perfil-discoteca.page.html

@@ -1,8 +1,6 @@
-<ion-header [translucent]="true">
+<ion-header>
   <ion-toolbar>
-    <ion-title>
+    <ion-title>Mi Perfil</ion-title>
-      Mi Perfil
-    </ion-title>
   </ion-toolbar>
 </ion-header>
 
@@ -17,6 +15,7 @@
     <div class='fotoPerfil'>
       <ion-row>
         <ion-col>
+
           <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
           <div class="textoPie">{{nombre}}</div>
 

src/app/perfil-discoteca/perfil-discoteca.page.scss

@@ -1,65 +0,0 @@
-:root {--ion-background-color: #494949;
-    --ion-background-color-rgb: 73,73,73;
-    
-    --ion-text-color: #eeeeee;
-    --ion-text-color-rgb: 238,238,238;}
-    
-    *{
-      padding: 5px;
-      letter-spacing: 2px;
-    }
-    .titulo{
-      font: "arial";
-    
-    }
-    .fotoPerfil{
-        display: block;
-        text-align: end;
-        max-width: 800px;
-        max-height: auto;
-        margin: auto;
-    }
-    
-    .textoPie{
-      position: relative;
-      bottom: 40px;
-      right: 20px;
-      float: right;
-    }
-    
-    .addFoto{
-      position: relative;
-      float: left;
-    }
-    
-    .datosDisplay{
-    
-        float: left;
-        position: relative;
-        margin: auto;
-        
-    }
-    
-    .datosLabel{
-        color: grey;
-    }
-    
-    .galeria{
-      
-        display: block;
-        max-width: 300px;
-        max-height: auto;
-        margin: auto;
-    }
-    
-    .botonesHidden{
-        display: none;
-    }
-    
-    .botonesVisible{
-      display: none;
-    }
-    
-    ion-slides {
-      height: 100%;
-    }

src/app/perfil-discoteca/perfil-discoteca.page.ts

@@ -7,7 +7,6 @@ import { AlertController } from '@ionic/angular';
 import { ViewChild } from '@angular/core';
 import { Evento } from '../evento';
 import { Router } from '@angular/router';
-import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
 
 @Component({
   selector: 'app-perfil-discoteca',
@@ -161,7 +160,7 @@ export class PerfilDiscotecaPage implements OnInit {
 } 
 
 addEvento() {
-  this.router.navigate(['/tabs/tab1/prompt-evento']);
+  this.router.navigate(['prompt-evento']);
 }
 }
 

src/app/tab1/tab1-routing.module.ts

@@ -1,30 +1,13 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { Tab1Page } from './tab1.page';
-import { PerfilDiscotecaPage } from '../perfil-discoteca/perfil-discoteca.page'
-import { PromptEventoPage } from '../prompt-evento/prompt-evento.page'
 
 const routes: Routes = [
   {
     path: '',
-          redirectTo: 'perfil-discoteca',
+    component: Tab1Page,
-          pathMatch: 'full',
   },
 
-        {
-          path: 'perfil-discoteca',
-          component: PerfilDiscotecaPage
-        },
-            
-        {
-          path: 'prompt-evento',
-          component: PromptEventoPage
-        },
-        
-
-
-
-
 
 ];
 

src/app/tab1/tab1.module.ts

@@ -3,7 +3,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Tab1Page } from './tab1.page';
-import { PerfilDiscotecaPageModule} from '../perfil-discoteca/perfil-discoteca.module'
 import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
 
 import { Tab1PageRoutingModule } from './tab1-routing.module';
@@ -14,8 +13,7 @@ import { Tab1PageRoutingModule } from './tab1-routing.module';
     CommonModule,
     FormsModule,
     ExploreContainerComponentModule,
-    Tab1PageRoutingModule,
+    Tab1PageRoutingModule
-
   ],
   declarations: [Tab1Page]
 })

src/app/tab1/tab1.page.html

@@ -0,0 +1,92 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-title>
+      Mi Perfil
+    </ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title class="titulo" size="large">Mi Perfil</ion-title>
+    </ion-toolbar>
+  </ion-header>
+
+  <ion-grid>
+    <div class='fotoPerfil'>
+      <ion-row>
+        <ion-col>
+
+          <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
+          <div class="textoPie">{{nombre}}</div>
+
+          <div class="addFoto">
+            <ion-button [disabled]='editDisabled'>
+              <ion-icon name="image" slot="icon-only"></ion-icon>
+              <input type="file" (change)="loadImageFromDevice($event);cargarImagen()" id="file-input-perfil" accept="image/png, image/jpeg">
+            </ion-button>
+          </div>
+
+          <div>
+            <ion-button (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
+              <ion-icon name="create"></ion-icon>
+            </ion-button>
+            <div id="botonesHidden1" class="botonesHidden">
+              <ion-button (click)="saveEdit()" label="guardar" [disabled]='editDisabled'>
+              <ion-icon name="save"></ion-icon>
+            </ion-button>
+            <ion-button (click)="cancelEdit()" [disabled]='editDisabled'>
+              Cancelar
+            </ion-button></div>
+          </div>
+          
+
+
+        </ion-col>
+      </ion-row>
+    
+
+      <ion-row>
+        <ion-col>
+          <div id="cajaDatos" class='datosDisplay'>
+            <div class="datosLabel">Teléfono: </div>
+            <div [contentEditable]='editEnabled'>{{telefono}}</div>
+            <div class="datosLabel">Localización: </div>
+            <div [contentEditable]='editEnabled'>{{localizacion}}</div>
+          </div>
+        </ion-col>
+        <ion-col>
+          <div class="galeria">
+            <input type="file" (change)="loadImageFromDevice($event)" id="file-input-galeria" accept="image/png, image/jpeg">
+            <ion-slides (ionDrag)="onSlideChanged()">
+              <ion-slide *ngFor="let foto of galeriaFotos">
+                <div class="fotoGaleria"><img src="{{foto}}">
+                <ion-button (click)="borrarDeGaleria()">
+                  <ion-icon name="trash-outline"></ion-icon>
+                </ion-button>
+              </div>
+              </ion-slide>
+            </ion-slides>
+          </div>
+        </ion-col>
+      </ion-row>
+      
+      
+      <ion-row>
+          <ion-button (click)="addEvento()">
+            <ion-icon name="add-circle-outline">
+            </ion-icon>
+            Añadir evento
+          </ion-button>
+      </ion-row>
+      
+    </div>
+
+  
+
+
+
+  </ion-grid>
+
+</ion-content>

src/app/tab1/tab1.page.ts

@@ -2,13 +2,12 @@ import { Component, OnInit } from '@angular/core';
 import { NodeCompatibleEventEmitter } from 'rxjs/internal/observable/fromEvent';
 import { Tab1Service } from './tab1.service'
 import { Discoteca } from '../discoteca'
-import { PerfilDiscotecaPage } from '../perfil-discoteca/perfil-discoteca.page'
 import { IonSlides} from '@ionic/angular';
 import { AlertController } from '@ionic/angular';
 import { ViewChild } from '@angular/core';
 import { Evento } from '../evento';
 import { Router } from '@angular/router';
-import { from } from 'rxjs';
+import { PerfilDiscotecaPageModule } from '../perfil-discoteca/perfil-discoteca.module';
 
 @Component({
   selector: 'app-tab1',
@@ -18,18 +17,153 @@ import { from } from 'rxjs';
 
 
 export class Tab1Page implements OnInit {
- 
+  @ViewChild('IonSlides') slides: IonSlides;
+  nombre: string;
+  telefono: number;
+  localizacion: string;
+  fotoSrc: string;
+  fotoLoaded: string;
+  someURL: string;
+  editDisabled: string;
+  editEnabled: string;
+  galeriaFotos: string[];
+  galeriaFake: string[];
+  currentIndex: number;
+  eventos: Evento[];
+  alertCtrl: AlertController;
 
   constructor(private tab1Service: Tab1Service, private router: Router) {
 
   }
 
   ngOnInit(){
+    this.initValues();
+  }
+
+  initValues(): void{
+    this.getNombre();
+    this.getTelefono();
+    this.getLocalizacion();
+    this.getEventos();
+    this.editDisabled="true";
+    this.editEnabled="false";
+    this.fotoSrc = '../assets/barraca.jpg';
+    this.fotoLoaded = this.fotoSrc;
+    this.galeriaFotos = [];
 
   }
 
 
+  getNombre(): void{
+    this.nombre = this.tab1Service.getNombre();
+  }
 
+  getTelefono(): void{
+    this.telefono = this.tab1Service.getTelefono();
+  }
+
+  getLocalizacion(): void{
+    this.localizacion = this.tab1Service.getLocalizacion();
+  }
+
+  getEventos(): void{
+    this.eventos = this.tab1Service.getEventos();
+  }
+
+  cargarImagen(){
+      this.fotoSrc = this.someURL;
+  }
+
+  addGaleria(){
+     this.galeriaFotos.push(this.someURL); 
+     this.slides.update();
+
+
+
+  }
+
+  loadImageFromDevice(event): void{
+
+    const file = event.target.files[0];
+
+    let blobURL: string;
+  
+    const reader = new FileReader();
+  
+    reader.readAsDataURL(file);
+  
+    reader.onload = () => {
+
+      let blob: Blob = new Blob([new Uint8Array((reader.result as ArrayBuffer))]);
+      let blobURL = URL.createObjectURL(blob); 
+      this.someURL = reader.result as string;
+      if (event.target.id=="file-input-perfil")
+        this.cargarImagen();
+      else if (event.target.id=="file-input-galeria")
+        this.addGaleria();
+        
+    };
+  
+
+  };
+
+
+  enableEdit(){
+    this.editDisabled="false";
+    this.editEnabled="true";
+    let cajaDatos = document.getElementById("cajaDatos");
+    cajaDatos.style.background="white";
+    cajaDatos.style.color="black";
+    let botones = document.getElementById("botonesHidden1");
+    botones.style.display = "block";
+    botones = document.getElementById("botonesHidden2");
+    botones.style.display = "block";
+
+ 
+
+  }
+
+  disableEdit(){
+    this.editDisabled="true";
+    this.editEnabled="false";
+    let cajaDatos = document.getElementById("cajaDatos");
+    cajaDatos.style.background="inherit";
+    cajaDatos.style.color="inherit";
+    let botones = document.getElementById("botonesHidden1");
+    botones.style.display = "none";
+    botones = document.getElementById("botonesHidden2");
+    botones.style.display = "none";
+
+
+  }
+
+  saveEdit(){
+    this.fotoLoaded = this.fotoSrc;
+    this.disableEdit();
+    
+  }
+
+  cancelEdit(){
+    if(this.fotoLoaded)
+      this.fotoSrc = this.fotoLoaded;
+    this.disableEdit();}
+
+  borrarDeGaleria(){
+    this.galeriaFotos.splice(this.currentIndex, 1);
+
+  }
+
+  onSlideChanged() {
+    this.slides.getActiveIndex().then(index =>{
+        this.currentIndex = index;}
+    );
+    
+    this.slides.update();
+} 
+
+addEvento() {
+  this.router.navigate(['prompt-evento']);
+}
 }
 
 

src/app/tabs/tabs-routing.module.ts

@@ -23,9 +23,7 @@ const routes: Routes = [
         path: '',
         redirectTo: '/tabs/tab1',
         pathMatch: 'full'
-      },
+      }
-
-      
     ]
   },
   {