package-lock.json

@@ -358,31 +358,6 @@
         }
       }
     },
-    "@angular/animations": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.1.tgz",
-      "integrity": "sha512-U2gtMaiVfTNMn0FPpSDTgOgtYc45QUnQcc2Po40rCmgH7BGyJAOgmaXY9uv319Jjl+vNrX+bbXaZix73Zpjfyg==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "@angular/cdk": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-11.2.1.tgz",
-      "integrity": "sha512-d+ERvvWqGykBm5ooWG8TmMjL6q6aOpUd13ha1sx960EfKJqNyideYUfPMp6xprTyxmUIUZ/G9AQ/pxnzrLGnsA==",
-      "requires": {
-        "parse5": "^5.0.0",
-        "tslib": "^2.0.0"
-      },
-      "dependencies": {
-        "parse5": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-          "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
-          "optional": true
-        }
-      }
-    },
     "@angular/cli": {
       "version": "10.0.8",
       "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz",
@@ -857,14 +832,6 @@
       "integrity": "sha512-QQLYUjD0T6u2hLNYXUEUbupAGsz5egmhCAckaQojvXCe3SLL/hQsrK4odrNuspy7TvMB0H5ZNEHGlF6m/WLZ3g==",
       "dev": true
     },
-    "@angular/material": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-11.2.1.tgz",
-      "integrity": "sha512-unHC8W+GcZSNRNSZ4l3ABdbezf6PIUtShx5MMG6HXgieqlkEgkU0W0BAeGvO/61vl6yEebizMYD/+5yqM9lUlw==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
     "@angular/platform-browser": {
       "version": "10.0.14",
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-10.0.14.tgz",

package.json

@@ -13,12 +13,9 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^11.2.1",
-    "@angular/cdk": "^11.2.1",
     "@angular/common": "~10.0.0",
     "@angular/core": "~10.0.0",
     "@angular/forms": "~10.0.0",
-    "@angular/material": "^11.2.1",
     "@angular/platform-browser": "~10.0.0",
     "@angular/platform-browser-dynamic": "~10.0.0",
     "@angular/router": "~10.0.0",

src/app/app-routing.module.ts

@@ -13,10 +13,6 @@ const routes: Routes = [
     path: 'tabs',
     loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
   },
-  {
-    path: 'tabsUser',
-    loadChildren: () => import('./tabs-user/tabs-user.module').then(m => m.TabsUserPageModule)
-  },
   {
     path: 'view-evento',
     loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule)
@@ -30,24 +26,6 @@ const routes: Routes = [
     redirectTo: 'login',
     pathMatch: 'full'
   },
-  {
-    path: 'tabs-user',
-    loadChildren: () => import('./tabs-user/tabs-user.module').then( m => m.TabsUserPageModule)
-  },
-  {
-    path: 'feed',
-    loadChildren: () => import('./feed/feed.module').then( m => m.FeedPageModule)
-  },
-  {
-    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)
-  },
-
-
-
 
 
 

src/app/app.module.ts

@@ -11,17 +11,12 @@ import { AppComponent } from './app.component';
 import { PerfilDiscotecaPage } from './perfil-discoteca/perfil-discoteca.page';
 import { PromptEventoPage} from './prompt-evento/prompt-evento.page'
 import { GaleriamodalPageModule } from './galeriamodal/galeriamodal.module';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatCardModule } from '@angular/material/card';
 import { LoginPage } from './login/login.page';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { MatIconModule } from '@angular/material/icon';
-
 
 @NgModule({
   declarations: [AppComponent, PerfilDiscotecaPage, PromptEventoPage, LoginPage],
   entryComponents: [],
-  imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule, MatMenuModule, BrowserAnimationsModule, MatIconModule, MatCardModule],
+  imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule, GaleriamodalPageModule],
   providers: [
     StatusBar,
     SplashScreen,

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

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

src/app/feed/feed.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 { FeedPageRoutingModule } from './feed-routing.module';
-
-import { FeedPage } from './feed.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    FeedPageRoutingModule
-  ],
-  declarations: [FeedPage]
-})
-export class FeedPageModule {}

src/app/feed/feed.page.html

