Skip to content

C
Callmycab-Driverapp
Commit b07dac76 by Alen Jose
Options

Merge branch 'alen' into 'master'

Alen See merge request alen/CMC-driver!4
parents b2389697 94466005
Showing with 473 additions and 166 deletions
config.xml
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.starter" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>CMC_driver</name> <name>CMC-Driver</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
<content src="index.html" /> <content src="index.html" />
...@@ -76,15 +76,12 @@ ...@@ -76,15 +76,12 @@
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" /> <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
<splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" /> <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
</platform> </platform>
<plugin name="cordova-plugin-whitelist" spec="1.3.3" /> <engine name="android" spec="^6.2.3" />
<plugin name="cordova-plugin-device" spec="2.0.2" /> <plugin name="cordova-plugin-app-event" spec="^1.2.1" />
<plugin name="cordova-plugin-splashscreen" spec="5.0.2" /> <plugin name="cordova-plugin-device" spec="^2.0.2" />
<plugin name="cordova-plugin-ionic-webview" spec="1.1.19" /> <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
<plugin name="cordova-plugin-ionic-keyboard" spec="2.0.5" /> <plugin name="cordova-plugin-ionic-webview" spec="^1.1.19" />
<plugin name="cordova-plugin-network-information" spec="^2.0.1" /> <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
<plugin name="onesignal-cordova-plugin" spec="^2.4.1" /> <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-plugin-request-location-accuracy" spec="^2.2.3" /> <plugin name="de.appplant.cordova.plugin.local-notification" spec="^0.8.5" />
<plugin name="cordova-plugin-geolocation" spec="^4.0.1">
<variable name="GEOLOCATION_USAGE_DESCRIPTION" value="To locate you" />
</plugin>
</widget> </widget>
ionic.config.json
{ {
"name": "CMC_driver", "name": "myApp",
"app_id": "", "app_id": "",
"type": "ionic-angular", "type": "ionic-angular",
"integrations": { "integrations": {
......
package-lock.json
{ {
"name": "CMC_driver", "name": "myApp",
"version": "0.0.1", "version": "0.0.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
"integrity": "sha512-0r3gSQk9jw5orFHCTUIgao0zan6dHt2J0BO3t/uEzbod+uwqvUn/gh+yg+kK6HX92Fg8E7y030KX4Bw/aXt0Ew==" "integrity": "sha512-0r3gSQk9jw5orFHCTUIgao0zan6dHt2J0BO3t/uEzbod+uwqvUn/gh+yg+kK6HX92Fg8E7y030KX4Bw/aXt0Ew=="
}, },
"@firebase/database": { "@firebase/database": {
"version": "0.3.3", "version": "0.3.4",
"resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.3.4.tgz",
"integrity": "sha512-8r/snlMuOB6QXdkfjbZaFxK1U8CbQgCG0rVfMHclRVNQhZLtTEtiVNDTQk75bfxY0k+iqyg+6fsNWClA92glcg==", "integrity": "sha512-xsQPk4MJq8KuuEq0QXYVWsQc+ksMeoYpmiYWM9UWIoT20PqmZ2WHmxLkVW7xFnM55wsawJ2FtW/Nan9uMhS1nw==",
"requires": { "requires": {
"@firebase/database-types": "0.3.2", "@firebase/database-types": "0.3.2",
"@firebase/logger": "0.1.1", "@firebase/logger": "0.1.1",
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
"integrity": "sha512-9ZYdvYQ6r3aaHJarhUM5Hf6lQWu3ZJme+RR0o8qfBb9L04TL3uNjt+AJFku1ysVPntTn+9GqJjiIB2/OC3JtwA==" "integrity": "sha512-9ZYdvYQ6r3aaHJarhUM5Hf6lQWu3ZJme+RR0o8qfBb9L04TL3uNjt+AJFku1ysVPntTn+9GqJjiIB2/OC3JtwA=="
}, },
"@firebase/firestore": { "@firebase/firestore": {
"version": "0.5.5", "version": "0.5.6",
"resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.5.5.tgz", "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-0.5.6.tgz",
"integrity": "sha512-JE97NcAinBSt2JArhjSHWETldUHn5gWhl25jQkiwIhEUqcie4Km0xcXFveah8GNaHJQYfz61RPCV4lkjJoEtQw==", "integrity": "sha512-0D8HRi3S9sF+dDN2O7JwYe/tXSoQRwgO/q4DhbgS+Btd0KPgz+I/+TP6kEqA4g74PgpX06ND6LWvfE5eIUXcyA==",
"requires": { "requires": {
"@firebase/firestore-types": "0.4.3", "@firebase/firestore-types": "0.4.3",
"@firebase/logger": "0.1.1", "@firebase/logger": "0.1.1",
...@@ -193,11 +193,11 @@ ...@@ -193,11 +193,11 @@
"integrity": "sha512-QdFBhH0Bcw7TRodN6nJ1pQq0AGAgMfpIUQguKcogTE/2L/lAECxbUfTWtBcGenKcSKpae5xJuuhGZxaPGkQv7A==" "integrity": "sha512-QdFBhH0Bcw7TRodN6nJ1pQq0AGAgMfpIUQguKcogTE/2L/lAECxbUfTWtBcGenKcSKpae5xJuuhGZxaPGkQv7A=="
}, },
"@firebase/functions": { "@firebase/functions": {
"version": "0.2.4", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.2.4.tgz", "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.3.0.tgz",
"integrity": "sha512-HSa2MdBRPWltv1gvE1nWmbzxtWt5jJt4gZ8wje5qEIld7tbLvaWCJRvLGwH/dX1r9s6u6GtDF9FD4Gn2z2xFiQ==", "integrity": "sha512-bCJmcniVbCdPcydI+CdeEkDidlBnJRsc667ETvljwfnp+df4Em2ZSqcEG8DApzuyd+uI+rYFCvwX5FS4pkFkcA==",
"requires": { "requires": {
"@firebase/functions-types": "0.1.3", "@firebase/functions-types": "0.2.0",
"@firebase/messaging-types": "0.2.3", "@firebase/messaging-types": "0.2.3",
"isomorphic-fetch": "2.2.1", "isomorphic-fetch": "2.2.1",
"tslib": "1.9.0" "tslib": "1.9.0"
...@@ -211,9 +211,9 @@ ...@@ -211,9 +211,9 @@
} }
}, },
"@firebase/functions-types": { "@firebase/functions-types": {
"version": "0.1.3", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.1.3.tgz", "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.2.0.tgz",
"integrity": "sha512-9cOrF5b2B3kfdwsRm3owSXZciIQbupbEKhq4WTsLRXU8mz8ol7WxuOuG/FwYaHryeI8z29gIzP9NpiGoKJgo4w==" "integrity": "sha512-q1FB3YKEAnWd+FpIL5Xn0B1BXO2IowrAdrSViXkFxNZVpp9iCzQ8Ytcbr3V1xUr3dnmoW/V7zkZJZGuwBgiVhw=="
}, },
"@firebase/logger": { "@firebase/logger": {
"version": "0.1.1", "version": "0.1.1",
...@@ -301,39 +301,49 @@ ...@@ -301,39 +301,49 @@
"integrity": "sha512-ToJbeJnxDc3O325FvcKVb3yHO1hvgHjCFvhKol6Z17GiB7vL104POjFQT4RnlLiAGSRCBAMxinDec9y9vQYdyg==" "integrity": "sha512-ToJbeJnxDc3O325FvcKVb3yHO1hvgHjCFvhKol6Z17GiB7vL104POjFQT4RnlLiAGSRCBAMxinDec9y9vQYdyg=="
}, },
"@ionic-native/core": { "@ionic-native/core": {
"version": "4.7.0", "version": "4.8.0",
"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-4.7.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-4.8.0.tgz",
"integrity": "sha512-BT4a9qIl3qfJMukcfMPtXDAAsOrYIAoVQvCodDZhqGExTakIx0/JlOr+lZa6KEU46CoA1SEctcBjj0N+nNcWOw==" "integrity": "sha512-+kCkilCVOJvkGV3LF/d2XIFJnERsXafJJwvEfc7eLLpEh2XklMpiMho3u3R9urFOj1XcQ1mqECGXOE1BeamZuA=="
},
"@ionic-native/device": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-4.9.0.tgz",
"integrity": "sha512-AnwB6dsgpepfYXe5Ow40Y2E/cGLIF8nq2BAhSULdw1/ANtAAszVQyFGGxbV3bPy4ahi/d2mRRfzerqtYiSw/Vg=="
}, },
"@ionic-native/geolocation": { "@ionic-native/geolocation": {
"version": "4.8.0", "version": "4.9.0",
"resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-4.8.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/geolocation/-/geolocation-4.9.0.tgz",
"integrity": "sha512-5WcloJjAbKTG9WcAvJnRPgylTbVZgWB25LyejQb6bed4by/jE3yHmL+CmSetmFsu00/NvMQrE3BmrC/tJBLulA==" "integrity": "sha512-MjOuYMKr9u0sJnO8lPplKBFrS8hU2/eMBg6JImV+PPDSm+cu865KOkNCxeW/p1pT6S6vtNRHuUKgtDc1bOKfkw=="
},
"@ionic-native/local-notifications": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-4.9.0.tgz",
"integrity": "sha512-4x1gfaqu/1KLHlhcaFCxxCLADZerVyKRxRIPJc6OE2EHNbtvKexbfbpFId4fmJNwgKSU01xojAFPxg+Dz/MEFQ=="
}, },
"@ionic-native/location-accuracy": { "@ionic-native/location-accuracy": {
"version": "4.8.0", "version": "4.9.0",
"resolved": "https://registry.npmjs.org/@ionic-native/location-accuracy/-/location-accuracy-4.8.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/location-accuracy/-/location-accuracy-4.9.0.tgz",
"integrity": "sha512-nUwUpI/RUYOfAz8Yz0dJXBlk+59D4f25c5YYyTBaDjPpKO6sREoGp5iVZYKPZodYj1niinBANFBnnsEHTTLQHw==" "integrity": "sha512-ZrWYP29k5HQQOwWrRf4rPuJtqqGAoxAME0ZScsBcpAXioz2WdJhPuioJ9v/XMlwulFfHhdXkMTXMuHjqgTouYg=="
}, },
"@ionic-native/network": { "@ionic-native/network": {
"version": "4.8.0", "version": "4.9.0",
"resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-4.8.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-4.9.0.tgz",
"integrity": "sha512-60F6VLpWLmCTSPxaFGxmXRVre+e09xWU/x050MUkeOX/OkCfCjDOQUP1bleLe9O7rZFL3fPtngZV7TObOrRmXQ==" "integrity": "sha512-tSF5RhuTw9Zf8UHwAlUw5GU9ouvNMuxBS8RoDh7d/l7OkoZnluw4XkazvO/m21d2OFgHhkG3XUXuIi2OhUo+mw=="
}, },
"@ionic-native/onesignal": { "@ionic-native/onesignal": {
"version": "4.8.0", "version": "4.9.0",
"resolved": "https://registry.npmjs.org/@ionic-native/onesignal/-/onesignal-4.8.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/onesignal/-/onesignal-4.9.0.tgz",
"integrity": "sha512-fUYGdIyZ48OALX726zaRSVwRX3ZDLMsuc0dB3qbi/keBVZhWAooCeZPV4UdkzynFOnFnPRcGzJxk6q/SUgGP/g==" "integrity": "sha512-zSq4lp0fdIsoGYU7CRsyJLs9migmowYK8Kbg2hVE1pYbLgAJk86B53928k7sO6gJrDLNlBFqYhc2wC8T+N9hRw=="
}, },
"@ionic-native/splash-screen": { "@ionic-native/splash-screen": {
"version": "4.7.0", "version": "4.8.0",
"resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-4.7.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-4.8.0.tgz",
"integrity": "sha512-3kh/FiXzgvhbgLoJXHXuNwirVMgsVlw2x95sdwMSHAN3sfUEjg9sNu57WbsIMzzlTbxZ6wdeWIErH9SVDFC/sw==" "integrity": "sha512-MOB5przq4oRpTVINHbKgzeuunycZ34EdmFZ4RgnkaUUEAeNoTya2XqiHhGSImBXbslEKKXBvXe7LuYMlLCxvuw=="
}, },
"@ionic-native/status-bar": { "@ionic-native/status-bar": {
"version": "4.7.0", "version": "4.8.0",
"resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-4.7.0.tgz", "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-4.8.0.tgz",
"integrity": "sha512-sUQhWH0Wv6k7tFCBwR3s89NUyzLSrxutRerzMGVHnE8s2o4cNV1yM7zRSjIS6VQxUDnAyEv4CLFbuZmNvqooFw==" "integrity": "sha512-mNtE7HI7W7TydIJaux48G3Lp9BEH2Hx+RWPySfmH3bwl7yeytvXzlKPPCYbpphBlRhIKYp5v3hepM7Ufuo3+9A=="
}, },
"@ionic/app-scripts": { "@ionic/app-scripts": {
"version": "3.1.10", "version": "3.1.10",
...@@ -659,7 +669,7 @@ ...@@ -659,7 +669,7 @@
"dev": true, "dev": true,
"requires": { "requires": {
"browserslist": "2.11.3", "browserslist": "2.11.3",
"caniuse-lite": "1.0.30000858", "caniuse-lite": "1.0.30000861",
"normalize-range": "0.1.2", "normalize-range": "0.1.2",
"num2fraction": "1.2.2", "num2fraction": "1.2.2",
"postcss": "6.0.23", "postcss": "6.0.23",
...@@ -800,9 +810,9 @@ ...@@ -800,9 +810,9 @@
"dev": true "dev": true
}, },
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -1016,7 +1026,7 @@ ...@@ -1016,7 +1026,7 @@
"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
"dev": true, "dev": true,
"requires": { "requires": {
"caniuse-lite": "1.0.30000858", "caniuse-lite": "1.0.30000861",
"electron-to-chromium": "1.3.50" "electron-to-chromium": "1.3.50"
} }
}, },
...@@ -1109,9 +1119,9 @@ ...@@ -1109,9 +1119,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30000858", "version": "1.0.30000861",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000858.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000861.tgz",
"integrity": "sha512-oJRGfVfwHr0VKcoy2UqIoRmQcDOugnNAQsWYI3/JTzExrlzxSKtmLW1N4h+gmjgpYCEJthHmaIjok894H5il/g==", "integrity": "sha512-aeEQ4kyd41qCl8XFbCjWgVBI3EOd66M9sC43MFn0kuD/vcrNqvoIAlKon4xdp8yMCYvVjdCltI3lgArj8I6cNA==",
"dev": true "dev": true
}, },
"caseless": { "caseless": {
...@@ -1273,9 +1283,9 @@ ...@@ -1273,9 +1283,9 @@
} }
}, },
"commander": { "commander": {
"version": "2.15.1", "version": "2.16.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
"dev": true "dev": true
}, },
"component-emitter": { "component-emitter": {
...@@ -1346,20 +1356,244 @@ ...@@ -1346,20 +1356,244 @@
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
"dev": true "dev": true
}, },
"cordova-plugin-geolocation": { "cordova-android": {
"version": "4.0.1", "version": "6.2.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-geolocation/-/cordova-plugin-geolocation-4.0.1.tgz", "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-6.2.3.tgz",
"integrity": "sha1-RwP6ZJ0kBdJamnMsmev4aHVKLAQ=" "integrity": "sha1-JJ8hts5fHxyEenq4OxaQnb7Vqig=",
"requires": {
"cordova-common": "2.0.2",
"elementtree": "0.1.6",
"nopt": "3.0.6",
"properties-parser": "0.2.3",
"q": "1.5.0",
"shelljs": "0.5.3"
}, },
"cordova-plugin-network-information": { "dependencies": {
"version": "2.0.1", "abbrev": {
"resolved": "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-2.0.1.tgz", "version": "1.1.0",
"integrity": "sha1-6QQh9DDGq3bUCSI/Jfzvu7zhdpA=" "bundled": true
},
"ansi": {
"version": "0.3.1",
"bundled": true
},
"balanced-match": {
"version": "0.4.2",
"bundled": true
},
"base64-js": {
"version": "0.0.8",
"bundled": true
},
"big-integer": {
"version": "1.6.22",
"bundled": true
},
"bplist-parser": {
"version": "0.1.1",
"bundled": true,
"requires": {
"big-integer": "1.6.22"
}
},
"brace-expansion": {
"version": "1.1.7",
"bundled": true,
"requires": {
"balanced-match": "0.4.2",
"concat-map": "0.0.1"
}
},
"concat-map": {
"version": "0.0.1",
"bundled": true
},
"cordova-common": {
"version": "2.0.2",
"bundled": true,
"requires": {
"ansi": "0.3.1",
"bplist-parser": "0.1.1",
"cordova-registry-mapper": "1.1.15",
"elementtree": "0.1.6",
"glob": "5.0.15",
"minimatch": "3.0.3",
"osenv": "0.1.4",
"plist": "1.2.0",
"q": "1.5.0",
"semver": "5.3.0",
"shelljs": "0.5.3",
"underscore": "1.8.3",
"unorm": "1.4.1"
}
},
"cordova-registry-mapper": {
"version": "1.1.15",
"bundled": true
},
"elementtree": {
"version": "0.1.6",
"bundled": true,
"requires": {
"sax": "0.3.5"
}
},
"glob": {
"version": "5.0.15",
"bundled": true,
"requires": {
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.3",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
}
},
"inherits": {
"version": "2.0.3",
"bundled": true
},
"lodash": {
"version": "3.10.1",
"bundled": true
},
"minimatch": {
"version": "3.0.3",
"bundled": true,
"requires": {
"brace-expansion": "1.1.7"
}
},
"nopt": {
"version": "3.0.6",
"bundled": true,
"requires": {
"abbrev": "1.1.0"
}
},
"once": {
"version": "1.4.0",
"bundled": true,
"requires": {
"wrappy": "1.0.2"
}
},
"os-homedir": {
"version": "1.0.2",
"bundled": true
},
"os-tmpdir": {
"version": "1.0.2",
"bundled": true
},
"osenv": {
"version": "0.1.4",
"bundled": true,
"requires": {
"os-homedir": "1.0.2",
"os-tmpdir": "1.0.2"
}
},
"path-is-absolute": {
"version": "1.0.1",
"bundled": true
},
"plist": {
"version": "1.2.0",
"bundled": true,
"requires": {
"base64-js": "0.0.8",
"util-deprecate": "1.0.2",
"xmlbuilder": "4.0.0",
"xmldom": "0.1.27"
}
},
"properties-parser": {
"version": "0.2.3",
"bundled": true
},
"q": {
"version": "1.5.0",
"bundled": true
},
"sax": {
"version": "0.3.5",
"bundled": true
},
"semver": {
"version": "5.3.0",
"bundled": true
},
"shelljs": {
"version": "0.5.3",
"bundled": true
}, },
"cordova-plugin-request-location-accuracy": { "underscore": {
"version": "2.2.3", "version": "1.8.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-request-location-accuracy/-/cordova-plugin-request-location-accuracy-2.2.3.tgz", "bundled": true
"integrity": "sha512-cwcG+4sHIU/Vfe1mvEtXh5hfo4k8OEdHo1Rdc9GU0YU/5J/umsBQdHfuBJ7hez59N7lRoUKpKhLhcY8MPBz9Fg==" },
"unorm": {
"version": "1.4.1",
"bundled": true
},
"util-deprecate": {
"version": "1.0.2",
"bundled": true
},
"wrappy": {
"version": "1.0.2",
"bundled": true
},
"xmlbuilder": {
"version": "4.0.0",
"bundled": true,
"requires": {
"lodash": "3.10.1"
}
},
"xmldom": {
"version": "0.1.27",
"bundled": true
}
}
},
"cordova-plugin-app-event": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/cordova-plugin-app-event/-/cordova-plugin-app-event-1.2.1.tgz",
"integrity": "sha1-DuuxQTKqQ7suXAgamr29l8otgTI="
},
"cordova-plugin-device": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz",
"integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro="
},
"cordova-plugin-ionic-keyboard": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.0.5.tgz",
"integrity": "sha512-ygwK+U7Vs7OJJYsDrWAxhegHfvuRRpMC3Y8RhQSVLfv4ELrXtkCUjD+UfsDQ3aObpvxGLTvcVrOw5p04dPXy3w=="
},
"cordova-plugin-ionic-webview": {
"version": "1.1.19",
"resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-1.1.19.tgz",
"integrity": "sha512-Sgs6eHWsVFYBuc2xVhA3JqV7d7Wac6Yj1ZJjBLrhaA60LlMV8pReaPvWr898DKoLfhlBhJqNBEJSUAVP/4G9FA=="
},
"cordova-plugin-splashscreen": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz",
"integrity": "sha1-dH509W4gHNWFvGLRS8oZ9oZ/8e0="
},
"cordova-plugin-whitelist": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
}, },
"core-js": { "core-js": {
"version": "2.5.5", "version": "2.5.5",
...@@ -1488,6 +1722,15 @@ ...@@ -1488,6 +1722,15 @@
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
"dev": true "dev": true
}, },
"de.appplant.cordova.plugin.local-notification": {
"version": "0.8.5",
"resolved": "https://registry.npmjs.org/de.appplant.cordova.plugin.local-notification/-/de.appplant.cordova.plugin.local-notification-0.8.5.tgz",
"integrity": "sha1-4MaobqUqxPQdumdSHZGlippCo70=",
"requires": {
"cordova-plugin-app-event": "1.2.1",
"cordova-plugin-device": "2.0.2"
}
},
"debug": { "debug": {
"version": "2.6.9", "version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
...@@ -2124,15 +2367,15 @@ ...@@ -2124,15 +2367,15 @@
} }
}, },
"firebase": { "firebase": {
"version": "5.1.0", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/firebase/-/firebase-5.1.0.tgz", "resolved": "https://registry.npmjs.org/firebase/-/firebase-5.2.0.tgz",
"integrity": "sha512-Q9m10Jvfge+2PAbxBM5zy0BiTf3UhAY5W32nIhwg6yKVhq4ZCk6xeZcxoLqTwKJLdJRH05rpnz9mx88QaAP5oQ==", "integrity": "sha512-mWrQihqNXLhQWr1TuORN82wwoKDy5Z4OJyUSlv2wp9EaH0m6AkivFoVjHyEHzU54krP940z5PGF3d4nMlRs1gA==",
"requires": { "requires": {
"@firebase/app": "0.3.3", "@firebase/app": "0.3.3",
"@firebase/auth": "0.7.0", "@firebase/auth": "0.7.0",
"@firebase/database": "0.3.3", "@firebase/database": "0.3.4",
"@firebase/firestore": "0.5.5", "@firebase/firestore": "0.5.6",
"@firebase/functions": "0.2.4", "@firebase/functions": "0.3.0",
"@firebase/messaging": "0.3.5", "@firebase/messaging": "0.3.5",
"@firebase/polyfill": "0.3.3", "@firebase/polyfill": "0.3.3",
"@firebase/storage": "0.2.3" "@firebase/storage": "0.2.3"
...@@ -2771,7 +3014,7 @@ ...@@ -2771,7 +3014,7 @@
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "1.1.3", "chalk": "1.1.3",
"commander": "2.15.1", "commander": "2.16.0",
"is-my-json-valid": "2.17.2", "is-my-json-valid": "2.17.2",
"pinkie-promise": "2.0.1" "pinkie-promise": "2.0.1"
}, },
...@@ -2934,9 +3177,9 @@ ...@@ -2934,9 +3177,9 @@
"dev": true "dev": true
}, },
"hosted-git-info": { "hosted-git-info": {
"version": "2.6.0", "version": "2.6.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz",
"integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==", "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==",
"dev": true "dev": true
}, },
"http-errors": { "http-errors": {
...@@ -3206,23 +3449,6 @@ ...@@ -3206,23 +3449,6 @@
"kind-of": "3.2.2" "kind-of": "3.2.2"
} }
}, },
"is-odd": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz",
"integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
"dev": true,
"requires": {
"is-number": "4.0.0"
},
"dependencies": {
"is-number": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
"integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
"dev": true
}
}
},
"is-plain-object": { "is-plain-object": {
"version": "2.0.4", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
...@@ -3835,9 +4061,9 @@ ...@@ -3835,9 +4061,9 @@
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
}, },
"nanomatch": { "nanomatch": {
"version": "1.2.9", "version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
"integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
"dev": true, "dev": true,
"requires": { "requires": {
"arr-diff": "4.0.0", "arr-diff": "4.0.0",
...@@ -3845,7 +4071,6 @@ ...@@ -3845,7 +4071,6 @@
"define-property": "2.0.2", "define-property": "2.0.2",
"extend-shallow": "3.0.2", "extend-shallow": "3.0.2",
"fragment-cache": "0.2.1", "fragment-cache": "0.2.1",
"is-odd": "2.0.0",
"is-windows": "1.0.2", "is-windows": "1.0.2",
"kind-of": "6.0.2", "kind-of": "6.0.2",
"object.pick": "1.3.0", "object.pick": "1.3.0",
...@@ -4039,7 +4264,7 @@ ...@@ -4039,7 +4264,7 @@
"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
"dev": true, "dev": true,
"requires": { "requires": {
"hosted-git-info": "2.6.0", "hosted-git-info": "2.6.1",
"is-builtin-module": "1.0.0", "is-builtin-module": "1.0.0",
"semver": "5.5.0", "semver": "5.5.0",
"validate-npm-package-license": "3.0.3" "validate-npm-package-license": "3.0.3"
...@@ -4190,11 +4415,6 @@ ...@@ -4190,11 +4415,6 @@
"wrappy": "1.0.2" "wrappy": "1.0.2"
} }
}, },
"onesignal-cordova-plugin": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/onesignal-cordova-plugin/-/onesignal-cordova-plugin-2.4.1.tgz",
"integrity": "sha512-P4Jiypo5d549LrRWsZE1g5z7cmQMseG6yIayQem+hLRUXlWx7qqOdxTa1oUh5nFxlYon8u6jI5wIybRWxL5YfQ=="
},
"optjs": { "optjs": {
"version": "3.2.2", "version": "3.2.2",
"resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz", "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
...@@ -4807,7 +5027,7 @@ ...@@ -4807,7 +5027,7 @@
"stringstream": "0.0.6", "stringstream": "0.0.6",
"tough-cookie": "2.3.4", "tough-cookie": "2.3.4",
"tunnel-agent": "0.4.3", "tunnel-agent": "0.4.3",
"uuid": "3.2.1" "uuid": "3.3.2"
}, },
"dependencies": { "dependencies": {
"qs": { "qs": {
...@@ -5339,7 +5559,7 @@ ...@@ -5339,7 +5559,7 @@
"requires": { "requires": {
"asn1": "0.2.3", "asn1": "0.2.3",
"assert-plus": "1.0.0", "assert-plus": "1.0.0",
"bcrypt-pbkdf": "1.0.1", "bcrypt-pbkdf": "1.0.2",
"dashdash": "1.14.1", "dashdash": "1.14.1",
"ecc-jsbn": "0.1.1", "ecc-jsbn": "0.1.1",
"getpass": "0.1.7", "getpass": "0.1.7",
...@@ -5700,7 +5920,7 @@ ...@@ -5700,7 +5920,7 @@
"babel-code-frame": "6.26.0", "babel-code-frame": "6.26.0",
"builtin-modules": "1.1.1", "builtin-modules": "1.1.1",
"chalk": "2.4.1", "chalk": "2.4.1",
"commander": "2.15.1", "commander": "2.16.0",
"diff": "3.5.0", "diff": "3.5.0",
"glob": "7.1.2", "glob": "7.1.2",
"js-yaml": "3.12.0", "js-yaml": "3.12.0",
...@@ -6035,9 +6255,9 @@ ...@@ -6035,9 +6255,9 @@
"dev": true "dev": true
}, },
"uuid": { "uuid": {
"version": "3.2.1", "version": "3.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
"dev": true "dev": true
}, },
"validate-npm-package-license": { "validate-npm-package-license": {
...@@ -6434,7 +6654,7 @@ ...@@ -6434,7 +6654,7 @@
"extglob": "2.0.4", "extglob": "2.0.4",
"fragment-cache": "0.2.1", "fragment-cache": "0.2.1",
"kind-of": "6.0.2", "kind-of": "6.0.2",
"nanomatch": "1.2.9", "nanomatch": "1.2.13",
"object.pick": "1.3.0", "object.pick": "1.3.0",
"regex-not": "1.0.2", "regex-not": "1.0.2",
"snapdragon": "0.8.2", "snapdragon": "0.8.2",
......
package.json
{ {
"name": "CMC_driver", "name": "myApp",
"version": "0.0.1", "version": "0.0.1",
"author": "Ionic Framework", "author": "Ionic Framework",
"homepage": "http://ionicframework.com/", "homepage": "http://ionicframework.com/",
...@@ -21,22 +21,28 @@ ...@@ -21,22 +21,28 @@
"@angular/http": "5.2.11", "@angular/http": "5.2.11",
"@angular/platform-browser": "5.2.11", "@angular/platform-browser": "5.2.11",
"@angular/platform-browser-dynamic": "5.2.11", "@angular/platform-browser-dynamic": "5.2.11",
"@ionic-native/core": "4.7.0", "@ionic-native/core": "4.8.0",
"@ionic-native/geolocation": "^4.8.0", "@ionic-native/device": "^4.9.0",
"@ionic-native/location-accuracy": "^4.8.0", "@ionic-native/geolocation": "^4.9.0",
"@ionic-native/network": "^4.8.0", "@ionic-native/local-notifications": "^4.9.0",
"@ionic-native/onesignal": "^4.8.0", "@ionic-native/location-accuracy": "^4.9.0",
"@ionic-native/splash-screen": "4.7.0", "@ionic-native/network": "^4.9.0",
"@ionic-native/status-bar": "4.7.0", "@ionic-native/onesignal": "^4.9.0",
"@ionic-native/splash-screen": "4.8.0",
"@ionic-native/status-bar": "4.8.0",
"@ionic/storage": "2.1.3", "@ionic/storage": "2.1.3",
"angularfire2": "^5.0.0-rc.11", "angularfire2": "^5.0.0-rc.11",
"cordova-plugin-geolocation": "^4.0.1", "cordova-android": "^6.2.3",
"cordova-plugin-network-information": "^2.0.1", "cordova-plugin-app-event": "^1.2.1",
"cordova-plugin-request-location-accuracy": "^2.2.3", "cordova-plugin-device": "^2.0.2",
"firebase": "^5.1.0", "cordova-plugin-ionic-keyboard": "^2.0.5",
"cordova-plugin-ionic-webview": "^1.1.19",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-whitelist": "^1.3.3",
"de.appplant.cordova.plugin.local-notification": "^0.8.5",
"firebase": "^5.2.0",
"ionic-angular": "3.9.2", "ionic-angular": "3.9.2",
"ionicons": "3.0.0", "ionicons": "3.0.0",
"onesignal-cordova-plugin": "^2.4.1",
"promise-polyfill": "^8.0.0", "promise-polyfill": "^8.0.0",
"rxjs": "5.5.11", "rxjs": "5.5.11",
"sw-toolbox": "3.6.0", "sw-toolbox": "3.6.0",
...@@ -49,12 +55,16 @@ ...@@ -49,12 +55,16 @@
"description": "An Ionic project", "description": "An Ionic project",
"cordova": { "cordova": {
"plugins": { "plugins": {
"cordova-plugin-network-information": {}, "cordova-plugin-device": {},
"onesignal-cordova-plugin": {}, "cordova-plugin-ionic-keyboard": {},
"cordova-plugin-request-location-accuracy": {}, "cordova-plugin-ionic-webview": {},
"cordova-plugin-geolocation": { "cordova-plugin-splashscreen": {},
"GEOLOCATION_USAGE_DESCRIPTION": "To locate you" "cordova-plugin-whitelist": {},
} "cordova-plugin-app-event": {},
} "de.appplant.cordova.plugin.local-notification": {}
},
"platforms": [
"android"
]
} }
} }
\ No newline at end of file
src/app/app.component.ts
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild } from '@angular/core';
import { Nav, Platform,AlertController,Events } from 'ionic-angular'; import { Nav, Platform, AlertController, Events } from 'ionic-angular';
import { StatusBar } from '@ionic-native/status-bar'; import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen'; import { SplashScreen } from '@ionic-native/splash-screen';
import { Network } from '@ionic-native/network'; import { Network } from '@ionic-native/network';
...@@ -8,21 +8,26 @@ import { LocationAccuracy } from '@ionic-native/location-accuracy'; ...@@ -8,21 +8,26 @@ import { LocationAccuracy } from '@ionic-native/location-accuracy';
import { Storage } from "@ionic/storage"; import { Storage } from "@ionic/storage";
import { Myservice } from "../providers/myservice"; import { Myservice } from "../providers/myservice";
import { driver } from "../models/mymodel"; import { driver } from "../models/mymodel";
import * as firebase from 'firebase';
import { LocalNotifications } from '@ionic-native/local-notifications';
@Component({ @Component({
templateUrl: 'app.html' templateUrl: 'app.html'
}) })
export class MyApp { export class MyApp {
@ViewChild(Nav) nav: Nav; @ViewChild(Nav) nav: Nav;
rootPage:string; rootPage: string;
pages: Array<{title: string, component: any}>; pages: Array<{ title: string, component: any }>;
local:driver local: driver
status: boolean
pushId: string
constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen, private network: Network, private alertCtrl: AlertController, private oneSignal: OneSignal, private locationAccuracy: LocationAccuracy, private storage: Storage, private myservice: Myservice, public events: Events) { constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen, private network: Network, private alertCtrl: AlertController, private oneSignal: OneSignal, private locationAccuracy: LocationAccuracy, private storage: Storage, private myservice: Myservice, public events: Events, private localNotifications: LocalNotifications) {
// , private localNotifications: LocalNotifications
this.initializeApp(); this.initializeApp();
} }
initializeApp() { initializeApp() {
...@@ -59,23 +64,47 @@ export class MyApp { ...@@ -59,23 +64,47 @@ export class MyApp {
} }
}) })
this.storage.get('driver_data').then(data=>{ this.storage.get('driver_data').then(data => {
if(data!=null){ if (data != null) {
this.local = data this.local = data
this.rootPage = 'HomePage' this.rootPage = 'HomePage'
// this.oneSignal.getIds().then((id) => { // this.oneSignal.getIds().then((id) => {
// this.myservice.load_post({deviceid:id.userId,driverid:this.local.id},'updateDeviceid') // this.myservice.load_post({deviceid:id.userId,driverid:this.local.id},'updateDeviceid')
// }) // })
var This = this
var query = firebase.database().ref("drivers/").orderByChild("id").equalTo((data.id))
query.once("child_added", function (snapshot) {
This.pushId = snapshot.val().push_id
if (snapshot.val().status == 'online')
This.status = true
else
This.status = false
});
} }
else{ else {
this.rootPage = 'LandingPage' this.rootPage = 'LandingPage'
} }
}) })
this.localNotifications.schedule({
text: 'Delayed ILocalNotification',
trigger: { at: new Date(new Date().getTime() + 3600) },
led: 'FF0000',
sound: null
}); });
});
}
statusChange() {
var This = this
if (This.status == true)
var stat = 'online'
else
var stat = 'offline'
firebase.database().ref("drivers/" + This.pushId + "/").update({ status: stat })
} }
openPage(page) { openPage(page) {
if (page == 'LandingPage'){ if (page == 'LandingPage') {
this.storage.clear() this.storage.clear()
} }
this.nav.setRoot(page); this.nav.setRoot(page);
......
src/app/app.html
...@@ -7,6 +7,14 @@ ...@@ -7,6 +7,14 @@
</div> </div>
<p>{{local?.name}}</p> <p>{{local?.name}}</p>
<h6>{{local?.dial_code}} {{local?.phone}}</h6> <h6>{{local?.dial_code}} {{local?.phone}}</h6>
<ion-list>
<ion-item class="item_cstm">
<ion-label>Online</ion-label>
<ion-toggle [(ngModel)]="status" (ionChange)=statusChange()></ion-toggle>
</ion-item>
</ion-list>
</div> </div>
<div class="cab_sidemenu_list"> <div class="cab_sidemenu_list">
<ul> <ul>
......
src/app/app.module.ts
...@@ -20,6 +20,8 @@ import { AngularFireDatabase } from 'angularfire2/database'; ...@@ -20,6 +20,8 @@ import { AngularFireDatabase } from 'angularfire2/database';
import { AngularFireModule } from 'angularfire2'; import { AngularFireModule } from 'angularfire2';
import { dataService } from "../providers/common.service"; import { dataService } from "../providers/common.service";
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import * as firebase from "firebase";
import { LocalNotifications } from '@ionic-native/local-notifications';
export const firebaseConfig = { export const firebaseConfig = {
apiKey: "AIzaSyDLrbLd4RCCh86xuTVu7-cfJ28We_cG1sU", apiKey: "AIzaSyDLrbLd4RCCh86xuTVu7-cfJ28We_cG1sU",
...@@ -29,6 +31,8 @@ export const firebaseConfig = { ...@@ -29,6 +31,8 @@ export const firebaseConfig = {
storageBucket: "callmycab-205809.appspot.com", storageBucket: "callmycab-205809.appspot.com",
messagingSenderId: "151146703576" messagingSenderId: "151146703576"
}; };
firebase.initializeApp(firebaseConfig);
@NgModule({ @NgModule({
declarations: [ declarations: [
MyApp MyApp
...@@ -58,6 +62,7 @@ export const firebaseConfig = { ...@@ -58,6 +62,7 @@ export const firebaseConfig = {
AngularFireDatabase, AngularFireDatabase,
dataService, dataService,
DatePipe, DatePipe,
LocalNotifications,
] ]
}) })
export class AppModule {} export class AppModule {}
src/app/app.scss
...@@ -177,4 +177,7 @@ ion-popover{background: rgba(0,0,0,0.6) !important;} ...@@ -177,4 +177,7 @@ ion-popover{background: rgba(0,0,0,0.6) !important;}
.cab_sidemenu_list{width:100%;padding-left:0px;padding-top:0px;} .cab_sidemenu_list{width:100%;padding-left:0px;padding-top:0px;}
.cab_sidemenu_list ul{width:100%;padding:0px;margin:0px;} .cab_sidemenu_list ul{width:100%;padding:0px;margin:0px;}
.cab_sidemenu_list ul li{list-style: none;color: #fff;font-size:16px;font-weight:300;padding-top:15px;padding-bottom:15px;background-position: left !important;background-repeat: no-repeat !important;padding-left:0px;background-size:23px !important;} .cab_sidemenu_list ul li{list-style: none;color: #fff;font-size:16px;font-weight:300;padding-top:15px;padding-bottom:15px;background-position: left !important;background-repeat: no-repeat !important;padding-left:0px;background-size:23px !important;}
.item_cstm{background-color: transparent !important;color: #fff}
.toggle-md.toggle-checked .toggle-inner{background-color: #4CAF50 !important;}
.toggle-md.toggle-checked .toggle-icon{background-color: #dedede!important}
.toggle-md .toggle-inner{background-color: #dedede;}
src/pages/home/home.ts
...@@ -19,10 +19,11 @@ baseurl = this.myservice.base_url ...@@ -19,10 +19,11 @@ baseurl = this.myservice.base_url
} }
ionViewDidEnter(){ ionViewDidEnter(){
this.myservice.show_loader()
this.storage.get('driver_data').then(data=>{ this.storage.get('driver_data').then(data=>{
if(data){ if(data){
this.myservice.load_post({id:data.id},'getMyRides').subscribe(response=>{ this.myservice.load_post({id:data.id},'getMyRides').subscribe(response=>{
this.myservice.hide_loader()
if(response.status == 'success'){ if(response.status == 'success'){
this.upcoming = response.data.upcoming this.upcoming = response.data.upcoming
this.completed = response.data.completed this.completed = response.data.completed
......
src/pages/payment/payment.html
...@@ -8,32 +8,47 @@ ...@@ -8,32 +8,47 @@
<ion-content padding class="cab_coupon_bg"> <ion-content padding class="cab_coupon_bg">
<div class="cab_trip_detail_wrapper"> <div class="cab_trip_detail_wrapper">
<h4 class="text_white">Pickup Point</h4> <h4 class="text_white">Pickup Point</h4>
<!-- <p class="floatLeft textLeft width50">{{book.from}}</p> --> <p class="floatLeft textLeft width50">{{book.from}}</p>
<!-- <p class="floatRight textRight width50">11 :23 am, 02-08-2017</p> --> <!-- <p class="floatRight textRight width50">11 :23 am, 02-08-2017</p> -->
<div class="clear"></div> <div class="clear"></div>
<br> <br>
<h4 class="text_white">Drop Point</h4> <h4 class="text_white">Drop Point</h4>
<!-- <p class="floatLeft textLeft width50">{{book.to}}</p> --> <p class="floatLeft textLeft width50">{{book.to}}</p>
<!-- <p class="floatRight textRight width50">12 :00 am, 02-08-2017</p> --> <!-- <p class="floatRight textRight width50">12 :00 am, 02-08-2017</p> -->
<div class="clear"></div> <div class="clear"></div>
<br> <br>
<br> <br>
</div> </div>
<div class="cab_coupon_content">
<p style="padding-top: 0px;margin-top: 0px;margin-bottom: 0px;">Ride Details</p>
<li>
<div class="child textLeft">Distance</div>
<div class="child textRight">Rs. {{details?.distance}}</div>
<div class="clear"></div>
</li>
<li>
<div class="child textLeft">Hours</div>
<div class="child textRight">Rs. {{details?.hours}}</div>
<div class="clear"></div>
</li>
</div>
<div class="cab_coupon_content"> <div class="cab_coupon_content">
<p style="padding-top: 0px;margin-top: 0px;margin-bottom: 0px;">Payment Details</p> <p style="padding-top: 0px;margin-top: 0px;margin-bottom: 0px;">Payment Details</p>
<li> <li>
<div class="child textLeft">Total</div> <div class="child textLeft">Total</div>
<!-- <div class="child textRight">Rs. {{ride.amount}}</div> --> <div class="child textRight">Rs. {{details?.bfor_deduction}}</div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li> <li>
<div class="child textLeft">Discount</div> <div class="child textLeft">Discount</div>
<!-- <div class="child textRight">Rs. {{ride.discount}}</div> --> <div class="child textRight">Rs. {{book?.discount}}</div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
<li> <li>
<div class="child textLeft">Due after service</div> <div class="child textLeft">Due after service</div>
<!-- <div class="child textRight">Rs. {{ride.amount - ride.discount}}</div> --> <div class="child textRight">Rs. {{details?.amount}}</div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
</div> </div>
...@@ -42,7 +57,7 @@ ...@@ -42,7 +57,7 @@
<ion-footer> <ion-footer>
<div class="theme_bgcolor p10 text_white"> <div class="theme_bgcolor p10 text_white">
<p class="floatLeft text_size_18">Total</p> <p class="floatLeft text_size_18">Total</p>
<!-- <p class="floatRight text_size_18">Rs.{{ride.amount - ride.discount}}</p> --> <p class="floatRight text_size_18">Rs.{{details?.amount}}</p>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<button ion-button class="cab_footer_btn width100 text_white" (click)="done()">Completed</button> <button ion-button class="cab_footer_btn width100 text_white" (click)="done()">Completed</button>
......
src/pages/payment/payment.ts
...@@ -20,6 +20,7 @@ export class PaymentPage { ...@@ -20,6 +20,7 @@ export class PaymentPage {
ride: any; ride: any;
waypoints = this.data.getwaypointData() waypoints = this.data.getwaypointData()
rate = this.data.getrateData(); rate = this.data.getrateData();
details:any;
constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform, private datePipe: DatePipe) { constructor(public navCtrl: NavController, public navParams: NavParams, private data: dataService, private zone: NgZone, private myservice: Myservice, private storage: Storage, public platform: Platform, private datePipe: DatePipe) {
} }
...@@ -59,23 +60,34 @@ export class PaymentPage { ...@@ -59,23 +60,34 @@ export class PaymentPage {
if (totalDist > This.rate.intialkm){ if (totalDist > This.rate.intialkm){
var extra = totalDist - This.rate.intialkm var extra = totalDist - This.rate.intialkm
var rate = ((extra * This.rate.standardrate) + (This.rate.intailrate)) + This.book.timeAmount var rate = ((extra * This.rate.standardrate) + (This.rate.intailrate)) + This.book.timeAmount
var amount = rate
rate = rate - This.book.discount rate = rate - This.book.discount
} }
else{ else{
var rate = This.rate.intailrate + This.book.timeAmount; var rate = This.rate.intailrate + This.book.timeAmount;
var amount = rate
rate = rate - This.book.discount rate = rate - This.book.discount
} }
var data = { 'pickup_time': This.datePipe.transform(This.book.actualPick, 'h:mm a'), 'drop_time': This.datePipe.transform(This.book.actualDrop, 'h:mm a'), 'drop_date': This.datePipe.transform(This.book.actualDrop, 'MM/dd/yyyy'), 'distance': totalDist, 'amount': rate, 'km': totalDist}
This.myservice.hide_loader(); var h = Math.floor(This.book.seconds / 3600);
console.log(data); var m = Math.floor(This.book.seconds % 3600 / 60);
// This.myservice.load_post({},'updateRideDetails').subscribe(response=>{
// if(response.status == 'success'){ var hDisplay = h > 0 ? h + "h" : "";
var mDisplay = m > 0 ? m + "min" : "";
var data = { 'id': This.book.id ,'pickup_time': This.datePipe.transform(This.book.actualPick, 'h:mm a'), 'drop_time': This.datePipe.transform(This.book.actualDrop, 'h:mm a'), 'drop_date': This.datePipe.transform(This.book.actualDrop, 'MM/dd/yyyy'), 'distance': totalDist, 'amount': rate, 'km': totalDist}
// } console.log(data);
// else This.myservice.load_post({data},'updateRideDetails').subscribe(response=>{
// This.myservice.show_alert('',response.message) This.myservice.hide_loader();
// }) if(response.status == 'success'){
This.details = response.data;
This.details.bfor_deduction = amount;
This.details.hours = hDisplay + mDisplay;
}
else
This.myservice.show_alert('',response.message)
})
} else { } else {
window.alert('Directions request failed due to ' + status); window.alert('Directions request failed due to ' + status);
} }
...@@ -94,7 +106,11 @@ export class PaymentPage { ...@@ -94,7 +106,11 @@ export class PaymentPage {
} }
done() { done() {
this.myservice.load_post({ status: 'Completed', id: this.book.id }, 'changeStatus') this.myservice.load_post({ status: 'Completed', id: this.book.id }, 'changeStatus').subscribe(resp=>{
if(resp.status == 'success'){
this.navCtrl.setRoot('HomePage')
}
})
} }
} }
src/pages/ridedetails/ridedetails.ts
...@@ -22,8 +22,7 @@ export class RidedetailsPage { ...@@ -22,8 +22,7 @@ export class RidedetailsPage {
ionViewDidEnter(){ ionViewDidEnter(){
this.now = this.datePipe.transform(new Date(), 'MM/dd/yyyy') this.now = this.datePipe.transform(new Date(), 'MM/dd/yyyy')
console.log(this.now)
console.log(this.details.pickup_date)
if (this.now == this.details.pickup_date){ if (this.now == this.details.pickup_date){
this.temp = true; this.temp = true;
} }
......
src/pages/signin/signin.ts
...@@ -42,8 +42,10 @@ export class SigninPage { ...@@ -42,8 +42,10 @@ export class SigninPage {
This.navCtrl.setRoot('HomePage') This.navCtrl.setRoot('HomePage')
}, 500); }, 500);
} }
else else{
This.myservice.hide_loader();
this.myservice.show_alert('', response.message) this.myservice.show_alert('', response.message)
}
}) })
} }
......
src/pages/userlocation/userlocation.ts
...@@ -182,6 +182,7 @@ export class UserlocationPage { ...@@ -182,6 +182,7 @@ export class UserlocationPage {
var calcTime = response.rows[0].elements[0].duration.value var calcTime = response.rows[0].elements[0].duration.value
var realTime = (This.details.actualDrop - This.details.actualPick) / 1000//in seconds var realTime = (This.details.actualDrop - This.details.actualPick) / 1000//in seconds
This.details.seconds = realTime
// var realTime = (1530183600000 - 1530182700000) / 1000 //in seconds // var realTime = (1530183600000 - 1530182700000) / 1000 //in seconds
// console.log('google time', calcTime); // console.log('google time', calcTime);
// console.log('time taken',realTime); // console.log('time taken',realTime);
......
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