reorganización con carpetas

src/app/api.service.ts

@@ -1,31 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable, throwError, BehaviorSubject } from 'rxjs';
-import { catchError, retry, map, tap } from 'rxjs/operators';
-import { User } from './user';
-import { Discoteca } from './discoteca';
-import { UserLogin } from './user-login';
-
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ApiService {
-
-  
-
-  constructor(private http: HttpClient) {
-
-   }
-
-
-  validateUser(user: UserLogin): Observable<User>{
-
-    return this.http.post<User>("http://localhost:3307/api/consultas/users", user)
-      
-  }
-
-
-
-
-}

src/app/discoteca-i.ts

@@ -1,2 +0,0 @@
-export interface DiscotecaI {
-}

src/app/interfaces/discoteca-i.ts

@@ -0,0 +1,6 @@
+export interface DiscotecaI {
+    discotecaId: number,
+    nombre: string,
+    telefono: number,
+    localizacion: string
+}

src/app/interfaces/eventoi.ts

@@ -0,0 +1,2 @@
+export interface Eventoi {
+}

src/app/interfaces/user.ts

@@ -1,6 +1,6 @@
 export interface User {
   id: number;
-  discotecaId: number;
+  discotecaID: number;
   userType: number; 
   username: string;
 }

src/app/login/login.page.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { LoginService } from '../login.service';
+import { LoginService } from '../services/login.service';
-import { User } from '../user';
+import { User } from '../interfaces/user';
 
 @Component({
   selector: 'app-login',

src/app/services/api.service.ts

@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+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 { Discoteca } from '../discoteca';
+import { UserLogin } from '../interfaces/user-login';
+import { DiscotecaI } from '../interfaces/discoteca-i';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ApiService {
+
+  baseUrl = "http://localhost:3307/api/consultas";
+
+  constructor(private http: HttpClient) {
+
+   }
+
+
+  validateUser(user: UserLogin): Observable<User>{
+
+    return this.http.post<User>(this.baseUrl+"/users", user)
+      
+  }
+
+  getUserDiscoteca(discotecaId: number): Observable<DiscotecaI>{
+
+    return this.http.post<DiscotecaI>(this.baseUrl+"/discoteca", { "id": discotecaId});
+
+  }
+
+
+
+
+}

src/app/services/login.service.ts

@@ -2,8 +2,9 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { VirtualTimeScheduler } from 'rxjs';
 import { ApiService } from './api.service';
-import { User } from './user';
+import { Tab1Service } from '../tab1/tab1.service';
-import { UserLogin } from './user-login';
+import { User } from '../interfaces/user';
+import { UserLogin } from '../interfaces/user-login';
 
 
 @Injectable({
@@ -13,10 +14,10 @@ export class LoginService {
 
   user: User;
 
-  constructor(private apiService: ApiService, private router: Router) {
+  constructor(private apiService: ApiService, private router: Router, private tab1service: Tab1Service) {
     this.user = {
       id: 0,
-      discotecaId: 0,
+      discotecaID: 0,
       userType: 0,
       username: '',
     };
@@ -31,8 +32,11 @@ export class LoginService {
 
     this.apiService.validateUser(userlogin)
       .subscribe(user => {
-        this.user = user;
+        this.user = user[0];
         console.log(this.user);
+        console.log(this.user.discotecaID);
+        this.tab1service.getDiscoteca(this.user.discotecaID);
+
       })
 
   }

src/app/tab1/tab1.service.ts

@@ -5,6 +5,9 @@ import { Discoteca } from '../discoteca'
 import { Evento } from '../evento';
 import { FormControl, FormGroup } from '@angular/forms';
 import { NumericValueAccessor } from '@ionic/angular';
+import { DiscotecaI } from '../interfaces/discoteca-i';
+import { ApiService } from '../services/api.service';
+import { Router } from '@angular/router';
 
 
 @Injectable({
@@ -13,13 +16,14 @@ import { NumericValueAccessor } from '@ionic/angular';
 export class Tab1Service implements OnInit{
 
   discoteca: Discoteca;
+  discotecaI: DiscotecaI;
   galeria: string[];
   eventos: Evento[];
   eventoForms: FormGroup[];
   eventoIndex: number;
   editarEvento: boolean;
 
-  constructor() { 
+  constructor(private apiService: ApiService, private router: Router) { 
     
   }
 
@@ -29,9 +33,9 @@ export class Tab1Service implements OnInit{
 
   initValues(): void{
     this.discoteca = new Discoteca();
-    this.discoteca.setNombre('Barraca');
+    this.discoteca.setNombre(this.discotecaI.nombre);
-    this.discoteca.setTelefono(666666666);
+    this.discoteca.setTelefono(this.discotecaI.telefono);
-    this.discoteca.setLocalizacion('Calle del Barquillo');
+    this.discoteca.setLocalizacion(this.discotecaI.localizacion);
     this.galeria = [];
     this.initEventos();
     this.editarEvento = false;
@@ -73,4 +77,16 @@ export class Tab1Service implements OnInit{
     return this.eventos[eventoIndex];
   }
 
+  getDiscoteca(discotecaId: number){
+    if (discotecaId != 0){
+    this.apiService.getUserDiscoteca(discotecaId)
+    .subscribe(discoteca => {
+      this.discotecaI = discoteca[0];
+      console.log(this.discotecaI);
+      this.initValues();
+      this.router.navigate(['/tabs/tab1/perfil-discoteca']);
+    })
+  }
+  }
+
 }