@@ -1,35 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>Eventos Próximos</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-grid>
-  <ion-row>
-    <ion-col size="12">
-    <div *ngIf="eventos.length>0" class="eventos">
-      <ion-list>
-          <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
-          <div class="evento">
-            <div class="eventoHeader">
-            {{evento.nombre}} · 
-            <ion-icon name="calendar-outline"></ion-icon>
-            {{evento.fecha}} · 
-            <ion-icon name="cash-outline"></ion-icon>
-            {{evento.precio1}},{{evento.precio2}}
-            </div>
-            <div class="eventoDesc">
-            {{evento.descripcion}}
-            </div>
-            <div class="discotecaEvento">
-              {{discotecas[idsDiscoteca.indexOf(evento.discotecaID)]?.nombre}}
-            </div>
-          </div>
-          </ion-item>
-      </ion-list>
-    </div>
-  </ion-col>
-  </ion-row>
-</ion-grid>
-</ion-content>

src/app/feed/feed.page.spec.ts

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

src/app/feed/feed.page.ts

@@ -1,59 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { Eventoi } from '../interfaces/eventoi';
-import { DiscotecaI } from '../interfaces/discoteca-i';
-import { ApiService } from '../services/api.service';
-import { FeedService } from '../services/feed.service';
-import { Tab1Service } from '../tab1/tab1.service';
-
-@Component({
-  selector: 'app-feed',
-  templateUrl: './feed.page.html',
-  styleUrls: ['./feed.page.scss'],
-})
-export class FeedPage implements OnInit {
-
-  eventos: Eventoi[];
-  discotecas: DiscotecaI[];
-  idsDiscoteca: number[];
-  constructor(private feedService:FeedService, private tab1Service: Tab1Service, private router:Router, private apiService: ApiService ) { }
-
-  ngOnInit() {
-    this.eventos = this.feedService.eventos;
-    this.idsDiscoteca = [];
-    this.discotecas=[];
-    this.getDiscotecasDistintas();
-  }
-
-  mostrarEvento(evento: Eventoi){
-
-    this.feedService.eventoIndex = this.eventos.indexOf(evento);
-    let discotecaDelEvento: DiscotecaI = this.discotecas[this.idsDiscoteca.indexOf(evento.discotecaID)];
-    this.feedService.discotecaEvento = discotecaDelEvento;
-    this.router.navigate(['/tabsUser/tab2/view-evento-cliente']);
-
-  }
-
-  getDiscotecasDistintas(){
-    this.eventos.forEach(
-      evento => {
-         if(!(this.idsDiscoteca.find(id => evento.discotecaID==id))){
-            this.idsDiscoteca.push(evento.discotecaID);
-        }
-      }
-    )
-
-    this.idsDiscoteca.forEach(
-      idDiscoteca => {
-        this.apiService.getUserDiscoteca(idDiscoteca)
-        .subscribe(discoteca => {
-          console.log(discoteca[0]);
-          this.discotecas.push(discoteca[0]);
-        })
-      }
-    )
-  }
-
-
-
-}

src/app/interfaces/eventoi.ts

