Commit 12c49ee4 by Nabil Sadki

Reorganise folders

parent 0f9502d8
......@@ -4,10 +4,10 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
const routes: Routes = [
{ path: '', redirectTo: 'mainslider', pathMatch: 'full' },
{ 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: '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({
......
import { Component, OnInit } from '@angular/core';
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 { Router } from '@angular/router';
import { GooglePlus } from '@ionic-native/google-plus/ngx';
......
......@@ -19,11 +19,11 @@ const routes: Routes = [
children: [
{
path: 'dashboard',
loadChildren: '../dashboard/dashboard.module#DashboardPageModule'
loadChildren: '../offres/dashboard/dashboard.module#DashboardPageModule'
},
{
path: 'partenaires',
loadChildren: '../partenaires/partenaires.module#PartenairesPageModule'
loadChildren: '../partenaires/partenaires/partenaires.module#PartenairesPageModule'
},
{
path: 'params',
......@@ -39,11 +39,11 @@ const routes: Routes = [
},
{
path: 'details-offre/:oid',
loadChildren: '../offre-details/offre-details.module#OffreDetailsPageModule'
loadChildren: '../offres/offre-details/offre-details.module#OffreDetailsPageModule'
},
{
path: 'profil',
loadChildren: '../profil/profil.module#ProfilPageModule'
loadChildren: '../compte/profil/profil.module#ProfilPageModule'
},
]
}
......
import { Component, OnInit } from '@angular/core';
import { TripService } from '../../services/trip-service';
import { TripService } from '../../../services/trip-service';
@Component({
selector: 'app-dashboard',
......
import { Component, OnInit } from '@angular/core';
import { AlloService } from '../../services/allo-service';
import { TripService } from '../../services/trip-service';
import { AlloService } from '../../../services/allo-service';
import { TripService } from '../../../services/trip-service';
import { Storage } from '@ionic/storage';
import { ActivatedRoute } from '@angular/router';
......
......@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
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';
......
......@@ -10,6 +10,9 @@
width: 18vw;
height: 8vw;
font-size: large;
display: flex;
align-items: center;
justify-content: center;
}
ion-img {
min-height: 10rem;
......
import { Component, OnInit, ViewChild } from '@angular/core';
import { ToastController, IonInfiniteScroll } from '@ionic/angular';
import { AlloService } from '../../services/allo-service';
import { TripService } from '../../services/trip-service';
import { AlloService } from '../../../services/allo-service';
import { TripService } from '../../../services/trip-service';
import { Storage } from '@ionic/storage';
import { Router } from '@angular/router';
......
import { Component, OnInit } from '@angular/core';
import { LoadingController } from '@ionic/angular';
// import { ActivatedRoute } from '@angular/router';
import { TripService } from '../../services/trip-service';
import { AlloService } from '../../services/allo-service';
import { TripService } from '../../../services/trip-service';
import { AlloService } from '../../../services/allo-service';
@Component({
selector: 'app-partenaires-list',
......
import { Component, OnInit } from '@angular/core';
import { LoadingController } from '@ionic/angular';
import { AlloService } from "../../services/allo-service";
import { TripService } from "../../services/trip-service";
import { AlloService } from '../../../services/allo-service';
import { TripService } from '../../../services/trip-service';
import L from 'leaflet';
import 'leaflet.markercluster';
......@@ -36,7 +36,7 @@ export class PartenairesMapPage implements OnInit {
}
loadmap() {
this.map = L.map("map", { attributionControl: false });
this.map = L.map('map', { attributionControl: false });
this.map.on('load', () => {
// this.loader.dismiss();
});
......
......@@ -53,10 +53,10 @@ export class TripService {
this.products = this._ALLO.shuffleArray(products);
this.products.forEach((element) => { element.hidden = true; });
// setTimeout(() => {
setTimeout(() => {
this.filtredProducts = this.products;
this.offersCardList = this.filtredProducts.slice(0, 2);
// }, 3000);
}, 2000);
}
if (null !== data && 'object' === typeof data && data.hasOwnProperty('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