onsaliyo
/
Discofy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.coolneng.duckdns.org/onsaliyo/Discofy into FrontEndDev

This commit is contained in:
onsaliyo 2021-03-31 13:23:16 +02:00
parent 10d1387936 77016910fd
commit 6c8af25e4b
5 changed files with 672 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1124
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

24
package.json
View File

@ -23,16 +23,16 @@
"@angular/platform-browser-dynamic": "~10.0.0",
"@angular/router": "~10.0.0",
"@capacitor/core": "2.4.3",
"@ionic-native/core": "^5.0.0",
"@ionic-native/splash-screen": "^5.0.0",
"@ionic-native/status-bar": "^5.0.0",
"@ionic/angular": "^5.0.0",
"@ionic-native/core": "^5.31.1",
"@ionic-native/splash-screen": "^5.31.1",
"@ionic-native/status-bar": "^5.31.1",
"@ionic/angular": "^5.5.4",
"rxjs": "~6.5.5",
"tslib": "^2.0.0",
"tslib": "^2.1.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.0",
"@angular-devkit/build-angular": "^0.1000.8",
"@angular/cli": "10.0.8",
"@angular/compiler": "~10.0.0",
"@angular/compiler-cli": "~10.0.0",
@ -41,15 +41,15 @@
"@ionic/angular-toolkit": "^2.3.0",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"@types/node": "^12.20.4",
"codelyzer": "^6.0.0",
"cordova-android": "^9.0.0",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^4.2.1",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-splashscreen": "^5.0.4",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.4",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
@ -60,7 +60,7 @@
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~3.9.5"
"typescript": "^3.9.9"
},
"description": "An Ionic project",
"cordova": {

6
src/app/discoteca.ts
View File

@ -1,5 +1,5 @@
import {Evento} from './evento';
import {Eventoi} from './interfaces/eventoi';
export class Discoteca {
@ -7,7 +7,7 @@ export class Discoteca {
private nombre: string;
private telefono: number;
private localizacion: string;
private eventos: Evento[];
private eventos: Eventoi[];
private descripcion: string;
setId(id: number): void{
@ -42,7 +42,7 @@ export class Discoteca {
return this.localizacion
}
getEventos(): Evento[]{
getEventos(): Eventoi[]{
return this.eventos;
}

1
src/app/tab1/tab1.page.ts
View File

@ -6,7 +6,6 @@ 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';

4
src/app/view-evento/view-evento.page.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { Evento } from '../evento';
import { Eventoi } from '../interfaces/eventoi';
import { Tab1Service } from '../tab1/tab1.service';
@Component({
@ -9,7 +9,7 @@ import { Tab1Service } from '../tab1/tab1.service';
})
export class ViewEventoPage implements OnInit {
evento: Evento;
evento: Eventoi;
constructor(private tab1Service: Tab1Service) { }