@@ -6,7 +6,7 @@ export interface Eventoi {
     nombre: string,
     localizacion: string, 
     fecha: Date, 
-    hora: Date,
+    hora: Time,
     descripcion: string,
     precio1: number,
     precio2: number,

src/app/login/login.page.html

@@ -6,7 +6,7 @@
 
 <ion-content>
   <span>Usuario: </span><input type="text" id="username">
-  <span>Contraseña: </span><input type="password" id="password">
+  <span>Contraseña: </span><input type="text" id="password">
   <ion-button (click)="login()">
     Login
   </ion-button>

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

@@ -8,52 +8,38 @@
 
 <ion-content [fullscreen]="true">
 
-    <div class='main'>
+
+  
+    <div class='fotoPerfil'>
       <ion-grid>
       <ion-row>
-      <div class='fotoPerfil'>
+        <ion-col>
           <ion-img class="fotoPerfil" width="100%" height="100%" [src]='fotoSrc' alt='barraquinha'></ion-img>
           <div class="textoPie">{{nombre}}</div>
-      </div>
-      </ion-row>
 
-      <ion-row>
+          <div class="addFoto">
-      <div class="menuBotones">
+            <ion-button [disabled]='editDisabled'>
-
-        <button mat-icon-button [matMenuTriggerFor]="menu">
-          <ion-icon name="settings" class="settingsIcon"></ion-icon>
-        </button>
-        
-        <mat-menu #menu="matMenu" xPositon="after" yPosition="above"> 
-        <button mat-menu-item>
               <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">
-        </button>
+            </ion-button>
+          </div>
 
-
+          <div>
-        <button mat-menu-item (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
+            <ion-button (click)="enableEdit()" label="editar" [disabled]='editEnabled'>
               <ion-icon name="create"></ion-icon>
-        </button>
+            </ion-button>
-
-
-        <button mat-menu-item (click)="addEvento()">
-          <ion-icon name="add-circle-outline">
-          </ion-icon>
-          Añadir evento
-        </button>
-      </mat-menu>
-      </div>
-    </ion-row>
-
-      <ion-row>
             <div id="botonesHidden1" class="botonesHidden">
-          <button (click)="saveEdit()" label="guardar" [disabled]='editDisabled' id="saveButton">
+              <ion-button (click)="saveEdit()" label="guardar" [disabled]='editDisabled'>
               <ion-icon name="save"></ion-icon>
-            </button>
+            </ion-button>
-            <button (click)="cancelEdit()" [disabled]='editDisabled' id="cancelButton">
+            <ion-button (click)="cancelEdit()" [disabled]='editDisabled'>
               Cancelar
-            </button>
+            </ion-button></div>
           </div>
+          
+
+
+        </ion-col>
       </ion-row>
     
 
@@ -66,24 +52,10 @@
             <div [contentEditable]='editEnabled'>{{localizacion}}</div>
           </div>
         </ion-col>
-        <ion-col>
-          <div>
-            <mat-card>
-              <mat-card-header>
-                Descripción
-              </mat-card-header>
-              <mat-card-content>
-                {{descripcion}}
-              </mat-card-content>
-            </mat-card>
-          </div>
-        </ion-col>
-      </ion-row>
 
-      <ion-row>
+        <ion-col>
           <div class="galeria">
             Galería de Fotos
-
             <input type="file" (change)="loadImageFromDevice($event)" id="file-input-galeria" accept="image/png, image/jpeg">
             <ion-slides (ionDrag)="onSlideChanged()" [options]="sliderOpts">
               <ion-slide *ngFor="let foto of galeriaFotos">
@@ -97,10 +69,19 @@
               </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>
 
       <ion-row>
-        <ion-col size="12">
         <div *ngIf="eventos.length>0" class="eventos">
           <ion-list>
               <ion-item *ngFor="let evento of eventos" button (click)="mostrarEvento(evento)">
@@ -120,13 +101,14 @@
               </ion-item>
           </ion-list>
         </div>
-      </ion-col>
-      </ion-row>
-
-      <ion-row>
-      
       </ion-row>
     </ion-grid>  
     </div>
 
+  
+
+
+
+
+
 </ion-content>

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

@@ -6,20 +6,16 @@
   }
     
     *{
-      padding: 10px;
+      padding: 5px;
       display: block;
-    }
-    
-    .main{
-      max-width: 800px;
-      max-height: auto;
       margin: auto;
-      text-align: justify;
     }
     
     .fotoPerfil{
         text-align: end;
-
+        max-width: 800px;
+        max-height: auto;
+        margin: auto;
     }
     
     .textoPie{
@@ -39,8 +35,6 @@
       float: left;
       position: relative;
       margin: auto;
-      text-align: right;
-      padding-right: 50px;
         
     }
     
@@ -49,14 +43,15 @@
     }
     
     .galeria{
-        text-align: center;
+      
-        padding: 30px;
+        display: block;
+        max-width: 300px;
+        max-height: auto;
         margin: auto;
     }
     
     .botonesHidden{
         display: none;
-        padding: none;
     }
     
     .botonesVisible{
@@ -64,21 +59,14 @@
     }
 
     .eventos{
-      text-align: justify;
+      display:block;
-    }
-
-    .evento{
-      max-width:fit-content;
     }
 
     .evento:hover{
       background-color: rgb(97, 97, 97);
     }
