Compare commits

...

4 Commits

24 changed files with 413 additions and 273 deletions

View File

@ -7,15 +7,12 @@ const routes: Routes = [
path: '',
loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
},
{
path: 'view-evento',
loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule)
},
{
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: [

View File

@ -10,4 +10,14 @@
margin-right: auto;
text-align: center;
margin: auto;
}
--ion-color-primary: #c4b700;
--ion-color-primary-rgb: 196, 183, 0;
--ion-color-primary-contrast: #ffffff;
--ion-color-primary-contrast-rgb: 255,255,255;
--ion-color-primary-shade: #695100;
--ion-color-primary-tint: #8a8b39;
}

View File

@ -1,18 +1,20 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { RouteReuseStrategy } from '@angular/router';
import { ReactiveFormsModule } from '@angular/forms';
import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
import { SplashScreen } from '@ionic-native/splash-screen/ngx';
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';
import { PromptEventoPage} from './prompt-evento/prompt-evento.page'
@NgModule({
declarations: [AppComponent],
declarations: [AppComponent, PerfilDiscotecaPage, PromptEventoPage],
entryComponents: [],
imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule, ReactiveFormsModule],
providers: [
StatusBar,
SplashScreen,

View File

@ -1,9 +1,13 @@
export class Evento {
private id: number;
private nombre: string;
private localizacion: string;
private fecha: Date;
private desc: string;
nombre: string;
localizacion: string;
fecha: Date;
dia: string;
hora: string;
descripcion: string;
precio1: number;
precio2: number;
setNombre(nombre: string): void{
this.nombre = nombre;
@ -30,10 +34,42 @@ export class Evento {
}
setDesc(desc: string): void{
this.desc = desc;
this.descripcion = desc;
}
getDesc(): string{
return this.desc;
return this.descripcion;
}
setDia(fecha: Date): void{
this.dia = fecha.getDate()+"/"+fecha.getMonth();
}
getDia(): string{
return this.dia;
}
setHora(fecha: Date): void{
this.hora = fecha.getHours()+":"+fecha.getMinutes();
}
getHora(): string{
return this.hora;
}
setPrecio1(precio: number): void{
this.precio1 = precio;
}
getPrecio1(): number{
return this.precio1;
}
setPrecio2(precio: number): void{
this.precio2 = precio;
}
getPrecio2(): number{
return this.precio2;
}
}

View File

@ -1,13 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { Routes, RouterModule, ChildrenOutletContexts } 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({

View File

@ -1,19 +1,22 @@
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]
})

View File

@ -1,6 +1,8 @@
<ion-header>
<ion-header [translucent]="true">
<ion-toolbar>
<ion-title>Mi Perfil</ion-title>
<ion-title>
Mi Perfil
</ion-title>
</ion-toolbar>
</ion-header>
@ -15,7 +17,6 @@
<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>
@ -56,6 +57,7 @@
</ion-col>
<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()">
<ion-slide *ngFor="let foto of galeriaFotos">
@ -78,6 +80,27 @@
Añadir evento
</ion-button>
</ion-row>
<ion-row>
<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>
</ion-item>
</ion-list>
</div>
</ion-row>
</div>
@ -87,4 +110,4 @@
</ion-grid>
</ion-content>
</ion-content>

View File

@ -0,0 +1,80 @@
: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;
}
.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;
}
.eventos{
display:block;
}
.evento:hover{
background-color: rgb(97, 97, 97);
}
.eventoHeader{
font-weight: bold;
}
.eventoDesc{
color: white;
}
ion-slides {
height: 100%;
}

View File

