Skip to content

A
allo-app
Commit cd027b99 by Nabil Sadki
Options

Merge branch 'v1.0.8.1' 

# Conflicts:
#	.gitignore
#	config.xml
#	package.json
#	src/app/app-routing.module.ts
#	src/app/app.component.ts
#	src/app/pages/dashboard/dashboard.page.html
#	src/app/pages/dashboard/dashboard.page.ts
#	src/app/pages/mainslider/mainslider.page.html
#	src/app/pages/mainslider/mainslider.page.scss
#	src/app/pages/mainslider/mainslider.page.ts
#	src/app/pages/menu/menu.module.ts
#	src/app/pages/menu/menu.page.html
#	src/app/pages/menu/menu.page.ts
#	src/app/pages/params/params.page.html
#	src/app/pages/partenaires-list/partenaires-list.page.ts
#	src/app/pages/start/start.page.ts
#	src/app/services/location-service.ts
#	src/app/services/trip-service.ts
parents 02cedb83 6a2c8e49
Showing with 106 additions and 95 deletions
.gitignore
......@@ -32,3 +32,6 @@ $RECYCLE.BIN/
.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate
.history
.gradle
CHANGELOG.md 0 → 100644
v1.0.8.1
- Add CHANGELOG.md
- Set geolocation param default to true
- Add more values to notiftime parameter
- Set notiftime param default to 1 day
- Add Allo Testeurs logo to menu
- Add presentation to menu
- Add skip presentation!
v1.0.8.0
- Presentation
- Deals list
- Partners list
- Partners geolocation
- Partners geonotification
- General params
- About us
- Contact us
\ No newline at end of file
config.xml
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.allotesteurs.app" version="1.0.8.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget android-versionCode="10810" id="com.allotesteurs.app" version="1.0.8.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Allo Testeurs</name>
<description>Découvrir les bon plans à Kénitra et ailleurs!</description>
<author email="contact@allo-testeurs.com" href="https://www.allo-testeurs.com">Allo Testeurs Agency</author>
......@@ -93,7 +93,7 @@
<preference name="DisallowOverscroll" value="true" />
<preference name="android-minSdkVersion" value="19" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashScreenDelay" value="6000" />
<preference name="SplashScreenDelay" value="10000" />
<preference name="FadeSplashScreen" value="true" />
<preference name="ShowSplashScreen" value="true" />
<preference name="ShowSplashScreenSpinner" value="false" />
......
package.json
{
"name": "atapp",
"version": "0.0.1",
"version": "1.0.8.1",
"author": "Allo Testeurs",
"homepage": "http://www.allo-testeurs.com/",
"scripts": {
......
src/app/app-routing.module.ts
......@@ -6,17 +6,6 @@ const routes: Routes = [
{ path: 'start', loadChildren: './pages/start/start.module#StartPageModule' },
{ path: 'mainslider', loadChildren: './pages/mainslider/mainslider.module#MainsliderPageModule' },
{ path: 'app', loadChildren: './pages/menu/menu.module#MenuPageModule' },
// { path: 'etablissement', loadChildren: './pages/etablissement/etablissement.module#EtablissementPageModule' },
// { path: 'login', loadChildren: './pages/login/login.module#LoginPageModule' },
// { path: 'dashboard', loadChildren: './pages/dashboard/dashboard.module#DashboardPageModule' },
// { path: 'contact', loadChildren: './pages/contact/contact.module#ContactPageModule' },
// { path: 'a-propos', loadChildren: './pages/a-propos/a-propos.module#AProposPageModule' },
// { path: 'params', loadChildren: './pages/params/params.module#ParamsPageModule' },
// { path: 'gagner-points', loadChildren: './pages/gagner-points/gagner-points.module#GagnerPointsPageModule' },
// { path: 'lots-a-gagner', loadChildren: './pages/lots-a-gagner/lots-a-gagner.module#LotsAGagnerPageModule' },
// { path: 'partenaires', loadChildren: './pages/partenaires/partenaires.module#PartenairesPageModule' },
// { path: 'partenaires-list', loadChildren: './pages/partenaires-list/partenaires-list.module#PartenairesListPageModule' },
// { path: 'partenaires-map', loadChildren: './pages/partenaires-map/partenaires-map.module#PartenairesMapPageModule' },
];
@NgModule({
......
src/app/app.component.ts
......@@ -52,7 +52,7 @@ export class AppComponent {
setDefaultParams() {
this._STOR.get('PARAM_geolocate').then((val) => {
if (val === null) {
this._STOR.set('PARAM_geolocate', false);
this._STOR.set('PARAM_geolocate', true);
}
});
this._STOR.get('PARAM_geoarea').then((val) => {
......@@ -62,7 +62,7 @@ export class AppComponent {
});
this._STOR.get('PARAM_notiftime').then((val) => {
if (val === null) {
this._STOR.set('PARAM_notiftime', 15);
this._STOR.set('PARAM_notiftime', 2880);
}
});
this._STOR.get('PARAM_trackdelay').then((val) => {
......
src/app/pages/dashboard/dashboard.page.html
<ion-header *ngIf="_ALLO.showPage">
<ion-header>
<ion-toolbar color="primary">
<ion-buttons slot="start">
<!-- <ion-button menuToggle>
......
src/app/pages/dashboard/dashboard.page.ts
......@@ -32,7 +32,7 @@ export class DashboardPage implements OnInit {
ngOnInit() {
console.log('ngOnInit Dashboard');
this._ALLO.presentLoading();
// this._ALLO.presentLoading();
}
setImgVisible(trip) {
......
src/app/pages/mainslider/mainslider.page.html
<ion-content>
<ion-slides pager="true">
<ion-slides #mainSlider pager="true">
<ion-slide color="primary" padding>
<ion-item lines="none" color="primary" class="skip">
<ion-button fill="outline" color="light" (click)="skipPresentation($event)">
Passer <ion-icon name="arrow-dropright-circle" slot="end"></ion-icon>
</ion-button>
</ion-item>
<ion-grid>
<ion-row>
<ion-col>
......@@ -54,6 +59,11 @@
<button ion-button class="round" color="light" margin-top full tappable (click)="getNotifs()">Notifs!</button>-->
</ion-slide>
<ion-slide padding>
<ion-item lines="none" color="primary" class="skip">
<ion-button fill="outline" color="light" (click)="skipPresentation($event)">
Passer <ion-icon name="arrow-dropright-circle" slot="end"></ion-icon>
</ion-button>
</ion-item>
<ion-grid>
<ion-row>
<ion-col>
......@@ -82,6 +92,11 @@
</ion-grid>
</ion-slide>
<ion-slide padding>
<ion-item lines="none" color="primary" class="skip">
<ion-button fill="outline" color="light" (click)="skipPresentation($event)">
Passer <ion-icon name="arrow-dropright-circle" slot="end"></ion-icon>
</ion-button>
</ion-item>
<ion-grid>
<ion-row>
<ion-col>
......@@ -110,6 +125,11 @@
</ion-grid>
</ion-slide>
<ion-slide padding>
<ion-item lines="none" color="primary" class="skip">
<ion-button fill="outline" color="light" (click)="skipPresentation($event)">
Passer <ion-icon name="arrow-dropright-circle" slot="end"></ion-icon>
</ion-button>
</ion-item>
<ion-grid>
<ion-row>
<ion-col>
......@@ -192,7 +212,8 @@
<ion-grid no-margin no-padding>
<ion-row>
<ion-col>
<ion-button class="round" color="light" margin-top full tappable href="/app/dashboard">
<ion-button class="round" color="light" margin-top full tappable
href="/app/dashboard">
Continuer sans &nbsp;<ion-icon name="arrow-dropright-circle"></ion-icon>
</ion-button>
</ion-col>
......
src/app/pages/mainslider/mainslider.page.scss
......@@ -9,8 +9,12 @@ ion-slides {
font-family: "Open Sans Light" !important;
text-align: justify;
}
.skip {
position: absolute;
top: 20px;
right: 20px;
}
.swiper-pagination-bullet-active {
background-color: var(--ion-color-light, #ffffff);
}
--bullet-background-active: var(--ion-color-light, #ffffff) !important;
}
src/app/pages/mainslider/mainslider.page.ts
import { Component, ViewChild } from '@angular/core';
import { Platform, NavController } from '@ionic/angular';
import { Platform, NavController, IonSlides } from '@ionic/angular';
import { Storage } from '@ionic/storage';
import { Router } from '@angular/router';
// import { DashboardPage } from "../dashboard/dashboard";
import { PermService } from "../../services/perm-service";
import { LocationService } from "../../services/location-service";
import { PermService } from '../../services/perm-service';
import { LocationService } from '../../services/location-service';
// import { AlloService } from "../../services/allo-service";
// import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
......@@ -15,6 +15,7 @@ import { LocationService } from "../../services/location-service";
})
export class MainsliderPage {
// @ViewChild(Nav) nav: NavController;
@ViewChild(IonSlides) mainSlider: IonSlides;
slideOpts = {
effect: 'flip'
......@@ -60,6 +61,12 @@ export class MainsliderPage {
// this._STOR.set('PARAM_mainslider', this.prmMainslider);
// }
skipPresentation($event) {
this.mainSlider.getActiveIndex().then(index => {
this.mainSlider.slideTo(4);
});
}
getGps() {
if (this.platform.is('cordova')) {
console.log('cord');
......
src/app/pages/menu/menu.module.ts
......@@ -5,8 +5,6 @@ import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
// import { NoBorderDirective } from '../../directives/no-border.directive';
import { MenuPage } from './menu.page';
const routes: Routes = [
......@@ -24,10 +22,6 @@ const routes: Routes = [
loadChildren: '../dashboard/dashboard.module#DashboardPageModule'
},
{
path: 'etablissement',
loadChildren: '../etablissement/etablissement.module#EtablissementPageModule'
},
{
path: 'partenaires',
loadChildren: '../partenaires/partenaires.module#PartenairesPageModule'
},
......@@ -42,18 +36,6 @@ const routes: Routes = [
{
path: 'a-propos',
loadChildren: '../a-propos/a-propos.module#AProposPageModule'
},
{
path: 'gagner-points',
loadChildren: '../gagner-points/gagner-points.module#GagnerPointsPageModule'
},
{
path: 'lots-a-gagner',
loadChildren: '../lots-a-gagner/lots-a-gagner.module#LotsAGagnerPageModule'
},
{
path: 'login',
loadChildren: '../login/login.module#LoginPageModule'
}
]
}
......
src/app/pages/menu/menu.page.html
<ion-menu contentId="content">
<ion-header>
<ion-toolbar color="primary">
<!-- <ion-title>Menu</ion-title> -->
<ion-avatar size="large" slot="start" class="ion-margin-start">
<img src="../../../assets/img/avatar.jpeg">
</ion-avatar>
<ion-item color="primary" lines="none">
<ion-label>
<h2>Nabil Sadki</h2>
<h3>Premium</h3>
<p>
<ion-badge color="light">1000 points</ion-badge>
</p>
</ion-label>
<ion-button fill="outline" slot="end" color="light">Modifier</ion-button>
</ion-item>
<!-- <ion-thumbnail size="large" slot="start" class="ion-margin-start"> -->
<ion-grid>
<ion-row>
<ion-col size="2"></ion-col>
<ion-col size="8">
<img src="../../../assets/logo-full-white.png">
</ion-col>
<ion-col size="2"></ion-col>
</ion-row>
</ion-grid>
<!-- </ion-thumbnail> -->
</ion-toolbar>
</ion-header>
<ion-content>
<div *ngFor="let p of pages">
......@@ -44,8 +40,8 @@
<!-- Children List for clicked Item -->
<ion-list *ngIf="p.open">
<ion-menu-toggle>
<ion-item *ngFor="let sub of p.children" class="sub-item" [routerLink]="sub.url" routerDirection="root"
routerLinkActive="active">
<ion-item *ngFor="let sub of p.children" class="sub-item" [routerLink]="sub.url"
routerDirection="root" routerLinkActive="active">
<ion-icon [name]="sub.icon" slot="start"></ion-icon>
<ion-label>
{{ sub.title }}
......
src/app/pages/menu/menu.page.ts
......@@ -34,29 +34,9 @@ export class MenuPage implements OnInit {
icon: 'alert'
},
{
title: 'Experimental',
children: [
{
title: 'Etablissement',
url: '/app/etablissement',
icon: 'business'
},
{
title: 'Gagner des points',
url: '/app/gagner-points',
icon: 'gift'
},
{
title: 'Lots à gagner',
url: '/app/lots-a-gagner',
icon: 'gift'
},
{
title: 'Login',
url: '/app/login',
icon: 'key'
},
]
title: 'Présentation',
url: '/mainslider',
icon: 'albums'
}
];
......
src/app/pages/params/params.page.html
......@@ -56,9 +56,11 @@
<ion-select-option value="15">15 min</ion-select-option>
<ion-select-option value="30">30 min</ion-select-option>
<ion-select-option value="45">45 min</ion-select-option>
<ion-select-option value="60">1h</ion-select-option>
<ion-select-option value="120">2h</ion-select-option>
<ion-select-option value="480">4h</ion-select-option>
<ion-select-option value="60">1 h</ion-select-option>
<ion-select-option value="120">2 h</ion-select-option>
<ion-select-option value="480">4 h</ion-select-option>
<ion-select-option value="960">8 h</ion-select-option>
<ion-select-option value="2880">1 j</ion-select-option>
</ion-select>
</ion-item>
<ion-item>
......
src/app/pages/partenaires-list/partenaires-list.page.ts
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';
......@@ -14,8 +15,10 @@ export class PartenairesListPage implements OnInit {
public partenairesList: Array<any> = [];
public offresList: Array<any> = [];
private loading: any;
// private partnerId: any = null;
constructor(
// private activatedRoute: ActivatedRoute,
public loadingController: LoadingController,
public _ALLO: AlloService,
public _TRIP: TripService
......@@ -56,7 +59,8 @@ export class PartenairesListPage implements OnInit {
ngOnInit() {
console.log('ngOnInit');
this._ALLO.presentLoading();
// this.partnerId = this.activatedRoute.snapshot.paramMap.get('partnerid');
// this._ALLO.presentLoading();
}
ionViewDidEnter() {
......
src/app/pages/start/start.page.ts
import { Component, OnInit } from '@angular/core';
import { TripService } from '../../services/trip-service';
@Component({
selector: 'app-start',
......@@ -7,10 +8,14 @@ import { Component, OnInit } from '@angular/core';
})
export class StartPage implements OnInit {
constructor() { }
constructor(
public _TRIP: TripService
) {
this._TRIP.fetchData(true);
}
ngOnInit() {
console.log('ngOnInit Start page');
// console.log('ngOnInit Start page');
}
}
src/app/services/location-service.ts
......@@ -213,11 +213,11 @@ export class LocationService {
text: 'Vous êtes tout prêt de ce partenaire!',
led: 'FFFFFF',
attachments: [partner.thumb],
vibrate: true,
actions: [
{ id: 'offres', partner: partner.id, title: 'Toutes les offres' },
{ id: 'fiche', partner: partner.id, title: 'Fiche du partenaire' }
]
vibrate: true
// actions: [
// { id: 'offres', partner: partner.id, title: 'Toutes les offres' },
// { id: 'fiche', partner: partner.id, title: 'Fiche du partenaire' }
// ]
});
this.notificationsToSave.push({
id: partner.id,
......
src/app/services/trip-service.ts
......@@ -35,7 +35,6 @@ export class TripService {
this.setData(json);
});
} else {
console.log('hhh');
this.http.get('https://www.allo-testeurs.com/services.json?' + Math.random())
.subscribe((data) => {
this.storage.set('REST_services', data);
......
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