-
     .eventoHeader{
       font-weight: bold;
-      float: left;
-
     }
 
     .eventoDesc{
@@ -88,26 +76,3 @@
     ion-slides {
       height: 200px;
     }
-
-    mat-card-header{
-      text-align: right;
-      font-weight: bold;
-    }
-
-
-    button{
-      background-color: transparent;
-    }
-
-    .settingsIcon{
-      font-size: large;
-      background-color: white;
-    }
-
-    .menuBotones{
-      position: relative;
-      float: left;
-      bottom: 60px;
-      left: 20px;
-      
-    }

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

@@ -33,6 +33,7 @@ export class PerfilDiscotecaPage implements OnInit {
   sliderOpts = {
       slidesPerView: 1.5,
       centeredSlides: true,
+      spaceBetween: 20,
   };
 
   constructor(private tab1Service: Tab1Service, private router: Router, private modalController: ModalController) {
@@ -48,7 +49,6 @@ export class PerfilDiscotecaPage implements OnInit {
     this.getTelefono();
     this.getLocalizacion();
     this.getEventos();
-    this.getDescripcion();
     this.editDisabled="true";
     this.editEnabled="false";
     this.fotoSrc = '../assets/img/barraca.jpg';
@@ -79,7 +79,6 @@ export class PerfilDiscotecaPage implements OnInit {
     this.eventos = this.tab1Service.eventos;
   }
 
-
   cargarImagen(){
       this.fotoSrc = this.someURL;
   }
@@ -124,14 +123,10 @@ export class PerfilDiscotecaPage implements OnInit {
     let cajaDatos = document.getElementById("cajaDatos");
     cajaDatos.style.background="white";
     cajaDatos.style.color="black";
-    cajaDatos.contentEditable = "true";
     let botones = document.getElementById("botonesHidden1");
     botones.style.display = "block";
-    let saveButton = document.getElementById("saveButton") as HTMLButtonElement;
+    botones = document.getElementById("botonesHidden2");
-    saveButton.disabled=false;
+    botones.style.display = "block";
-    let cancelButton = document.getElementById("cancelButton") as HTMLButtonElement;
-    cancelButton.disabled=false;
-
 
  
 
@@ -143,7 +138,6 @@ export class PerfilDiscotecaPage implements OnInit {
     let cajaDatos = document.getElementById("cajaDatos");
     cajaDatos.style.background="inherit";
     cajaDatos.style.color="inherit";
-    cajaDatos.contentEditable="false";
     let botones = document.getElementById("botonesHidden1");
     botones.style.display = "none";
     botones = document.getElementById("botonesHidden2");
@@ -189,7 +183,6 @@ export class PerfilDiscotecaPage implements OnInit {
   editarEvento(evento: Eventoi){
     this.tab1Service.eventoIndex = this.eventos.indexOf(evento);
     this.tab1Service.editarEvento = true;
-    this.tab1Service.initEventoForms();
     this.router.navigate(['/tabs/tab1/prompt-evento']);
 }
 

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

@@ -13,7 +13,7 @@
     <input type="text" id="nombre" formControlName = "nombre">
   </label>
   <span
-    *ngIf="nombre?.errors?.required && (nombre.touched||submitted)">
+    *ngIf="nombre.errors.required && (nombre.touched||submitted)">
     Tu evento necesita un nombre
   </span>
   </ion-item>
@@ -24,7 +24,7 @@
       <ion-datetime displayFormat="YYYY/DD/MM"placeholder="Elegir Fecha" formControlName="fecha"></ion-datetime>
     </label>
     <span
-      *ngIf="fecha?.errors?.required && submitted">
+      *ngIf="fecha.errors.required && submitted">
       Tu evento necesita una fecha
     </span>
   </ion-item>
@@ -32,10 +32,10 @@
   <ion-item>
     <label>
       Hora
-      <ion-datetime displayFormat="HH:mm"placeholder="Elegir Hora" formControlName="hora"></ion-datetime>
+      <ion-datetime displayFormat="HH:MM"placeholder="Elegir Hora" formControlName="hora"></ion-datetime>
     </label>
     <span
-      *ngIf="hora?.errors?.required && submitted">
+      *ngIf="hora.errors.required && submitted">
       Tu evento necesita una hora
     </span>
   </ion-item>
@@ -47,7 +47,7 @@
       <input type="number" formControlName = "precio1"><label>, </label><input type="number" formControlName = "precio2">
     </label>
     <span
-    *ngIf="precio1?.errors?.required && (precio1.touched||submitted)">
+    *ngIf="precio1.errors.required && (precio1.touched||submitted)">
     Tu evento necesita un precio (puede ser 0)
   </span>
   </ion-item>
@@ -58,7 +58,7 @@
       <textarea formControlName = "descripcion" rows="10"></textarea>
     </label>
     <span
-    *ngIf="descripcion?.errors?.required && (descripcion.touched||submitted)">
+    *ngIf="descripcion.errors.required && (descripcion.touched||submitted)">
     ¡Dale una descripción a tu evento!
   </span>
   </ion-item>

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

@@ -13,7 +13,6 @@ import { ViewEventoPageRoutingModule } from '../view-evento/view-evento-routing.
 })
 export class PromptEventoPage implements OnInit{
   submitted = false;
-  editarEvento = false;
   eventoForm = new FormGroup({
       nombre: new FormControl(null, Validators.required),
       fecha: new FormControl(null, Validators.required),
@@ -37,7 +36,21 @@ export class PromptEventoPage implements OnInit{
   onSubmit(){
     this.submitted = true;
     if (this.eventoForm.valid){
-      this.asignarEvento(this.tab1Service.eventos[this.tab1Service.eventoIndex]);
+      let evento: Eventoi = {
+        id: null,
+        discotecaID: this.tab1Service.discotecaI.discotecaID,
+        nombre: '',
+        localizacion: this.tab1Service.discotecaI.localizacion,
+        fecha: null,
+        hora: null,
+        descripcion: '',
+        precio1: null,
+        precio2: null
+
+
+      };
+      this.asignarEvento(evento);
+
     }
   }
   asignarEvento(evento: Eventoi){
@@ -46,19 +59,28 @@ export class PromptEventoPage implements OnInit{
     var fecha = this.eventoForm.get('fecha').value;
     fecha = fecha.split("T")[0];
     evento.fecha = fecha;
-    var hora = this.eventoForm.get('hora').value;
+    let hora = this.eventoForm.get('hora').value;
-    if (!this.tab1Service.editarEvento){
+    hora = hora.split("T")[1];
-      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;
+    //evento.setDia(evento.getFecha()); el datetime de Ion devuelve un String, no se puede 
     if (!this.tab1Service.eventos){
-      this.tab1Service.eventos=[];}
+      this.tab1Service.initEventos();}
     if(!this.tab1Service.eventoForms){
       this.tab1Service.initEventoForms();}
+    if(this.tab1Service.editarEvento==true){
+      this.tab1Service.updateEvento(evento);
+      //this.tab1Service.eventos[this.tab1Service.eventoIndex] = evento;
+      //this.tab1Service.eventoForms[this.tab1Service.eventoIndex] = this.eventoForm;
+    }
+    else{
       this.tab1Service.postEvento(evento);
+      //this.tab1Service.eventos.push(evento);
+      //this.tab1Service.eventoForms.push(this.eventoForm);
+    }
+    
   }
 
   get nombre(){

src/app/services/api.service.ts

@@ -39,13 +39,7 @@ export class ApiService {
     
   }
 
-  getEventos(): Observable<Eventoi[]>{
+  getEventos(discotecaID: number): Observable<Eventoi[]>{
-
-    return this.http.get<Eventoi[]>(this.baseUrl+"/evento");
-  }
-
-  getEventosDiscoteca(discotecaID: number): Observable<Eventoi[]>{
-
       return this.http.post<Eventoi[]>(this.baseUrl+"/eventosDiscoteca", {"id": discotecaID});
 
 

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

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

src/app/services/feed.service.ts

@@ -1,31 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { DiscotecaI } from '../interfaces/discoteca-i';
-import { Eventoi } from '../interfaces/eventoi';
-import { ApiService } from './api.service';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class FeedService {
-
-  eventos: Eventoi[];
-  eventoIndex: number;
-  discotecaEvento: DiscotecaI;
-
-  constructor(private apiService: ApiService, private router: Router) { }
-
-  initFeed(): void{
-    this.apiService.getEventos()
-    .subscribe(eventos => {
-      this.eventos = eventos;
-      this.router.navigate(['/tabsUser'])
-    })
-  }
-
-  getEventoByIndex(eventoIndex: number):Eventoi{
-    return this.eventos[eventoIndex];
-  } 
-
-  
-}

src/app/services/login.service.ts

@@ -5,7 +5,6 @@ import { ApiService } from './api.service';
 import { Tab1Service } from '../tab1/tab1.service';
 import { User } from '../interfaces/user';
 import { UserLogin } from '../interfaces/user-login';
-import { FeedService } from './feed.service';
 
 
 @Injectable({
@@ -15,7 +14,7 @@ export class LoginService {
 
   user: User;
 
-  constructor(private apiService: ApiService, private router: Router, private tab1service: Tab1Service, private feedService: FeedService) {
+  constructor(private apiService: ApiService, private router: Router, private tab1service: Tab1Service) {
     this.user = {
       id: 0,
       discotecaID: 0,
@@ -34,10 +33,9 @@ export class LoginService {
     this.apiService.validateUser(userlogin)
       .subscribe(user => {
         this.user = user[0];
-        if (this.user.userType==0)
+        console.log(this.user);
+        console.log(this.user.discotecaID);
         this.tab1service.getDiscoteca(this.user.discotecaID);
-        else if (this.user.userType==1) 
-          this.feedService.initFeed();
 
       })
 

src/app/tab1/tab1.service.ts

@@ -3,7 +3,7 @@ import { stringify } from 'querystring';
 import { Tab1Page } from './tab1.page'
 import { Discoteca } from '../discoteca'
 import { Observable, of } from 'rxjs';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { FormControl, FormGroup } from '@angular/forms';
 import { NumericValueAccessor } from '@ionic/angular';
 import { DiscotecaI } from '../interfaces/discoteca-i';
 import { ApiService } from '../services/api.service';
@@ -65,7 +65,7 @@ export class Tab1Service implements OnInit{
 
   initEventos(): void{
     this.eventos = [];
-    this.apiService.getEventosDiscoteca(this.discoteca.getId())
+    this.apiService.getEventos(this.discoteca.getId())
     .subscribe(eventos => {
       this.eventos = eventos;
       this.router.navigate(['/tabs/tab1/perfil-discoteca']);
@@ -76,20 +76,6 @@ export class Tab1Service implements OnInit{
 
   initEventoForms(): void{
     this.eventoForms = [];
-    if (this.eventos){
-      this.eventos.forEach(evento => {
-        let thisForm = new FormGroup({
-          nombre: new FormControl(null, Validators.required),
-          fecha: new FormControl(null, Validators.required),
-          hora: new FormControl(null, Validators.required),
-          precio1: new FormControl(null, Validators.required),
-          precio2: new FormControl(null, Validators.required),
-          descripcion: new FormControl(null, Validators.required),
-      });
-      thisForm.patchValue(evento);
-      this.eventoForms.push(thisForm);
-      })
-    }
   }
 
   getEventobyIndex(eventoIndex: number){
@@ -105,7 +91,6 @@ getDiscoteca(discotecaId: number){
       this.initValues();
     })
   }
- 
   }
 
   postEvento(evento: Eventoi){
@@ -120,6 +105,4 @@ getDiscoteca(discotecaId: number){
 
   }
 
-
-
 }

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

@@ -1,23 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { FeedPage } from '../feed/feed.page';
 import { Tab2Page } from './tab2.page';
-import { ViewEventoClientePage } from '../view-evento-cliente/view-evento-cliente.page';
-import { ViewDiscotecaClientePage } from '../view-discoteca-cliente/view-discoteca-cliente.page';
 
 const routes: Routes = [
   {
     path: '',
-    component: FeedPage,
+    component: Tab2Page,
-
-  },
-  {
-    path: 'view-evento-cliente',
-    component: ViewEventoClientePage
-  },
-  {
-    path: 'view-discoteca-cliente',
-    component: ViewDiscotecaClientePage
   }
 ];
 

src/app/tab2/tab2.page.html

@@ -0,0 +1,56 @@
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta charset="utf-8">
+  <meta name="keywords" content="">
+  <meta name="description" content="">
+  <meta name="page_type" content="np-template-header-footer-from-plugin">
+  <title>Página 1</title>
+  <link rel="stylesheet" href="nicepage.css" media="screen">
+<link rel="stylesheet" href="Página-1.css" media="screen">
+  <script class="u-script" type="text/javascript" src="jquery.js" defer=""></script>
+  <script class="u-script" type="text/javascript" src="nicepage.js" defer=""></script>
+  <meta name="generator" content="Nicepage 3.0.9, nicepage.com">
+  <link id="u-theme-google-font" rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i|Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i">
+  
+  
+  
+  <meta property="og:title" content="Página 1">
+  <meta property="og:type" content="website">
+  <meta name="theme-color" content="#478ac9">
+  <link rel="canonical" href="index.html">
+  <meta property="og:url" content="index.html">
+</head>
+<body class="u-body">
+  <section class="u-clearfix u-section-1" id="sec-6396">
+    <div class="u-clearfix u-sheet u-sheet-1">
+      <div class="u-clearfix u-expanded-width u-layout-wrap u-layout-wrap-1">
+        <div class="u-layout">
+          <div class="u-layout-row">
+            <div class="u-size-30">
+              <div class="u-layout-col">
+                <div class="u-container-style u-layout-cell u-size-60 u-layout-cell-1">
+                  
+                  <div class="u-container-layout u-container-layout-1"></div>
+                </div>
+              </div>
+            </div>
+            <div class="u-size-30">
+              <div class="u-layout-col">
+                <div class="u-container-style u-layout-cell u-size-30 u-layout-cell-2">
+                  <div class="u-container-layout u-container-layout-2"></div>
+                </div>
+                <div class="u-container-style u-layout-cell u-size-30 u-layout-cell-3">
+                  <div class="u-container-layout u-container-layout-3"></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+  
+  
+  
+  
+</body>

src/app/tab2/tab2.page.ts

@@ -1,19 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
-import { Eventoi } from '../interfaces/eventoi';
-import { FeedService } from '../services/feed.service';
 
 @Component({
   selector: 'app-tab2',
   templateUrl: 'tab2.page.html',
   styleUrls: ['tab2.page.scss']
 })
-export class Tab2Page implements OnInit{
+export class Tab2Page {
-
 
   constructor() {}
 
-  ngOnInit(){
-    
-  }
-
 }

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

@@ -1,34 +0,0 @@
-import { FullscreenOverlayContainer } from '@angular/cdk/overlay';
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { TabsUserPage } from './tabs-user.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: TabsUserPage,
-    children: [
-      {
-        path: 'tab2',
-        loadChildren: ()=> import('../tab2/tab2.module').then(m=>m.Tab2PageModule),
-      },
-
-      {
-        path: 'tab3',
-        loadChildren: ()=> import('../tab3/tab3.module').then(m=>m.Tab3PageModule),
-      },
-
-      {
-        path:'',
-        redirectTo: 'tab2',
-        pathMatch: 'full'
-      }
-    ]
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class TabsUserPageRoutingModule {}

src/app/tabs-user/tabs-user.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 { TabsUserPageRoutingModule } from './tabs-user-routing.module';
-
-import { TabsUserPage } from './tabs-user.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    TabsUserPageRoutingModule
-  ],
-  declarations: [TabsUserPage]
-})
-export class TabsUserPageModule {}

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

@@ -1,17 +0,0 @@
-<ion-tabs>
-
-  <ion-tab-bar slot="bottom">
-    <ion-tab-button tab="tab2">
-      <ion-icon name="search-outline"></ion-icon>
-      <ion-label>Feed</ion-label>
-    </ion-tab-button>
-
-    <ion-tab-button tab="tab3">
-      <ion-icon name="accessibility-outline"></ion-icon>
-      <ion-label>Me</ion-label>
-    </ion-tab-button>
-
-
-  </ion-tab-bar>
-
-</ion-tabs>

src/app/tabs-user/tabs-user.page.spec.ts

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

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

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-tabs-user',
-  templateUrl: './tabs-user.page.html',
-  styleUrls: ['./tabs-user.page.scss'],
-})
-export class TabsUserPage implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

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

@@ -11,7 +11,14 @@ const routes: Routes = [
         path: 'tab1',
         loadChildren: () => import('../tab1/tab1.module').then(m => m.Tab1PageModule),
       },
-
+      {
+        path: 'tab2',
+        loadChildren: () => import('../tab2/tab2.module').then(m => m.Tab2PageModule)
+      },
+      {
+        path: 'tab3',
+        loadChildren: () => import('../tab3/tab3.module').then(m => m.Tab3PageModule)
+      },
       {
         path: '',
         redirectTo: 'tab1',

src/app/tabs/tabs.page.html

@@ -2,11 +2,19 @@
 
   <ion-tab-bar slot="bottom">
     <ion-tab-button tab="tab1">
-      <ion-icon name="home-outline"></ion-icon>
+      <ion-icon name="triangle"></ion-icon>
-      <ion-label>Perfil</ion-label>
+      <ion-label>Tab 1</ion-label>
     </ion-tab-button>
 
+    <ion-tab-button tab="tab2">
+      <ion-icon name="ellipse"></ion-icon>
+      <ion-label>Tab 2</ion-label>
+    </ion-tab-button>
 
+    <ion-tab-button tab="tab3">
+      <ion-icon name="square"></ion-icon>
+      <ion-label>Tab 3</ion-label>
+    </ion-tab-button>
   </ion-tab-bar>
 
 </ion-tabs>

src/app/view-discoteca-cliente/view-discoteca-cliente-routing.module.ts

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

src/app/view-discoteca-cliente/view-discoteca-cliente.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 { ViewDiscotecaClientePageRoutingModule } from './view-discoteca-cliente-routing.module';
-
-import { ViewDiscotecaClientePage } from './view-discoteca-cliente.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    ViewDiscotecaClientePageRoutingModule
-  ],
-  declarations: [ViewDiscotecaClientePage]
-})
-export class ViewDiscotecaClientePageModule {}

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

@@ -1,9 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>view-discoteca-cliente</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-
-</ion-content>

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

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

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

@@ -1,27 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { DiscotecaI } from '../interfaces/discoteca-i';
-import { Eventoi } from '../interfaces/eventoi';
-import { FeedService } from '../services/feed.service';
-
-@Component({
-  selector: 'app-view-discoteca-cliente',
-  templateUrl: './view-discoteca-cliente.page.html',
-  styleUrls: ['./view-discoteca-cliente.page.scss'],
-})
-export class ViewDiscotecaClientePage implements OnInit {
-
-  discoteca: DiscotecaI
-  eventos: Eventoi[]
-
-  constructor(private feedService: FeedService) { }
-
-  ngOnInit() {
-    this.discoteca = this.feedService.discotecaEvento;
-    this.feedService.eventos.forEach(evento => {
-      if (this.discoteca.discotecaID == evento.discotecaID){
-        this.eventos.push(evento);
-      }
-    })
-  }
-
-}

src/app/view-evento-cliente/view-evento-cliente-routing.module.ts

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { ViewDiscotecaClientePage } from '../view-discoteca-cliente/view-discoteca-cliente.page';
-
-import { ViewEventoClientePage } from './view-evento-cliente.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: ViewEventoClientePage
-  },
-  {
-    path: 'view-discoteca-cliente',
-    component: ViewDiscotecaClientePage
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class ViewEventoClientePageRoutingModule {}

src/app/view-evento-cliente/view-evento-cliente.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 { ViewEventoClientePageRoutingModule } from './view-evento-cliente-routing.module';
-
-import { ViewEventoClientePage } from './view-evento-cliente.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    ViewEventoClientePageRoutingModule
-  ],
-  declarations: [ViewEventoClientePage]
-})
-export class ViewEventoClientePageModule {}

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

@@ -1,31 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title>ViewEvento</ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <ion-grid>
-      <div class="evento">
-        <ion-row>
-          <div class="eventoHeader">
-          {{evento.nombre}} · 
-          <ion-icon name="calendar-outline"></ion-icon>
-          {{evento.fecha}} · 
-          <ion-icon name="cash-outline"></ion-icon>
-          {{evento.precio1}},{{evento.precio2}}
-          </div>
-        </ion-row>
-        <ion-row>
-          <div class="eventoDesc">
-          {{evento.descripcion}}
-          </div>
-        </ion-row>
-        <ion-row>
-          <div class="discotecaEvento">
-            <a [routerLink]="['/tabsUser/tab2/view-discoteca-cliente']">{{discoteca?.nombre}}</a>
-          </div>
-        </ion-row>
-      </div>
-  </ion-grid>
-</ion-content>

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

@@ -1,3 +0,0 @@
-.discotecaEvento{
-    padding: 40px;
-}

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

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

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

@@ -1,22 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { DiscotecaI } from '../interfaces/discoteca-i';
-import { Eventoi } from '../interfaces/eventoi';
-import { FeedService } from '../services/feed.service';
-
-@Component({
-  selector: 'app-view-evento-cliente',
-  templateUrl: './view-evento-cliente.page.html',
-  styleUrls: ['./view-evento-cliente.page.scss'],
-})
-export class ViewEventoClientePage implements OnInit {
-
-  evento: Eventoi;
-  discoteca: DiscotecaI;
-  constructor(private feedService: FeedService) { }
-
-  ngOnInit() {
-    this.evento = this.feedService.getEventoByIndex(this.feedService.eventoIndex);
-    this.discoteca = this.feedService.discotecaEvento;
-  }
-
-}