@ -7,6 +7,7 @@ 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',
@ -25,7 +26,6 @@ export class PerfilDiscotecaPage implements OnInit {
editDisabled: string;
editEnabled: string;
galeriaFotos: string[];
galeriaFake: string[];
currentIndex: number;
eventos: Evento[];
alertCtrl: AlertController;
@ -77,7 +77,6 @@ export class PerfilDiscotecaPage implements OnInit {
this.slides.update();
}
loadImageFromDevice(event): void{
@ -160,7 +159,12 @@ export class PerfilDiscotecaPage implements OnInit {
}
addEvento() {
this.router.navigate(['prompt-evento']);
this.router.navigate(['/tabs/tab1/prompt-evento']);
}
mostrarEvento(evento: Evento){
this.tab1Service.eventoIndex = this.eventos.indexOf(evento);
this.router.navigate(['/tabs/tab1/view-evento']);
}
}

View File

@ -5,6 +5,40 @@
</ion-header>
<ion-content>
<form [formGroup]="eventoForm" (ngSubmit)="onSubmit()">
<div class="campoInput">
<label>
Nombre del evento:
<input type="text" formControlName = "nombre">
</label>
</div>
<div class="campoInput">
<label>
Fecha:
<ion-datetime displayFormat="DD/MM, HH:mm"placeholder="Elegir Fecha" formControlName="fecha"></ion-datetime>
</label>
</div>
<div class="campoInput">
<label>
Descripción:
<input type="text" formControlName = "descripcion">
</label>
</div>
<div class="campoInput">
<label>
Precio:
<input type="number" formControlName = "precio1"><label>, </label><input type="number" formControlName = "precio2">
</label>
</div>
<button type="submit">GUARDAR</button>
</form>
</ion-content>

View File

@ -0,0 +1,12 @@
*{
--ion-text-color: #000000;
padding: 5px;
letter-spacing: 2px;
}
.campoInput{
display: block;
}

View File

@ -1,15 +1,48 @@
import { Component, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { Tab1Service } from '../tab1/tab1.service';
import { Evento } from '../evento';
import { Router } from '@angular/router';
import { FormBuilder } from '@angular/forms';
@Component({
selector: 'app-prompt-evento',
templateUrl: './prompt-evento.page.html',
styleUrls: ['./prompt-evento.page.scss'],
})
export class PromptEventoPage implements OnInit {
export class PromptEventoPage{
eventoForm = new FormGroup({
nombre: new FormControl(''),
fecha: new FormControl(''),
hora: new FormControl(''),
precio1: new FormControl(''),
precio2: new FormControl(''),
descripcion: new FormControl('')
});
constructor() { }
eventos: Evento[];
ngOnInit() {
constructor(private tab1Service: Tab1Service, private router: Router) {
this.eventos = [];
}
onSubmit(){
let evento = new Evento();
this.asignarEvento(evento);
this.router.navigate(['/tabs/tab1/perfil-discoteca']);
}
asignarEvento(evento: Evento){
evento.setNombre(this.eventoForm.get('nombre').value);
evento.setDesc(this.eventoForm.get('descripcion').value);
evento.setFecha(this.eventoForm.get('fecha').value);
evento.setPrecio1(this.eventoForm.get('precio1').value);
evento.setPrecio2(this.eventoForm.get('precio2').value);
//evento.setDia(evento.getFecha()); el datetime de Ion devuelve un String, no se puede
//evento.setHora(evento.getFecha()); transformar en dia y hora
if (!this.tab1Service.eventos){
this.tab1Service.initEventos();}
this.tab1Service.eventos.push(evento);
}
}

View File

@ -1,12 +1,35 @@
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'
import { ViewEventoPage } from '../view-evento/view-evento.page'
const routes: Routes = [
{
path: '',
component: Tab1Page,
},
{
path: '',
redirectTo: 'perfil-discoteca',
pathMatch: 'full',
},
{
path: 'perfil-discoteca',
component: PerfilDiscotecaPage
},
{
path: 'prompt-evento',
component: PromptEventoPage
},
{
path: 'view-evento',
component: ViewEventoPage
}
];

View File

@ -3,6 +3,7 @@ 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';
@ -13,7 +14,8 @@ import { Tab1PageRoutingModule } from './tab1-routing.module';
CommonModule,
FormsModule,
ExploreContainerComponentModule,
Tab1PageRoutingModule
Tab1PageRoutingModule,
],
declarations: [Tab1Page]
})

View File

@ -1,92 +0,0 @@
<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>

View File

@ -2,12 +2,13 @@ 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 { PerfilDiscotecaPageModule } from '../perfil-discoteca/perfil-discoteca.module';
import { from } from 'rxjs';
@Component({
selector: 'app-tab1',
@ -17,153 +18,18 @@ import { PerfilDiscotecaPageModule } from '../perfil-discoteca/perfil-discoteca.
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']);
}
}

View File

@ -4,6 +4,7 @@ import { Tab1Page } from './tab1.page'
import { Discoteca } from '../discoteca'
import { Galeria } from '../galeria';
import { Evento } from '../evento';
import { NumericValueAccessor } from '@ionic/angular';
@Injectable({
@ -14,6 +15,7 @@ export class Tab1Service implements OnInit{
discoteca: Discoteca;
galeria: Galeria;
eventos: Evento[];
eventoIndex: number;
constructor() {
@ -29,6 +31,7 @@ export class Tab1Service implements OnInit{
this.discoteca.setTelefono(666666666);
this.discoteca.setLocalizacion('Calle del Barquillo');
this.galeria = new Galeria();
this.initEventos();
this.galeria.setDiscoteca(this.discoteca.getNombre());
}
@ -48,7 +51,15 @@ export class Tab1Service implements OnInit{
}
getEventos(): Evento[]{
return this.discoteca.getEventos();
return this.eventos;
}
initEventos(): void{
this.eventos = [];
}
getEventobyIndex(eventoIndex: number){
return this.eventos[eventoIndex];
}
}

View File

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

View File

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

View File

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

View File

@ -0,0 +1,9 @@
<ion-header>
<ion-toolbar>
<ion-title>ViewEvento</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<label>{{evento.nombre}}</label>
</ion-content>

View File

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

View File

@ -0,0 +1,20 @@
import { Component, OnInit } from '@angular/core';
import { Evento } from '../evento';
import { Tab1Service } from '../tab1/tab1.service';
@Component({
selector: 'app-view-evento',
templateUrl: './view-evento.page.html',
styleUrls: ['./view-evento.page.scss'],
})
export class ViewEventoPage implements OnInit {
evento: Evento;
constructor(private tab1Service: Tab1Service) { }
ngOnInit() {
this.evento = this.tab1Service.getEventobyIndex(this.tab1Service.eventoIndex);
}
}