src/app/app-routing.module.ts

@@ -41,19 +41,10 @@ const routes: Routes = [
   {
     path: 'view-evento-cliente',
     loadChildren: () => import('./view-evento-cliente/view-evento-cliente.module').then( m => m.ViewEventoClientePageModule)
-  },
+  },
  {
-  {
     path: 'view-discoteca-cliente',
     loadChildren: () => import('./view-discoteca-cliente/view-discoteca-cliente.module').then( m => m.ViewDiscotecaClientePageModule)
   },
-  {
-    path: 'reservamodal',
-    loadChildren: () => import('./reservamodal/reservamodal.module').then( m => m.ReservamodalPageModule)
-  },
-  {
-    path: 'perfil-usuario',
-    loadChildren: () => import('./perfil-usuario/perfil-usuario.module').then( m => m.PerfilUsuarioPageModule)
-  },
 
 
 

src/app/feed/feed.page.html

@@ -6,10 +6,6 @@
 
 <ion-content>
   <ion-grid>
-  <ion-row class="searchbar">
-    <ion-input class="text" id="filtro" aria-placeholder="evento o discoteca"></ion-input>
-    <ion-button (click)="filtrarEventos()"><ion-icon name="search-outline"></ion-icon></ion-button>
-  </ion-row>
   <ion-row>
     <ion-col size="12">
     <div *ngIf="eventos.length>0" class="eventos">

src/app/feed/feed.page.scss

@@ -1,3 +0,0 @@
-.searchbar{
-    float: right;
-}

src/app/feed/feed.page.ts

@@ -5,7 +5,6 @@ import { DiscotecaI } from '../interfaces/discoteca-i';
 import { ApiService } from '../services/api.service';
 import { FeedService } from '../services/feed.service';
 import { Tab1Service } from '../tab1/tab1.service';
-import { EventListenerFocusTrapInertStrategy } from '@angular/cdk/a11y';
 
 @Component({
   selector: 'app-feed',
@@ -17,12 +16,9 @@ export class FeedPage implements OnInit {
   eventos: Eventoi[];
   discotecas: DiscotecaI[];
   idsDiscoteca: number[];
-  mostrarTodos: boolean;
-
   constructor(private feedService:FeedService, private tab1Service: Tab1Service, private router:Router, private apiService: ApiService ) { }
 
   ngOnInit() {
-    this.mostrarTodos = true;
     this.eventos = this.feedService.eventos;
     this.idsDiscoteca = [];
     this.discotecas=[];
@@ -58,31 +54,6 @@ export class FeedPage implements OnInit {
     )
   }
 
-  filtrarEventos(){
-    var filtro = (<HTMLInputElement>document.getElementById("filtro")).value;
-    let eventoSinFiltrar = this.feedService.eventos;
-    this.eventos = [];
-    eventoSinFiltrar.forEach(evento => {
-        if (this.cumpleFiltro(evento, filtro)){
-          this.eventos.push(evento);
-        }
-    })
-    
-  }
-
-  cumpleFiltro(evento: Eventoi, filtro: string){
-
-    if(evento.nombre.toLowerCase().includes(filtro.toLowerCase())){
-      return true;
-    }
-
-    if (this.discotecas[this.idsDiscoteca.indexOf(evento.discotecaID)]
-    .nombre.toLowerCase().includes(filtro.toLowerCase())){
-      return true;
-    }
-
-    else return false;
-  }
 
 
 }

src/app/interfaces/codigo.ts

@@ -1,5 +0,0 @@
-export interface Codigo {
-    UserID: number,
-    codigo: string, 
-    numReservas: number
-}

src/app/interfaces/reservai.ts

@@ -1,8 +0,0 @@
-export interface Reservai {
-    UserID: number,
-    EventoID: number,
-    codigoDescuento: string,
-    codigoUnico: string,
-    codigoUnicoID: number,
-    descuentoPorciento: number
-}

src/app/interfaces/user.ts

@@ -1,5 +1,5 @@
 export interface User {
-  userID: number;
+  id: number;
   discotecaID: number;
   userType: number; 
   username: string;

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

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

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

@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { PerfilUsuarioPageRoutingModule } from './perfil-usuario-routing.module';
-
-import { PerfilUsuarioPage } from './perfil-usuario.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    PerfilUsuarioPageRoutingModule
-  ],
-  declarations: [PerfilUsuarioPage]
-})
-export class PerfilUsuarioPageModule {}

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

@@ -1,14 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Mi perfil</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <div *ngIf="codigos?.length>0">
-    <div *ngFor="let codigo of codigos">
-      Tu código: {{codigo.codigo}}
-    </div>
-  </div>
-
-</ion-content>

src/app/perfil-usuario/perfil-usuario.page.spec.ts

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

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

@@ -1,25 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Codigo } from '../interfaces/codigo';
-import { ApiService } from '../services/api.service';
-import { LoginService } from '../services/login.service';
-
-@Component({
-  selector: 'app-perfil-usuario',
-  templateUrl: './perfil-usuario.page.html',
-  styleUrls: ['./perfil-usuario.page.scss'],
-})
-export class PerfilUsuarioPage implements OnInit {
-
-  codigos: Codigo[];
-
-  constructor(private apiService: ApiService, private loginService: LoginService) { }
-
-  ngOnInit() {
-    this.apiService.getCodigosUsuario(this.loginService.user)
-    .subscribe(codigos => {
-      this.codigos = codigos;
-      console.log(this.codigos);
-    })
-  }
-
-}

