Commit 12c49ee4 by Nabil Sadki

Reorganise folders

parent 0f9502d8
...@@ -4,10 +4,10 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; ...@@ -4,10 +4,10 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'mainslider', pathMatch: 'full' }, { path: '', redirectTo: 'mainslider', pathMatch: 'full' },
{ path: 'start', loadChildren: './pages/start/start.module#StartPageModule' }, { path: 'start', loadChildren: './pages/start/start.module#StartPageModule' },
{ path: 'login', loadChildren: './pages/login/login.module#LoginPageModule' }, { path: 'login', loadChildren: './pages/compte/login/login.module#LoginPageModule' },
{ path: 'mainslider', loadChildren: './pages/mainslider/mainslider.module#MainsliderPageModule' }, { path: 'mainslider', loadChildren: './pages/mainslider/mainslider.module#MainsliderPageModule' },
{ path: 'app', loadChildren: './pages/menu/menu.module#MenuPageModule' }, { path: 'app', loadChildren: './pages/menu/menu.module#MenuPageModule' },
{ path: 'offre-details', loadChildren: './pages/offre-details/offre-details.module#OffreDetailsPageModule' }, { path: 'offre-details', loadChildren: './pages/offres/offre-details/offre-details.module#OffreDetailsPageModule' },
]; ];
@NgModule({ @NgModule({
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Validators, FormBuilder, FormGroup, FormControl } from '@angular/forms'; import { Validators, FormBuilder, FormGroup, FormControl } from '@angular/forms';
import { AlloService } from '../../services/allo-service'; import { AlloService } from '../../../services/allo-service';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { GooglePlus } from '@ionic-native/google-plus/ngx'; import { GooglePlus } from '@ionic-native/google-plus/ngx';
......
...@@ -19,11 +19,11 @@ const routes: Routes = [ ...@@ -19,11 +19,11 @@ const routes: Routes = [
children: [ children: [
{ {
path: 'dashboard', path: 'dashboard',
loadChildren: '../dashboard/dashboard.module#DashboardPageModule' loadChildren: '../offres/dashboard/dashboard.module#DashboardPageModule'
}, },
{ {
path: 'partenaires', path: 'partenaires',
loadChildren: '../partenaires/partenaires.module#PartenairesPageModule' loadChildren: '../partenaires/partenaires/partenaires.module#PartenairesPageModule'
}, },
{ {
path: 'params', path: 'params',
...@@ -39,11 +39,11 @@ const routes: Routes = [ ...@@ -39,11 +39,11 @@ const routes: Routes = [
}, },
{ {
path: 'details-offre/:oid', path: 'details-offre/:oid',
loadChildren: '../offre-details/offre-details.module#OffreDetailsPageModule' loadChildren: '../offres/offre-details/offre-details.module#OffreDetailsPageModule'
}, },
{ {
path: 'profil', path: 'profil',
loadChildren: '../profil/profil.module#ProfilPageModule' loadChildren: '../compte/profil/profil.module#ProfilPageModule'
}, },
] ]
} }
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { TripService } from '../../services/trip-service'; import { TripService } from '../../../services/trip-service';
@Component({ @Component({
selector: 'app-dashboard', selector: 'app-dashboard',
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { AlloService } from '../../services/allo-service'; import { AlloService } from '../../../services/allo-service';
import { TripService } from '../../services/trip-service'; import { TripService } from '../../../services/trip-service';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
......
...@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms'; ...@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular'; import { IonicModule } from '@ionic/angular';
import { SearchPipe } from '../../pipes/search/search.pipe'; import { SearchPipe } from '../../../pipes/search/search.pipe';
import { OffresCartePage } from './offres-carte.page'; import { OffresCartePage } from './offres-carte.page';
......
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
width: 18vw; width: 18vw;
height: 8vw; height: 8vw;
font-size: large; font-size: large;
display: flex;
align-items: center;
justify-content: center;
} }
ion-img { ion-img {
min-height: 10rem; min-height: 10rem;
......
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ToastController, IonInfiniteScroll } from '@ionic/angular'; import { ToastController, IonInfiniteScroll } from '@ionic/angular';
import { AlloService } from '../../services/allo-service'; import { AlloService } from '../../../services/allo-service';
import { TripService } from '../../services/trip-service'; import { TripService } from '../../../services/trip-service';
import { Storage } from '@ionic/storage'; import { Storage } from '@ionic/storage';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { LoadingController } from '@ionic/angular'; import { LoadingController } from '@ionic/angular';
// import { ActivatedRoute } from '@angular/router'; // import { ActivatedRoute } from '@angular/router';
import { TripService } from '../../services/trip-service'; import { TripService } from '../../../services/trip-service';
import { AlloService } from '../../services/allo-service'; import { AlloService } from '../../../services/allo-service';
@Component({ @Component({
selector: 'app-partenaires-list', selector: 'app-partenaires-list',
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { LoadingController } from '@ionic/angular'; import { LoadingController } from '@ionic/angular';
import { AlloService } from "../../services/allo-service"; import { AlloService } from '../../../services/allo-service';
import { TripService } from "../../services/trip-service"; import { TripService } from '../../../services/trip-service';
import L from 'leaflet'; import L from 'leaflet';
import 'leaflet.markercluster'; import 'leaflet.markercluster';
...@@ -36,7 +36,7 @@ export class PartenairesMapPage implements OnInit { ...@@ -36,7 +36,7 @@ export class PartenairesMapPage implements OnInit {
} }
loadmap() { loadmap() {
this.map = L.map("map", { attributionControl: false }); this.map = L.map('map', { attributionControl: false });
this.map.on('load', () => { this.map.on('load', () => {
// this.loader.dismiss(); // this.loader.dismiss();
}); });
......
...@@ -53,10 +53,10 @@ export class TripService { ...@@ -53,10 +53,10 @@ export class TripService {
this.products = this._ALLO.shuffleArray(products); this.products = this._ALLO.shuffleArray(products);
this.products.forEach((element) => { element.hidden = true; }); this.products.forEach((element) => { element.hidden = true; });
// setTimeout(() => { setTimeout(() => {
this.filtredProducts = this.products; this.filtredProducts = this.products;
this.offersCardList = this.filtredProducts.slice(0, 2); this.offersCardList = this.filtredProducts.slice(0, 2);
// }, 3000); }, 2000);
} }
if (null !== data && 'object' === typeof data && data.hasOwnProperty('cats')) { if (null !== data && 'object' === typeof data && data.hasOwnProperty('cats')) {
var cats = this._ALLO.jsonToArray(data.cats); var cats = this._ALLO.jsonToArray(data.cats);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment