Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
allo-app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nabil Sadki
allo-app
Commits
12c49ee4
Commit
12c49ee4
authored
Sep 11, 2019
by
Nabil Sadki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorganise folders
parent
0f9502d8
Hide whitespace changes
Inline
Side-by-side
Showing
53 changed files
with
25 additions
and
22 deletions
+25
-22
app-routing.module.ts
src/app/app-routing.module.ts
+2
-2
login.module.ts
src/app/pages/compte/login/login.module.ts
+0
-0
login.page.html
src/app/pages/compte/login/login.page.html
+0
-0
login.page.scss
src/app/pages/compte/login/login.page.scss
+0
-0
login.page.spec.ts
src/app/pages/compte/login/login.page.spec.ts
+0
-0
login.page.ts
src/app/pages/compte/login/login.page.ts
+1
-1
profil.module.ts
src/app/pages/compte/profil/profil.module.ts
+0
-0
profil.page.html
src/app/pages/compte/profil/profil.page.html
+0
-0
profil.page.scss
src/app/pages/compte/profil/profil.page.scss
+0
-0
profil.page.spec.ts
src/app/pages/compte/profil/profil.page.spec.ts
+0
-0
profil.page.ts
src/app/pages/compte/profil/profil.page.ts
+0
-0
lots-a-gagner.module.ts
src/app/pages/lots/lots-a-gagner/lots-a-gagner.module.ts
+0
-0
lots-a-gagner.page.html
src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.html
+0
-0
lots-a-gagner.page.scss
src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.scss
+0
-0
lots-a-gagner.page.spec.ts
src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.spec.ts
+0
-0
lots-a-gagner.page.ts
src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.ts
+0
-0
menu.module.ts
src/app/pages/menu/menu.module.ts
+4
-4
dashboard.module.ts
src/app/pages/offres/dashboard/dashboard.module.ts
+0
-0
dashboard.page.html
src/app/pages/offres/dashboard/dashboard.page.html
+0
-0
dashboard.page.scss
src/app/pages/offres/dashboard/dashboard.page.scss
+0
-0
dashboard.page.spec.ts
src/app/pages/offres/dashboard/dashboard.page.spec.ts
+0
-0
dashboard.page.ts
src/app/pages/offres/dashboard/dashboard.page.ts
+1
-1
offre-details.module.ts
src/app/pages/offres/offre-details/offre-details.module.ts
+0
-0
offre-details.page.html
src/app/pages/offres/offre-details/offre-details.page.html
+0
-0
offre-details.page.scss
src/app/pages/offres/offre-details/offre-details.page.scss
+0
-0
offre-details.page.spec.ts
...app/pages/offres/offre-details/offre-details.page.spec.ts
+0
-0
offre-details.page.ts
src/app/pages/offres/offre-details/offre-details.page.ts
+2
-2
offres-carte.module.ts
src/app/pages/offres/offres-carte/offres-carte.module.ts
+1
-1
offres-carte.page.html
src/app/pages/offres/offres-carte/offres-carte.page.html
+0
-0
offres-carte.page.scss
src/app/pages/offres/offres-carte/offres-carte.page.scss
+3
-0
offres-carte.page.spec.ts
src/app/pages/offres/offres-carte/offres-carte.page.spec.ts
+0
-0
offres-carte.page.ts
src/app/pages/offres/offres-carte/offres-carte.page.ts
+2
-2
offres-tlm.module.ts
src/app/pages/offres/offres-tlm/offres-tlm.module.ts
+0
-0
offres-tlm.page.html
src/app/pages/offres/offres-tlm/offres-tlm.page.html
+0
-0
offres-tlm.page.scss
src/app/pages/offres/offres-tlm/offres-tlm.page.scss
+0
-0
offres-tlm.page.spec.ts
src/app/pages/offres/offres-tlm/offres-tlm.page.spec.ts
+0
-0
offres-tlm.page.ts
src/app/pages/offres/offres-tlm/offres-tlm.page.ts
+0
-0
partenaires-list.module.ts
...s/partenaires/partenaires-list/partenaires-list.module.ts
+0
-0
partenaires-list.page.html
...s/partenaires/partenaires-list/partenaires-list.page.html
+0
-0
partenaires-list.page.scss
...s/partenaires/partenaires-list/partenaires-list.page.scss
+0
-0
partenaires-list.page.spec.ts
...artenaires/partenaires-list/partenaires-list.page.spec.ts
+0
-0
partenaires-list.page.ts
...ges/partenaires/partenaires-list/partenaires-list.page.ts
+2
-2
partenaires-map.module.ts
...ges/partenaires/partenaires-map/partenaires-map.module.ts
+0
-0
partenaires-map.page.html
...ges/partenaires/partenaires-map/partenaires-map.page.html
+0
-0
partenaires-map.page.scss
...ges/partenaires/partenaires-map/partenaires-map.page.scss
+0
-0
partenaires-map.page.spec.ts
.../partenaires/partenaires-map/partenaires-map.page.spec.ts
+0
-0
partenaires-map.page.ts
...pages/partenaires/partenaires-map/partenaires-map.page.ts
+3
-3
partenaires.module.ts
src/app/pages/partenaires/partenaires/partenaires.module.ts
+0
-0
partenaires.page.html
src/app/pages/partenaires/partenaires/partenaires.page.html
+0
-0
partenaires.page.scss
src/app/pages/partenaires/partenaires/partenaires.page.scss
+0
-0
partenaires.page.spec.ts
...pp/pages/partenaires/partenaires/partenaires.page.spec.ts
+0
-0
partenaires.page.ts
src/app/pages/partenaires/partenaires/partenaires.page.ts
+0
-0
trip-service.ts
src/app/services/trip-service.ts
+4
-4
No files found.
src/app/app-routing.module.ts
View file @
12c49ee4
...
...
@@ -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/offre
s/offre
-details/offre-details.module#OffreDetailsPageModule'
},
];
@
NgModule
({
...
...
src/app/pages/login/login.module.ts
→
src/app/pages/
compte/
login/login.module.ts
View file @
12c49ee4
File moved
src/app/pages/login/login.page.html
→
src/app/pages/
compte/
login/login.page.html
View file @
12c49ee4
File moved
src/app/pages/login/login.page.scss
→
src/app/pages/
compte/
login/login.page.scss
View file @
12c49ee4
File moved
src/app/pages/login/login.page.spec.ts
→
src/app/pages/
compte/
login/login.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/login/login.page.ts
→
src/app/pages/
compte/
login/login.page.ts
View file @
12c49ee4
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'
;
...
...
src/app/pages/profil/profil.module.ts
→
src/app/pages/
compte/
profil/profil.module.ts
View file @
12c49ee4
File moved
src/app/pages/profil/profil.page.html
→
src/app/pages/
compte/
profil/profil.page.html
View file @
12c49ee4
File moved
src/app/pages/profil/profil.page.scss
→
src/app/pages/
compte/
profil/profil.page.scss
View file @
12c49ee4
File moved
src/app/pages/profil/profil.page.spec.ts
→
src/app/pages/
compte/
profil/profil.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/profil/profil.page.ts
→
src/app/pages/
compte/
profil/profil.page.ts
View file @
12c49ee4
File moved
src/app/pages/lots-a-gagner/lots-a-gagner.module.ts
→
src/app/pages/lots
/lots
-a-gagner/lots-a-gagner.module.ts
View file @
12c49ee4
File moved
src/app/pages/lots-a-gagner/lots-a-gagner.page.html
→
src/app/pages/lots
/lots
-a-gagner/lots-a-gagner.page.html
View file @
12c49ee4
File moved
src/app/pages/lots-a-gagner/lots-a-gagner.page.scss
→
src/app/pages/lots
/lots
-a-gagner/lots-a-gagner.page.scss
View file @
12c49ee4
File moved
src/app/pages/lots-a-gagner/lots-a-gagner.page.spec.ts
→
src/app/pages/lots
/lots
-a-gagner/lots-a-gagner.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/lots-a-gagner/lots-a-gagner.page.ts
→
src/app/pages/lots
/lots
-a-gagner/lots-a-gagner.page.ts
View file @
12c49ee4
File moved
src/app/pages/menu/menu.module.ts
View file @
12c49ee4
...
...
@@ -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
:
'../offre
s/offre
-details/offre-details.module#OffreDetailsPageModule'
},
{
path
:
'profil'
,
loadChildren
:
'../profil/profil.module#ProfilPageModule'
loadChildren
:
'../
compte/
profil/profil.module#ProfilPageModule'
},
]
}
...
...
src/app/pages/dashboard/dashboard.module.ts
→
src/app/pages/
offres/
dashboard/dashboard.module.ts
View file @
12c49ee4
File moved
src/app/pages/dashboard/dashboard.page.html
→
src/app/pages/
offres/
dashboard/dashboard.page.html
View file @
12c49ee4
File moved
src/app/pages/dashboard/dashboard.page.scss
→
src/app/pages/
offres/
dashboard/dashboard.page.scss
View file @
12c49ee4
File moved
src/app/pages/dashboard/dashboard.page.spec.ts
→
src/app/pages/
offres/
dashboard/dashboard.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/dashboard/dashboard.page.ts
→
src/app/pages/
offres/
dashboard/dashboard.page.ts
View file @
12c49ee4
import
{
Component
,
OnInit
}
from
'@angular/core'
;
import
{
TripService
}
from
'../../services/trip-service'
;
import
{
TripService
}
from
'../../
../
services/trip-service'
;
@
Component
({
selector
:
'app-dashboard'
,
...
...
src/app/pages/offre-details/offre-details.module.ts
→
src/app/pages/offre
s/offre
-details/offre-details.module.ts
View file @
12c49ee4
File moved
src/app/pages/offre-details/offre-details.page.html
→
src/app/pages/offre
s/offre
-details/offre-details.page.html
View file @
12c49ee4
File moved
src/app/pages/offre-details/offre-details.page.scss
→
src/app/pages/offre
s/offre
-details/offre-details.page.scss
View file @
12c49ee4
File moved
src/app/pages/offre-details/offre-details.page.spec.ts
→
src/app/pages/offre
s/offre
-details/offre-details.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/offre-details/offre-details.page.ts
→
src/app/pages/offre
s/offre
-details/offre-details.page.ts
View file @
12c49ee4
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'
;
...
...
src/app/pages/offres-carte/offres-carte.module.ts
→
src/app/pages/offres
/offres
-carte/offres-carte.module.ts
View file @
12c49ee4
...
...
@@ -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'
;
...
...
src/app/pages/offres-carte/offres-carte.page.html
→
src/app/pages/offres
/offres
-carte/offres-carte.page.html
View file @
12c49ee4
File moved
src/app/pages/offres-carte/offres-carte.page.scss
→
src/app/pages/offres
/offres
-carte/offres-carte.page.scss
View file @
12c49ee4
...
...
@@ -10,6 +10,9 @@
width
:
18vw
;
height
:
8vw
;
font-size
:
large
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
ion-img
{
min-height
:
10rem
;
...
...
src/app/pages/offres-carte/offres-carte.page.spec.ts
→
src/app/pages/offres
/offres
-carte/offres-carte.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/offres-carte/offres-carte.page.ts
→
src/app/pages/offres
/offres
-carte/offres-carte.page.ts
View file @
12c49ee4
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'
;
...
...
src/app/pages/offres-tlm/offres-tlm.module.ts
→
src/app/pages/offres
/offres
-tlm/offres-tlm.module.ts
View file @
12c49ee4
File moved
src/app/pages/offres-tlm/offres-tlm.page.html
→
src/app/pages/offres
/offres
-tlm/offres-tlm.page.html
View file @
12c49ee4
File moved
src/app/pages/offres-tlm/offres-tlm.page.scss
→
src/app/pages/offres
/offres
-tlm/offres-tlm.page.scss
View file @
12c49ee4
File moved
src/app/pages/offres-tlm/offres-tlm.page.spec.ts
→
src/app/pages/offres
/offres
-tlm/offres-tlm.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/offres-tlm/offres-tlm.page.ts
→
src/app/pages/offres
/offres
-tlm/offres-tlm.page.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires-list/partenaires-list.module.ts
→
src/app/pages/partenaires
/partenaires
-list/partenaires-list.module.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires-list/partenaires-list.page.html
→
src/app/pages/partenaires
/partenaires
-list/partenaires-list.page.html
View file @
12c49ee4
File moved
src/app/pages/partenaires-list/partenaires-list.page.scss
→
src/app/pages/partenaires
/partenaires
-list/partenaires-list.page.scss
View file @
12c49ee4
File moved
src/app/pages/partenaires-list/partenaires-list.page.spec.ts
→
src/app/pages/partenaires
/partenaires
-list/partenaires-list.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires-list/partenaires-list.page.ts
→
src/app/pages/partenaires
/partenaires
-list/partenaires-list.page.ts
View file @
12c49ee4
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'
,
...
...
src/app/pages/partenaires-map/partenaires-map.module.ts
→
src/app/pages/partenaires
/partenaires
-map/partenaires-map.module.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires-map/partenaires-map.page.html
→
src/app/pages/partenaires
/partenaires
-map/partenaires-map.page.html
View file @
12c49ee4
File moved
src/app/pages/partenaires-map/partenaires-map.page.scss
→
src/app/pages/partenaires
/partenaires
-map/partenaires-map.page.scss
View file @
12c49ee4
File moved
src/app/pages/partenaires-map/partenaires-map.page.spec.ts
→
src/app/pages/partenaires
/partenaires
-map/partenaires-map.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires-map/partenaires-map.page.ts
→
src/app/pages/partenaires
/partenaires
-map/partenaires-map.page.ts
View file @
12c49ee4
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();
});
...
...
src/app/pages/partenaires/partenaires.module.ts
→
src/app/pages/partenaires/partenaires
/partenaires
.module.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires/partenaires.page.html
→
src/app/pages/partenaires/partenaires
/partenaires
.page.html
View file @
12c49ee4
File moved
src/app/pages/partenaires/partenaires.page.scss
→
src/app/pages/partenaires/partenaires
/partenaires
.page.scss
View file @
12c49ee4
File moved
src/app/pages/partenaires/partenaires.page.spec.ts
→
src/app/pages/partenaires/partenaires
/partenaires
.page.spec.ts
View file @
12c49ee4
File moved
src/app/pages/partenaires/partenaires.page.ts
→
src/app/pages/partenaires/partenaires
/partenaires
.page.ts
View file @
12c49ee4
File moved
src/app/services/trip-service.ts
View file @
12c49ee4
...
...
@@ -53,10 +53,10 @@ export class TripService {
this
.
products
=
this
.
_ALLO
.
shuffleArray
(
products
);
this
.
products
.
forEach
((
element
)
=>
{
element
.
hidden
=
true
;
});
//
setTimeout(() => {
this
.
filtredProducts
=
this
.
products
;
this
.
offersCardList
=
this
.
filtredProducts
.
slice
(
0
,
2
);
// }, 3
000);
setTimeout
(()
=>
{
this
.
filtredProducts
=
this
.
products
;
this
.
offersCardList
=
this
.
filtredProducts
.
slice
(
0
,
2
);
},
2
000
);
}
if
(
null
!==
data
&&
'object'
===
typeof
data
&&
data
.
hasOwnProperty
(
'cats'
))
{
var
cats
=
this
.
_ALLO
.
jsonToArray
(
data
.
cats
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment