FrontEndDev #4

Merged
onsaliyo merged 17 commits from FrontEndDev into master 2021-05-14 15:45:24 +02:00
12 changed files with 159 additions and 59 deletions
Showing only changes of commit dc04cd122f - Show all commits

View File

@ -1,58 +1,62 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
import { LoginPage } from './login/login.page'; import { LoginPage } from './login/login.page';
const routes: Routes = [ const routes: Routes = [
{ {
path: 'login', path: 'login',
component: LoginPage component: LoginPage
}, },
{ {
path: 'tabs', path: 'tabs',
loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule) loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
}, },
{ {
path: 'tabsUser', path: 'tabsUser',
loadChildren: () => import('./tabs-user/tabs-user.module').then(m => m.TabsUserPageModule) loadChildren: () => import('./tabs-user/tabs-user.module').then(m => m.TabsUserPageModule)
}, },
{ {
path: 'view-evento', path: 'view-evento',
loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule) loadChildren: () => import('./view-evento/view-evento.module').then( m => m.ViewEventoPageModule)
}, },
{ {
path: 'galeriamodal', path: 'galeriamodal',
loadChildren: () => import('./galeriamodal/galeriamodal.module').then( m => m.GaleriamodalPageModule) loadChildren: () => import('./galeriamodal/galeriamodal.module').then( m => m.GaleriamodalPageModule)
}, },
{ {
path:'', path:'',
redirectTo: 'login', redirectTo: 'login',
pathMatch: 'full' pathMatch: 'full'
}, },
{ {
path: 'tabs-user', path: 'tabs-user',
loadChildren: () => import('./tabs-user/tabs-user.module').then( m => m.TabsUserPageModule) loadChildren: () => import('./tabs-user/tabs-user.module').then( m => m.TabsUserPageModule)
}, },
{ {
path: 'feed', path: 'feed',
loadChildren: () => import('./feed/feed.module').then( m => m.FeedPageModule) loadChildren: () => import('./feed/feed.module').then( m => m.FeedPageModule)
}, },
{ {
path: 'view-evento-cliente', path: 'view-evento-cliente',
loadChildren: () => import('./view-evento-cliente/view-evento-cliente.module').then( m => m.ViewEventoClientePageModule) 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)
}, },
];
@NgModule({ ];
imports: [ @NgModule({
RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) imports: [
], RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
exports: [RouterModule] ],
}) exports: [RouterModule]
export class AppRoutingModule {} })
export class AppRoutingModule {}

View File

@ -29,7 +29,6 @@ export class FeedPage implements OnInit {
this.feedService.eventoIndex = this.eventos.indexOf(evento); this.feedService.eventoIndex = this.eventos.indexOf(evento);
let discotecaDelEvento: DiscotecaI = this.discotecas[this.idsDiscoteca.indexOf(evento.discotecaID)]; let discotecaDelEvento: DiscotecaI = this.discotecas[this.idsDiscoteca.indexOf(evento.discotecaID)];
console.log(discotecaDelEvento);
this.feedService.discotecaEvento = discotecaDelEvento; this.feedService.discotecaEvento = discotecaDelEvento;
this.router.navigate(['/tabsUser/tab2/view-evento-cliente']); this.router.navigate(['/tabsUser/tab2/view-evento-cliente']);

View File

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

View File

@ -0,0 +1,17 @@
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 {}

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 { 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 {}

View File

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

View File

@ -0,0 +1,24 @@
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();
});
});

View File

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

View File

@ -1,5 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { ViewDiscotecaClientePage } from '../view-discoteca-cliente/view-discoteca-cliente.page';
import { ViewEventoClientePage } from './view-evento-cliente.page'; import { ViewEventoClientePage } from './view-evento-cliente.page';
@ -7,6 +8,10 @@ const routes: Routes = [
{ {
path: '', path: '',
component: ViewEventoClientePage component: ViewEventoClientePage
},
{
path: 'view-discoteca-cliente',
component: ViewDiscotecaClientePage
} }
]; ];

View File

@ -23,7 +23,7 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<div class="discotecaEvento"> <div class="discotecaEvento">
{{discoteca?.nombre}} <a [routerLink]="['/tabsUser/tab2/view-discoteca-cliente']">{{discoteca?.nombre}}</a>
</div> </div>
</ion-row> </ion-row>
</div> </div>

View File

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