src/app/prompt-evento/prompt-evento.page.ts

@@ -3,7 +3,8 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Tab1Service } from '../tab1/tab1.service';
 import { Router } from '@angular/router';
 import { Eventoi } from '../interfaces/eventoi';
-
+import { DatePipe } from '@angular/common'
+import { ViewEventoPageRoutingModule } from '../view-evento/view-evento-routing.module';
 
 @Component({
   selector: 'app-prompt-evento',
@@ -11,8 +12,6 @@ import { Eventoi } from '../interfaces/eventoi';
   styleUrls: ['./prompt-evento.page.scss'],
 })
 export class PromptEventoPage implements OnInit{
-
-  evento: Eventoi;
   submitted = false;
   editarEvento = false;
   eventoForm = new FormGroup({
@@ -38,14 +37,9 @@ export class PromptEventoPage implements OnInit{
   onSubmit(){
     this.submitted = true;
     if (this.eventoForm.valid){
-      if (this.tab1Service.editarEvento == true){
+      this.asignarEvento(this.tab1Service.eventos[this.tab1Service.eventoIndex]);
-        this.asignarEvento(this.tab1Service.eventos[this.tab1Service.eventoIndex])}
-      else{
-        this.asignarEvento(this.initEventoVacio());
-      };
     }
   }
-
   asignarEvento(evento: Eventoi){
     evento.nombre = this.eventoForm.get('nombre').value;
     evento.descripcion = this.eventoForm.get('descripcion').value;
@@ -56,6 +50,7 @@ export class PromptEventoPage implements OnInit{
     if (!this.tab1Service.editarEvento){
       hora = hora.split("T")[1];}
     hora = hora.split(":")[0]+(":")+hora.split(":")[1];
+    console.log(hora);
     evento.hora = hora;
     evento.precio1 = this.eventoForm.get('precio1').value;
     evento.precio2 = this.eventoForm.get('precio2').value;
@@ -90,19 +85,5 @@ export class PromptEventoPage implements OnInit{
     return this.eventoForm.get('descripcion');
   }
 
-  initEventoVacio(): Eventoi{
-    let evento = {
-      id: 0, 
-      discotecaID: this.tab1Service.discotecaI.discotecaID, 
-      nombre: this.tab1Service.discotecaI.localizacion, 
-      localizacion: '', 
-      fecha: null,
-      hora: null,
-      precio1: 0,
-      precio2: 0,
-      descripcion: ''
-    }
-    return evento;
-  }
 
 }

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

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

src/app/reservamodal/reservamodal.module.ts

@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { ReservamodalPageRoutingModule } from './reservamodal-routing.module';
-
-import { ReservamodalPage } from './reservamodal.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    ReservamodalPageRoutingModule
-  ],
-  declarations: [ReservamodalPage]
-})
-export class ReservamodalPageModule {}

src/app/reservamodal/reservamodal.page.html

@@ -1,12 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>reservamodal</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  ¡Reserva realizada! 
-  Tu código de reserva: 
-{{codigoReserva}}
-Descuento del {{descuento}} %
-</ion-content>

src/app/reservamodal/reservamodal.page.spec.ts

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

src/app/reservamodal/reservamodal.page.ts

@@ -1,23 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { NavParams } from '@ionic/angular';
-
-@Component({
-  selector: 'app-reservamodal',
-  templateUrl: './reservamodal.page.html',
-  styleUrls: ['./reservamodal.page.scss'],
-})
-export class ReservamodalPage implements OnInit {
-
-  codigoReserva: string;
-  descuento: number;
-  constructor(private navParams: NavParams) { }
-
-  ngOnInit() {
-    this.codigoReserva = this.navParams.get('codigo');
-    this.descuento = this.navParams.get('descuento');
-    if(!this.descuento){
-      this.descuento = 0;
-    }
-  }
-
-}

src/app/services/api.service.ts

@@ -3,12 +3,10 @@ import { HttpClient } from '@angular/common/http';
 import { Observable, throwError, BehaviorSubject } from 'rxjs';
 import { catchError, retry, map, tap } from 'rxjs/operators';
 import { User } from '../interfaces/user';
-import { Codigo } from '../interfaces/codigo'
 import { Discoteca } from '../discoteca';
 import { UserLogin } from '../interfaces/user-login';
 import { DiscotecaI } from '../interfaces/discoteca-i';
 import { Eventoi } from '../interfaces/eventoi';
-import { Reservai } from '../interfaces/reservai';
 
 
 @Injectable({
@@ -53,14 +51,6 @@ export class ApiService {
 
   }
 
-  creaReserva(reserva: Reservai): Observable<Reservai>{
-      return this.http.post<Reservai>(this.baseUrl+"/reserva", reserva);
-  }
-
-  getCodigosUsuario(user: User){
-      return this.http.post<Codigo[]>(this.baseUrl+"/codigosUsuario", user);
-  }
-
 
 
 

src/app/services/codigoreserva.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { CodigoreservaService } from './codigoreserva.service';
-
-describe('CodigoreservaService', () => {
-  let service: CodigoreservaService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(CodigoreservaService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/services/codigoreserva.service.ts

@@ -1,27 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class CodigoreservaService {
-
-  codigo: string;
-  length: number;
-
-  constructor() {
-    
-   }
-
-  generarAleatorio(){
-    this.length = 7;
-    var result = [];
-    var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    var charactersLength = characters.length;
-    for ( var i = 0; i < this.length; i++ ) {
-      result.push(characters.charAt(Math.floor(Math.random() * 
-    charactersLength)));
-   }
-   return result.join("");
-}
-
-}

src/app/services/login.service.ts

@@ -17,7 +17,7 @@ export class LoginService {
 
   constructor(private apiService: ApiService, private router: Router, private tab1service: Tab1Service, private feedService: FeedService) {
     this.user = {
-      userID: 0,
+      id: 0,
       discotecaID: 0,
       userType: 0,
       username: '',

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

@@ -1,12 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { PerfilUsuarioPage } from '../perfil-usuario/perfil-usuario.page';
 import { Tab3Page } from './tab3.page';
 
 const routes: Routes = [
   {
     path: '',
-    component: PerfilUsuarioPage,
+    component: Tab3Page,
   }
 ];
 

src/app/tabs-user/tabs-user.page.html

@@ -8,7 +8,7 @@
 
     <ion-tab-button tab="tab3">
       <ion-icon name="accessibility-outline"></ion-icon>
-      <ion-label>Mi Perfil</ion-label>
+      <ion-label>Me</ion-label>
     </ion-tab-button>
 
 

src/app/view-discoteca-cliente/view-discoteca-cliente.page.ts

@@ -16,7 +16,6 @@ export class ViewDiscotecaClientePage implements OnInit {
   constructor(private feedService: FeedService) { }
 
   ngOnInit() {
-    this.eventos = [];
     this.discoteca = this.feedService.discotecaEvento;
     this.feedService.eventos.forEach(evento => {
       if (this.discoteca.discotecaID == evento.discotecaID){

src/app/view-evento-cliente/view-evento-cliente.page.html

@@ -26,14 +26,6 @@
             <a [routerLink]="['/tabsUser/tab2/view-discoteca-cliente']">{{discoteca?.nombre}}</a>
           </div>
         </ion-row>
-        <ion-row>
-          <ion-button (click)="openReserva()">
-            Reserva
-          </ion-button>
-        </ion-row>
-        <ion-row>
-          <span>Código de descuento: </span><input type="text" id="codigoDescuento">
-        </ion-row>
       </div>
   </ion-grid>
 </ion-content>

src/app/view-evento-cliente/view-evento-cliente.page.ts

@@ -1,14 +1,7 @@
-import { stringify } from '@angular/compiler/src/util';
 import { Component, OnInit } from '@angular/core';
-import { ModalController } from '@ionic/angular';
 import { DiscotecaI } from '../interfaces/discoteca-i';
 import { Eventoi } from '../interfaces/eventoi';
-import { Reservai } from '../interfaces/reservai';
-import { ReservamodalPage } from '../reservamodal/reservamodal.page';
-import { ApiService } from '../services/api.service';
-import { CodigoreservaService } from '../services/codigoreserva.service';
 import { FeedService } from '../services/feed.service';
-import { LoginService } from '../services/login.service';
 
 @Component({
   selector: 'app-view-evento-cliente',
@@ -19,61 +12,11 @@ export class ViewEventoClientePage implements OnInit {
 
   evento: Eventoi;
   discoteca: DiscotecaI;
-  reserva: Reservai;
+  constructor(private feedService: FeedService) { }
-  codigoReserva: string;
-  reservaRealizada: boolean;
-
-  constructor(private feedService: FeedService, private modalController: ModalController, 
-    private codigoReservaService: CodigoreservaService, private loginService: LoginService, private apiService: ApiService) { }
 
   ngOnInit() {
-    this.reservaRealizada = false;
     this.evento = this.feedService.getEventoByIndex(this.feedService.eventoIndex);
     this.discoteca = this.feedService.discotecaEvento;
   }
 
-  generarCodigo(){
-    return stringify(this.codigoReservaService.generarAleatorio());
-  }
-
-  initReserva(){
-    this.reserva = {
-      UserID: this.loginService.user.userID,
-      EventoID: this.evento.id,
-      codigoDescuento: null,
-      codigoUnico: '',
-      codigoUnicoID: null,
-      descuentoPorciento: null
-    }
-  }
-
-  openReserva(){
-    this.initReserva();
-    this.reserva.codigoDescuento =  (<HTMLInputElement>document.getElementById("codigoDescuento")).value;
-    this.reserva.codigoUnico = this.generarCodigo();
-    this.creaReserva(this.reserva);
-  }
-
-  creaReserva(reserva){
-    this.apiService.creaReserva(reserva)
-    .subscribe(
-      data => {
-        console.log(data);
-        this.reserva = data;
-        this.reservaRealizada = true;
-        this.modalController.create({
-          component: ReservamodalPage,
-          componentProps : {
-            codigo: this.reserva.codigoUnico,
-            descuento: this.reserva.descuentoPorciento
-          }
-  
-        }).then(modal => modal.present());
-      },
-      error => {
-        console.log(error);
-      }
-    )
-  }
-
 }